Sane ordering of the files #included in the Qt frontend.

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

diff --git a/src/frontends/controllers/ControlCitation.C b/src/frontends/controllers/ControlCitation.C
index b7f755dbe29b04e1e7f5aa8b4f1cbc66a4f2a9cf..d00cf7bb2600877a88e0d88bbdb7c8c5d3277197 100644 (file)
--- a/src/frontends/controllers/ControlCitation.C
+++ b/src/frontends/controllers/ControlCitation.C
@@ -14,6 +14,7 @@
 
 #include "buffer.h"
 #include "bufferparams.h"
+#include "debug.h" // temporary
 
 
 using std::string;
@@ -33,6 +34,7 @@ ControlCitation::ControlCitation(Dialog & d)
 
 bool ControlCitation::initialiseParams(string const & data)
 {
+       lyxerr << "ControlCitation::initialiseParams\n\t" << data << std::endl;
        ControlCommand::initialiseParams(data);
 
        vector<pair<string, string> > blist;

diff --git a/src/frontends/qt2/Alert_pimpl.C b/src/frontends/qt2/Alert_pimpl.C
index 41c7570cb8554e8c222b02ff3ead96b0b77c0f9f..06cb159226a344344af7de962d6757557e594858 100644 (file)
--- a/src/frontends/qt2/Alert_pimpl.C
+++ b/src/frontends/qt2/Alert_pimpl.C
@@ -13,13 +13,15 @@
 #include "Alert_pimpl.h"
 #include "Alert.h"
 
-#include <qmessagebox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
 #include "ui/QAskForTextDialog.h"
 #include "qt_helpers.h"
+
 #include "gettext.h"
 
+#include <qmessagebox.h>
+#include <qlabel.h>
+#include <qlineedit.h>
+
 #include <algorithm>
 
 using lyx::support::bformat;

diff --git a/src/frontends/qt2/BulletsModule.C b/src/frontends/qt2/BulletsModule.C
index 3f50ac5892905c1800868a6e1daadd4857232780..5c237aaef170e5531214ff340bff1ec9a8423bf2 100644 (file)
--- a/src/frontends/qt2/BulletsModule.C
+++ b/src/frontends/qt2/BulletsModule.C
@@ -11,13 +11,12 @@
 
 #include <config.h>
 
+#include "BulletsModule.h"
+#include "QBrowseBox.h"
 #include "qt_helpers.h"
 
 #include "support/filetools.h"
 
-#include "QBrowseBox.h"
-#include "BulletsModule.h"
-
 #include <qinputdialog.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 0167d56ae8090663f4c490ae5fc93959eb959d3d..5497bf856633994048c116d6ea5e8176a9fddf4b 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-20  Angus Leeming  <leeming@lyx.org>
+
+       * Most .C files: bring some sort of sanity to the order
+       of inclusion of header files.
+
 2004-05-19  Angus Leeming  <leeming@lyx.org>
 
        * Most files: wrap code up inside namespace lyx::frontend.

diff --git a/src/frontends/qt2/FileDialog.C b/src/frontends/qt2/FileDialog.C
index 8622ae6dd900ed055428555c8b92c14e18548472..cf766cee99c85fb08909f318e04e42606d0568ea 100644 (file)
--- a/src/frontends/qt2/FileDialog.C
+++ b/src/frontends/qt2/FileDialog.C
@@ -8,19 +8,18 @@
  * Full author contact details are available in file CREDITS.
  */
 
-
 #include <config.h>
 
 #include "frontends/FileDialog.h"
 
+#include "FileDialog_private.h"
+#include "qt_helpers.h"
+
 #include "debug.h"
 #include "gettext.h"
 
 #include "support/globbing.h"
 
-#include "FileDialog_private.h"
-#include "qt_helpers.h"
-
 
 using lyx::support::FileFilterList;
 

diff --git a/src/frontends/qt2/FileDialog_private.C b/src/frontends/qt2/FileDialog_private.C
index bada6eff9c6c36c9a2fbf065e3e2a07418b9e103..be328bbe14e7852710c6fc5c290f42bd5ebd1670 100644 (file)
--- a/src/frontends/qt2/FileDialog_private.C
+++ b/src/frontends/qt2/FileDialog_private.C
@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #include "FileDialog_private.h"
 #include "qt_helpers.h"
 

diff --git a/src/frontends/qt2/QAbout.C b/src/frontends/qt2/QAbout.C
index 258f0f6ce217d751aa99da4632c70fded41d292e..bfe0e5bf5eb3ae6f2ec1dcd793222db14da8d7fd 100644 (file)
--- a/src/frontends/qt2/QAbout.C
+++ b/src/frontends/qt2/QAbout.C
@@ -10,21 +10,21 @@
 
 #include <config.h>
 
-#include "debug.h"
+#include "QAbout.h"
+#include "QAboutDialog.h"
+#include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "controllers/ButtonController.h"
+#include "controllers/ControlAboutlyx.h"
+
 #include "support/lstrings.h"
 #include "support/std_sstream.h"
-#include "qt_helpers.h"
-#include "ButtonController.h"
-#include "ControlAboutlyx.h"
 
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qtextview.h>
 
-#include "QAboutDialog.h"
-#include "Qt2BC.h"
-#include "QAbout.h"
-
 using lyx::support::prefixIs;
 
 using std::getline;

diff --git a/src/frontends/qt2/QBibitem.C b/src/frontends/qt2/QBibitem.C
index 5f18836adf24ad3dbbdb9ccf5d9af5117f085edc..f221df5775c60551fdebae9a06072d5aeee915da 100644 (file)
--- a/src/frontends/qt2/QBibitem.C
+++ b/src/frontends/qt2/QBibitem.C
@@ -10,16 +10,16 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlCommand.h"
+#include "QBibitem.h"
+#include "QBibitemDialog.h"
+#include "Qt2BC.h"
 #include "qt_helpers.h"
 
+#include "controllers/ControlCommand.h"
+
 #include <qlineedit.h>
 #include <qpushbutton.h>
 
-#include "QBibitemDialog.h"
-#include "QBibitem.h"
-#include "Qt2BC.h"
 
 namespace lyx {
 namespace frontend {

diff --git a/src/frontends/qt2/QBibitemDialog.C b/src/frontends/qt2/QBibitemDialog.C
index 0871160d3a9d27c90e68b2cf2afb38ebba3ea2ce..d9fba1b1abf02319778b7971cff867420782a5a5 100644 (file)
--- a/src/frontends/qt2/QBibitemDialog.C
+++ b/src/frontends/qt2/QBibitemDialog.C
@@ -10,11 +10,11 @@
 
 #include <config.h>
 
-#include <qpushbutton.h>
-
 #include "QBibitemDialog.h"
 #include "QBibitem.h"
 
+#include <qpushbutton.h>
+
 namespace lyx {
 namespace frontend {
 

diff --git a/src/frontends/qt2/QBibtex.C b/src/frontends/qt2/QBibtex.C
index bd7ac30f9d8295152bcb3804477b2fbc041fb567..2a9e38e5efd601eb8907acec5b574699a2d72922 100644 (file)
--- a/src/frontends/qt2/QBibtex.C
+++ b/src/frontends/qt2/QBibtex.C
@@ -12,23 +12,22 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "support/lstrings.h"
-
-#include "ControlBibtex.h"
+#include "QBibtex.h"
+#include "QBibtexDialog.h"
+#include "ui/QBibtexAddDialogBase.h"
+#include "Qt2BC.h"
 #include "qt_helpers.h"
 
+#include "controllers/ControlBibtex.h"
+
 #include "support/filetools.h" // ChangeExtension
+#include "support/lstrings.h"
 
 #include <qcombobox.h>
 #include <qpushbutton.h>
 #include <qlistbox.h>
 #include <qcheckbox.h>
 
-#include "ui/QBibtexAddDialogBase.h"
-#include "QBibtexDialog.h"
-#include "QBibtex.h"
-#include "Qt2BC.h"
 
 using lyx::support::ChangeExtension;
 using lyx::support::contains;

diff --git a/src/frontends/qt2/QBibtexDialog.C b/src/frontends/qt2/QBibtexDialog.C
index 867487f4081cd16c1985f60a9c17659cab0c8ba6..5acd3f8ee290472f63431122b3cc4e1baca5c8d7 100644 (file)
--- a/src/frontends/qt2/QBibtexDialog.C
+++ b/src/frontends/qt2/QBibtexDialog.C
@@ -10,6 +10,9 @@
 
 #include <config.h>
 
+#include "QBibtexDialog.h"
+#include "ui/QBibtexAddDialogBase.h"
+#include "QBibtex.h"
 #include "qt_helpers.h"
 
 #include "support/filetools.h"
@@ -20,9 +23,6 @@
 #include <qlistbox.h>
 #include <qfiledialog.h>
 
-#include "ui/QBibtexAddDialogBase.h"
-#include "QBibtexDialog.h"
-#include "QBibtex.h"
 
 using lyx::support::ChangeExtension;
 

diff --git a/src/frontends/qt2/QBox.C b/src/frontends/qt2/QBox.C
index 1915423576b8a79c0a80240a50e1c06ecf10389b..627058f48f85adc24128806c9f9d4737fc5234b7 100644 (file)
--- a/src/frontends/qt2/QBox.C
+++ b/src/frontends/qt2/QBox.C
@@ -12,21 +12,24 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "QBox.h"
-#include "ControlBox.h"
+
+#include "lengthcombo.h"
 #include "QBoxDialog.h"
 #include "qt_helpers.h"
-#include "controllers/helper_funcs.h"
-#include "support/lstrings.h"
-#include "support/tostr.h"
-
 #include "Qt2BC.h"
+
+#include "lengthcommon.h"
 #include "lyxrc.h" // to set the default length values
+
+#include "controllers/ControlBox.h"
+#include "controllers/helper_funcs.h"
+
 #include "insets/insetbox.h"
 
-#include "lengthcombo.h"
-#include "lengthcommon.h"
+#include "support/lstrings.h"
+#include "support/tostr.h"
+
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qcombobox.h>

diff --git a/src/frontends/qt2/QBoxDialog.C b/src/frontends/qt2/QBoxDialog.C
index 69ccfc9b4a9fe265390771b0a9009f72e58b1c9d..690ba81770b82cd536fdf4553672e4ae93ee8c05 100644 (file)
--- a/src/frontends/qt2/QBoxDialog.C
+++ b/src/frontends/qt2/QBoxDialog.C
@@ -10,14 +10,15 @@
 
 #include <config.h>
 
-#include "QBox.h"
 #include "QBoxDialog.h"
-#include "qt_helpers.h"
 
 #include "lengthcombo.h"
+#include "QBox.h"
+#include "qt_helpers.h"
+
 #include <qcombobox.h>
-#include <qpushbutton.h>
 #include <qlineedit.h>
+#include <qpushbutton.h>
 
 namespace lyx {
 namespace frontend {

diff --git a/src/frontends/qt2/QBranch.C b/src/frontends/qt2/QBranch.C
index 8459aa75fb61acc03d052511b20d9604543e74d0..e1c2ef8ac16dfac8c0a18b255c9a3cc5ac408ad2 100644 (file)
--- a/src/frontends/qt2/QBranch.C
+++ b/src/frontends/qt2/QBranch.C
@@ -10,18 +10,17 @@
 
 #include <config.h>
 
-#include "debug.h"
+#include "QBranch.h"
+#include "QBranchDialog.h"
+#include "Qt2BC.h"
+#include "qt_helpers.h"
+
 #include "BranchList.h"
 
 #include "controllers/ControlBranch.h"
 
 #include "insets/insetbranch.h"
 
-#include "QBranch.h"
-#include "QBranchDialog.h"
-#include "Qt2BC.h"
-#include "qt_helpers.h"
-
 #include <qcombobox.h>
 #include <qpushbutton.h>
 

diff --git a/src/frontends/qt2/QBranchDialog.C b/src/frontends/qt2/QBranchDialog.C
index 66ccf2d6e6c560a3c44d77119254e7faaa7516c0..22d5d259d5adcc3cc68cdafe7656d182fa5671ee 100644 (file)
--- a/src/frontends/qt2/QBranchDialog.C
+++ b/src/frontends/qt2/QBranchDialog.C
@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "QBranch.h"
 #include "QBranchDialog.h"
+#include "QBranch.h"
 
 #include <qpushbutton.h>
 

diff --git a/src/frontends/qt2/QBrowseBox.C b/src/frontends/qt2/QBrowseBox.C
index 49d041d2580af17fe3a684af610b45363d35b669..c910abad49d5526797fb0a7b99be480e0a89abdf 100644 (file)
--- a/src/frontends/qt2/QBrowseBox.C
+++ b/src/frontends/qt2/QBrowseBox.C
@@ -10,14 +10,14 @@
 
 #include <config.h>
 
+#include "QBrowseBox.h"
+
 #include <qpixmap.h>
 #include <qpainter.h>
 #include <qapplication.h>
 #include <qdrawutil.h>
 #include <qstyle.h>
 
-#include "QBrowseBox.h"
-
 #include <cmath>
 
 

diff --git a/src/frontends/qt2/QChanges.C b/src/frontends/qt2/QChanges.C
index 1fcaf873cf7a4a84f3c1c3a9ba56e29157d2fe28..5380535e0461fe18cca18c15ba4b53790efa5a31 100644 (file)
--- a/src/frontends/qt2/QChanges.C
+++ b/src/frontends/qt2/QChanges.C
@@ -10,17 +10,16 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlChanges.h"
+#include "QChanges.h"
+#include "QChangesDialog.h"
+#include "Qt2BC.h"
 #include "qt_helpers.h"
 
+#include "controllers/ControlChanges.h"
+
 #include <qpushbutton.h>
 #include <qtextview.h>
 
-#include "QChangesDialog.h"
-#include "QChanges.h"
-#include "Qt2BC.h"
-
 
 using std::string;
 

diff --git a/src/frontends/qt2/QChangesDialog.C b/src/frontends/qt2/QChangesDialog.C
index b2be2b6855da67ba8bf8eab53e03a6f760ec877c..4f21582e6a9f97a83ed2191d265181d5da52779e 100644 (file)
--- a/src/frontends/qt2/QChangesDialog.C
+++ b/src/frontends/qt2/QChangesDialog.C
@@ -10,11 +10,12 @@
 
 #include <config.h>
 
-#include <qpushbutton.h>
-
 #include "QChangesDialog.h"
 #include "QChanges.h"
 
+#include <qpushbutton.h>
+
+
 namespace lyx {
 namespace frontend {
 

diff --git a/src/frontends/qt2/QCharacter.C b/src/frontends/qt2/QCharacter.C
index a640c7282ab9a3885156006305d7c44536fe2b73..46d11147151dd0980f00e1fcf85474016dc03970 100644 (file)
--- a/src/frontends/qt2/QCharacter.C
+++ b/src/frontends/qt2/QCharacter.C
@@ -11,20 +11,18 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "QCharacter.h"
 #include "ControlCharacter.h"
 #include "QCharacterDialog.h"
 #include "Qt2BC.h"
-
 #include "qt_helpers.h"
 
+#include "LColor.h"
+
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 
-#include "LColor.h"
-
 using std::vector;
 
 namespace lyx {

diff --git a/src/frontends/qt2/QCharacterDialog.C b/src/frontends/qt2/QCharacterDialog.C
index 9f563dff2785518a64c62f8e2ced3ba44543e609..2635beb94cf15f46fc2b83eb0f57a78ce362d834 100644 (file)
--- a/src/frontends/qt2/QCharacterDialog.C
+++ b/src/frontends/qt2/QCharacterDialog.C
@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #include "QCharacterDialog.h"
 
 #include <qcheckbox.h>

diff --git a/src/frontends/qt2/QCitation.C b/src/frontends/qt2/QCitation.C
index 6d75f68483eb46270baa97147bc5ad13d79317c0..aefedb6c3195914406832ced33c6d20316c45110 100644 (file)
--- a/src/frontends/qt2/QCitation.C
+++ b/src/frontends/qt2/QCitation.C
@@ -11,11 +11,17 @@
 
 #include <config.h>
 
-#include "bufferparams.h"
-#include "debug.h"
-#include "ui/QCitationFindDialogBase.h"
-#include "QCitationDialog.h"
 #include "QCitation.h"
+#include "QCitationDialog.h"
+#include "ui/QCitationFindDialogBase.h"
+#include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "bufferparams.h"
+
+#include "controllers/ControlCitation.h"
+
+#include "support/lstrings.h"
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
@@ -25,11 +31,6 @@
 #include <qpushbutton.h>
 #include <qlabel.h>
 
-#include "Qt2BC.h"
-#include "ControlCitation.h"
-#include "qt_helpers.h"
-#include "support/lstrings.h"
-
 using std::find;
 using std::string;
 using std::vector;

diff --git a/src/frontends/qt2/QCitationDialog.C b/src/frontends/qt2/QCitationDialog.C
index 863ab10af50dc71c08e1d69b5a6e303d804a6b68..fd1bc23d39c8abcff52ef127938236a35463e695 100644 (file)
--- a/src/frontends/qt2/QCitationDialog.C
+++ b/src/frontends/qt2/QCitationDialog.C
@@ -12,9 +12,13 @@
 
 #include <config.h>
 
+#include "QCitationDialog.h"
+#include "ui/QCitationFindDialogBase.h"
+#include "QCitation.h"
 #include "qt_helpers.h"
+
 #include "controllers/ControlCitation.h"
-#include "ButtonController.h"
+#include "controllers/ButtonController.h"
 
 #include <qcheckbox.h>
 #include <qlineedit.h>
@@ -22,9 +26,6 @@
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 
-#include "ui/QCitationFindDialogBase.h"
-#include "QCitationDialog.h"
-#include "QCitation.h"
 
 using std::vector;
 using std::string;

diff --git a/src/frontends/qt2/QCommandBuffer.C b/src/frontends/qt2/QCommandBuffer.C
index 40f74087174cee1db82239d26c492e8cc476f1f5..7ec5bb27a48eaf80831e95dcaf994afc1fa5a3c4 100644 (file)
--- a/src/frontends/qt2/QCommandBuffer.C
+++ b/src/frontends/qt2/QCommandBuffer.C
@@ -10,13 +10,17 @@
 
 #include <config.h>
 
-#include "support/filetools.h"
-#include "controllers/ControlCommandBuffer.h"
-#include "qt_helpers.h"
-
+// Qt defines a macro 'signals' that clashes with a boost namespace.
+// All is well if the namespace is visible first.
 #include "QtView.h"
+
 #include "QCommandBuffer.h"
 #include "QCommandEdit.h"
+#include "qt_helpers.h"
+
+#include "controllers/ControlCommandBuffer.h"
+
+#include "support/filetools.h"
 
 #include <qlistbox.h>
 #include <qlayout.h>

diff --git a/src/frontends/qt2/QContentPane.C b/src/frontends/qt2/QContentPane.C
index c169dedab35ef65af71c1306c8088e37c91f676c..e9cf7a48b9105bfbe5a1cf61d0e44743054924f2 100644 (file)
--- a/src/frontends/qt2/QContentPane.C
+++ b/src/frontends/qt2/QContentPane.C
@@ -10,15 +10,18 @@
 
 #include <config.h>
 
-#include <boost/bind.hpp>
-
+// Qt defines a macro 'signals' that clashes with a boost namespace.
+// All is well if the namespace is visible first.
 #include "QWorkArea.h"
+
 #include "QContentPane.h"
 #include "QLyXKeySym.h"
 
+#include <qapplication.h>
 #include <qpainter.h>
 #include <qtimer.h>
-#include <qapplication.h>
+
+#include <boost/bind.hpp>
 
 namespace {
 

diff --git a/src/frontends/qt2/QDelimiterDialog.C b/src/frontends/qt2/QDelimiterDialog.C
index c1a4c5b386535acdaf998a6a815c896b09acc14a..c3e7fd27fa82d932e900e277bd19b1e58587e28f 100644 (file)
--- a/src/frontends/qt2/QDelimiterDialog.C
+++ b/src/frontends/qt2/QDelimiterDialog.C
@@ -10,19 +10,19 @@
 
 #include <config.h>
 
-
-#include "qt_helpers.h"
-
-#include "ControlMath.h"
-#include "QMath.h"
 #include "QDelimiterDialog.h"
 
 #include "iconpalette.h"
+#include "QMath.h"
+#include "qt_helpers.h"
+
+#include "controllers/ControlMath.h"
 
 #include <qlabel.h>
 #include <qpixmap.h>
 #include <qcheckbox.h>
 
+
 using std::string;
 
 namespace lyx {

diff --git a/src/frontends/qt2/QDialogView.C b/src/frontends/qt2/QDialogView.C
index 997a6d8306c429a1d55b147990c24ce1187a7b49..91fc42009b085b483e77c307950785523b559b29 100644 (file)
--- a/src/frontends/qt2/QDialogView.C
+++ b/src/frontends/qt2/QDialogView.C
@@ -10,10 +10,11 @@
 
 #include <config.h>
 
+#include "QDialogView.h"
 #include "Qt2BC.h"
-#include "ButtonController.h"
 #include "qt_helpers.h"
-#include "QDialogView.h"
+
+#include "controllers/ButtonController.h"
 
 namespace lyx {
 namespace frontend {

diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C
index 86d9d8c76f47caa922a82d231c38c0ebfa8a389a..ab5972e00cd2b27bfb1984d699a01e75b77e4300 100644 (file)
--- a/src/frontends/qt2/QDocument.C
+++ b/src/frontends/qt2/QDocument.C
@@ -10,26 +10,25 @@
 
 #include <config.h>
 
-#include "controllers/ControlDocument.h"
+#include "QDocument.h"
+#include "QDocumentDialog.h"
+#include "Qt2BC.h"
+#include "qt_helpers.h"
 
 #include "bufferparams.h"
-#include "debug.h"
-#include "language.h"
-#include "helper_funcs.h" // getSecond()
-#include "frnt_lang.h"
+#include "floatplacement.h"
 #include "gettext.h"
+#include "helper_funcs.h" // getSecond()
+#include "language.h"
 #include "lyxrc.h" // defaultUnit
+#include "lyxtextclasslist.h"
 #include "tex-strings.h" // tex_graphics
+
 #include "support/tostr.h"
 #include "support/lstrings.h"
-#include "lyxtextclasslist.h"
-#include "floatplacement.h"
-
-#include "QDocument.h"
-#include "QDocumentDialog.h"
-#include "Qt2BC.h"
 
-#include "qt_helpers.h"
+#include "controllers/ControlDocument.h"
+#include "controllers/frnt_lang.h"
 
 #include <qpushbutton.h>
 #include <qmultilineedit.h>

diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C
index a5d7bd9a319366a41ae68b55a22dd8f53ac21786..006d06b1a98672962052348445d14e846dd17370 100644 (file)
--- a/src/frontends/qt2/QDocumentDialog.C
+++ b/src/frontends/qt2/QDocumentDialog.C
@@ -10,15 +10,6 @@
 
 #include <config.h>
 
-#include "bufferparams.h"
-#include "debug.h"
-#include "gettext.h"
-#include "lyxrc.h"
-
-#include "controllers/ControlDocument.h"
-
-#include "support/lstrings.h"
-
 #include "QDocument.h"
 #include "QDocumentDialog.h"
 
@@ -27,6 +18,14 @@
 #include "panelstack.h"
 #include "qt_helpers.h"
 
+#include "bufferparams.h"
+#include "gettext.h"
+#include "lyxrc.h"
+
+#include "controllers/ControlDocument.h"
+
+#include "support/lstrings.h"
+
 #include <qlabel.h>
 #include <qmultilineedit.h>
 #include <qlineedit.h>

diff --git a/src/frontends/qt2/QERT.C b/src/frontends/qt2/QERT.C
index c50558d8c8ef0d95316e3bd7eb07f2aa83f71c6f..6972eab2c4e4dd42711fa1bd21a187aa65a81bed 100644 (file)
--- a/src/frontends/qt2/QERT.C
+++ b/src/frontends/qt2/QERT.C
@@ -10,15 +10,15 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlERT.h"
+#include "QERT.h"
+#include "QERTDialog.h"
+#include "Qt2BC.h"
+
+#include "controllers/ControlERT.h"
 
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 
-#include "QERTDialog.h"
-#include "QERT.h"
-#include "Qt2BC.h"
 
 namespace lyx {
 namespace frontend {

diff --git a/src/frontends/qt2/QERTDialog.C b/src/frontends/qt2/QERTDialog.C
index cea0345bed3652b693776f53456689e5c9f6f810..643214313308c724192a95e261139a119e935554 100644 (file)
--- a/src/frontends/qt2/QERTDialog.C
+++ b/src/frontends/qt2/QERTDialog.C
@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "QERT.h"
 #include "QERTDialog.h"
+#include "QERT.h"
 
 #include <qpushbutton.h>
 

diff --git a/src/frontends/qt2/QErrorList.C b/src/frontends/qt2/QErrorList.C
index 7e2dc17726b71400bf7378580e3c601c9234198d..639510f733cdbf04f06ee222730a0a401d8648e2 100644 (file)
--- a/src/frontends/qt2/QErrorList.C
+++ b/src/frontends/qt2/QErrorList.C
@@ -10,13 +10,12 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "qt_helpers.h"
-
-#include "ControlErrorList.h"
 #include "QErrorList.h"
 #include "QErrorListDialog.h"
 #include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "controllers/ControlErrorList.h"
 
 #include <qlistbox.h>
 #include <qtextbrowser.h>

diff --git a/src/frontends/qt2/QErrorListDialog.C b/src/frontends/qt2/QErrorListDialog.C
index 0c6bc656598a703d9e9ebf7de8b1cee59e8d0b4e..b981bb1bc94f58b71965bf3eb75272ca5d0fb936 100644 (file)
--- a/src/frontends/qt2/QErrorListDialog.C
+++ b/src/frontends/qt2/QErrorListDialog.C
@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "QErrorList.h"
 #include "QErrorListDialog.h"
+#include "QErrorList.h"
 
 #include <qlistbox.h>
 #include <qpushbutton.h>

diff --git a/src/frontends/qt2/QExternal.C b/src/frontends/qt2/QExternal.C
index 8c082dca7c2eed1701368f49d5978b0c1f381d90..992f6933a57247c45e098e3ab6cd043a3941f05b 100644 (file)
--- a/src/frontends/qt2/QExternal.C
+++ b/src/frontends/qt2/QExternal.C
@@ -11,7 +11,8 @@
 
 #include <config.h>
 
-#include "debug.h"
+// Qt defines a macro 'signals' that clashes with a boost namespace.
+// All is well if the namespace is visible first.
 #include "lengthcommon.h"
 #include "lyxrc.h"
 

diff --git a/src/frontends/qt2/QExternalDialog.C b/src/frontends/qt2/QExternalDialog.C
index 39b14dde780176664c05aad0ce723a61ffbf1d28..6e8825f473038b821f050cbc8a11f53c2ff1b8c3 100644 (file)
--- a/src/frontends/qt2/QExternalDialog.C
+++ b/src/frontends/qt2/QExternalDialog.C
@@ -11,6 +11,8 @@
 
 #include <config.h>
 
+// Qt defines a macro 'signals' that clashes with a boost namespace.
+// All is well if the namespace is visible first.
 #include "insets/ExternalTemplate.h"
 
 #include "controllers/ButtonController.h"

diff --git a/src/frontends/qt2/QFloat.C b/src/frontends/qt2/QFloat.C
index 4c0d1c95c18091b36db0a4ed1d26775b039c3a45..6bf478b77043a182a5afa3d79f4695eb859a27a6 100644 (file)
--- a/src/frontends/qt2/QFloat.C
+++ b/src/frontends/qt2/QFloat.C
@@ -10,13 +10,13 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlFloat.h"
-#include "QFloatDialog.h"
 #include "QFloat.h"
+#include "QFloatDialog.h"
 #include "Qt2BC.h"
 #include "floatplacement.h"
 
+#include "controllers/ControlFloat.h"
+
 #include "insets/insetfloat.h"
 
 #include <qpushbutton.h>

diff --git a/src/frontends/qt2/QFloatDialog.C b/src/frontends/qt2/QFloatDialog.C
index de55390115b698283728d6ed5e17752e5d538ffd..7eb01a11ca32bcb6d8449fac20864c52e5def06b 100644 (file)
--- a/src/frontends/qt2/QFloatDialog.C
+++ b/src/frontends/qt2/QFloatDialog.C
@@ -10,12 +10,12 @@
 
 #include <config.h>
 
+#include "QFloatDialog.h"
+#include "QFloat.h"
 #include "floatplacement.h"
 
 #include <qpushbutton.h>
 
-#include "QFloatDialog.h"
-#include "QFloat.h"
 
 namespace lyx {
 namespace frontend {

diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C
index b9734654d48a38bb228e72dfb831d76e6043ce8b..2f6f0fd084a8ad46e713f98c200726d46b05f897 100644 (file)
--- a/src/frontends/qt2/QGraphics.C
+++ b/src/frontends/qt2/QGraphics.C
@@ -12,18 +12,24 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlGraphics.h"
-#include "controllers/helper_funcs.h"
-#include "support/lstrings.h"
-#include "support/tostr.h"
-#include "support/lyxlib.h"
-#include "insets/insetgraphicsParams.h"
+#include "QGraphics.h"
 
-#include "lyxrc.h"
 #include "lengthcombo.h"
+#include "QGraphicsDialog.h"
+#include "Qt2BC.h"
 #include "qt_helpers.h"
+
 #include "lengthcommon.h"
+#include "lyxrc.h"
+
+#include "controllers/ControlGraphics.h"
+#include "controllers/helper_funcs.h"
+
+#include "insets/insetgraphicsParams.h"
+
+#include "support/lstrings.h"
+#include "support/tostr.h"
+#include "support/lyxlib.h"
 
 #include <qlineedit.h>
 #include <qpushbutton.h>
@@ -31,10 +37,6 @@
 #include <qgroupbox.h>
 #include <qlabel.h>
 
-#include "QGraphicsDialog.h"
-#include "QGraphics.h"
-#include "Qt2BC.h"
-
 #include <cmath>
 
 using lyx::support::float_equal;

diff --git a/src/frontends/qt2/QGraphicsDialog.C b/src/frontends/qt2/QGraphicsDialog.C
index 2d234e5798873a4f681aa0d94410ccd92665a21a..cf801d2162072c5aaf33f2346b732c29fce0d770 100644 (file)
--- a/src/frontends/qt2/QGraphicsDialog.C
+++ b/src/frontends/qt2/QGraphicsDialog.C
@@ -11,17 +11,19 @@
 
 #include <config.h>
 
-#include "ControlGraphics.h"
-#include "debug.h"
+#include "QGraphicsDialog.h"
+#include "QGraphics.h"
+
+#include "lengthcombo.h"
 #include "qt_helpers.h"
 
+#include "debug.h"
+
+#include "controllers/ControlGraphics.h"
+
 #include <qpushbutton.h>
 #include <qlineedit.h>
 
-#include "lengthcombo.h"
-
-#include "QGraphicsDialog.h"
-#include "QGraphics.h"
 
 using std::string;
 

diff --git a/src/frontends/qt2/QInclude.C b/src/frontends/qt2/QInclude.C
index d8beb5f6aec62a6c32e65701315c396b1cf356b8..8526073ada4f2a5b99c421067f83f4db9f35cf14 100644 (file)
--- a/src/frontends/qt2/QInclude.C
+++ b/src/frontends/qt2/QInclude.C
@@ -10,13 +10,12 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlInclude.h"
-#include "qt_helpers.h"
-
 #include "QIncludeDialog.h"
 #include "QInclude.h"
 #include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "controllers/ControlInclude.h"
 
 #include <qlineedit.h>
 #include <qpushbutton.h>

diff --git a/src/frontends/qt2/QIncludeDialog.C b/src/frontends/qt2/QIncludeDialog.C
index 8c3883e859f8fb761c30cfb2f23cba794e9fbc01..5e998a76b391aab6fa4112590523ef81a7f9767a 100644 (file)
--- a/src/frontends/qt2/QIncludeDialog.C
+++ b/src/frontends/qt2/QIncludeDialog.C
@@ -10,12 +10,13 @@
 
 #include <config.h>
 
+#include "QIncludeDialog.h"
+#include "QInclude.h"
+
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 
-#include "QIncludeDialog.h"
-#include "QInclude.h"
 
 namespace lyx {
 namespace frontend {

diff --git a/src/frontends/qt2/QLImage.C b/src/frontends/qt2/QLImage.C
index 359c19a33c91dc766cddde549e339ff743731fef..8065fcd3decf5c4f56f1ed8725bdfd31ba4352e9 100644 (file)
--- a/src/frontends/qt2/QLImage.C
+++ b/src/frontends/qt2/QLImage.C
@@ -11,13 +11,16 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "QLImage.h"
-#include "graphics/GraphicsParams.h"
+#include "qt_helpers.h"
+
+#include "debug.h"
 #include "format.h"
+
+#include "graphics/GraphicsParams.h"
+
 #include "support/lstrings.h"       // lowercase
 #include "support/lyxfunctional.h"  // compare_memfun
-#include "qt_helpers.h"
 
 #include <qimage.h>
 #include <qpainter.h>

diff --git a/src/frontends/qt2/QLMenubar.C b/src/frontends/qt2/QLMenubar.C
index 27d1de10700bd4725711038f9f1e720046b5f706..ca16d63c7f24d590bef03f65054f979c0a92601e 100644 (file)
--- a/src/frontends/qt2/QLMenubar.C
+++ b/src/frontends/qt2/QLMenubar.C
@@ -10,12 +10,15 @@
 
 #include <config.h>
 
-#include "MenuBackend.h"
-
+// Qt defines a macro 'signals' that clashes with a boost namespace.
+// All is well if the namespace is visible first.
 #include "QtView.h"
+
 #include "QLMenubar.h"
 #include "QLPopupMenu.h"
 
+#include "MenuBackend.h"
+
 #include <qmenubar.h>
 #include <qcursor.h>
 

diff --git a/src/frontends/qt2/QLPainter.C b/src/frontends/qt2/QLPainter.C
index 7d9a7d7f545a81dd9dde0232db28797d75f35132..9f5b8a1031e96b105e20cced38b480a64ecd2ad8 100644 (file)
--- a/src/frontends/qt2/QLPainter.C
+++ b/src/frontends/qt2/QLPainter.C
@@ -11,16 +11,17 @@
 #include <config.h>
 
 #include "QLPainter.h"
-#include "font_metrics.h"
-#include "debug.h"
-#include "language.h"
-#include "LColor.h"
 
 #include "QWorkArea.h"
-#include "qfont_loader.h"
 #include "QLImage.h"
 #include "lcolorcache.h"
+#include "qfont_loader.h"
+
+#include "debug.h"
+#include "language.h"
+#include "LColor.h"
 
+#include "frontends/font_metrics.h"
 
 #include <qpainter.h>
 

diff --git a/src/frontends/qt2/QLPopupMenu.C b/src/frontends/qt2/QLPopupMenu.C
index 76bf2a7a7d507d260753c440fd5e855881a150f8..6a72c221845da29ee1c2b57ceb852754a07cb493 100644 (file)
--- a/src/frontends/qt2/QLPopupMenu.C
+++ b/src/frontends/qt2/QLPopupMenu.C
@@ -10,16 +10,18 @@
 
 #include <config.h>
 
-
-#include "support/lstrings.h"
-#include "MenuBackend.h"
-
+// Qt defines a macro 'signals' that clashes with a boost namespace.
+// All is well if the namespace is visible first.
 #include "QtView.h"
 
-#include "QLMenubar.h"
 #include "QLPopupMenu.h"
+#include "QLMenubar.h"
 #include "qt_helpers.h"
 
+#include "MenuBackend.h"
+
+#include "support/lstrings.h"
+
 using std::distance;
 using std::make_pair;
 using std::string;

diff --git a/src/frontends/qt2/QLPrintDialog.C b/src/frontends/qt2/QLPrintDialog.C
index 7a311726665c57130c3e8055bb8b82b75b0c7a16..e06b9e9f95cdd2a988373191c3d1d8c0b2751220 100644 (file)
--- a/src/frontends/qt2/QLPrintDialog.C
+++ b/src/frontends/qt2/QLPrintDialog.C
@@ -11,10 +11,9 @@
 
 #include <config.h>
 
-#include "qt_helpers.h"
-
-#include "QPrint.h"
 #include "QLPrintDialog.h"
+#include "QPrint.h"
+#include "qt_helpers.h"
 
 #include <qfiledialog.h>
 #include <qcheckbox.h>

diff --git a/src/frontends/qt2/QLog.C b/src/frontends/qt2/QLog.C
index cc3dedfda8eac8252217bd39e0eaf0e5b70aca75..7e9e3086afd84e93db338b7f8f049786dcee770d 100644 (file)
--- a/src/frontends/qt2/QLog.C
+++ b/src/frontends/qt2/QLog.C
@@ -10,15 +10,14 @@
 
 #include <config.h>
 
-#include "controllers/ControlLog.h"
-
-#include "support/std_sstream.h"
-
 #include "QLog.h"
 #include "QLogDialog.h"
-
 #include "qt_helpers.h"
 
+#include "controllers/ControlLog.h"
+
+#include "support/std_sstream.h"
+
 #include <qtextview.h>
 #include <qpushbutton.h>
 

diff --git a/src/frontends/qt2/QLogDialog.C b/src/frontends/qt2/QLogDialog.C
index 516b52c247610380cb4aa9d9c5af049fcefdaa55..56f0c34d518ffdae354d77d99364a0bfc564d7d6 100644 (file)
--- a/src/frontends/qt2/QLogDialog.C
+++ b/src/frontends/qt2/QLogDialog.C
@@ -10,11 +10,12 @@
 
 #include <config.h>
 
-#include <qpushbutton.h>
-
 #include "QLogDialog.h"
 #include "QLog.h"
 
+#include <qpushbutton.h>
+
+
 namespace lyx {
 namespace frontend {
 

diff --git a/src/frontends/qt2/QLyXKeySym.C b/src/frontends/qt2/QLyXKeySym.C
index a7de8ed629e7834e6ab8da9fb6b5b34753da30ea..e904c16ef144e6e092965966c03a631a2d2ddb22 100644 (file)
--- a/src/frontends/qt2/QLyXKeySym.C
+++ b/src/frontends/qt2/QLyXKeySym.C
@@ -11,11 +11,12 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "QLyXKeySym.h"
 #include "qlkey.h"
 #include "qt_helpers.h"
 
+#include "debug.h"
+
 #include <qaccel.h>
 #include <qevent.h>
 #include <qtextcodec.h>

diff --git a/src/frontends/qt2/QMath.C b/src/frontends/qt2/QMath.C
index 98543a7278729b14e3aab5186799b3cf6cba29f8..0161dad9f1a532a7d72caadeb2e6b136d8541ddb 100644 (file)
--- a/src/frontends/qt2/QMath.C
+++ b/src/frontends/qt2/QMath.C
@@ -10,11 +10,12 @@
 
 #include <config.h>
 
-#include "gettext.h"
+#include "QMath.h"
 #include "QMathDialog.h"
 #include "QMathMatrixDialog.h"
 #include "QDelimiterDialog.h"
-#include "QMath.h"
+
+#include "gettext.h"
 
 namespace lyx {
 namespace frontend {

diff --git a/src/frontends/qt2/QMathDialog.C b/src/frontends/qt2/QMathDialog.C
index 9613605ccfab3decab19851b8ad3f3649d87cc62..0c43674accbb413f0f1da1e5abc8456e6123c0f9 100644 (file)
--- a/src/frontends/qt2/QMathDialog.C
+++ b/src/frontends/qt2/QMathDialog.C
@@ -10,15 +10,13 @@
 
 #include <config.h>
 
-
-#include "qt_helpers.h"
-
-#include "ControlMath.h"
-
 #include "QMathDialog.h"
 #include "QMath.h"
 
 #include "iconpalette.h"
+#include "qt_helpers.h"
+
+#include "controllers/ControlMath.h"
 
 #include <qwidgetstack.h>
 #include <qcombobox.h>

diff --git a/src/frontends/qt2/QMathMatrixDialog.C b/src/frontends/qt2/QMathMatrixDialog.C
index 765d2816e7abf18fdfb1b2896fe7e828403b8e43..f9815edddb258c0bdafadbdcb87c5baa7096e908 100644 (file)
--- a/src/frontends/qt2/QMathMatrixDialog.C
+++ b/src/frontends/qt2/QMathMatrixDialog.C
@@ -10,19 +10,20 @@
 
 #include <config.h>
 
+#include "QMathMatrixDialog.h"
+#include "QMath.h"
+
+#include "emptytable.h"
 #include "qt_helpers.h"
 
-#include "support/std_sstream.h"
-#include "ControlMath.h"
+#include "controllers/ControlMath.h"
 
-#include "QMath.h"
-#include "QMathMatrixDialog.h"
+#include "support/std_sstream.h"
 
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qspinbox.h>
-#include "emptytable.h"
 
 using std::ostringstream;
 using std::string;

diff --git a/src/frontends/qt2/QNote.C b/src/frontends/qt2/QNote.C
index 9bca052eb5d593a0b26c6eb16b3582d705238027..7fe36603f6a23b8aa2f2305e62040c2cfa14d716 100644 (file)
--- a/src/frontends/qt2/QNote.C
+++ b/src/frontends/qt2/QNote.C
@@ -10,16 +10,17 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlNote.h"
+#include "QNote.h"
+#include "QNoteDialog.h"
+#include "Qt2BC.h"
+
+#include "controllers/ControlNote.h"
+
 #include "insets/insetnote.h"
 
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 
-#include "QNoteDialog.h"
-#include "QNote.h"
-#include "Qt2BC.h"
 
 using std::string;
 

diff --git a/src/frontends/qt2/QNoteDialog.C b/src/frontends/qt2/QNoteDialog.C
index 6130cd2e03e4beccf534fe04d7934e3b8f46f579..b03afdbc456bf69e49998605ca0e1f40b5eb8ea0 100644 (file)
--- a/src/frontends/qt2/QNoteDialog.C
+++ b/src/frontends/qt2/QNoteDialog.C
@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "QNote.h"
 #include "QNoteDialog.h"
+#include "QNote.h"
 
 #include <qpushbutton.h>
 

diff --git a/src/frontends/qt2/QParagraph.C b/src/frontends/qt2/QParagraph.C
index 98ed3a7fb66e8e48653a71d9b87d586ca5a5b9ae..6cb268f65f56627eae41b0edbd19b6dc15d9b8d8 100644 (file)
--- a/src/frontends/qt2/QParagraph.C
+++ b/src/frontends/qt2/QParagraph.C
@@ -10,23 +10,24 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlParagraph.h"
 #include "QParagraph.h"
 #include "QParagraphDialog.h"
 #include "Qt2BC.h"
-#include "ParagraphParameters.h"
 #include "qt_helpers.h"
-#include "helper_funcs.h"
 
+#include "ParagraphParameters.h"
 #include "Spacing.h"
+
+#include "controllers/ControlParagraph.h"
+#include "controllers/helper_funcs.h"
+
 #include "support/tostr.h"
 
+#include <qbuttongroup.h>
+#include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
-#include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <qbuttongroup.h>
 
 
 using std::string;

diff --git a/src/frontends/qt2/QParagraphDialog.C b/src/frontends/qt2/QParagraphDialog.C
index 89d884bb002b5ed85673dbbb4b23ca49c37d5cb6..9db5aae51cf8829e0826f06d73dd0a7d57639fec 100644 (file)
--- a/src/frontends/qt2/QParagraphDialog.C
+++ b/src/frontends/qt2/QParagraphDialog.C
@@ -14,8 +14,8 @@
 #include "QParagraphDialog.h"
 #include "QParagraph.h"
 
-#include <qlineedit.h>
 #include <qcombobox.h>
+#include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qvalidator.h>
 #include <qwhatsthis.h>

diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C
index f803549bb2ea724491783fde73c08c6500940f3e..3e345c713413d2a8d46a0d6615fab61e5925e1f3 100644 (file)
--- a/src/frontends/qt2/QPrefs.C
+++ b/src/frontends/qt2/QPrefs.C
@@ -10,14 +10,13 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "support/lstrings.h"
-#include "support/tostr.h"
-#include "support/std_sstream.h"
-#include <iomanip>
-
-#include "ControlPrefs.h"
+#include "QPrefs.h"
 #include "QPrefsDialog.h"
+
+#include "lcolorcache.h"
+#include "Qt2BC.h"
+#include "qt_helpers.h"
+
 #include "ui/QPrefAsciiModule.h"
 #include "ui/QPrefDateModule.h"
 #include "ui/QPrefKeyboardModule.h"
@@ -31,26 +30,32 @@
 #include "ui/QPrefPrinterModule.h"
 #include "ui/QPrefUIModule.h"
 #include "ui/QPrefIdentityModule.h"
-#include "lyx_gui.h"
-#include "QPrefs.h"
-#include "Qt2BC.h"
+
+#include "debug.h"
+#include "LColor.h"
 #include "lyxfont.h"
-#include "frnt_lang.h"
-#include "helper_funcs.h"
-#include "qt_helpers.h"
-#include "lcolorcache.h"
 
-#include <boost/tuple/tuple.hpp>
+#include "support/lstrings.h"
+#include "support/tostr.h"
+#include "support/std_sstream.h"
+
+#include "controllers/ControlPrefs.h"
+#include "controllers/frnt_lang.h"
+#include "controllers/helper_funcs.h"
+
+#include "frontends/lyx_gui.h"
 
-#include <qpushbutton.h>
 #include <qcheckbox.h>
-#include <qlineedit.h>
-#include <qspinbox.h>
+#include "qcoloritem.h"
 #include <qcombobox.h>
 #include <qlabel.h>
-#include "qcoloritem.h"
+#include <qlineedit.h>
+#include <qpushbutton.h>
+#include <qspinbox.h>
 
-#include "LColor.h"
+#include <boost/tuple/tuple.hpp>
+
+#include <iomanip>
 
 using lyx::support::compare_no_case;
 using lyx::support::strToDbl;

diff --git a/src/frontends/qt2/QPrefs.h b/src/frontends/qt2/QPrefs.h
index ae188acaeba42805d4fcfdbf14b28218c3c562c0..f27076e608a5bd577b6fe8f77bcd61a52419c580 100644 (file)
--- a/src/frontends/qt2/QPrefs.h
+++ b/src/frontends/qt2/QPrefs.h
@@ -15,13 +15,14 @@
 #include "QDialogView.h"
 #include <vector>
 
+class Converters;
 class Formats;
 
 namespace lyx {
 namespace frontend {
 
 class QPrefsDialog;
-class Controllers;
+class ControlPrefs;
 
 class QPrefs
        : public QController<ControlPrefs, QView<QPrefsDialog> >

diff --git a/src/frontends/qt2/QPrefsDialog.C b/src/frontends/qt2/QPrefsDialog.C
index cd8389e8c7bb3bfb4bad634d8d55e1b12fc5c5aa..50fae356d951c27464018726cd12abf8650ed9f2 100644 (file)
--- a/src/frontends/qt2/QPrefsDialog.C
+++ b/src/frontends/qt2/QPrefsDialog.C
@@ -11,10 +11,12 @@
 #include <config.h>
 #include "qt_helpers.h"
 
-#include "ControlPrefs.h"
+#include "QPrefsDialog.h"
 #include "QPrefs.h"
 
-#include "QPrefsDialog.h"
+#include "panelstack.h"
+#include "qcoloritem.h"
+#include "qfontexample.h"
 
 #include "ui/QPrefAsciiModule.h"
 #include "ui/QPrefDateModule.h"
@@ -35,16 +37,15 @@
 #include "gettext.h"
 #include "LColor.h"
 
-#include "panelstack.h"
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlineedit.h>
+#include "controllers/ControlPrefs.h"
+
 #include <qcheckbox.h>
+#include <qcolordialog.h>
 #include <qcombobox.h>
 #include <qfontdatabase.h>
-#include <qcolordialog.h>
-#include "qcoloritem.h"
-#include "qfontexample.h"
+#include <qlineedit.h>
+#include <qpushbutton.h>
+#include <qspinbox.h>
 
 using std::string;
 

diff --git a/src/frontends/qt2/QPrint.C b/src/frontends/qt2/QPrint.C
index 3642a58308cb45e23fd5a93adbcd24585f535637..1da3b0f4d337c18116c184084314c3451d720c40 100644 (file)
--- a/src/frontends/qt2/QPrint.C
+++ b/src/frontends/qt2/QPrint.C
@@ -11,14 +11,14 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "PrinterParams.h"
-#include "ControlPrint.h"
-#include "qt_helpers.h"
-
 #include "QPrint.h"
 #include "QLPrintDialog.h"
 #include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "PrinterParams.h"
+
+#include "controllers/ControlPrint.h"
 
 #include <qlineedit.h>
 #include <qcheckbox.h>

diff --git a/src/frontends/qt2/QRef.C b/src/frontends/qt2/QRef.C
index ea575b42f00ba749523a44a9cc04010da9be5559..0093a498228a581caa1459a9bd02aa7109b84f3a 100644 (file)
--- a/src/frontends/qt2/QRef.C
+++ b/src/frontends/qt2/QRef.C
@@ -11,13 +11,14 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlRef.h"
-#include "insets/insetref.h"
-
 #include "QRef.h"
 #include "QRefDialog.h"
 #include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "controllers/ControlRef.h"
+
+#include "insets/insetref.h"
 
 #include <qlineedit.h>
 #include <qcheckbox.h>
@@ -26,7 +27,6 @@
 #include <qpushbutton.h>
 #include <qtooltip.h>
 
-#include "qt_helpers.h"
 
 using std::vector;
 using std::string;

diff --git a/src/frontends/qt2/QRefDialog.C b/src/frontends/qt2/QRefDialog.C
index 10fae38502e0b4bdeec046b487725c1a4e7ea56b..9114a9ac00653398b649781bb281206758edffd9 100644 (file)
--- a/src/frontends/qt2/QRefDialog.C
+++ b/src/frontends/qt2/QRefDialog.C
@@ -11,13 +11,13 @@
 
 #include <config.h>
 
-#include "QRef.h"
 #include "QRefDialog.h"
+#include "QRef.h"
 
-#include <qpushbutton.h>
-#include <qlineedit.h>
 #include <qcombobox.h>
+#include <qlineedit.h>
 #include <qlistbox.h>
+#include <qpushbutton.h>
 
 namespace lyx {
 namespace frontend {

diff --git a/src/frontends/qt2/QSearch.C b/src/frontends/qt2/QSearch.C
index 39e9885630784b9337ef29fbb7af0700ccfcc086..684e47eafbca80f117b2791278c2a2857551bc06 100644 (file)
--- a/src/frontends/qt2/QSearch.C
+++ b/src/frontends/qt2/QSearch.C
@@ -10,15 +10,14 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlSearch.h"
-
 #include "QSearch.h"
 #include "QSearchDialog.h"
 #include "Qt2BC.h"
 
-#include <qpushbutton.h>
+#include "controllers/ControlSearch.h"
+
 #include <qcombobox.h>
+#include <qpushbutton.h>
 
 using std::string;
 

diff --git a/src/frontends/qt2/QSearchDialog.C b/src/frontends/qt2/QSearchDialog.C
index adc8b2406994bd0842b042b2e9500dbc1f08236e..f4e8c11a7a3ee13625c8b9b15d64b29fcd0d7941 100644 (file)
--- a/src/frontends/qt2/QSearchDialog.C
+++ b/src/frontends/qt2/QSearchDialog.C
@@ -10,15 +10,16 @@
 
 #include <config.h>
 
-#include "ControlSearch.h"
 #include "QSearchDialog.h"
 #include "QSearch.h"
 #include "qt_helpers.h"
 
-#include <qpushbutton.h>
-#include <qcombobox.h>
+#include "controllers/ControlSearch.h"
+
 #include <qcheckbox.h>
+#include <qcombobox.h>
 #include <qlineedit.h>
+#include <qpushbutton.h>
 
 using std::string;
 

diff --git a/src/frontends/qt2/QSendto.C b/src/frontends/qt2/QSendto.C
index 5092142abbf114aa19c0d4b063ec6c547e2676f1..3d4a9e492b07a775689e8c460dcae85d10c1e473 100644 (file)
--- a/src/frontends/qt2/QSendto.C
+++ b/src/frontends/qt2/QSendto.C
@@ -10,18 +10,19 @@
 
 #include <config.h>
 
-#include "Qt2BC.h"
-#include "ControlSendto.h"
-#include "QSendtoDialog.h"
 #include "QSendto.h"
+#include "QSendtoDialog.h"
+#include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "format.h"
+
+#include "controllers/ControlSendto.h"
 
 #include <qcombobox.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
 
-#include "qt_helpers.h"
-#include "format.h"
-
 using std::vector;
 using std::string;
 

diff --git a/src/frontends/qt2/QSendtoDialog.C b/src/frontends/qt2/QSendtoDialog.C
index 32bb4c1a3048de3a1421e47da8a6af8d90f96608..5d7296233c298ceb273cbe8427b82b59ac1b9b71 100644 (file)
--- a/src/frontends/qt2/QSendtoDialog.C
+++ b/src/frontends/qt2/QSendtoDialog.C
@@ -10,11 +10,12 @@
 
 #include <config.h>
 
-#include <qpushbutton.h>
-
 #include "QSendtoDialog.h"
 #include "QSendto.h"
 
+#include <qpushbutton.h>
+
+
 namespace lyx {
 namespace frontend {
 

diff --git a/src/frontends/qt2/QShowFile.C b/src/frontends/qt2/QShowFile.C
index 06d5004bff3fcdc061919b6fad4ef015b7a3e43b..0dfb15b76b25d3a93b2f9b539cea8c5fe784f22a 100644 (file)
--- a/src/frontends/qt2/QShowFile.C
+++ b/src/frontends/qt2/QShowFile.C
@@ -10,13 +10,12 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlShowFile.h"
-#include "qt_helpers.h"
-
 #include "QShowFile.h"
 #include "QShowFileDialog.h"
 #include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "controllers/ControlShowFile.h"
 
 #include <qtextview.h>
 #include <qpushbutton.h>

diff --git a/src/frontends/qt2/QShowFileDialog.C b/src/frontends/qt2/QShowFileDialog.C
index 0514530669c18da0fd1b02a5c1eda77746cb6116..f83bc9c4c2193ab6382c2996fdd8cee1a6b5c733 100644 (file)
--- a/src/frontends/qt2/QShowFileDialog.C
+++ b/src/frontends/qt2/QShowFileDialog.C
@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "QShowFile.h"
 #include "QShowFileDialog.h"
+#include "QShowFile.h"
 
 #include <qpushbutton.h>
 

diff --git a/src/frontends/qt2/QSpellchecker.C b/src/frontends/qt2/QSpellchecker.C
index 572cf7953aba4baffae7f765d590aba58ab3b090..b9615c9a7ff4d9886b866f2131337022a3e514b1 100644 (file)
--- a/src/frontends/qt2/QSpellchecker.C
+++ b/src/frontends/qt2/QSpellchecker.C
@@ -10,15 +10,13 @@
 
 #include <config.h>
 
-#include "debug.h"
-
-#include "controllers/ControlSpellchecker.h"
-
-#include "QSpellcheckerDialog.h"
 #include "QSpellchecker.h"
+#include "QSpellcheckerDialog.h"
 #include "Qt2BC.h"
 #include "qt_helpers.h"
 
+#include "controllers/ControlSpellchecker.h"
+
 #include <qprogressbar.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>

diff --git a/src/frontends/qt2/QSpellcheckerDialog.C b/src/frontends/qt2/QSpellcheckerDialog.C
index 35fa29bdddefa8e73abb5355781875df929c13cf..cb3ed9ebc4add20736d944822f944daef2e7cdb1 100644 (file)
--- a/src/frontends/qt2/QSpellcheckerDialog.C
+++ b/src/frontends/qt2/QSpellcheckerDialog.C
@@ -13,9 +13,9 @@
 #include "QSpellcheckerDialog.h"
 #include "QSpellchecker.h"
 
-#include <qpushbutton.h>
-#include <qlistbox.h>
 #include <qcombobox.h>
+#include <qlistbox.h>
+#include <qpushbutton.h>
 
 namespace lyx {
 namespace frontend {

diff --git a/src/frontends/qt2/QTabular.C b/src/frontends/qt2/QTabular.C
index b12715b136c509ee2059e54dcbd3a8f9275bb641..bac34940af461ae4463679a185f577dad51ee773 100644 (file)
--- a/src/frontends/qt2/QTabular.C
+++ b/src/frontends/qt2/QTabular.C
@@ -12,20 +12,21 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlTabular.h"
-#include "qt_helpers.h"
-#include "support/tostr.h"
-
-#include "QTabularDialog.h"
 #include "QTabular.h"
+#include "QTabularDialog.h"
 #include "Qt2BC.h"
-#include "ButtonController.h"
 
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qcheckbox.h>
 #include "lengthcombo.h"
+#include "qt_helpers.h"
+
+#include "controllers/ButtonController.h"
+#include "controllers/ControlTabular.h"
+
+#include "support/tostr.h"
+
+#include <qcheckbox.h>
+#include <qlineedit.h>
+#include <qpushbutton.h>
 #include "qsetborder.h"
 
 using std::string;

diff --git a/src/frontends/qt2/QTabularCreate.C b/src/frontends/qt2/QTabularCreate.C
index 843766768d5a2ce3eff7934cf5a00a6b2af864ee..b6103b95060d141ab4acba541636e43859b08e68 100644 (file)
--- a/src/frontends/qt2/QTabularCreate.C
+++ b/src/frontends/qt2/QTabularCreate.C
@@ -10,12 +10,12 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlTabularCreate.h"
 #include "QTabularCreateDialog.h"
 #include "QTabularCreate.h"
 #include "Qt2BC.h"
 
+#include "controllers/ControlTabularCreate.h"
+
 #include <qspinbox.h>
 #include <qpushbutton.h>
 

diff --git a/src/frontends/qt2/QTabularCreateDialog.C b/src/frontends/qt2/QTabularCreateDialog.C
index ef862dc6e59fb0f5f9f48e195eaf3bc0ad3a540f..d53998659e15b95a558ed8c2916c7eb8e51dbb04 100644 (file)
--- a/src/frontends/qt2/QTabularCreateDialog.C
+++ b/src/frontends/qt2/QTabularCreateDialog.C
@@ -11,8 +11,8 @@
 
 #include <config.h>
 
-#include "QTabularCreate.h"
 #include "QTabularCreateDialog.h"
+#include "QTabularCreate.h"
 
 #include <qpushbutton.h>
 #include <qspinbox.h>

diff --git a/src/frontends/qt2/QTabularDialog.C b/src/frontends/qt2/QTabularDialog.C
index eebdfdc6014de488305ad4c95f5a1cd971680a04..4d7b4ab1593c64d880d0671fa68bb9b954a4a92b 100644 (file)
--- a/src/frontends/qt2/QTabularDialog.C
+++ b/src/frontends/qt2/QTabularDialog.C
@@ -12,13 +12,12 @@
 
 #include <config.h>
 
-
-#include "ControlTabular.h"
-
-#include "QTabular.h"
 #include "QTabularDialog.h"
+#include "QTabular.h"
 #include "qt_helpers.h"
 
+#include "controllers/ControlTabular.h"
+
 #include <qcheckbox.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>

diff --git a/src/frontends/qt2/QTexinfo.C b/src/frontends/qt2/QTexinfo.C
index 3507585357cacdbf3a29c548e0a7f7ee06c88f91..ef7467cf41c6d17008960fa71c035a86ceecef94 100644 (file)
--- a/src/frontends/qt2/QTexinfo.C
+++ b/src/frontends/qt2/QTexinfo.C
@@ -10,17 +10,16 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "QTexinfoDialog.h"
 #include "QTexinfo.h"
+#include "QTexinfoDialog.h"
 #include "Qt2BC.h"
 #include "qt_helpers.h"
 
 #include "support/filetools.h"
 
+#include <qcheckbox.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
-#include <qcheckbox.h>
 
 using lyx::support::OnlyFilename;
 

diff --git a/src/frontends/qt2/QTexinfoDialog.C b/src/frontends/qt2/QTexinfoDialog.C
index 34da483d064ace07f54fd80fa581f4b217a1dc04..b9f15db0e222fda64acc4c4c9db55c29f4779403 100644 (file)
--- a/src/frontends/qt2/QTexinfoDialog.C
+++ b/src/frontends/qt2/QTexinfoDialog.C
@@ -13,9 +13,9 @@
 #include "QTexinfoDialog.h"
 #include "QTexinfo.h"
 
+#include <qcombobox.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
-#include <qcombobox.h>
 
 using std::vector;
 using std::string;

diff --git a/src/frontends/qt2/QThesaurus.C b/src/frontends/qt2/QThesaurus.C
index ed5b191c15bd37785c7a7457f669f6333bf97adb..31994d85fc6e3a8146b62eeffb3336902e9d85e8 100644 (file)
--- a/src/frontends/qt2/QThesaurus.C
+++ b/src/frontends/qt2/QThesaurus.C
@@ -10,13 +10,13 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlThesaurus.h"
-#include "QThesaurusDialog.h"
 #include "QThesaurus.h"
+#include "QThesaurusDialog.h"
 #include "Qt2BC.h"
 #include "qt_helpers.h"
 
+#include "controllers/ControlThesaurus.h"
+
 #include <qlineedit.h>
 #include <qpushbutton.h>
 

diff --git a/src/frontends/qt2/QThesaurusDialog.C b/src/frontends/qt2/QThesaurusDialog.C
index db7a85215c57232c62e2032ebc7959f8cb09c699..44e97ccb65004956e29d747d05811458c4acdf81 100644 (file)
--- a/src/frontends/qt2/QThesaurusDialog.C
+++ b/src/frontends/qt2/QThesaurusDialog.C
@@ -10,11 +10,12 @@
 
 #include <config.h>
 
-#include "ControlThesaurus.h"
 #include "QThesaurusDialog.h"
 #include "QThesaurus.h"
 #include "qt_helpers.h"
 
+#include "controllers/ControlThesaurus.h"
+
 #include <qpushbutton.h>
 #include <qlistview.h>
 #include <qlineedit.h>

diff --git a/src/frontends/qt2/QToc.C b/src/frontends/qt2/QToc.C
index 88e51740dbbba1177b98218da6e3637ea73b5320..0ee87807101b2abea1cce557c1f4afbab0d5bd23 100644 (file)
--- a/src/frontends/qt2/QToc.C
+++ b/src/frontends/qt2/QToc.C
@@ -10,19 +10,20 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include <stack>
-
-#include "qt_helpers.h"
-
-#include "ControlToc.h"
 #include "QToc.h"
 #include "QTocDialog.h"
 #include "Qt2BC.h"
+#include "qt_helpers.h"
 
+#include "debug.h"
+
+#include "controllers/ControlToc.h"
+
+#include <qcombobox.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
-#include <qcombobox.h>
+
+#include <stack>
 
 using std::endl;
 

diff --git a/src/frontends/qt2/QTocDialog.C b/src/frontends/qt2/QTocDialog.C
index a873d217e8e6b3811dbee4374360cce9e97b9550..0e92d89378729b172163ffb0841f81af92c6a1c4 100644 (file)
--- a/src/frontends/qt2/QTocDialog.C
+++ b/src/frontends/qt2/QTocDialog.C
@@ -10,9 +10,8 @@
 
 #include <config.h>
 
-
-#include "QToc.h"
 #include "QTocDialog.h"
+#include "QToc.h"
 #include "qt_helpers.h"
 
 #include <qlistview.h>

diff --git a/src/frontends/qt2/QURL.C b/src/frontends/qt2/QURL.C
index 48470c955642c9c77c8ff8ab374ab752bf2ea10d..68cf3ec5eba6eb31d0df958b26cd279b7f2880ca 100644 (file)
--- a/src/frontends/qt2/QURL.C
+++ b/src/frontends/qt2/QURL.C
@@ -10,18 +10,17 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlCommand.h"
-#include "qt_helpers.h"
-
 #include "QURL.h"
 #include "QURLDialog.h"
 #include "Qt2BC.h"
-#include "ButtonController.h"
+#include "qt_helpers.h"
+
+#include "controllers/ButtonController.h"
+#include "controllers/ControlCommand.h"
 
 #include <qcheckbox.h>
-#include <qpushbutton.h>
 #include <qlineedit.h>
+#include <qpushbutton.h>
 
 using std::string;
 

diff --git a/src/frontends/qt2/QURLDialog.C b/src/frontends/qt2/QURLDialog.C
index 08ae4bb0646697adaa70ce47986c22497d1a1222..c1600365b9a8cf296d7e60890abed67570997b29 100644 (file)
--- a/src/frontends/qt2/QURLDialog.C
+++ b/src/frontends/qt2/QURLDialog.C
@@ -10,11 +10,11 @@
 
 #include <config.h>
 
-#include "QURL.h"
 #include "QURLDialog.h"
+#include "QURL.h"
 
-#include <qpushbutton.h>
 #include <qlineedit.h>
+#include <qpushbutton.h>
 
 namespace lyx {
 namespace frontend {

diff --git a/src/frontends/qt2/QVSpace.C b/src/frontends/qt2/QVSpace.C
index e3cc6be868da39942de3bb378f33e290d3a8546c..d7d7f25218a18d30d2a8c6e58024b86ac6519ca8 100644 (file)
--- a/src/frontends/qt2/QVSpace.C
+++ b/src/frontends/qt2/QVSpace.C
@@ -15,18 +15,20 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlVSpace.h"
 #include "QVSpace.h"
 #include "QVSpaceDialog.h"
 #include "Qt2BC.h"
-#include "lyxrc.h" // to set the default length values
+
+#include "lengthcombo.h"
 #include "qt_helpers.h"
-#include "helper_funcs.h"
 
+#include "lyxrc.h" // to set the default length values
 #include "Spacing.h"
 #include "vspace.h"
 
+#include "controllers/ControlVSpace.h"
+#include "controllers/helper_funcs.h"
+
 #include "support/lstrings.h"
 #include "support/tostr.h"
 
@@ -34,7 +36,6 @@
 #include <qlineedit.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include "lengthcombo.h"
 
 
 using std::string;

diff --git a/src/frontends/qt2/QVSpaceDialog.C b/src/frontends/qt2/QVSpaceDialog.C
index 6dfe544a18c2b19df6bb38fe27269139c7cb94fd..133f0b840966208162477a7209038465091d2a45 100644 (file)
--- a/src/frontends/qt2/QVSpaceDialog.C
+++ b/src/frontends/qt2/QVSpaceDialog.C
@@ -15,13 +15,14 @@
 #include "QVSpaceDialog.h"
 #include "QVSpace.h"
 
-#include <qlineedit.h>
+#include "lengthcombo.h"
+#include "qt_helpers.h"
+
 #include <qcombobox.h>
+#include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qvalidator.h>
-#include "lengthcombo.h"
 
-#include "qt_helpers.h"
 
 namespace lyx {
 namespace frontend {

diff --git a/src/frontends/qt2/QWorkArea.C b/src/frontends/qt2/QWorkArea.C
index 5e105e1d44c6a119d29c0b214a1a025fc94f032b..40a1f90d30da7b2d1fbb5dadb10a6d3a4bc0c77a 100644 (file)
--- a/src/frontends/qt2/QWorkArea.C
+++ b/src/frontends/qt2/QWorkArea.C
@@ -10,19 +10,21 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "QWorkArea.h"
-#include "LColor.h"
-#include "qt_helpers.h"
+
 #include "lcolorcache.h"
+#include "qt_helpers.h"
+
+#include "debug.h"
 #include "funcrequest.h"
+#include "LColor.h"
 
 #include <qapplication.h>
+#include <qclipboard.h>
 #include <qdragobject.h>
-#include <qpainter.h>
-#include <qmainwindow.h>
 #include <qlayout.h>
-#include <qclipboard.h>
+#include <qmainwindow.h>
+#include <qpainter.h>
 
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>

diff --git a/src/frontends/qt2/QWrap.C b/src/frontends/qt2/QWrap.C
index e501b4609e9c88a784b84cf8336372e53fac3233..967c125ad107fbc773d59e1fad14aa1b8f474b18 100644 (file)
--- a/src/frontends/qt2/QWrap.C
+++ b/src/frontends/qt2/QWrap.C
@@ -10,21 +10,22 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "qt_helpers.h"
-#include "support/tostr.h"
-#include "support/lstrings.h"
-#include "ControlWrap.h"
-
 #include "QWrap.h"
 #include "QWrapDialog.h"
 #include "Qt2BC.h"
+
 #include "lengthcombo.h"
+#include "qt_helpers.h"
+
+#include "controllers/ControlWrap.h"
 
 #include "insets/insetwrap.h"
 
-#include <qpushbutton.h>
+#include "support/tostr.h"
+#include "support/lstrings.h"
+
 #include <qlineedit.h>
+#include <qpushbutton.h>
 
 using lyx::support::strToDbl;
 

diff --git a/src/frontends/qt2/QWrapDialog.C b/src/frontends/qt2/QWrapDialog.C
index 7ea2817c230b8cc9e5b777bfbb6f6fe4d42503ff..3e9783c5d0ee8311a2e775d4375a6e0b48deec62 100644 (file)
--- a/src/frontends/qt2/QWrapDialog.C
+++ b/src/frontends/qt2/QWrapDialog.C
@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "QWrap.h"
 #include "QWrapDialog.h"
+#include "QWrap.h"
 
 #include <qpushbutton.h>
 

diff --git a/src/frontends/qt2/emptytable.C b/src/frontends/qt2/emptytable.C
index d6e61667dc6cfd4481a3d2619c6210ab291ed92b..ce64cde1d15c56d02323b0a29443384d93177b80 100644 (file)
--- a/src/frontends/qt2/emptytable.C
+++ b/src/frontends/qt2/emptytable.C
@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #include "emptytable.h"
 #include <qpainter.h>
 

diff --git a/src/frontends/qt2/iconpalette.C b/src/frontends/qt2/iconpalette.C
index 61297d43188f6b991463e3c169afadf89b7b55b1..4ed8a936bdbff492d8fc08888fd3ea01c9ee763f 100644 (file)
--- a/src/frontends/qt2/iconpalette.C
+++ b/src/frontends/qt2/iconpalette.C
@@ -10,11 +10,11 @@
 
 #include <config.h>
 
-#include "debug.h"
-
 #include "iconpalette.h"
 #include "qt_helpers.h"
 
+#include "debug.h"
+
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qtooltip.h>

diff --git a/src/frontends/qt2/io_callback.C b/src/frontends/qt2/io_callback.C
index 2d88e658d3f23dff360354d1535f6a49e2c441ff..643516ae81932b37817b90c50e30bb19f15a67bd 100644 (file)
--- a/src/frontends/qt2/io_callback.C
+++ b/src/frontends/qt2/io_callback.C
@@ -11,10 +11,10 @@
 
 #include <config.h>
 
-
+// Qt defines a macro 'signals' that clashes with a boost namespace.
 #include "lyxserver.h"
-#include "io_callback.h"
 
+#include "io_callback.h"
 
 io_callback::io_callback(int fd, LyXComm * comm)
        : comm_(comm)

diff --git a/src/frontends/qt2/lengthcombo.C b/src/frontends/qt2/lengthcombo.C
index 09261a8074dec4b5d40aa71b0c297a31e26dbb7e..4fc1a9fe7ae57a4348343e1486174aa4391cf038 100644 (file)
--- a/src/frontends/qt2/lengthcombo.C
+++ b/src/frontends/qt2/lengthcombo.C
@@ -11,7 +11,6 @@
 
 #include <config.h>
 
-
 #include "lengthcombo.h"
 
 #include "lengthcommon.h"

diff --git a/src/frontends/qt2/lengthvalidator.C b/src/frontends/qt2/lengthvalidator.C
index e08291b3975dc3919f93cc3f0d0b21d50825b983..f346163d4374719e373cba8f3bc389f0c4c8bc3b 100644 (file)
--- a/src/frontends/qt2/lengthvalidator.C
+++ b/src/frontends/qt2/lengthvalidator.C
@@ -12,11 +12,10 @@
 #include <config.h>
 
 #include "lengthvalidator.h"
+#include "qt_helpers.h"
 
 #include "support/lstrings.h"
 
-#include "qt_helpers.h"
-
 #include <qwidget.h>
 
 

diff --git a/src/frontends/qt2/lyx_gui.C b/src/frontends/qt2/lyx_gui.C
index dbfbd64e796d5c0906ba2704330b340eb8a0453d..abb487fab0afd33e157233e5af75b52b5361b428 100644 (file)
--- a/src/frontends/qt2/lyx_gui.C
+++ b/src/frontends/qt2/lyx_gui.C
@@ -11,37 +11,38 @@
 
 #include <config.h>
 
-
-#include "support/lstrings.h"
-#include "support/os.h"
-#include "qt_helpers.h"
-
 #include "lyx_gui.h"
-#include "funcrequest.h"
-#include "graphics/LoaderQueue.h"
 
 // FIXME: move this stuff out again
 #include "bufferlist.h"
+#include "BufferView.h"
+#include "funcrequest.h"
+#include "LColor.h"
 #include "lyx_main.h"
 #include "LyXAction.h"
 #include "lyxfunc.h"
 #include "lyxrc.h"
 #include "lyxserver.h"
 #include "lyxsocket.h"
-#include "BufferView.h"
-#include "LColor.h"
 
-// Dear Lord, deliver us from Evil,
-// aka the Qt headers
+#include "graphics/LoaderQueue.h"
+
+#include "support/lstrings.h"
+#include "support/os.h"
+
+// Dear Lord, deliver us from Evil, aka the Qt headers
+// Qt defines a macro 'signals' that clashes with a boost namespace.
+// All is well if the namespace is visible first.
 #include <boost/signals/signal1.hpp>
 #include <boost/bind.hpp>
 
 #include "QtView.h"
-#include "QLImage.h"
-#include "qfont_loader.h"
 #include "io_callback.h"
-#include "socket_callback.h"
 #include "lcolorcache.h"
+#include "qfont_loader.h"
+#include "QLImage.h"
+#include "qt_helpers.h"
+#include "socket_callback.h"
 
 #ifdef Q_WS_MACX
 #include <Carbon/Carbon.h>

diff --git a/src/frontends/qt2/qfont_loader.C b/src/frontends/qt2/qfont_loader.C
index 3348a7b3c79aa8b279ee89560f8dcd700a9ae236..1c7e9ced3a6bec23db4f9bc1f8a5b0cf09c186b7 100644 (file)
--- a/src/frontends/qt2/qfont_loader.C
+++ b/src/frontends/qt2/qfont_loader.C
@@ -11,14 +11,18 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "qfont_loader.h"
 #include "qt_helpers.h"
+
+#include "debug.h"
 #include "lyxrc.h"
 
-#include "support/lstrings.h"
 #include "frontends/lyx_gui.h"
 
+#include "support/filetools.h"
+#include "support/lstrings.h"
+#include "support/systemcall.h"
+
 #include <qfontinfo.h>
 
 #include <boost/tuple/tuple.hpp>
@@ -28,8 +32,6 @@
 #include <X11/Xlib.h>
 #include <algorithm>
 #endif
-#include "support/systemcall.h"
-#include "support/filetools.h"
 
 using lyx::support::contains;
 using lyx::support::LibFileSearch;

diff --git a/src/frontends/qt2/qfont_metrics.C b/src/frontends/qt2/qfont_metrics.C
index 12e5045a82e1c3ac6d5d4ec986efac4e6e7ca6d5..6c5a7e99692e93e663acaba6e079a575aa65d419 100644 (file)
--- a/src/frontends/qt2/qfont_metrics.C
+++ b/src/frontends/qt2/qfont_metrics.C
@@ -11,11 +11,14 @@
 
 #include <config.h>
 
-#include "font_metrics.h"
+#include "frontends/font_metrics.h"
 #include "frontends/lyx_gui.h"
+
 #include "qfont_loader.h"
+
 #include "language.h"
 
+
 using std::string;
 
 

diff --git a/src/frontends/qt2/qscreen.C b/src/frontends/qt2/qscreen.C
index 9419f6c3611262318a6232e27b1ea408937fcf99..e40a847ba5606b9aac7abfe6ca9241db4e32976c 100644 (file)
--- a/src/frontends/qt2/qscreen.C
+++ b/src/frontends/qt2/qscreen.C
@@ -10,9 +10,10 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "QWorkArea.h"
 #include "qscreen.h"
+
+#include "debug.h"
 #include "LColor.h"
 
 #include <qapplication.h>

diff --git a/src/frontends/qt2/qsetborder.C b/src/frontends/qt2/qsetborder.C
index 548512f4abd1b87faf1af1cfb690d6305dedc3ef..7d7b9e34a472133b6814e3c40bb47fba9cbfe9f5 100644 (file)
--- a/src/frontends/qt2/qsetborder.C
+++ b/src/frontends/qt2/qsetborder.C
@@ -11,8 +11,8 @@
 
 #include <config.h>
 
-#include <qpainter.h>
 #include "qsetborder.h"
+#include <qpainter.h>
 
 
 QSetBorder::QSetBorder(QWidget * parent, char const * name, WFlags fl)

diff --git a/src/frontends/qt2/qtTimeout.C b/src/frontends/qt2/qtTimeout.C
index b8768c792df058d9d1813d6067c97b22bed28a8f..241932b4a0e88d19574fea9d7cd33e7ee953bba3 100644 (file)
--- a/src/frontends/qt2/qtTimeout.C
+++ b/src/frontends/qt2/qtTimeout.C
@@ -10,9 +10,10 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "qtTimeout.h"
 
+#include "debug.h"
+
 
 Timeout::Timeout(unsigned int msec, Type t)
        : pimpl_(new qtTimeout(*this)), type(t), timeout_ms(msec)

diff --git a/src/frontends/qt2/qt_helpers.C b/src/frontends/qt2/qt_helpers.C
index 109f0837391288715f9c445549bb9f576a0fa932..91a9077335d554c8749ecfb7e57951ba7b7f76b4 100644 (file)
--- a/src/frontends/qt2/qt_helpers.C
+++ b/src/frontends/qt2/qt_helpers.C
@@ -11,12 +11,13 @@
 
 #include <config.h>
 
-#include "support/tostr.h"
-#include "support/lstrings.h"
-#include "gettext.h"
+#include "lengthcombo.h"
 #include "qt_helpers.h"
 
-#include "lengthcombo.h"
+#include "gettext.h"
+
+#include "support/lstrings.h"
+#include "support/tostr.h"
 
 #include <qlineedit.h>
 #include <qtextcodec.h>

diff --git a/src/frontends/qt2/socket_callback.C b/src/frontends/qt2/socket_callback.C
index ab3f1611fc85e662b1b8ea0a022c164c18ee855c..55e7b306d774712be458f320129f553447d25d51 100644 (file)
--- a/src/frontends/qt2/socket_callback.C
+++ b/src/frontends/qt2/socket_callback.C
@@ -12,7 +12,6 @@
 
 #include <config.h>
 
-
 #include "lyxsocket.h"
 #include "socket_callback.h"
 
@@ -37,6 +36,7 @@ void socket_callback::server_received()
        server_->serverCallback();
 }
 
+
 void socket_callback::data_received()
 {
        data_->server()->dataCallback(data_);