From a35cb0d34d90873f88d03a6642ddd0b481636f5c Mon Sep 17 00:00:00 2001 From: David Capello Date: Sat, 19 Apr 2014 21:06:58 -0300 Subject: [PATCH] Fix compilation errors (gcc) --- src/app/ui/timeline.cpp | 2 +- src/ui/clipboard.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp index be2e5f53c..e016cf708 100644 --- a/src/app/ui/timeline.cpp +++ b/src/app/ui/timeline.cpp @@ -1732,7 +1732,7 @@ void Timeline::dropCels(DropOp op, const Range& drop) dstFrameStep = FrameNumber(-1); } - DocumentApi& api = m_document->getApi(); + DocumentApi api = m_document->getApi(); for (int srcLayerIdx = srcLayerBegin, dstLayerIdx = dstLayerBegin; srcLayerIdx != srcLayerEnd; ) { diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index 0316233ce..e8f419182 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -20,13 +20,13 @@ static std::string clipboard_text; namespace ui { namespace clipboard { -const char* ui::clipboard::get_text() +const char* get_text() { clipboard_text = Manager::getDefault()->getClipboard()->getText(); return clipboard_text.c_str(); } -void ui::clipboard::set_text(const char* text) +void set_text(const char* text) { clipboard_text = text ? text: ""; Manager::getDefault()->getClipboard()->setText(clipboard_text);