From c05523da2b05c4fe48076908d45e5bdc7251b9d3 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Wed, 1 Jun 2011 10:31:44 +0200 Subject: [PATCH] fix #include paths in core headers to other core headers to be relative ... and with double quotes brackets, so they can properly include each other without relying on the compiler include path --- core/action.h | 4 ++-- core/annotations.h | 4 ++-- core/area.h | 4 ++-- core/audioplayer.h | 2 +- core/document.h | 8 ++++---- core/fileprinter.h | 4 ++-- core/fontinfo.h | 2 +- core/form.h | 4 ++-- core/generator.h | 8 ++++---- core/misc.h | 4 ++-- core/movie.h | 4 ++-- core/observer.h | 2 +- core/page.h | 8 ++++---- core/pagesize.h | 2 +- core/pagetransition.h | 2 +- core/sound.h | 2 +- core/sourcereference.h | 2 +- core/textdocumentgenerator.cpp | 8 ++++---- core/textdocumentgenerator.h | 6 +++--- core/textpage.h | 4 ++-- core/utils.h | 4 ++-- interfaces/configinterface.h | 2 +- interfaces/guiinterface.h | 2 +- interfaces/printinterface.h | 2 +- interfaces/saveinterface.h | 2 +- 25 files changed, 48 insertions(+), 48 deletions(-) diff --git a/core/action.h b/core/action.h index c45a13dd8..b45956af2 100644 --- a/core/action.h +++ b/core/action.h @@ -10,8 +10,8 @@ #ifndef _OKULAR_ACTION_H_ #define _OKULAR_ACTION_H_ -#include -#include +#include "global.h" +#include "okular_export.h" #include diff --git a/core/annotations.h b/core/annotations.h index 12bac5448..cf6428604 100644 --- a/core/annotations.h +++ b/core/annotations.h @@ -18,8 +18,8 @@ #include #include -#include -#include +#include "okular_export.h" +#include "area.h" namespace Okular { diff --git a/core/area.h b/core/area.h index c4e800a7a..6c6aef454 100644 --- a/core/area.h +++ b/core/area.h @@ -15,8 +15,8 @@ #include #include -#include -#include +#include "global.h" +#include "okular_export.h" class QPolygonF; class QRect; diff --git a/core/audioplayer.h b/core/audioplayer.h index 3090805fb..7697562ab 100644 --- a/core/audioplayer.h +++ b/core/audioplayer.h @@ -10,7 +10,7 @@ #ifndef _OKULAR_AUDIOPLAYER_H_ #define _OKULAR_AUDIOPLAYER_H_ -#include +#include "okular_export.h" #include diff --git a/core/document.h b/core/document.h index c25942932..587c03cf5 100644 --- a/core/document.h +++ b/core/document.h @@ -11,10 +11,10 @@ #ifndef _OKULAR_DOCUMENT_H_ #define _OKULAR_DOCUMENT_H_ -#include -#include -#include -#include +#include "okular_export.h" +#include "area.h" +#include "global.h" +#include "pagesize.h" #include #include diff --git a/core/fileprinter.h b/core/fileprinter.h index f81ab9b1d..f17e09d24 100644 --- a/core/fileprinter.h +++ b/core/fileprinter.h @@ -17,8 +17,8 @@ #include #include -#include -#include +#include "okular_export.h" +#include "generator.h" class QPrinter; class QSize; diff --git a/core/fontinfo.h b/core/fontinfo.h index 9362fc178..d11b3b0a1 100644 --- a/core/fontinfo.h +++ b/core/fontinfo.h @@ -15,7 +15,7 @@ #include #include -#include +#include "okular_export.h" namespace Okular { diff --git a/core/form.h b/core/form.h index 24e190171..c6e0104e9 100644 --- a/core/form.h +++ b/core/form.h @@ -10,8 +10,8 @@ #ifndef _OKULAR_FORM_H_ #define _OKULAR_FORM_H_ -#include -#include +#include "okular_export.h" +#include "area.h" #include diff --git a/core/generator.h b/core/generator.h index 434416d0e..213e2ad37 100644 --- a/core/generator.h +++ b/core/generator.h @@ -12,10 +12,10 @@ #ifndef _OKULAR_GENERATOR_H_ #define _OKULAR_GENERATOR_H_ -#include -#include -#include -#include +#include "okular_export.h" +#include "fontinfo.h" +#include "global.h" +#include "pagesize.h" #include #include diff --git a/core/misc.h b/core/misc.h index e45e11260..2cfba3c1e 100644 --- a/core/misc.h +++ b/core/misc.h @@ -10,8 +10,8 @@ #ifndef _OKULAR_MISC_H_ #define _OKULAR_MISC_H_ -#include -#include +#include "okular_export.h" +#include "area.h" namespace Okular { diff --git a/core/movie.h b/core/movie.h index 7f7ac1254..f4b64e1d7 100644 --- a/core/movie.h +++ b/core/movie.h @@ -10,8 +10,8 @@ #ifndef _OKULAR_MOVIE_H_ #define _OKULAR_MOVIE_H_ -#include -#include +#include "global.h" +#include "okular_export.h" #include diff --git a/core/observer.h b/core/observer.h index f49980f96..266993ce9 100644 --- a/core/observer.h +++ b/core/observer.h @@ -13,7 +13,7 @@ #include -#include +#include "okular_export.h" namespace Okular { diff --git a/core/page.h b/core/page.h index e42fb0515..67bcf978c 100644 --- a/core/page.h +++ b/core/page.h @@ -12,10 +12,10 @@ #include -#include -#include -#include -#include +#include "okular_export.h" +#include "area.h" +#include "global.h" +#include "textpage.h" class QPixmap; diff --git a/core/pagesize.h b/core/pagesize.h index e92483378..0619f06bd 100644 --- a/core/pagesize.h +++ b/core/pagesize.h @@ -14,7 +14,7 @@ #include #include -#include +#include "okular_export.h" namespace Okular { diff --git a/core/pagetransition.h b/core/pagetransition.h index 119278207..4b6e7f9fe 100644 --- a/core/pagetransition.h +++ b/core/pagetransition.h @@ -10,7 +10,7 @@ #ifndef _OKULAR_PAGETRANSITION_H_ #define _OKULAR_PAGETRANSITION_H_ -#include +#include "okular_export.h" namespace Okular { diff --git a/core/sound.h b/core/sound.h index 23ba8d86f..1019c0105 100644 --- a/core/sound.h +++ b/core/sound.h @@ -10,7 +10,7 @@ #ifndef _OKULAR_SOUND_H_ #define _OKULAR_SOUND_H_ -#include +#include "okular_export.h" #include #include diff --git a/core/sourcereference.h b/core/sourcereference.h index 6b373d993..b767b270a 100644 --- a/core/sourcereference.h +++ b/core/sourcereference.h @@ -10,7 +10,7 @@ #ifndef OKULAR_SOURCEREFERENCE_H #define OKULAR_SOURCEREFERENCE_H -#include +#include "okular_export.h" class QString; diff --git a/core/textdocumentgenerator.cpp b/core/textdocumentgenerator.cpp index 93ed926dc..77ff55278 100644 --- a/core/textdocumentgenerator.cpp +++ b/core/textdocumentgenerator.cpp @@ -23,10 +23,10 @@ #include #endif -#include -#include -#include -#include +#include "action.h" +#include "annotations.h" +#include "page.h" +#include "textpage.h" #include "document.h" diff --git a/core/textdocumentgenerator.h b/core/textdocumentgenerator.h index bf4c8f013..dd75c5c06 100644 --- a/core/textdocumentgenerator.h +++ b/core/textdocumentgenerator.h @@ -10,10 +10,10 @@ #ifndef _OKULAR_TEXTDOCUMENTGENERATOR_H_ #define _OKULAR_TEXTDOCUMENTGENERATOR_H_ -#include +#include "okular_export.h" -#include -#include +#include "document.h" +#include "generator.h" class QTextBlock; class QTextDocument; diff --git a/core/textpage.h b/core/textpage.h index 223ef5191..2bdc09d9f 100644 --- a/core/textpage.h +++ b/core/textpage.h @@ -13,8 +13,8 @@ #include #include -#include -#include +#include "okular_export.h" +#include "global.h" class QMatrix; diff --git a/core/utils.h b/core/utils.h index 9f4326d5d..8d5d5fccb 100644 --- a/core/utils.h +++ b/core/utils.h @@ -10,8 +10,8 @@ #ifndef _OKULAR_UTILS_H_ #define _OKULAR_UTILS_H_ -#include -#include +#include "okular_export.h" +#include "area.h" class QRect; class QImage; diff --git a/interfaces/configinterface.h b/interfaces/configinterface.h index 22fe811ee..43b377c06 100644 --- a/interfaces/configinterface.h +++ b/interfaces/configinterface.h @@ -10,7 +10,7 @@ #ifndef _OKULAR_CONFIGINTERFACE_H_ #define _OKULAR_CONFIGINTERFACE_H_ -#include +#include "../core/okular_export.h" #include diff --git a/interfaces/guiinterface.h b/interfaces/guiinterface.h index 6f105970a..dbfd54b2f 100644 --- a/interfaces/guiinterface.h +++ b/interfaces/guiinterface.h @@ -10,7 +10,7 @@ #ifndef _OKULAR_GUIINTERFACE_H_ #define _OKULAR_GUIINTERFACE_H_ -#include +#include "../core/okular_export.h" #include diff --git a/interfaces/printinterface.h b/interfaces/printinterface.h index c11ec53ba..31ce5baf3 100644 --- a/interfaces/printinterface.h +++ b/interfaces/printinterface.h @@ -10,7 +10,7 @@ #ifndef _OKULAR_PRINTINTERFACE_H_ #define _OKULAR_PRINTINTERFACE_H_ -#include +#include "../core/okular_export.h" #include diff --git a/interfaces/saveinterface.h b/interfaces/saveinterface.h index 22a9cddd3..f55e209bd 100644 --- a/interfaces/saveinterface.h +++ b/interfaces/saveinterface.h @@ -10,7 +10,7 @@ #ifndef _OKULAR_SAVEINTERFACE_H_ #define _OKULAR_SAVEINTERFACE_H_ -#include +#include "../core/okular_export.h" #include