Fix compilation errors (gcc)

This commit is contained in:
David Capello 2014-04-19 21:06:58 -03:00
parent b36cff8d75
commit a35cb0d34d
2 changed files with 3 additions and 3 deletions

View File

@ -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; ) {

View File

@ -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);