Reduce includes in header files (2)

src/BiblioInfo.cpp

@@ -30,6 +30,7 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
+#include "support/FileName.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"

src/frontends/Application.h

@@ -14,8 +14,6 @@
 #include "ColorCode.h"
 #include "FuncCode.h"
 
-#include "KeyModifier.h"
-
 #include "support/strfwd.h"
 
 #include <functional>

src/frontends/qt/ColorCache.cpp

@@ -10,9 +10,11 @@
 
 #include <config.h>
 
+#include "ColorCache.h"
+
 #include "LyXRC.h"
 
-#include "ColorCache.h"
+#include "Color.h"
 #include "ColorSet.h"
 
 namespace lyx {

src/frontends/qt/ColorCache.h

@@ -12,14 +12,14 @@
 #ifndef COLORCACHE_H
 #define COLORCACHE_H
 
-#include "Color.h"
+#include "ColorCode.h"
 
 #include <QColor>
 #include <QPalette>
 
 namespace lyx {
 
-struct RGBColor;
+class Color;
 
 /**
  * Cache from Color to QColor.

src/frontends/qt/FindAndReplace.h

@@ -17,11 +17,12 @@
 #include "qt_helpers.h"
 #include "ui_FindAndReplaceUi.h"
 
-#include "lyxfind.h"
-
 #include <string>
 
 namespace lyx {
+
+class FindAndReplaceOptions;
+
 namespace frontend {
 
 class FindAndReplaceWidget : public QTabWidget, public Ui::FindAndReplaceUi

src/frontends/qt/GuiApplication.h

@@ -13,6 +13,8 @@
 #ifndef GUIAPPLICATION_H
 #define GUIAPPLICATION_H
 
+#include "KeyModifier.h"
+
 #include "frontends/Application.h"
 #include "support/filetools.h"
 

src/frontends/qt/GuiBibtex.cpp

@@ -27,6 +27,7 @@
 #include "Validator.h"
 
 #include "ButtonPolicy.h"
+#include "FancyLineEdit.h"
 
 #include "frontends/alert.h"
 

src/frontends/qt/GuiBibtex.h

@@ -16,7 +16,6 @@
 #include "GuiDialog.h"
 #include "GuiSelectionManager.h"
 #include "ButtonController.h"
-#include "FancyLineEdit.h"
 #include "ui_BibtexUi.h"
 
 #include "insets/InsetCommandParams.h"
@@ -27,6 +26,8 @@
 namespace lyx {
 namespace frontend {
 
+class FancyLineEdit;
+
 class GuiBibtex : public GuiDialog, public Ui::BibtexUi
 {
 	Q_OBJECT

src/frontends/qt/GuiCitation.cpp

@@ -16,6 +16,7 @@
 
 #include "GuiCitation.h"
 
+#include "FancyLineEdit.h"
 #include "GuiApplication.h"
 #include "GuiSelectionManager.h"
 #include "qt_helpers.h"
@@ -23,6 +24,7 @@
 #include "Buffer.h"
 #include "BufferView.h"
 #include "BufferParams.h"
+#include "Citation.h"
 #include "TextClass.h"
 #include "FuncRequest.h"
 

src/frontends/qt/GuiCitation.h

@@ -17,12 +17,10 @@
 
 #include "DialogView.h"
 #include "ui_CitationUi.h"
-#include "FancyLineEdit.h"
 
 #include "insets/InsetCommandParams.h"
 
 #include "BiblioInfo.h"
-#include "Citation.h"
 
 #include <QAbstractListModel>
 #include <QStandardItemModel>
@@ -31,8 +29,11 @@
 
 namespace lyx {
 
+class CitationStyle;
+
 namespace frontend {
 
+class FancyLineEdit;
 class GuiSelectionManager;
 
 

src/frontends/qt/GuiDocument.cpp

@@ -13,7 +13,9 @@
 
 #include "GuiDocument.h"
 
+#include "BulletsModule.h"
 #include "CategorizedCombo.h"
+#include "FancyLineEdit.h"
 #include "GuiApplication.h"
 #include "GuiBranches.h"
 #include "GuiIndices.h"

src/frontends/qt/GuiDocument.h

@@ -14,7 +14,6 @@
 #define GUIDOCUMENT_H
 
 #include "BufferParams.h"
-#include "BulletsModule.h"
 #include "GuiDialog.h"
 #include "GuiIdListModel.h"
 
@@ -51,6 +50,8 @@ namespace support {
 
 namespace frontend {
 
+class BulletsModule;
+class FancyLineEdit;
 class FloatPlacement;
 class GuiBranches;
 class GuiIndices;

src/frontends/qt/GuiLyXFiles.cpp

@@ -15,14 +15,11 @@
 #include "qt_helpers.h"
 
 #include "FileDialog.h"
-#include "Buffer.h"
-#include "BufferParams.h"
 #include "FuncRequest.h"
 #include "Language.h"
 #include "LyXRC.h"
 
 #include "support/environment.h"
-#include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/Messages.h"

src/frontends/qt/GuiPrefs.cpp

@@ -19,6 +19,7 @@
 #include "GuiFontExample.h"
 #include "GuiFontLoader.h"
 #include "GuiKeySymbol.h"
+#include "GuiLyXFiles.h"
 #include "GuiView.h"
 #include "qt_helpers.h"
 #include "Validator.h"

src/frontends/qt/GuiPrefs.h

@@ -15,7 +15,6 @@
 #define GUIPREFS_H
 
 #include "GuiDialog.h"
-#include "GuiLyXFiles.h"
 
 #include "Converter.h"
 #include "Format.h"
@@ -52,6 +51,7 @@ namespace lyx {
 
 namespace frontend {
 
+class GuiLyXFiles;
 class PrefModule;
 
 class GuiPreferences : public GuiDialog, public Ui::PrefsUi

src/frontends/qt/GuiRef.cpp

@@ -20,6 +20,7 @@
 #include "BufferList.h"
 #include "BufferView.h"
 #include "Cursor.h"
+#include "FancyLineEdit.h"
 #include "FuncRequest.h"
 
 #include "qt_helpers.h"

src/frontends/qt/GuiRef.h

@@ -14,7 +14,6 @@
 
 #include "GuiDialog.h"
 #include "ui_RefUi.h"
-#include "FancyLineEdit.h"
 
 #include "insets/InsetCommandParams.h"
 
@@ -25,6 +24,8 @@ class QTreeWidgetItem;
 namespace lyx {
 namespace frontend {
 
+class FancyLineEdit;
+
 class GuiRef : public GuiDialog, public Ui::RefUi
 {
 	Q_OBJECT

src/frontends/qt/GuiView.cpp

@@ -50,6 +50,7 @@
 #include "Format.h"
 #include "FuncStatus.h"
 #include "FuncRequest.h"
+#include "KeySymbol.h"
 #include "Language.h"
 #include "LayoutFile.h"
 #include "Lexer.h"

src/frontends/qt/GuiViewSource.h

@@ -28,6 +28,7 @@ class QTextDocument;
 
 namespace lyx {
 
+class BufferView;
 class TexRow;
 
 

src/frontends/qt/GuiWorkArea.h

@@ -16,7 +16,6 @@
 #include "ui_WorkAreaUi.h"
 
 #include "frontends/WorkArea.h"
-#include "frontends/KeySymbol.h"
 
 #include <QAbstractScrollArea>
 #include <QTabBar>
@@ -30,6 +29,7 @@ namespace lyx {
 class Buffer;
 class BufferView;
 class FuncRequest;
+class KeySymbol;
 
 namespace frontend {
 

src/frontends/qt/Menus.cpp

@@ -29,6 +29,7 @@
 #include "Buffer.h"
 #include "BufferList.h"
 #include "BufferParams.h"
+#include "BufferView.h"
 #include "Converter.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"

src/frontends/qt/Menus.h

@@ -14,13 +14,13 @@
 #define MENUS_H
 
 #include <QMenu>
-#include "BufferView.h"
 
 class QString;
 class QMenuBar;
 
 namespace lyx {
 
+class BufferView;
 class docstring_list;
 class Lexer;
 class FuncRequest;

src/frontends/qt/PanelStack.cpp

@@ -15,6 +15,8 @@
 #include "GuiApplication.h"
 #include "qt_helpers.h"
 
+#include "FancyLineEdit.h"
+
 #include "support/debug.h"
 #include "support/lassert.h"
 

src/frontends/qt/PanelStack.h

@@ -13,8 +13,6 @@
 #ifndef PANELSTACK_H
 #define PANELSTACK_H
 
-#include "FancyLineEdit.h"
-
 #include <QHash>
 #include <QWidget>
 
@@ -27,6 +25,7 @@ class QTreeWidgetItem;
 namespace lyx {
 namespace frontend {
 
+class FancyLineEdit;
 
 class PanelStack : public QWidget
 {

src/frontends/qt/TocWidget.h

@@ -15,7 +15,7 @@
 
 #include "ui_TocUi.h"
 
-#include "FuncRequest.h"
+#include "FuncCode.h"
 
 #include <QString>
 #include <QWidget>
@@ -28,6 +28,7 @@ namespace lyx {
 
 class Cursor;
 class DispatchResult;
+class FuncRequest;
 class FuncStatus;
 class Inset;
 

src/frontends/qt/Toolbars.h

@@ -13,7 +13,7 @@
 #ifndef TOOLBAR_BACKEND_H
 #define TOOLBAR_BACKEND_H
 
-#include "FuncRequest.h"
+#include "support/docstring.h"
 
 #include <vector>
 #include <map>
@@ -22,6 +22,7 @@
 
 namespace lyx {
 
+class FuncRequest;
 class Lexer;
 
 namespace frontend {

src/insets/Inset.h

@@ -24,7 +24,6 @@
 
 #include "support/strfwd.h"
 #include "support/types.h"
-#include "support/FileNameList.h"
 
 #include <climits>
 
@@ -66,6 +65,7 @@ class otexstream;
 
 namespace graphics { class PreviewLoader; }
 
+namespace support {class FileNameList; }
 
 /// returns the InsetCode corresponding to the \c name.
 /// Eg, insetCode("branch") == BRANCH_CODE

src/insets/InsetCitation.cpp

@@ -18,6 +18,7 @@
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "BufferView.h"
+#include "Citation.h"
 #include "DispatchResult.h"
 #include "FuncCode.h"
 #include "FuncRequest.h"

src/insets/InsetCitation.h

@@ -14,10 +14,11 @@
 #define INSET_CITATION_H
 
 #include "InsetCommand.h"
-#include "Citation.h"
 
 namespace lyx {
 
+class CitationStyle;
+
 /////////////////////////////////////////////////////////////////////////
 //
 // InsetCitation

src/insets/InsetCollapsible.cpp

@@ -35,6 +35,7 @@
 
 #include "support/debug.h"
 #include "support/docstream.h"
+#include "support/FileName.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"