While working on bug 3227, I noticed that from()->show() called QDialog::show() inste...

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

diff --git a/src/frontends/qt4/QAbout.h b/src/frontends/qt4/QAbout.h
index 94b22d1d56a4e01b95abff58f23ae390233b84a7..18bea8a0cd780b805470dc4cc5cb68a3a0395043 100644 (file)
--- a/src/frontends/qt4/QAbout.h
+++ b/src/frontends/qt4/QAbout.h
@@ -13,11 +13,11 @@
 #define FORMABOUT_H
 
 #include "QDialogView.h"
+#include "QAboutDialog.h"
 
 namespace lyx {
 namespace frontend {
 
-class QAboutDialog;
 class ControlAboutlyx;
 
 class QAbout

diff --git a/src/frontends/qt4/QBibitem.h b/src/frontends/qt4/QBibitem.h
index 2127e6ef0b556dd1cfcd550966f9c6aca0a17c66..b5066c2718c52d80e52413dfdac3dc2b711def07 100644 (file)
--- a/src/frontends/qt4/QBibitem.h
+++ b/src/frontends/qt4/QBibitem.h
@@ -12,13 +12,13 @@
 #ifndef QBIBITEM_CONTROLLER_H
 #define QBIBITEM_CONTROLLER_H
 
+#include "QBibitemDialog.h"
 #include "QDialogView.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlCommand;
-class QBibitemDialog;
 
 class QBibitem
        : public QController<ControlCommand, QView<QBibitemDialog> >

diff --git a/src/frontends/qt4/QBibitemDialog.C b/src/frontends/qt4/QBibitemDialog.C
index 9ef306f1addb8e07ae134d052c2afb12bb6d32d6..44efae89e0cb6bb9fc66b57f5cde14e13fe688b6 100644 (file)
--- a/src/frontends/qt4/QBibitemDialog.C
+++ b/src/frontends/qt4/QBibitemDialog.C
@@ -12,8 +12,9 @@
 
 #include "QBibitemDialog.h"
 
+#include "QBibitem.h"
+
 #include <qpushbutton.h>
-//Added by qt3to4:
 #include <QCloseEvent>
 
 namespace lyx {

diff --git a/src/frontends/qt4/QBibitemDialog.h b/src/frontends/qt4/QBibitemDialog.h
index 5415c423086c722cdb6b5dd147734414883f0b17..5662b14aaab87bd953abc49c2633db23bcb4fe5d 100644 (file)
--- a/src/frontends/qt4/QBibitemDialog.h
+++ b/src/frontends/qt4/QBibitemDialog.h
@@ -18,12 +18,12 @@
 
 #include <QCloseEvent>
 
-#include "QBibitem.h"
-//class QBibitem;
 
 namespace lyx {
 namespace frontend {
 
+class QBibitem;
+
 class QBibitemDialog : public QDialog, public Ui::QBibitemUi {
        Q_OBJECT
 public:

diff --git a/src/frontends/qt4/QBox.h b/src/frontends/qt4/QBox.h
index b544e7da432b66b055900d21c9c73a694fbf3e59..e6d2b82ed8601fa229fd17cc026bc4d50326841b 100644 (file)
--- a/src/frontends/qt4/QBox.h
+++ b/src/frontends/qt4/QBox.h
@@ -13,14 +13,15 @@
 #ifndef QBOX_H
 #define QBOX_H
 
+#include "QBoxDialog.h"
 #include "QDialogView.h"
+
 #include <vector>
 
 namespace lyx {
 namespace frontend {
 
 class ControlBox;
-class QBoxDialog;
 
 ///
 class QBox

diff --git a/src/frontends/qt4/QBranch.h b/src/frontends/qt4/QBranch.h
index 1b936a0ea211df9a9519ce65a10fb18c344ef2b9..95bc71f4a0605c450577299a41b6c10c7692c9f3 100644 (file)
--- a/src/frontends/qt4/QBranch.h
+++ b/src/frontends/qt4/QBranch.h
@@ -12,13 +12,13 @@
 #ifndef QBRANCH_H
 #define QBRANCH_H
 
+#include "QBranchDialog.h"
 #include "QDialogView.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlBranch;
-class QBranchDialog;
 
 /** This class provides a QT implementation of the Branch Dialog.
  */

diff --git a/src/frontends/qt4/QChanges.h b/src/frontends/qt4/QChanges.h
index c5adf3ce2ad0f2cfcee93be0d2b68fae957f9a93..9d8e90f652f7e9bb6b68679cb82c94453d3fed5d 100644 (file)
--- a/src/frontends/qt4/QChanges.h
+++ b/src/frontends/qt4/QChanges.h
@@ -12,13 +12,13 @@
 #ifndef QCHANGES_H
 #define QCHANGES_H
 
+#include "QChangesDialog.h"
 #include "QDialogView.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlChanges;
-class QChangesDialog;
 
 class QChanges
        : public QController<ControlChanges, QView<QChangesDialog> >

diff --git a/src/frontends/qt4/QChangesDialog.C b/src/frontends/qt4/QChangesDialog.C
index 25ee375af040129574078182c397e18c8ce01028..d91db3755ff1712ec1cbe6272cad7317f3ba8dbb 100644 (file)
--- a/src/frontends/qt4/QChangesDialog.C
+++ b/src/frontends/qt4/QChangesDialog.C
@@ -12,6 +12,8 @@
 
 #include "QChangesDialog.h"
 
+#include "QChanges.h"
+
 #include <QPushButton>
 #include <QCloseEvent>
 

diff --git a/src/frontends/qt4/QChangesDialog.h b/src/frontends/qt4/QChangesDialog.h
index 74703da0f6207fbadc598c51cce40fd6aeeae38e..09018ef18964d2d13638202940a13e10f7dce902 100644 (file)
--- a/src/frontends/qt4/QChangesDialog.h
+++ b/src/frontends/qt4/QChangesDialog.h
@@ -13,16 +13,15 @@
 #define QCHANGESDIALOG_H
 
 #include "ui/QChangesUi.h"
-#include "QChanges.h"
 
 #include <QCloseEvent>
 #include <QDialog>
 
-class QChanges;
-
 namespace lyx {
 namespace frontend {
 
+class QChanges;
+
 class QChangesDialog : public QDialog, public Ui::QChangesUi {
        Q_OBJECT
 public:

diff --git a/src/frontends/qt4/QCharacter.h b/src/frontends/qt4/QCharacter.h
index 3d2175890fb5edd1a161953d60134058adb6f12c..2c69b5984769c459a82e65110220bef3de055a8c 100644 (file)
--- a/src/frontends/qt4/QCharacter.h
+++ b/src/frontends/qt4/QCharacter.h
@@ -13,7 +13,9 @@
 #ifndef QCHARACTER_H_CONTROLLER
 #define QCHARACTER_H_CONTROLLER
 
+#include "QCharacterDialog.h"
 #include "QDialogView.h"
+
 #include "controllers/character.h"
 #include "controllers/frnt_lang.h"
 
@@ -23,8 +25,6 @@ namespace lyx {
 namespace frontend {
 
 class ControlCharacter;
-class QCharacterDialog;
-
 
 class QCharacter
        : public QController<ControlCharacter, QView<QCharacterDialog> >

diff --git a/src/frontends/qt4/QCharacterDialog.C b/src/frontends/qt4/QCharacterDialog.C
index 04a0b6139faa58a6b9fcf203abe06d6704468eb9..26d0901556e20b31885f1e6cb7a0f4cc7368d30d 100644 (file)
--- a/src/frontends/qt4/QCharacterDialog.C
+++ b/src/frontends/qt4/QCharacterDialog.C
@@ -12,9 +12,10 @@
 
 #include "QCharacterDialog.h"
 
+#include "QCharacter.h"
+
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-//Added by qt3to4:
 #include <QCloseEvent>
 
 namespace lyx {

diff --git a/src/frontends/qt4/QCharacterDialog.h b/src/frontends/qt4/QCharacterDialog.h
index 66703d19735122a7e8e1dac96af7f8601c424cac..0a98228364e36fa33c7965ffac1710f64472ad4b 100644 (file)
--- a/src/frontends/qt4/QCharacterDialog.h
+++ b/src/frontends/qt4/QCharacterDialog.h
@@ -16,7 +16,6 @@
 #include "ui/QCharacterUi.h"
 #include <QCloseEvent>
 #include <QDialog>
-#include "QCharacter.h"
 
 namespace lyx {
 
@@ -24,6 +23,8 @@ class LyXFont;
 
 namespace frontend {
 
+class QCharacter;
+
 class QCharacterDialog : public QDialog, public Ui::QCharacterUi {
        Q_OBJECT
 public:

diff --git a/src/frontends/qt4/QDialogView.h b/src/frontends/qt4/QDialogView.h
index a6c438c946444270317aa8344ef9e98f19d8dd13..51530b00f9f62a7bd74e4a57079951cc0ac78bb5 100644 (file)
--- a/src/frontends/qt4/QDialogView.h
+++ b/src/frontends/qt4/QDialogView.h
@@ -113,11 +113,7 @@ QView<GUIDialog>::QView(Dialog & p, docstring const & t)
 template <class GUIDialog>
 QDialog * QView<GUIDialog>::form() const
 {
-       /* Brain dead MSVC compiler wants to know the class hierarchy at the
-          definition site of the template, rather than the instantation point
-          to downcast correctly. So, rather than including all dialogs to
-          provide that, we just cast it with the ugly hammer. */
-       return (QDialog *) dialog_.get();
+       return dialog_.get();
 }
 
 

diff --git a/src/frontends/qt4/QDocument.h b/src/frontends/qt4/QDocument.h
index 87d0438c4c6f776a1766cbebc0b205d19363bcb5..8a50e6a6ae87d3ad860c6fa368c4f7e8c0b57461 100644 (file)
--- a/src/frontends/qt4/QDocument.h
+++ b/src/frontends/qt4/QDocument.h
@@ -13,6 +13,8 @@
 #define QDOCUMENT_H
 
 #include "QDialogView.h"
+#include "QDocumentDialog.h"
+
 #include "BranchList.h"
 #include <boost/scoped_ptr.hpp>
 #include <string>
@@ -25,7 +27,6 @@ namespace lyx {
 namespace frontend {
 
 class ControlDocument;
-class QDocumentDialog;
 
 class QDocument
        : public QController<ControlDocument, QView<QDocumentDialog> >

diff --git a/src/frontends/qt4/QDocumentDialog.C b/src/frontends/qt4/QDocumentDialog.C
index bc248ee18d2a36ea2da24cd8fa623a306f6fc5aa..4aeb63936a8c6d6aa1deefe774001aca248fb698 100644 (file)
--- a/src/frontends/qt4/QDocumentDialog.C
+++ b/src/frontends/qt4/QDocumentDialog.C
@@ -11,6 +11,7 @@
 
 #include <config.h>
 
+#include "QBranches.h"
 #include "QDocument.h"
 #include "QDocumentDialog.h"
 

diff --git a/src/frontends/qt4/QDocumentDialog.h b/src/frontends/qt4/QDocumentDialog.h
index fe2fdd3b6c297c6cba1082159b9b93e3b29c0181..d0b2ecf019a8f392d15a54c7ebfb50d5bf900438 100644 (file)
--- a/src/frontends/qt4/QDocumentDialog.h
+++ b/src/frontends/qt4/QDocumentDialog.h
@@ -27,8 +27,6 @@
 
 #include "BulletsModule.h"
 
-#include "QBranches.h"
-
 #include <QCloseEvent>
 #include <QDialog>
 #include <vector>
@@ -49,6 +47,7 @@ template<class UI>
 namespace lyx {
 namespace frontend {
 
+class QBranches;
 class QDocument;
 
 class QDocumentDialog : public QDialog, public Ui::QDocumentUi {

diff --git a/src/frontends/qt4/QERT.h b/src/frontends/qt4/QERT.h
index 21c1a992da69226430ab1bb8733a8aa3a77a9a12..9f5aba6b60bd57c27248188f23ceccf7f54666aa 100644 (file)
--- a/src/frontends/qt4/QERT.h
+++ b/src/frontends/qt4/QERT.h
@@ -13,13 +13,12 @@
 #define QERT_H
 
 #include "QDialogView.h"
+#include "QERTDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlERT;
-class QERTDialog;
-
 
 class QERT : public QController<ControlERT, QView<QERTDialog> >
 {

diff --git a/src/frontends/qt4/QErrorList.h b/src/frontends/qt4/QErrorList.h
index afd3c78b521372dae54ac1fc6f1eef8cb9707eb7..89553442a2a3b40330bb712008e19a4045357815 100644 (file)
--- a/src/frontends/qt4/QErrorList.h
+++ b/src/frontends/qt4/QErrorList.h
@@ -13,6 +13,7 @@
 #define QERRORLIST_H
 
 #include "QDialogView.h"
+#include "QErrorListDialog.h"
 
 class QListWidgetItem;
 
@@ -20,7 +21,6 @@ namespace lyx {
 namespace frontend {
 
 class ControlErrorList;
-class QErrorListDialog;
 
 class QErrorList :
        public QController<ControlErrorList, QView<QErrorListDialog> >

diff --git a/src/frontends/qt4/QExternal.h b/src/frontends/qt4/QExternal.h
index ae083266fef2d94ec28c82d9fa7b570d8addea8c..a903fef8371623769f3f9cf9a7321f260dc88573 100644 (file)
--- a/src/frontends/qt4/QExternal.h
+++ b/src/frontends/qt4/QExternal.h
@@ -13,14 +13,14 @@
 #define QEXTERNAL_H
 
 #include "QDialogView.h"
+#include "QExternalDialog.h"
+
 #include <map>
 
 namespace lyx {
 namespace frontend {
 
 class ControlExternal;
-class QExternalDialog;
-
 
 class QExternal
        : public QController<ControlExternal, QView<QExternalDialog> >

diff --git a/src/frontends/qt4/QFloat.h b/src/frontends/qt4/QFloat.h
index d170634dbfce90bd39578f92803892791945e077..4abebef67ad48d3156b5a171c8f7cdaaf45dcfe0 100644 (file)
--- a/src/frontends/qt4/QFloat.h
+++ b/src/frontends/qt4/QFloat.h
@@ -13,13 +13,13 @@
 #define QFLOAT_H
 
 #include "QDialogView.h"
+#include "QFloatDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 
 class ControlFloat;
-class QFloatDialog;
 
 ///
 class QFloat : public QController<ControlFloat, QView<QFloatDialog> > {

diff --git a/src/frontends/qt4/QGraphics.h b/src/frontends/qt4/QGraphics.h
index 503351f5308c979d2052c4e841f73c21d4a14e07..48f7b51018a35ed84125e319a3461970dadda6fc 100644 (file)
--- a/src/frontends/qt4/QGraphics.h
+++ b/src/frontends/qt4/QGraphics.h
@@ -14,13 +14,14 @@
 #define QGRAPHICS_H
 
 #include "QDialogView.h"
+#include "QGraphicsDialog.h"
+
 #include <vector>
 
 namespace lyx {
 namespace frontend {
 
 class ControlGraphics;
-class QGraphicsDialog;
 
 ///
 class QGraphics

diff --git a/src/frontends/qt4/QInclude.h b/src/frontends/qt4/QInclude.h
index 99a36da499491553361b8d05051305123e752f1f..0bd0bca06ef8fd68fcd302f056a85b0bc1b3af97 100644 (file)
--- a/src/frontends/qt4/QInclude.h
+++ b/src/frontends/qt4/QInclude.h
@@ -13,12 +13,12 @@
 #define QINCLUDE_H
 
 #include "QDialogView.h"
+#include "QIncludeDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlInclude;
-class QIncludeDialog;
 
 ///
 class QInclude : public QController<ControlInclude, QView<QIncludeDialog> >

diff --git a/src/frontends/qt4/QIndex.h b/src/frontends/qt4/QIndex.h
index 1686af99a8190b6f75c25e7ad3a38dba5d250cc7..04d5f5d830474d137fbd615b8c093946a5903ae1 100644 (file)
--- a/src/frontends/qt4/QIndex.h
+++ b/src/frontends/qt4/QIndex.h
@@ -14,13 +14,12 @@
 #define QINDEX_H
 
 #include "QDialogView.h"
+#include "QIndexDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlCommand;
-class QIndexDialog;
-
 
 class QIndex :
        public QController<ControlCommand, QView<QIndexDialog> >

diff --git a/src/frontends/qt4/QLog.h b/src/frontends/qt4/QLog.h
index 0853789a41806f069a580eb7c2b94fd624f6e2c1..0ef101c43325b6a85cc4bc15c6be0001bcd21e82 100644 (file)
--- a/src/frontends/qt4/QLog.h
+++ b/src/frontends/qt4/QLog.h
@@ -13,12 +13,12 @@
 #define QLOG_H
 
 #include "QDialogView.h"
+#include "QLogDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlLog;
-class QLogDialog;
 
 ///
 class QLog

diff --git a/src/frontends/qt4/QMath.h b/src/frontends/qt4/QMath.h
index 8dbcef822ed812f702a35fbc057af151b18147fa..43be5bb3688caf50eb16d5e6ad4c15989c403653 100644 (file)
--- a/src/frontends/qt4/QMath.h
+++ b/src/frontends/qt4/QMath.h
@@ -13,14 +13,14 @@
 #define QMATH_H
 
 #include "QDialogView.h"
+#include "QDelimiterDialog.h"
+#include "QMathDialog.h"
+#include "QMathMatrixDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlMath;
-class QMathDialog;
-class QMathMatrixDialog;
-class QDelimiterDialog;
 
 class QMath : public QController<ControlMath, QView<QMathDialog> > {
 public:

diff --git a/src/frontends/qt4/QNomencl.h b/src/frontends/qt4/QNomencl.h
index 408bd1f5a58cb743d9f62ab4386bb7db5ef8db57..c8b6d8cf64cd768cd6ba6cd0a400ce1776ede32c 100644 (file)
--- a/src/frontends/qt4/QNomencl.h
+++ b/src/frontends/qt4/QNomencl.h
@@ -15,13 +15,12 @@
 #define QNOMENCL_H
 
 #include "QDialogView.h"
+#include "QNomenclDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlCommand;
-class QNomenclDialog;
-
 
 class QNomencl :
        public QController<ControlCommand, QView<QNomenclDialog> >

diff --git a/src/frontends/qt4/QNote.h b/src/frontends/qt4/QNote.h
index e7f188b18357c0c5fb063c5d9ecd94552f9bd6b6..2a901d6fb8f044487f460bb37b51c4a1d216606c 100644 (file)
--- a/src/frontends/qt4/QNote.h
+++ b/src/frontends/qt4/QNote.h
@@ -13,12 +13,12 @@
 #define QNOTE_H
 
 #include "QDialogView.h"
+#include "QNoteDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlNote;
-class QNoteDialog;
 
 /** This class provides a QT implementation of the Note Dialog.
  */

diff --git a/src/frontends/qt4/QParagraph.h b/src/frontends/qt4/QParagraph.h
index d036659fb60054c23db1ca021a88066464c1f317..2ad010eef0f29d95c95aabbb6d6f1fe0b5e3c373 100644 (file)
--- a/src/frontends/qt4/QParagraph.h
+++ b/src/frontends/qt4/QParagraph.h
@@ -14,13 +14,12 @@
 #define QPARAGRAPH_H
 
 #include "QDialogView.h"
+#include "QParagraphDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlParagraph;
-class QParagraphDialog;
-
 
 class QParagraph
        : public QController<ControlParagraph, QView<QParagraphDialog> >

diff --git a/src/frontends/qt4/QPrefs.h b/src/frontends/qt4/QPrefs.h
index 08c080cb072dc8882f5a2ab01a26970599de024b..2338a3ab4a423329e0aed659df78996f9175cc50 100644 (file)
--- a/src/frontends/qt4/QPrefs.h
+++ b/src/frontends/qt4/QPrefs.h
@@ -13,6 +13,7 @@
 #define QPREFS_H
 
 #include "QDialogView.h"
+#include "QPrefsDialog.h"
 
 #include <vector>
 
@@ -24,7 +25,6 @@ class Movers;
 
 namespace frontend {
 
-class QPrefsDialog;
 class ControlPrefs;
 
 class QPrefs

diff --git a/src/frontends/qt4/QPrefsDialog.h b/src/frontends/qt4/QPrefsDialog.h
index 1322984a7a2caa5c05a0a42a3ae7731fd76379aa..57cabebdfe3b34655afcc02e6f4a1124ff4f433f 100644 (file)
--- a/src/frontends/qt4/QPrefsDialog.h
+++ b/src/frontends/qt4/QPrefsDialog.h
@@ -41,16 +41,6 @@
 #include "ui/QPrefUi.h"
 #include "ui/QPrefIdentityUi.h"
 
-template<class UI>
-       class UiWidget: public QWidget, public UI
-       {
-       public:
-               UiWidget(QWidget * parent = 0): QWidget(parent)
-               {
-                       UI::setupUi(this);
-               }
-       };
-
 namespace lyx {
 namespace frontend {
 

diff --git a/src/frontends/qt4/QPrint.h b/src/frontends/qt4/QPrint.h
index 6c537214665acc258e5e3994f72082bd86f56f8e..d0e8b55f19e6243b6dbb8e59cae7393caefd79f6 100644 (file)
--- a/src/frontends/qt4/QPrint.h
+++ b/src/frontends/qt4/QPrint.h
@@ -14,12 +14,12 @@
 #define QPRINT_H
 
 #include "QDialogView.h"
+#include "QLPrintDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlPrint;
-class QLPrintDialog;
 
 ///
 class QPrint

diff --git a/src/frontends/qt4/QRef.h b/src/frontends/qt4/QRef.h
index d48de08d55c643fb7c68d06f8bc53f984598181d..960ade559811054f91b4794724b7b4f3d16a6e78 100644 (file)
--- a/src/frontends/qt4/QRef.h
+++ b/src/frontends/qt4/QRef.h
@@ -13,6 +13,7 @@
 #define QREF_H
 
 #include "QDialogView.h"
+#include "QRefDialog.h"
 
 #include <vector>
 
@@ -20,8 +21,6 @@ namespace lyx {
 namespace frontend {
 
 class ControlRef;
-class QRefDialog;
-
 
 // full qualification because qt4 has also a ControlRef type
 class QRef

diff --git a/src/frontends/qt4/QSearch.h b/src/frontends/qt4/QSearch.h
index 5d168c0699eb570d8c0e7ca20033a02c2c53205f..c7a316b7c2a1d27eaf0efc7b7eecfcb4d96b4fa8 100644 (file)
--- a/src/frontends/qt4/QSearch.h
+++ b/src/frontends/qt4/QSearch.h
@@ -13,12 +13,12 @@
 #define QSEARCH_H
 
 #include "QDialogView.h"
+#include "QSearchDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlSearch;
-class QSearchDialog;
 
 ///
 class QSearch

diff --git a/src/frontends/qt4/QSendto.h b/src/frontends/qt4/QSendto.h
index b18c66c7f55a97ec32a6b4fcedf6e3c2876cf242..35761eace32dcc8ba2ca763ca985d352d1b06a14 100644 (file)
--- a/src/frontends/qt4/QSendto.h
+++ b/src/frontends/qt4/QSendto.h
@@ -13,6 +13,7 @@
 #define QSENDTO_H
 
 #include "QDialogView.h"
+#include "QSendtoDialog.h"
 
 #include <vector>
 
@@ -23,7 +24,6 @@ class Format;
 namespace frontend {
 
 class ControlSendto;
-class QSendtoDialog;
 
 /** This class provides a Qt implementation of the Custom Export Dialog.
  */

diff --git a/src/frontends/qt4/QShowFile.h b/src/frontends/qt4/QShowFile.h
index 8421e09b735c74a50ef0fca992ce9fa474c3f03e..363645f30ee03f9678b5995aaf4098ede6e9d06a 100644 (file)
--- a/src/frontends/qt4/QShowFile.h
+++ b/src/frontends/qt4/QShowFile.h
@@ -13,13 +13,12 @@
 #define QSHOWFILE_H
 
 #include "QDialogView.h"
+#include "QShowFileDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlShowFile;
-class QShowFileDialog;
-
 
 class QShowFile
        : public QController<ControlShowFile, QView<QShowFileDialog> >

diff --git a/src/frontends/qt4/QSpellchecker.h b/src/frontends/qt4/QSpellchecker.h
index 542c8d62b27af433080ec1d05fe97d83039ca6c4..67d00de62712a97d29b64104c50e0a8d2e37bf0b 100644 (file)
--- a/src/frontends/qt4/QSpellchecker.h
+++ b/src/frontends/qt4/QSpellchecker.h
@@ -14,13 +14,12 @@
 #define QSPELLCHECKER_H
 
 #include "QDialogView.h"
+#include "QSpellcheckerDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlSpellchecker;
-class QSpellcheckerDialog;
-
 
 class QSpellchecker
        : public QController<ControlSpellchecker, QView<QSpellcheckerDialog> >

diff --git a/src/frontends/qt4/QTabular.h b/src/frontends/qt4/QTabular.h
index 6780422fe07e58e33f5e79b562cb4521ede95693..3f03b6eb0c38e220dbfa9e850a6346859618602c 100644 (file)
--- a/src/frontends/qt4/QTabular.h
+++ b/src/frontends/qt4/QTabular.h
@@ -16,13 +16,12 @@
 #define QTABULAR_H
 
 #include "QDialogView.h"
+#include "QTabularDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlTabular;
-class QTabularDialog;
-
 
 class QTabular :
        public QController<ControlTabular, QView<QTabularDialog> >

diff --git a/src/frontends/qt4/QTabularCreate.h b/src/frontends/qt4/QTabularCreate.h
index 8039bf9bd71cbbaf41129b6201e5962c2b99c442..40a6236e22b8899e86278b94d6de15dcdf97af1d 100644 (file)
--- a/src/frontends/qt4/QTabularCreate.h
+++ b/src/frontends/qt4/QTabularCreate.h
@@ -13,12 +13,12 @@
 #define QTABULARCREATE_H
 
 #include "QDialogView.h"
+#include "QTabularCreateDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlTabularCreate;
-class QTabularCreateDialog;
 
 ///
 class QTabularCreate

diff --git a/src/frontends/qt4/QTexinfo.h b/src/frontends/qt4/QTexinfo.h
index 93f6be60544ff75d4ac546be32f8ae11a050f91c..40c14d11c1d1617bbaff8e54ff03bd6efd36076d 100644 (file)
--- a/src/frontends/qt4/QTexinfo.h
+++ b/src/frontends/qt4/QTexinfo.h
@@ -13,6 +13,8 @@
 #define QTEXINFO_H
 
 #include "QDialogView.h"
+#include "QTexinfoDialog.h"
+
 #include "ControlTexinfo.h"
 
 #include <map>
@@ -21,8 +23,6 @@
 namespace lyx {
 namespace frontend {
 
-class QTexinfoDialog;
-
 ///
 class QTexinfo
         : public QController<ControlTexinfo, QView<QTexinfoDialog> > {

diff --git a/src/frontends/qt4/QThesaurus.h b/src/frontends/qt4/QThesaurus.h
index 0e5bd439927360fc9815ce8b5fa07e690b6e5bb0..b31f16bf27cc6a03542cc8d2965e5ad206df4cec 100644 (file)
--- a/src/frontends/qt4/QThesaurus.h
+++ b/src/frontends/qt4/QThesaurus.h
@@ -13,12 +13,12 @@
 #define QTHESAURUS_H
 
 #include "QDialogView.h"
+#include "QThesaurusDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlThesaurus;
-class QThesaurusDialog;
 
 ///
 class QThesaurus

diff --git a/src/frontends/qt4/QVSpace.h b/src/frontends/qt4/QVSpace.h
index 9422f723c30f170bed01c4e7a337cd01eb5f78ad..af7aa730297650cf7af6be62dc13a283e01b3817 100644 (file)
--- a/src/frontends/qt4/QVSpace.h
+++ b/src/frontends/qt4/QVSpace.h
@@ -15,6 +15,7 @@
 #define QVSPACE_H
 
 #include "QDialogView.h"
+#include "QVSpaceDialog.h"
 
 #include <vector>
 
@@ -22,7 +23,6 @@ namespace lyx {
 namespace frontend {
 
 class ControlVSpace;
-class QVSpaceDialog;
 
 /** This class provides an Qt implementation of the VSpace dialog.
  */

diff --git a/src/frontends/qt4/QViewSource.h b/src/frontends/qt4/QViewSource.h
index e1bc08406d1367e54bf492c42b40a14f05c68634..55696842011a3432de97417604d6fd7db3a201f2 100644 (file)
--- a/src/frontends/qt4/QViewSource.h
+++ b/src/frontends/qt4/QViewSource.h
@@ -14,13 +14,14 @@
 #define QVIEWSOURCE_H
 
 #include "QDialogView.h"
+#include "QViewSourceDialog.h"
+
 #include <QSyntaxHighlighter>
 
 namespace lyx {
 namespace frontend {
 
 class ControlViewSource;
-class QViewSourceDialog;
 class latexHighlighter;
 
 ///

diff --git a/src/frontends/qt4/QWrap.h b/src/frontends/qt4/QWrap.h
index 575777cce7c7e1474c303fa3949559bf09fb8a60..4ef2ce976c687b108111d7c049b18bd1bb68bd34 100644 (file)
--- a/src/frontends/qt4/QWrap.h
+++ b/src/frontends/qt4/QWrap.h
@@ -13,13 +13,12 @@
 #define QWRAP_H
 
 #include "QDialogView.h"
+#include "QWrapDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlWrap;
-class QWrapDialog;
-
 
 class QWrap : public QController<ControlWrap, QView<QWrapDialog> > {
 public:

diff --git a/src/frontends/qt4/UrlView.h b/src/frontends/qt4/UrlView.h
index c329cf6b5ca3df9c81e263adcbb82a7edcb9cd5c..ccd6240b66c67117432450d6a54d7fcf138d33f1 100644 (file)
--- a/src/frontends/qt4/UrlView.h
+++ b/src/frontends/qt4/UrlView.h
@@ -13,12 +13,12 @@
 #define QT4_URL_VIEW_H
 
 #include "QDialogView.h"
+#include "QURLDialog.h"
 
 namespace lyx {
 namespace frontend {
 
 class ControlCommand;
-class QURLDialog;
 
 class UrlView :
        public QController<ControlCommand, QView<QURLDialog> >