header cleanup

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

src/DocIterator.cpp

@@ -14,7 +14,6 @@
 
 #include "DocIterator.h"
 
-#include "support/debug.h"
 #include "InsetList.h"
 #include "Paragraph.h"
 #include "Text.h"
@@ -24,6 +23,8 @@
 
 #include "insets/InsetTabular.h"
 
+#include "support/debug.h"
+
 #include <boost/assert.hpp>
 
 #include <ostream>

src/InsetList.cpp

@@ -16,10 +16,11 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BranchList.h"
-#include "support/debug.h"
 
 #include "insets/InsetBranch.h"
 
+#include "support/debug.h"
+
 using namespace std;
 
 namespace lyx {

src/Intl.cpp

@@ -14,9 +14,9 @@
 #include <config.h>
 
 #include "Intl.h"
-#include "support/debug.h"
 #include "LyXRC.h"
 
+#include "support/debug.h"
 
 namespace lyx {
 

src/KeyMap.cpp

@@ -15,11 +15,11 @@
 
 #include "KeyMap.h"
 
-#include "support/debug.h"
 #include "KeySequence.h"
 #include "LyXAction.h"
 #include "Lexer.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/FileName.h"
 #include "support/filetools.h"

src/LaTeX.cpp

@@ -17,14 +17,14 @@
 
 #include "BufferList.h"
 #include "LaTeX.h"
-#include "support/gettext.h"
 #include "LyXRC.h"
-#include "support/debug.h"
 #include "DepTable.h"
 
+#include "support/debug.h"
 #include "support/convert.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/Systemcall.h"
 #include "support/os.h"

src/Language.cpp

@@ -14,11 +14,11 @@
 
 #include "Language.h"
 
-#include "support/debug.h"
 #include "Encoding.h"
 #include "Lexer.h"
 #include "LyXRC.h"
 
+#include "support/debug.h"
 #include "support/FileName.h"
 
 #include <ostream>

src/Layout.cpp

@@ -16,9 +16,8 @@
 #include "TextClass.h"
 #include "Lexer.h"
 #include "Font.h"
+
 #include "support/debug.h"
-
-
 #include "support/lstrings.h"
 
 #include <ostream>

src/Lexer.cpp

@@ -15,9 +15,8 @@
 
 #include "Lexer.h"
 
-#include "support/debug.h"
-
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/gzstream.h"

src/LyXAction.cpp

@@ -15,9 +15,9 @@
 
 #include "LyXAction.h"
 
-#include "support/debug.h"
 #include "FuncRequest.h"
 
+#include "support/debug.h"
 #include "support/lstrings.h"
 
 #include <boost/assert.hpp>

src/LyXFunc.cpp

@@ -33,14 +33,12 @@
 #include "Converter.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "Encoding.h"
 #include "ErrorList.h"
 #include "Format.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "InsetIterator.h"
 #include "Intl.h"
 #include "KeyMap.h"
@@ -80,9 +78,11 @@
 #include "frontends/LyXView.h"
 #include "frontends/Selection.h"
 
+#include "support/debug.h"
 #include "support/environment.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/Path.h"
 #include "support/Package.h"

src/LyXRC.cpp

@@ -21,11 +21,9 @@
 
 #include "LyXRC.h"
 
-#include "support/debug.h"
 #include "Color.h"
 #include "Converter.h"
 #include "Format.h"
-#include "support/gettext.h"
 #include "Session.h"
 #include "Lexer.h"
 #include "FontEnums.h"
@@ -34,8 +32,10 @@
 #include "graphics/GraphicsTypes.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/environment.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/userinfo.h"

src/LyXVC.cpp

@@ -17,13 +17,13 @@
 
 #include "LyXVC.h"
 #include "VCBackend.h"
-#include "support/debug.h"
 #include "Buffer.h"
-#include "support/gettext.h"
 
 #include "frontends/alert.h"
 
+#include "support/debug.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 using namespace std;

src/MenuBackend.cpp

@@ -23,11 +23,9 @@
 #include "BufferParams.h"
 #include "Converter.h"
 #include "CutAndPaste.h"
-#include "support/debug.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "Format.h"
-#include "support/gettext.h"
 #include "KeyMap.h"
 #include "Session.h"
 #include "LyXAction.h"
@@ -41,9 +39,11 @@
 
 #include "frontends/Application.h"
 
-#include "support/filetools.h"
-#include "support/lstrings.h"
 #include "support/convert.h"
+#include "support/debug.h"
+#include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
 #include <boost/bind.hpp>
 

src/ModuleList.cpp

@@ -13,10 +13,10 @@
 
 #include "ModuleList.h"
 
-#include "support/debug.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 
+#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"

src/PDFOptions.cpp

@@ -12,11 +12,12 @@
 
 #include "PDFOptions.h"
 
-#include "support/convert.h"
-#include "support/lstrings.h"
-#include "support/debug.h"
 #include "Lexer.h"
 
+#include "support/convert.h"
+#include "support/debug.h"
+#include "support/lstrings.h"
+
 #include <sstream>
 #include <string>
 

src/Paragraph.cpp

@@ -42,7 +42,6 @@
 #include "VSpace.h"
 
 #include "frontends/alert.h"
-#include "frontends/FontMetrics.h"
 
 #include "insets/InsetBibitem.h"
 #include "insets/InsetLabel.h"

src/ParagraphMetrics.cpp

@@ -24,8 +24,6 @@
 #include "BufferView.h"
 #include "Counters.h"
 #include "Encoding.h"
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Layout.h"
@@ -44,9 +42,11 @@
 #include "insets/InsetBibitem.h"
 #include "insets/InsetOptArg.h"
 
+#include "support/convert.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
-#include "support/convert.h"
 
 #include <boost/bind.hpp>
 #include <boost/crc.hpp>

src/Row.cpp

@@ -17,6 +17,7 @@
 #include <config.h>
 
 #include "Row.h"
+
 #include "support/debug.h"
 
 

src/Server.cpp

@@ -40,12 +40,13 @@
 #include <config.h>
 
 #include "Server.h"
-#include "support/debug.h"
 #include "FuncRequest.h"
 #include "LyXAction.h"
 #include "LyXFunc.h"
+
 #include "frontends/Application.h"
 
+#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/lstrings.h"
 

src/ServerSocket.cpp

@@ -16,13 +16,13 @@
 
 #include "ServerSocket.h"
 
-#include "support/debug.h"
 #include "FuncRequest.h"
 #include "LyXAction.h"
 #include "LyXFunc.h"
 
 #include "frontends/Application.h"
 
+#include "support/debug.h"
 #include "support/environment.h"
 #include "support/FileName.h"
 #include "support/socktools.h"

src/Session.cpp

@@ -12,9 +12,10 @@
 #include <config.h>
 
 #include "Session.h"
+
 #include "support/debug.h"
-#include "support/Package.h"
 #include "support/filetools.h"
+#include "support/Package.h"
 
 #include <fstream>
 #include <sstream>

src/TexRow.cpp

@@ -13,6 +13,7 @@
 #include <config.h>
 
 #include "TexRow.h"
+
 #include "support/debug.h"
 
 #include <algorithm>

src/Text.cpp

@@ -47,9 +47,6 @@
 #include "VSpace.h"
 #include "WordLangTuple.h"
 
-#include "frontends/FontMetrics.h"
-#include "frontends/Painter.h"
-
 #include "insets/InsetText.h"
 #include "insets/InsetBibitem.h"
 #include "insets/InsetCaption.h"
@@ -81,8 +78,6 @@ namespace lyx {
 using cap::cutSelection;
 using cap::pasteParagraphList;
 
-using frontend::FontMetrics;
-
 namespace {
 
 void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,

src/Text2.cpp

@@ -47,8 +47,6 @@
 #include "TextMetrics.h"
 #include "VSpace.h"
 
-#include "frontends/FontMetrics.h"
-
 #include "insets/InsetEnvironment.h"
 
 #include "mathed/InsetMathHull.h"

src/TextClass.cpp

@@ -18,8 +18,6 @@
 
 #include "Color.h"
 #include "Counters.h"
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "Layout.h"
@@ -28,10 +26,12 @@
 
 #include "frontends/alert.h"
 
+#include "support/debug.h"
 #include "support/ExceptionMessage.h"
-#include "support/lstrings.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 #include "support/os.h"
 
 #include <sstream>

src/TextClassList.cpp

@@ -13,9 +13,9 @@
 
 #include "TextClassList.h"
 #include "TextClass.h"
-#include "support/debug.h"
 #include "Lexer.h"
 
+#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 

src/TextMetrics.cpp

@@ -27,7 +27,6 @@
 #include "CoordCache.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "support/debug.h"
 #include "FontIterator.h"
 #include "FuncRequest.h"
 #include "InsetList.h"
@@ -49,6 +48,8 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
+
 using namespace std;
 
 namespace lyx {

src/ToolbarBackend.cpp

@@ -14,12 +14,14 @@
 #include "ToolbarBackend.h"
 #include "FuncRequest.h"
 #include "Lexer.h"
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "LyXAction.h"
 #include "support/lstrings.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
+
 #include <boost/bind.hpp>
+
 #include <algorithm>
 
 using namespace std;

src/Trans.cpp

@@ -17,16 +17,16 @@
 #include "BufferView.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "support/debug.h"
 #include "Lexer.h"
 #include "LyXRC.h"
 #include "Text.h"
 
+#include "support/convert.h"
+#include "support/debug.h"
+#include "support/docstream.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "support/convert.h"
-#include "support/docstream.h"
 
 using namespace std;
 using namespace lyx::support;

src/Undo.cpp

@@ -20,7 +20,6 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "buffer_funcs.h"
-#include "support/debug.h"
 #include "DocIterator.h"
 #include "Paragraph.h"
 #include "ParagraphList.h"
@@ -31,6 +30,7 @@
 
 #include "insets/Inset.h"
 
+#include "support/debug.h"
 #include "support/limited_stack.h"
 
 #include <algorithm>

src/VCBackend.cpp

@@ -11,12 +11,12 @@
 #include <config.h>
 
 #include "VCBackend.h"
-#include "support/debug.h"
 #include "Buffer.h"
 
-#include "support/Path.h"
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
+#include "support/Path.h"
 #include "support/Systemcall.h"
 
 #include <boost/regex.hpp>

src/frontends/qt4/Action.cpp

@@ -12,13 +12,13 @@
 
 #include "Action.h"
 
-#include "support/debug.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "GuiView.h"
 #include "LyXFunc.h"
 #include "qt_helpers.h"
 
+#include "support/debug.h"
 #include "support/lstrings.h"
 
 namespace lyx {

src/frontends/qt4/ButtonController.cpp

@@ -11,9 +11,11 @@
 #include <config.h>
 
 #include "ButtonController.h"
-#include "support/debug.h"
+
 #include "qt_helpers.h"
 
+#include "support/debug.h"
+
 #include <QPushButton>
 #include <QLineEdit>
 #include <QLabel>

src/frontends/qt4/ButtonPolicy.cpp

@@ -11,6 +11,7 @@
 #include <config.h>
 
 #include "ButtonPolicy.h"
+
 #include "support/debug.h"
 
 #include <iostream>

src/frontends/qt4/GuiAlert.cpp

@@ -16,11 +16,11 @@
 #include "frontends/Application.h"
 
 #include "qt_helpers.h"
-#include "support/debug.h"
 #include "LyX.h" // for lyx::use_gui
 #include "ui_AskForTextUi.h"
 #include "support/gettext.h"
 
+#include "support/debug.h"
 #include "support/docstring.h"
 #include "support/lstrings.h"
 

src/frontends/qt4/GuiApplication.cpp

@@ -23,17 +23,9 @@
 #include "frontends/FontLoader.h"
 #include "frontends/FontMetrics.h"
 
-#include "support/ExceptionMessage.h"
-#include "support/FileName.h"
-#include "support/ForkedCalls.h"
-#include "support/lstrings.h"
-#include "support/os.h"
-#include "support/Package.h"
-
 #include "Buffer.h"
 #include "BufferList.h"
 #include "BufferView.h"
-#include "support/debug.h"
 #include "Font.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
@@ -44,6 +36,14 @@
 #include "Session.h"
 #include "version.h"
 
+#include "support/debug.h"
+#include "support/ExceptionMessage.h"
+#include "support/FileName.h"
+#include "support/ForkedCalls.h"
+#include "support/lstrings.h"
+#include "support/os.h"
+#include "support/Package.h"
+
 #include <QApplication>
 #include <QClipboard>
 #include <QEventLoop>

src/frontends/qt4/GuiBibtex.cpp

@@ -17,7 +17,6 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "support/debug.h"
 #include "ui_BibtexAddUi.h"
 #include "qt_helpers.h"
 #include "Validator.h"
@@ -25,10 +24,11 @@
 
 #include "ButtonPolicy.h"
 
+#include "support/debug.h"
+#include "support/FileFilterList.h"
 #include "support/filetools.h" // changeExtension
 #include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/FileFilterList.h"
 
 #include <QPushButton>
 #include <QListWidget>

src/frontends/qt4/GuiCitation.cpp

@@ -15,23 +15,23 @@
 
 #include "GuiCitation.h"
 
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "qt_helpers.h"
 #include "Buffer.h"
 #include "BufferParams.h"
 
-#include "support/lstrings.h"
-#include "support/docstring.h"
-
 #include "insets/InsetCommand.h"
 
-#include <vector>
-#include <string>
+#include "support/debug.h"
+#include "support/docstring.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
 #include <QCloseEvent>
 #include <QShowEvent>
 
+#include <vector>
+#include <string>
+
 #undef KeyPress
 
 #include <boost/regex.hpp>

src/frontends/qt4/GuiClipboard.cpp

@@ -14,13 +14,14 @@
 
 #include "FileDialog.h"
 
+#include "GuiClipboard.h"
+#include "qt_helpers.h"
+
 #include "frontends/alert.h"
 
 #include "Buffer.h"
 #include "BufferView.h"
 #include "Cursor.h"
-#include "GuiClipboard.h"
-#include "qt_helpers.h"
 
 #include "support/convert.h"
 #include "support/debug.h"

src/frontends/qt4/GuiDocument.cpp

@@ -42,7 +42,6 @@
 
 #include "insets/InsetListingsParams.h"
 
-//#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"

src/frontends/qt4/GuiErrorList.cpp

@@ -12,15 +12,15 @@
 
 #include "GuiErrorList.h"
 
-#include "Buffer.h"
-#include "BufferView.h"
-#include "support/debug.h"
-#include "support/gettext.h"
-#include "Text.h"
-#include "ParIterator.h"
-
 #include "qt_helpers.h"
 
+#include "Buffer.h"
+#include "BufferView.h"
+#include "ParIterator.h"
+#include "Text.h"
+
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <QListWidget>

src/frontends/qt4/GuiFontLoader.cpp

@@ -14,10 +14,10 @@
 #include "GuiFontLoader.h"
 #include "qt_helpers.h"
 
-#include "support/debug.h"
 #include "LyXRC.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/Systemcall.h"

src/frontends/qt4/GuiGraphics.cpp

@@ -16,7 +16,6 @@
 
 #include "GuiGraphics.h"
 
-#include "support/debug.h"
 #include "LengthCombo.h"
 #include "Length.h"
 #include "LyXRC.h"
@@ -24,7 +23,6 @@
 #include "Validator.h"
 
 #include "FuncRequest.h"
-#include "support/gettext.h"
 
 #include "graphics/GraphicsCache.h"
 #include "graphics/GraphicsCacheItem.h"
@@ -33,8 +31,10 @@
 #include "insets/InsetGraphicsParams.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/FileFilterList.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Package.h"

src/frontends/qt4/GuiLabel.cpp

@@ -12,9 +12,10 @@
 
 #include "GuiLabel.h"
 
-#include "support/debug.h"
 #include "qt_helpers.h"
 
+#include "support/debug.h"
+
 #include <QLabel>
 #include <QPushButton>
 #include <QLineEdit>

src/frontends/qt4/GuiListings.cpp

@@ -14,11 +14,13 @@
 #include "GuiListings.h"
 
 #include "qt_helpers.h"
+
 #include "FuncRequest.h"
+
 #include "insets/InsetListings.h"
 #include "insets/InsetListingsParams.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 

src/frontends/qt4/GuiMath.cpp

@@ -11,9 +11,11 @@
 #include <config.h>
 
 #include "GuiMath.h"
-#include "support/debug.h"
+
 #include "FuncRequest.h"
 
+#include "support/debug.h"
+
 using namespace std;
 
 namespace lyx {

src/frontends/qt4/GuiNomencl.cpp

@@ -13,9 +13,10 @@
 
 #include "GuiNomencl.h"
 
-#include "support/debug.h"
 #include "qt_helpers.h"
 
+#include "support/debug.h"
+
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>

src/frontends/qt4/GuiPainter.cpp

@@ -16,14 +16,13 @@
 #include "GuiApplication.h"
 #include "GuiFontMetrics.h"
 #include "GuiImage.h"
-
-#include "GuiApplication.h"
 #include "qt_helpers.h"
 
-#include "support/debug.h"
 #include "Language.h"
 #include "LyXRC.h"
 
+#include "support/debug.h"
+
 #include <QPixmapCache>
 #include <QTextLayout>
 

src/frontends/qt4/GuiParagraph.cpp

@@ -15,6 +15,8 @@
 
 #include "GuiParagraph.h"
 
+#include "qt_helpers.h"
+
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
@@ -24,7 +26,6 @@
 #include "Lexer.h"
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
-#include "qt_helpers.h"
 #include "Spacing.h"
 
 #include "support/debug.h"

src/frontends/qt4/GuiParagraph.h

@@ -14,15 +14,14 @@
 #ifndef GUIPARAGRAPH_H
 #define GUIPARAGRAPH_H
 
-// Uncomment this if you prefer dock widget
-//#define USE_DOCK_WIDGET
-
-#include "Layout.h"
-#include "ui_ParagraphUi.h"
 #include "DialogView.h"
-#include "ParagraphParameters.h"
 #include "GuiView.h"
 #include "qt_helpers.h"
+#include "ui_ParagraphUi.h"
+
+#include "Layout.h"
+#include "ParagraphParameters.h"
+
 #include "support/debug.h"
 
 #include <QDialog>

src/frontends/qt4/GuiPopupMenu.cpp

@@ -21,8 +21,8 @@
 #include "LyXFunc.h"
 #include "MenuBackend.h"
 
-#include "support/lstrings.h"
 #include "support/debug.h"
+#include "support/lstrings.h"
 
 namespace lyx {
 namespace frontend {

src/frontends/qt4/GuiPrefs.cpp

@@ -20,9 +20,7 @@
 #include "BufferList.h"
 #include "Color.h"
 #include "ConverterCache.h"
-#include "support/debug.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "GuiFontExample.h"
 #include "GuiKeySymbol.h"
 #include "KeyMap.h"
@@ -32,12 +30,14 @@
 #include "paper.h"
 #include "Session.h"
 
+#include "support/debug.h"
+#include "support/FileFilterList.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Package.h"
-#include "support/FileFilterList.h"
 
 #include "graphics/GraphicsTypes.h"
 

src/frontends/qt4/GuiSelection.cpp

@@ -15,8 +15,8 @@
 #include "GuiSelection.h"
 
 #include "qt_helpers.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/lstrings.h"
 
 #include <QApplication>

src/frontends/qt4/GuiSpellchecker.cpp

@@ -20,15 +20,15 @@
 #include "BufferView.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "Language.h"
 #include "LyXRC.h"
 #include "Paragraph.h"
 
-#include "support/textutils.h"
+#include "support/debug.h"
 #include "support/docstring.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/textutils.h"
 
 #include <QListWidgetItem>
 

src/frontends/qt4/GuiTexinfo.cpp

@@ -14,8 +14,8 @@
 #include "GuiTexinfo.h"
 
 #include "FuncRequest.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/FileName.h"
 #include "support/lstrings.h"

src/frontends/qt4/GuiToc.cpp

@@ -25,13 +25,13 @@
 #include "Buffer.h"
 #include "BufferView.h"
 #include "BufferParams.h"
-#include "support/debug.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "TextClass.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 
 #include <algorithm>
 

src/frontends/qt4/GuiToolbar.cpp

@@ -14,21 +14,6 @@
 
 #include <config.h>
 
-#include "Buffer.h"
-#include "BufferParams.h"
-#include "BufferView.h"
-#include "Cursor.h"
-#include "support/debug.h"
-#include "FuncRequest.h"
-#include "FuncStatus.h"
-#include "support/gettext.h"
-#include "IconPalette.h"
-#include "Layout.h"
-#include "LyXFunc.h"
-#include "Paragraph.h"
-#include "TextClass.h"
-#include "ToolbarBackend.h"
-
 #include "GuiView.h"
 #include "GuiCommandBuffer.h"
 #include "GuiToolbar.h"
@@ -36,9 +21,24 @@
 #include "Action.h"
 #include "qt_helpers.h"
 #include "InsertTableWidget.h"
-#include "LyXRC.h"
 
+#include "Buffer.h"
+#include "BufferParams.h"
+#include "BufferView.h"
+#include "Cursor.h"
+#include "FuncRequest.h"
+#include "FuncStatus.h"
+#include "IconPalette.h"
+#include "Layout.h"
+#include "LyXFunc.h"
+#include "LyXRC.h"
+#include "Paragraph.h"
+#include "TextClass.h"
+#include "ToolbarBackend.h"
+
+#include "support/debug.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/lyxalgo.h" // sorted
 

src/frontends/qt4/GuiToolbars.cpp

@@ -20,16 +20,17 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "support/debug.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "Layout.h"
 #include "LyX.h"
 #include "LyXFunc.h"
 #include "TextClass.h"
 #include "ToolbarBackend.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
+
 using namespace std;
 
 namespace lyx {

src/frontends/qt4/qt_helpers.cpp

@@ -17,14 +17,14 @@
 #include "FileDialog.h"
 #include "LengthCombo.h"
 
-#include "support/debug.h"
-#include "support/gettext.h"
+#include "frontends/alert.h"
+
 #include "Language.h"
 #include "Length.h"
 
-#include "frontends/alert.h"
-
+#include "support/debug.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/lyxalgo.h"
 #include "support/os.h"

src/graphics/GraphicsCacheItem.cpp

@@ -17,9 +17,9 @@
 #include "GraphicsImage.h"
 
 #include "ConverterCache.h"
-#include "support/debug.h"
 #include "Format.h"
 
+#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/FileMonitor.h"

src/graphics/GraphicsImage.cpp

@@ -14,6 +14,7 @@
 
 #include "GraphicsImage.h"
 #include "GraphicsParams.h"
+
 #include "support/debug.h"
 
 

src/graphics/GraphicsLoader.cpp

@@ -16,8 +16,8 @@
 #include "GraphicsImage.h"
 #include "GraphicsParams.h"
 #include "GraphicsCache.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/Timeout.h"
 
 #include <boost/bind.hpp>

src/insets/ExternalTemplate.cpp

@@ -13,9 +13,9 @@
 
 #include "ExternalTemplate.h"
 
-#include "support/debug.h"
 #include "Lexer.h"
 
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/Package.h"

src/insets/ExternalTransforms.cpp

@@ -13,7 +13,6 @@
 #include "ExternalTransforms.h"
 
 #include "support/debug.h"
-
 #include "support/lstrings.h"
 #include "support/lyxlib.h" // float_equal
 #include "support/convert.h"

src/insets/InsetBibtex.cpp

@@ -16,11 +16,9 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "DispatchResult.h"
-#include "support/debug.h"
 #include "EmbeddedFiles.h"
 #include "Encoding.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
@@ -28,9 +26,11 @@
 
 #include "frontends/alert.h"
 
+#include "support/debug.h"
 #include "support/ExceptionMessage.h"
 #include "support/docstream.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Path.h"

src/insets/InsetBox.cpp

@@ -19,7 +19,6 @@
 #include "BufferView.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
-#include "support/debug.h"
 #include "FuncStatus.h"
 #include "FuncRequest.h"
 #include "support/gettext.h"
@@ -28,6 +27,7 @@
 #include "MetricsInfo.h"
 #include "TextClass.h"
 
+#include "support/debug.h"
 #include "support/Translator.h"
 
 #include <sstream>

src/insets/InsetCitation.cpp

@@ -15,15 +15,15 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "support/gettext.h"
 #include "EmbeddedFiles.h"
 #include "FuncRequest.h"
 #include "LaTeXFeatures.h"
 
-#include "support/lstrings.h"
+#include "support/debug.h"
 #include "support/docstream.h"
+#include "support/lstrings.h"
 
 #include <algorithm>
 

src/insets/InsetCollapsable.cpp

@@ -18,12 +18,10 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "Dimension.h"
 #include "DispatchResult.h"
 #include "FloatList.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
@@ -35,7 +33,9 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
 
 using namespace std;
 

src/insets/InsetCommandParams.cpp

@@ -27,11 +27,11 @@
 #include "InsetRef.h"
 #include "InsetTOC.h"
 
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "Lexer.h"
 
+#include "support/debug.h"
 #include "support/ExceptionMessage.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/docstream.h"
 

src/insets/InsetERT.cpp

@@ -17,11 +17,9 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "Language.h"
 #include "Layout.h"
 #include "LyXAction.h"
@@ -33,6 +31,8 @@
 
 #include "frontends/alert.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <sstream>

src/insets/InsetExternal.cpp

@@ -19,12 +19,10 @@
 
 #include "Buffer.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "Exporter.h"
 #include "FuncStatus.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "LyXRC.h"
@@ -35,8 +33,10 @@
 
 #include "graphics/PreviewLoader.h"
 
+#include "support/debug.h"
 #include "support/ExceptionMessage.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "support/convert.h"

src/insets/InsetFloat.cpp

@@ -18,18 +18,18 @@
 #include "BufferView.h"
 #include "Counters.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "OutputParams.h"
 #include "TextClass.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/docstream.h"
 #include "support/convert.h"

src/insets/InsetFloatList.cpp

@@ -14,18 +14,18 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
 #include "TocBackend.h"
 #include "TextClass.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <ostream>

src/insets/InsetFoot.cpp

@@ -10,7 +10,6 @@
  */
 
 #include <config.h>
-#include "support/debug.h"
 
 #include "InsetFoot.h"
 
@@ -26,6 +25,7 @@
 #include "TextClass.h"
 #include "TocBackend.h"
 
+#include "support/debug.h"
 #include "support/lstrings.h"
 
 #include <ostream>

src/insets/InsetGraphics.cpp

@@ -55,14 +55,12 @@ TODO
 #include "BufferView.h"
 #include "Converter.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "ErrorList.h"
 #include "Exporter.h"
 #include "Format.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "Length.h"
 #include "Lexer.h"
@@ -75,9 +73,11 @@ TODO
 #include "frontends/alert.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/ExceptionMessage.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
 #include "support/os.h"

src/insets/InsetGraphicsParams.cpp

@@ -13,7 +13,6 @@
 
 #include "InsetGraphicsParams.h"
 
-#include "support/debug.h"
 #include "LyX.h" // for use_gui
 #include "Lexer.h"
 #include "LyXRC.h"
@@ -23,6 +22,7 @@
 #include "graphics/GraphicsTypes.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/lyxlib.h"
 #include "support/lstrings.h"

src/insets/InsetInfo.cpp

@@ -17,7 +17,6 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "support/debug.h"
 #include "FuncRequest.h"
 #include "InsetSpecialChar.h"
 #include "KeyMap.h"
@@ -32,6 +31,7 @@
 
 #include "frontends/Application.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/FileName.h"
 #include "support/gettext.h"

src/insets/InsetLine.cpp

@@ -12,7 +12,6 @@
 
 #include "InsetLine.h"
 
-#include "support/debug.h"
 #include "Dimension.h"
 #include "Font.h"
 #include "MetricsInfo.h"
@@ -20,9 +19,11 @@
 #include "OutputParams.h"
 #include "Text.h"
 
+#include "frontends/Painter.h"
+
+#include "support/debug.h"
 #include "support/docstream.h"
 
-#include "frontends/Painter.h"
 
 
 using namespace std;

src/insets/InsetNewline.cpp

@@ -12,7 +12,6 @@
 
 #include "InsetNewline.h"
 
-#include "support/debug.h"
 #include "Dimension.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
@@ -20,6 +19,7 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
 #include "support/docstring.h"
 #include "support/docstream.h"
 

src/insets/InsetNewpage.cpp

@@ -12,8 +12,6 @@
 
 #include "InsetNewpage.h"
 
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "Text.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
@@ -22,8 +20,10 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
 #include "support/docstring.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
 
 using namespace std;
 

src/insets/InsetOptArg.cpp

@@ -13,9 +13,8 @@
 #include "InsetOptArg.h"
 
 #include "support/debug.h"
-#include "support/gettext.h"
-
 #include "support/docstream.h"
+#include "support/gettext.h"
 
 using namespace std;
 

src/insets/InsetQuotes.cpp

@@ -15,7 +15,6 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "support/debug.h"
 #include "Dimension.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
@@ -27,6 +26,7 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
 #include "support/docstring.h"
 #include "support/docstream.h"
 #include "support/lstrings.h"

src/insets/InsetSpace.cpp

@@ -15,7 +15,6 @@
 
 #include "InsetSpace.h"
 
-#include "support/debug.h"
 #include "Dimension.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
@@ -24,6 +23,7 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 
 using namespace std;

src/insets/InsetSpecialChar.cpp

@@ -14,7 +14,6 @@
 
 #include "InsetSpecialChar.h"
 
-#include "support/debug.h"
 #include "Dimension.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
@@ -23,6 +22,7 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 
 using namespace std;

src/insets/InsetTabular.cpp

@@ -28,11 +28,9 @@
 #include "Counters.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
@@ -46,16 +44,19 @@
 #include "TextClass.h"
 #include "TextMetrics.h"
 
-#include "support/convert.h"
-#include "support/docstream.h"
-#include "support/FileName.h"
-#include "support/lstrings.h"
-
 #include "frontends/alert.h"
 #include "frontends/Clipboard.h"
 #include "frontends/Painter.h"
 #include "frontends/Selection.h"
 
+
+#include "support/convert.h"
+#include "support/debug.h"
+#include "support/docstream.h"
+#include "support/FileName.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
+
 #include <boost/scoped_ptr.hpp>
 
 #include <sstream>

src/insets/InsetText.cpp

@@ -20,11 +20,9 @@
 #include "CoordCache.h"
 #include "CutAndPaste.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "ErrorList.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "InsetList.h"
 #include "Intl.h"
 #include "lyxfind.h"
@@ -49,6 +47,8 @@
 #include "frontends/alert.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <boost/bind.hpp>

src/insets/InsetWrap.cpp

@@ -18,13 +18,11 @@
 #include "BufferView.h"
 #include "Counters.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "OutputParams.h"
@@ -33,6 +31,8 @@
 
 #include "support/convert.h"
 #include "support/docstream.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 
 using namespace std;
 

src/insets/MailInset.cpp

@@ -13,10 +13,11 @@
 #include "MailInset.h"
 
 #include "BufferView.h"
-#include "support/debug.h"
 
 #include "frontends/Application.h"
 
+#include "support/debug.h"
+
 #include <boost/assert.hpp>
 
 using namespace std;

src/lyxfind.cpp

@@ -22,9 +22,7 @@
 #include "buffer_funcs.h"
 #include "BufferView.h"
 #include "Changes.h"
-#include "support/debug.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "Text.h"
 #include "Paragraph.h"
 #include "ParIterator.h"
@@ -32,7 +30,9 @@
 #include "frontends/alert.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 using namespace std;

src/mathed/InsetMath.cpp

@@ -14,10 +14,10 @@
 #include "InsetMath.h"
 #include "MathData.h"
 #include "MathStream.h"
-#include "support/gettext.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
 

src/mathed/InsetMathChar.cpp

@@ -17,14 +17,14 @@
 #include "MathStream.h"
 #include "MetricsInfo.h"
 
-#include "support/debug.h"
 #include "Dimension.h"
 #include "TextPainter.h"
 
-#include "support/lstrings.h"
-
 #include "frontends/FontMetrics.h"
 
+#include "support/debug.h"
+#include "support/lstrings.h"
+
 
 namespace lyx {
 

src/mathed/InsetMathDecoration.cpp

@@ -20,6 +20,7 @@
 #include "MetricsInfo.h"
 
 #include "LaTeXFeatures.h"
+
 #include "support/debug.h"
 
 #include <ostream>

src/mathed/InsetMathDiff.cpp

@@ -13,6 +13,7 @@
 #include "InsetMathDiff.h"
 #include "MathData.h"
 #include "MathStream.h"
+
 #include "support/debug.h"
 
 

src/mathed/InsetMathExInt.cpp

@@ -15,8 +15,8 @@
 #include "MathStream.h"
 #include "MathStream.h"
 #include "InsetMathSymbol.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/docstring.h"
 
 

src/mathed/InsetMathGrid.cpp

@@ -21,15 +21,15 @@
 #include "CutAndPaste.h"
 #include "FuncStatus.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 
 #include "frontends/Clipboard.h"
 #include "frontends/Painter.h"
 
-#include "support/lstrings.h"
+#include "support/debug.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
 #include <sstream>
 

src/mathed/InsetMathHull.cpp

@@ -32,10 +32,8 @@
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "LyXRC.h"
 #include "OutputParams.h"
 #include "ParIterator.h"
@@ -52,6 +50,8 @@
 
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <sstream>

src/mathed/InsetMathLim.cpp

@@ -13,6 +13,7 @@
 #include "InsetMathLim.h"
 #include "MathData.h"
 #include "MathStream.h"
+
 #include "support/debug.h"
 
 

src/mathed/InsetMathMBox.cpp

@@ -18,7 +18,6 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "MetricsInfo.h"
 #include "output_latex.h"
 #include "OutputParams.h"
@@ -26,6 +25,8 @@
 #include "TexRow.h"
 #include "TextMetrics.h"
 
+#include "support/debug.h"
+
 using namespace std;
 
 namespace lyx {

src/mathed/InsetMathNest.cpp

@@ -38,25 +38,23 @@
 #include "CoordCache.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "LyXFunc.h"
 #include "LyXRC.h"
-#include "support/gettext.h"
-#include "Text.h"
 #include "OutputParams.h"
-
-#include "support/lstrings.h"
-#include "support/textutils.h"
-#include "support/docstream.h"
+#include "Text.h"
 
 #include "frontends/Clipboard.h"
 #include "frontends/Painter.h"
 #include "frontends/Selection.h"
 
-#include "FuncRequest.h"
+#include "support/debug.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
+#include "support/textutils.h"
+#include "support/docstream.h"
 
 #include <sstream>
 

src/mathed/InsetMathRef.cpp

@@ -16,10 +16,8 @@
 #include "LaTeXFeatures.h"
 #include "Buffer.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "MathData.h"
 #include "MathFactory.h"
 #include "MathSupport.h"
@@ -28,6 +26,9 @@
 
 #include "insets/InsetCommand.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
+
 #include <ostream>
 
 using namespace std;