Fix reloading of local layout file (bug #11120)

[lyx.git] / src / frontends / qt4 / GuiCompare.cpp

diff --git a/src/frontends/qt4/GuiCompare.cpp b/src/frontends/qt4/GuiCompare.cpp
index 9a4df587d23373a99780c91382f2248451c915aa..4ea7f3578440668e2a052a964f5b50d553db86f9 100644 (file)
--- 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();
@@ -310,11 +310,7 @@ int GuiCompare::run()
 
        // init the compare object and start it
        compare_ = new Compare(new_buffer_, old_buffer_, dest_buffer_, options);
-#if QT_VERSION >= 0x050600
-       connect(compare_, SIGNAL(errorOccurred()), this, SLOT(error()));
-#else
        connect(compare_, SIGNAL(error()), this, SLOT(error()));
-#endif
        connect(compare_, SIGNAL(finished(bool)), this, SLOT(finished(bool)));
        connect(compare_, SIGNAL(progress(int)), this, SLOT(progress(int)));
        connect(compare_, SIGNAL(progressMax(int)), this, SLOT(progressMax(int)));