merge QAbout and QAboutDialog

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17943 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/Makefile.dialogs b/src/frontends/qt4/Makefile.dialogs
index 944829d4d5252a634cdf83c2439fb9f4c565a21f..c9788d093ea1da057041b508f0bc22dc01ba3544 100644 (file)
--- a/src/frontends/qt4/Makefile.dialogs
+++ b/src/frontends/qt4/Makefile.dialogs
@@ -86,7 +86,7 @@ MOCFILES = \
        InsertTableWidget.C InsertTableWidget.h \
        lengthcombo.C lengthcombo.h \
        panelstack.C panelstack.h \
-       QAboutDialog.C QAboutDialog.h \
+       QAbout.C QAbout.h \
        QBibitemDialog.C QBibitemDialog.h \
        QBibtexDialog.C QBibtexDialog.h \
        QBox.C QBox.h \

diff --git a/src/frontends/qt4/QAbout.C b/src/frontends/qt4/QAbout.C
index ed72ffb64a011bab3d9affba7e7dd7a8e4586896..4a12c47c3dd9bf2b1fd3774f68c256fc9e3f480b 100644 (file)
--- a/src/frontends/qt4/QAbout.C
+++ b/src/frontends/qt4/QAbout.C
@@ -11,7 +11,6 @@
 #include <config.h>
 
 #include "QAbout.h"
-#include "QAboutDialog.h"
 #include "Qt2BC.h"
 #include "qt_helpers.h"
 
@@ -38,10 +37,11 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlAboutlyx, QView<QAboutDialog> > about_base_class;
+
+typedef QController<ControlAboutlyx, QView<QAboutDialog> > AboutBase;
 
 QAbout::QAbout(Dialog & parent)
-       : about_base_class(parent, _("About LyX"))
+       : AboutBase(parent, _("About LyX"))
 {
 }
 
@@ -120,3 +120,5 @@ void QAbout::build_dialog()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QAbout_moc.cpp"

diff --git a/src/frontends/qt4/QAbout.h b/src/frontends/qt4/QAbout.h
index 18bea8a0cd780b805470dc4cc5cb68a3a0395043..b471606169d16721f737c29edd38e30d942bb531 100644 (file)
--- a/src/frontends/qt4/QAbout.h
+++ b/src/frontends/qt4/QAbout.h
@@ -13,13 +13,26 @@
 #define FORMABOUT_H
 
 #include "QDialogView.h"
-#include "QAboutDialog.h"
+#include "ui/AboutUi.h"
+#include <QDialog>
 
 namespace lyx {
 namespace frontend {
 
 class ControlAboutlyx;
 
+class QAboutDialog : public QDialog, public Ui::QAboutUi {
+       Q_OBJECT
+public:
+       QAboutDialog(QWidget * parent = 0)
+               : QDialog(parent)
+       {
+               setupUi(this);
+               connect(closePB, SIGNAL(clicked()), this, SLOT(reject()));
+       }
+};
+
+
 class QAbout
        : public QController<ControlAboutlyx, QView<QAboutDialog> >
 {

diff --git a/src/frontends/qt4/QAboutDialog.C b/src/frontends/qt4/QAboutDialog.C
deleted file mode 100644 (file)
index 388d401..0000000
--- a/src/frontends/qt4/QAboutDialog.C
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * \file QAboutDialog.C
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Kalle Dalheimer
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#include <config.h>
-
-#include "QAboutDialog.h"
-
-namespace lyx {
-namespace frontend {
-
-QAboutDialog::QAboutDialog(QWidget * /*parent*/, char const * /*name*/,
-                          bool /*modal*/, Qt::WFlags /*fl*/)
-{
-       setupUi(this);
-
-       connect( closePB, SIGNAL( clicked() ),
-               this, SLOT( reject() ) );
-}
-
-
-QAboutDialog::~QAboutDialog()
-{}
-
-} // namespace frontend
-} // namespace lyx
-
-#include "QAboutDialog_moc.cpp"

diff --git a/src/frontends/qt4/QAboutDialog.h b/src/frontends/qt4/QAboutDialog.h
deleted file mode 100644 (file)
index de8f94b..0000000
--- a/src/frontends/qt4/QAboutDialog.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- C++ -*-
-/**
- * \file QAboutDialog.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Kalle Dalheimer
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef QABOUTDIALOG_H
-#define QABOUTDIALOG_H
-
-#include "ui/AboutUi.h"
-#include <QDialog>
-
-namespace lyx {
-namespace frontend {
-
-class QAboutDialog : public QDialog, public Ui::QAboutUi {
-       Q_OBJECT
-public:
-       QAboutDialog(QWidget * parent = 0, const char * name = 0,
-                    bool modal = FALSE, Qt::WFlags fl = 0);
-       ~QAboutDialog();
-};
-
-} // namespace frontend
-} // namespace lyx
-
-#endif // QABOUTDIALOG_H