Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

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

diff --git a/src/frontends/qt4/GuiChanges.cpp b/src/frontends/qt4/GuiChanges.cpp
index e5587819b2e58b17feb031ecd0d63530b84fcf19..5405e5d603dbf20b8fa48137cfdcf4d3bfe6b148 100644 (file)
--- a/src/frontends/qt4/GuiChanges.cpp
+++ b/src/frontends/qt4/GuiChanges.cpp
@@ -15,6 +15,7 @@
 
 #include "qt_helpers.h"
 
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/lyxtime.h"
 
@@ -27,7 +28,6 @@
 #include "lyxfind.h"
 #include "LyXRC.h"
 
-#include <QCloseEvent>
 #include <QTextBrowser>
 
 
@@ -36,11 +36,10 @@ namespace frontend {
 
 using support::bformat;
 
-GuiChanges::GuiChanges(LyXView & lv)
-       : GuiDialog(lv, "changes")
+GuiChanges::GuiChanges(GuiView & lv)
+       : GuiDialog(lv, "changes", qt_("Merge Changes"))
 {
        setupUi(this);
-       setViewTitle(_("Merge Changes"));
 
        connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
        connect(nextPB, SIGNAL(clicked()), this, SLOT(nextChange()));
@@ -54,13 +53,6 @@ GuiChanges::GuiChanges(LyXView & lv)
 }
 
 
-void GuiChanges::closeEvent(QCloseEvent *e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiChanges::updateContents()
 {
        docstring text;
@@ -124,7 +116,7 @@ void GuiChanges::rejectChange()
 }
 
 
-Dialog * createGuiChanges(LyXView & lv) { return new GuiChanges(lv); }
+Dialog * createGuiChanges(GuiView & lv) { return new GuiChanges(lv); }
 
 
 } // namespace frontend