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

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;

src/frontends/qt2/Alert_pimpl.C

@@ -13,12 +13,14 @@
 #include "Alert_pimpl.h"
 #include "Alert.h"
 
+#include "ui/QAskForTextDialog.h"
+#include "qt_helpers.h"
+
+#include "gettext.h"
+
 #include <qmessagebox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
-#include "ui/QAskForTextDialog.h"
-#include "qt_helpers.h"
-#include "gettext.h"
 
 #include <algorithm>
 

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>

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.

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;
 

src/frontends/qt2/FileDialog_private.C

@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #include "FileDialog_private.h"
 #include "qt_helpers.h"
 

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;

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 {

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 {
 

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;

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;
 

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 "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 "support/lstrings.h"
 #include "support/tostr.h"
 
-#include "Qt2BC.h"
-#include "lyxrc.h" // to set the default length values
-#include "insets/insetbox.h"
-
-#include "lengthcombo.h"
-#include "lengthcommon.h"
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qcombobox.h>

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 {

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>
 

src/frontends/qt2/QBranchDialog.C

@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "QBranch.h"
 #include "QBranchDialog.h"
+#include "QBranch.h"
 
 #include <qpushbutton.h>
 

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>
 
 

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;
 

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 {
 

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 {

src/frontends/qt2/QCharacterDialog.C

@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #include "QCharacterDialog.h"
 
 #include <qcheckbox.h>

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;

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;

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>

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 {
 

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 {

src/frontends/qt2/QDialogView.C

@@ -10,10 +10,11 @@
 
 #include <config.h>
 
-#include "Qt2BC.h"
-#include "ButtonController.h"
-#include "qt_helpers.h"
 #include "QDialogView.h"
+#include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "controllers/ButtonController.h"
 
 namespace lyx {
 namespace frontend {

src/frontends/qt2/QDocument.C

@@ -10,27 +10,26 @@
 
 #include <config.h>
 
-#include "controllers/ControlDocument.h"
-
-#include "bufferparams.h"
-#include "debug.h"
-#include "language.h"
-#include "helper_funcs.h" // getSecond()
-#include "frnt_lang.h"
-#include "gettext.h"
-#include "lyxrc.h" // defaultUnit
-#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 "bufferparams.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 "controllers/ControlDocument.h"
+#include "controllers/frnt_lang.h"
+
 #include <qpushbutton.h>
 #include <qmultilineedit.h>
 #include <qradiobutton.h>

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>

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 {

src/frontends/qt2/QERTDialog.C

@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "QERT.h"
 #include "QERTDialog.h"
+#include "QERT.h"
 
 #include <qpushbutton.h>
 

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>

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>

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"
 

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"

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>

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 {

src/frontends/qt2/QGraphics.C

@@ -12,18 +12,24 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlGraphics.h"
+#include "QGraphics.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 "insets/insetgraphicsParams.h"
-
-#include "lyxrc.h"
-#include "lengthcombo.h"
-#include "qt_helpers.h"
-#include "lengthcommon.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;

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;
 

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>

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 {

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>

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>
 

src/frontends/qt2/QLPainter.C

@@ -11,16 +11,17 @@
 #include <config.h>
 
 #include "QLPainter.h"
-#include "font_metrics.h"
+
+#include "QWorkArea.h"
+#include "QLImage.h"
+#include "lcolorcache.h"
+#include "qfont_loader.h"
+
 #include "debug.h"
 #include "language.h"
 #include "LColor.h"
 
-#include "QWorkArea.h"
-#include "qfont_loader.h"
-#include "QLImage.h"
-#include "lcolorcache.h"
-
+#include "frontends/font_metrics.h"
 
 #include <qpainter.h>
 

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;

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>

src/frontends/qt2/QLog.C

@@ -10,15 +10,14 @@
 
 #include <config.h>
 
+#include "QLog.h"
+#include "QLogDialog.h"
+#include "qt_helpers.h"
+
 #include "controllers/ControlLog.h"
 
 #include "support/std_sstream.h"
 
-#include "QLog.h"
-#include "QLogDialog.h"
-
-#include "qt_helpers.h"
-
 #include <qtextview.h>
 #include <qpushbutton.h>
 

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 {
 

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>

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 {

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>

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;

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;
 

src/frontends/qt2/QNoteDialog.C

@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "QNote.h"
 #include "QNoteDialog.h"
+#include "QNote.h"
 
 #include <qpushbutton.h>
 

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;

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>

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 "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 <qcheckbox.h>
+#include "qcoloritem.h"
+#include <qcombobox.h>
+#include <qlabel.h>
+#include <qlineedit.h>
+#include <qpushbutton.h>
+#include <qspinbox.h>
 
 #include <boost/tuple/tuple.hpp>
 
-#include <qpushbutton.h>
-#include <qcheckbox.h>
-#include <qlineedit.h>
-#include <qspinbox.h>
-#include <qcombobox.h>
-#include <qlabel.h>
-#include "qcoloritem.h"
-
-#include "LColor.h"
+#include <iomanip>
 
 using lyx::support::compare_no_case;
 using lyx::support::strToDbl;

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> >

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;
 

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>

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;

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 {

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;
 

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;
 

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;
 

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 {
 

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>

src/frontends/qt2/QShowFileDialog.C

@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "QShowFile.h"
 #include "QShowFileDialog.h"
+#include "QShowFile.h"
 
 #include <qpushbutton.h>
 

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>

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 {

src/frontends/qt2/QTabular.C

@@ -12,20 +12,21 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlTabular.h"
+#include "QTabular.h"
+#include "QTabularDialog.h"
+#include "Qt2BC.h"
+
+#include "lengthcombo.h"
 #include "qt_helpers.h"
+
+#include "controllers/ButtonController.h"
+#include "controllers/ControlTabular.h"
+
 #include "support/tostr.h"
 
-#include "QTabularDialog.h"
-#include "QTabular.h"
-#include "Qt2BC.h"
-#include "ButtonController.h"
-
-#include <qpushbutton.h>
-#include <qlineedit.h>
 #include <qcheckbox.h>
-#include "lengthcombo.h"
+#include <qlineedit.h>
+#include <qpushbutton.h>
 #include "qsetborder.h"
 
 using std::string;

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>
 

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>

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>

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;
 

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;

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>
 

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>

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;
 

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>

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;
 

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 {

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 "qt_helpers.h"
-#include "helper_funcs.h"
 
+#include "lengthcombo.h"
+#include "qt_helpers.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;

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 {

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 <qdragobject.h>
-#include <qpainter.h>
-#include <qmainwindow.h>
-#include <qlayout.h>
 #include <qclipboard.h>
+#include <qdragobject.h>
+#include <qlayout.h>
+#include <qmainwindow.h>
+#include <qpainter.h>
 
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>

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;
 

src/frontends/qt2/QWrapDialog.C

@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "QWrap.h"
 #include "QWrapDialog.h"
+#include "QWrap.h"
 
 #include <qpushbutton.h>
 

src/frontends/qt2/emptytable.C

@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #include "emptytable.h"
 #include <qpainter.h>
 

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>

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)

src/frontends/qt2/lengthcombo.C

@@ -11,7 +11,6 @@
 
 #include <config.h>
 
-
 #include "lengthcombo.h"
 
 #include "lengthcommon.h"

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>
 
 

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>

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;

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;
 
 

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>

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)

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)

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>

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_);