void GuiCompare::closeEvent(QCloseEvent *)
{
- slotCancel();
+ slotCancel();
}
QString const title = qt_("Select document");
QStringList const & filters = fileFilters(qt_("LyX Documents (*.lyx)"));
-
+
QString filename;
if (lyxview().documentBufferView()) {
QString path = bufferFilePath();
qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
filename = makeAbsPath(rel_filename, path);
}
- return filename;
+ return filename;
}
delete compare_;
compare_ = 0;
}
-
+
if (aborted) {
if (dest_buffer_) {
dest_buffer_->markClean();
// 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)));