X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiCompare.cpp;h=4ea7f3578440668e2a052a964f5b50d553db86f9;hb=b7f6b979d0f889f08e735f35378bb20ba3788b4b;hp=83ffd5ace4240800f6ec039db3778a551a496384;hpb=82d6524298e37613703e901495f22002994679f3;p=lyx.git diff --git a/src/frontends/qt4/GuiCompare.cpp b/src/frontends/qt4/GuiCompare.cpp index 83ffd5ace4..4ea7f35784 100644 --- a/src/frontends/qt4/GuiCompare.cpp +++ b/src/frontends/qt4/GuiCompare.cpp @@ -78,7 +78,7 @@ GuiCompare::~GuiCompare() void GuiCompare::closeEvent(QCloseEvent *) { - slotCancel(); + slotCancel(); } @@ -154,7 +154,7 @@ QString GuiCompare::browse(QString const & in_name) const QString const title = qt_("Select document"); QStringList const & filters = fileFilters(qt_("LyX Documents (*.lyx)")); - + QString filename; if (lyxview().documentBufferView()) { QString path = bufferFilePath(); @@ -166,7 +166,7 @@ QString GuiCompare::browse(QString const & in_name) const qt_("Documents|#o#O"), toqstr(lyxrc.document_path)); filename = makeAbsPath(rel_filename, path); } - return filename; + return filename; } @@ -207,7 +207,7 @@ void GuiCompare::finished(bool aborted) delete compare_; compare_ = 0; } - + if (aborted) { if (dest_buffer_) { dest_buffer_->markClean();