diff --git a/autotests/format/FormatTest.cpp b/autotests/format/FormatTest.cpp --- a/autotests/format/FormatTest.cpp +++ b/autotests/format/FormatTest.cpp @@ -31,7 +31,6 @@ #include "KReportItemLine.h" #include "KReportDesignerItemRectBase.h" #include "KReportUnit.h" -#include #include #include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -295,7 +295,6 @@ KReportZoomMode KReportDesignerSectionDetail KReportDesignerSection - KReportDpi KReportZoomHandler KReportDesignerItemBase KReportDesignerSectionDetailGroup diff --git a/src/common/KReportDocument.cpp b/src/common/KReportDocument.cpp --- a/src/common/KReportDocument.cpp +++ b/src/common/KReportDocument.cpp @@ -19,7 +19,7 @@ #include "KReportUnit.h" #include "KReportDetailSectionData.h" #include "KReportItemBase.h" -#include "KReportDpi.h" +#include "KReportDpi_p.h" #include "KReportPageSize.h" #include diff --git a/src/common/KReportItemBase.h b/src/common/KReportItemBase.h --- a/src/common/KReportItemBase.h +++ b/src/common/KReportItemBase.h @@ -20,7 +20,7 @@ #include "config-kreport.h" #include "kreport_export.h" -#include "KReportDpi.h" +#include "KReportDpi_p.h" #include "KReportUnit.h" #include diff --git a/src/renderer/KReportPage.cpp b/src/renderer/KReportPage.cpp --- a/src/renderer/KReportPage.cpp +++ b/src/renderer/KReportPage.cpp @@ -20,7 +20,7 @@ #include "KReportRendererBase.h" #include "KReportUnit.h" #include "KReportRenderObjects.h" -#include "KReportDpi.h" +#include "KReportDpi_p.h" #include "kreport_debug.h" #include diff --git a/src/renderer/KReportPreRenderer.cpp b/src/renderer/KReportPreRenderer.cpp --- a/src/renderer/KReportPreRenderer.cpp +++ b/src/renderer/KReportPreRenderer.cpp @@ -28,7 +28,7 @@ #include "KReportDetailSectionData.h" #include "KReportLabelSizeInfo.h" #include "KReportPageSize.h" -#include "KReportDpi.h" +#include "KReportDpi_p.h" #ifdef KREPORT_SCRIPTING #include "scripting/KReportScriptHandler.h" diff --git a/src/renderer/KReportPrintRenderer_p.cpp b/src/renderer/KReportPrintRenderer_p.cpp --- a/src/renderer/KReportPrintRenderer_p.cpp +++ b/src/renderer/KReportPrintRenderer_p.cpp @@ -20,7 +20,7 @@ #include "kreport_debug.h" #include "KReportRenderObjects.h" #include "KReportPageSize.h" -#include "KReportDpi.h" +#include "KReportDpi_p.h" #include #include diff --git a/src/wrtembed/KReportDesigner.cpp b/src/wrtembed/KReportDesigner.cpp --- a/src/wrtembed/KReportDesigner.cpp +++ b/src/wrtembed/KReportDesigner.cpp @@ -29,7 +29,7 @@ #include "KReportRuler_p.h" #include "KReportZoomHandler.h" #include "KReportPageSize.h" -#include "KReportDpi.h" +#include "KReportDpi_p.h" #include "KReportUtils.h" #include "KReportPluginInterface.h" #include "KReportPluginManager.h" diff --git a/src/wrtembed/KReportDesignerItemRectBase.cpp b/src/wrtembed/KReportDesignerItemRectBase.cpp --- a/src/wrtembed/KReportDesignerItemRectBase.cpp +++ b/src/wrtembed/KReportDesignerItemRectBase.cpp @@ -20,7 +20,7 @@ #include "KReportDesignerSectionView.h" #include "KReportDesigner.h" #include "KReportDesignerSectionScene.h" -#include "KReportDpi.h" +#include "KReportDpi_p.h" #include #include diff --git a/src/wrtembed/KReportDesignerSection.cpp b/src/wrtembed/KReportDesignerSection.cpp --- a/src/wrtembed/KReportDesignerSection.cpp +++ b/src/wrtembed/KReportDesignerSection.cpp @@ -30,7 +30,7 @@ #include "KReportDesignerItemLine.h" #include "KReportRuler_p.h" #include "KReportZoomHandler.h" -#include "KReportDpi.h" +#include "KReportDpi_p.h" #include "KReportPluginMetaData.h" #include "kreport_debug.h" diff --git a/src/wrtembed/KReportDesignerSectionScene.cpp b/src/wrtembed/KReportDesignerSectionScene.cpp --- a/src/wrtembed/KReportDesignerSectionScene.cpp +++ b/src/wrtembed/KReportDesignerSectionScene.cpp @@ -20,7 +20,7 @@ #include "KReportDesignerItemRectBase.h" #include "KReportDesigner.h" #include "KReportLabelSizeInfo.h" -#include "KReportDpi.h" +#include "KReportDpi_p.h" #include "kreport_debug.h" #include diff --git a/src/wrtembed/KReportDpi.cpp b/src/wrtembed/KReportDpi.cpp --- a/src/wrtembed/KReportDpi.cpp +++ b/src/wrtembed/KReportDpi.cpp @@ -19,7 +19,7 @@ * Boston, MA 02110-1301, USA. */ -#include "KReportDpi.h" +#include "KReportDpi_p.h" #ifdef Q_WS_X11 #include diff --git a/src/wrtembed/KReportDpi.h b/src/wrtembed/KReportDpi_p.h rename from src/wrtembed/KReportDpi.h rename to src/wrtembed/KReportDpi_p.h --- a/src/wrtembed/KReportDpi.h +++ b/src/wrtembed/KReportDpi_p.h @@ -22,20 +22,17 @@ #ifndef KREPORT_DPI_h #define KREPORT_DPI_h - -#include "kreport_export.h" - /** * Singleton to store user-overwritten DPI information. */ namespace KReportDpi { - KREPORT_EXPORT int dpiX(); + int dpiX(); - KREPORT_EXPORT int dpiY(); + int dpiY(); /// @internal, for KoApplication - KREPORT_EXPORT void setDpi(int x, int y); + void setDpi(int x, int y); } #endif // KREPORT_DPI_h diff --git a/src/wrtembed/KReportZoomHandler.cpp b/src/wrtembed/KReportZoomHandler.cpp --- a/src/wrtembed/KReportZoomHandler.cpp +++ b/src/wrtembed/KReportZoomHandler.cpp @@ -21,7 +21,7 @@ #include "KReportZoomHandler.h" #include "KReportUnit.h" // for POINT_TO_INCH -#include "KReportDpi.h" +#include "KReportDpi_p.h" #include #include