summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2014-10-08 11:37:04 (GMT)
committerMontel Laurent <montel@kde.org>2014-10-08 11:37:04 (GMT)
commit3b4ee788b8b25183ab61882d379c0fe818d1d6a0 (patch)
tree79c8cc9bce0aabc3a898e159441121b9e44107c5
parentef8d018a721eeff205740f271cc8e83a14bb0fb0 (diff)
Fix includes
-rw-r--r--conf/dlgeditor.cpp2
-rw-r--r--conf/dlgpresentation.cpp2
-rw-r--r--core/action.cpp2
-rw-r--r--generators/chm/generator_chm.cpp2
-rw-r--r--generators/comicbook/document.cpp2
-rw-r--r--generators/comicbook/generator_comicbook.cpp2
-rw-r--r--generators/comicbook/unrar.cpp2
-rw-r--r--generators/djvu/generator_djvu.cpp2
-rw-r--r--generators/djvu/kdjvu.cpp2
-rw-r--r--generators/dvi/TeXFontDefinition.cpp2
-rw-r--r--generators/dvi/TeXFont_PFB.cpp2
-rw-r--r--generators/dvi/TeXFont_PK.cpp2
-rw-r--r--generators/dvi/dviFile.cpp2
-rw-r--r--generators/dvi/dviRenderer.cpp2
-rw-r--r--generators/dvi/dviRenderer_draw.cpp2
-rw-r--r--generators/dvi/dviRenderer_prescan.cpp2
-rw-r--r--generators/dvi/dviexport.cpp2
-rw-r--r--generators/dvi/fontpool.cpp2
-rw-r--r--generators/dvi/generator_dvi.cpp2
-rw-r--r--generators/dvi/pageSize.cpp2
-rw-r--r--generators/dvi/psgs.cpp2
-rw-r--r--generators/dvi/special.cpp2
-rw-r--r--generators/dvi/util.cpp2
-rw-r--r--generators/dvi/vf.cpp2
-rw-r--r--generators/epub/converter.cpp2
-rw-r--r--generators/fax/generator_fax.cpp2
-rw-r--r--generators/fictionbook/converter.cpp2
-rw-r--r--generators/fictionbook/document.cpp2
-rw-r--r--generators/fictionbook/generator_fb.cpp2
-rw-r--r--generators/kimgio/generator_kimgio.cpp2
-rw-r--r--generators/mobipocket/converter.cpp2
-rw-r--r--generators/ooo/converter.cpp2
-rw-r--r--generators/ooo/document.cpp2
-rw-r--r--generators/ooo/generator_ooo.cpp2
-rw-r--r--generators/ooo/styleparser.cpp2
-rw-r--r--generators/plucker/generator_plucker.cpp2
-rw-r--r--generators/poppler/generator_pdf.cpp2
-rw-r--r--generators/tiff/generator_tiff.cpp2
-rw-r--r--generators/xps/generator_xps.cpp2
-rw-r--r--ui/annotwindow.cpp1
-rw-r--r--ui/latexrenderer.cpp1
-rw-r--r--ui/minibar.cpp2
-rw-r--r--ui/pageviewutils.h1
-rw-r--r--ui/sidebar.h1
44 files changed, 39 insertions, 45 deletions
diff --git a/conf/dlgeditor.cpp b/conf/dlgeditor.cpp
index 18e9c26..e9c9011 100644
--- a/conf/dlgeditor.cpp
+++ b/conf/dlgeditor.cpp
@@ -11,7 +11,7 @@
#include "core/texteditors_p.h"
-#include <klocale.h>
+#include <klocalizedstring.h>
#include "ui_dlgeditorbase.h"
diff --git a/conf/dlgpresentation.cpp b/conf/dlgpresentation.cpp
index 4e77084..35e8bcc 100644
--- a/conf/dlgpresentation.cpp
+++ b/conf/dlgpresentation.cpp
@@ -14,7 +14,7 @@
#include <qapplication.h>
#include <qdesktopwidget.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include "settings.h"
diff --git a/core/action.cpp b/core/action.cpp
index b89ab14..b6b1947 100644
--- a/core/action.cpp
+++ b/core/action.cpp
@@ -10,7 +10,7 @@
#include "action.h"
// kde includes
-#include <klocale.h>
+#include <KLocalizedString>
// local includes
#include "document.h"
diff --git a/generators/chm/generator_chm.cpp b/generators/chm/generator_chm.cpp
index 9384ca5..fec8c82 100644
--- a/generators/chm/generator_chm.cpp
+++ b/generators/chm/generator_chm.cpp
@@ -18,7 +18,7 @@
#include <KAboutData>
#include <khtml_part.h>
#include <khtmlview.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include <kurl.h>
#include <dom/html_misc.h>
#include <dom/dom_node.h>
diff --git a/generators/comicbook/document.cpp b/generators/comicbook/document.cpp
index 794441a..8e27717 100644
--- a/generators/comicbook/document.cpp
+++ b/generators/comicbook/document.cpp
@@ -13,7 +13,7 @@
#include <QtGui/QImage>
#include <QtGui/QImageReader>
-#include <klocale.h>
+#include <KLocalizedString>
#include <QMimeType>
#include <QMimeDatabase>
#include <kzip.h>
diff --git a/generators/comicbook/generator_comicbook.cpp b/generators/comicbook/generator_comicbook.cpp
index 8cde0d7..dd5b0ff 100644
--- a/generators/comicbook/generator_comicbook.cpp
+++ b/generators/comicbook/generator_comicbook.cpp
@@ -13,7 +13,7 @@
#include <QtPrintSupport/QPrinter>
#include <KAboutData>
-#include <klocale.h>
+#include <KLocalizedString>
#include <core/document.h>
#include <core/page.h>
diff --git a/generators/comicbook/unrar.cpp b/generators/comicbook/unrar.cpp
index 58156eb..1e9b9e9 100644
--- a/generators/comicbook/unrar.cpp
+++ b/generators/comicbook/unrar.cpp
@@ -16,7 +16,7 @@
#include <QtCore/qloggingcategory.h>
#include <kglobal.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include <kstandarddirs.h>
#include <ktempdir.h>
#if !defined(Q_OS_WIN)
diff --git a/generators/djvu/generator_djvu.cpp b/generators/djvu/generator_djvu.cpp
index 4656084..ccd1a90 100644
--- a/generators/djvu/generator_djvu.cpp
+++ b/generators/djvu/generator_djvu.cpp
@@ -27,7 +27,7 @@
#include <KAboutData>
#include <QtCore/QDebug>
-#include <klocale.h>
+#include <KLocalizedString>
#include <qtemporaryfile.h>
#include <KLocalizedString>
#include <QDir>
diff --git a/generators/djvu/kdjvu.cpp b/generators/djvu/kdjvu.cpp
index a6df08c..09b5335 100644
--- a/generators/djvu/kdjvu.cpp
+++ b/generators/djvu/kdjvu.cpp
@@ -19,7 +19,7 @@
#include <qstring.h>
#include <QtCore/QDebug>
-#include <klocale.h>
+#include <KLocalizedString>
#include <libdjvu/ddjvuapi.h>
#include <libdjvu/miniexp.h>
diff --git a/generators/dvi/TeXFontDefinition.cpp b/generators/dvi/TeXFontDefinition.cpp
index 6cc2c04..b560297 100644
--- a/generators/dvi/TeXFontDefinition.cpp
+++ b/generators/dvi/TeXFontDefinition.cpp
@@ -12,7 +12,7 @@
#include "xdvi.h"
#include "debug_dvi.h"
-#include <klocale.h>
+#include <KLocalizedString>
#include <QtCore/qloggingcategory.h>
#include <QFile>
diff --git a/generators/dvi/TeXFont_PFB.cpp b/generators/dvi/TeXFont_PFB.cpp
index a6f5dcd..8693e21 100644
--- a/generators/dvi/TeXFont_PFB.cpp
+++ b/generators/dvi/TeXFont_PFB.cpp
@@ -18,7 +18,7 @@
#include "debug_dvi.h"
#include "debug_dvi.h"
-#include <klocale.h>
+#include <KLocalizedString>
#include <QtCore/qloggingcategory.h>
#include <QImage>
diff --git a/generators/dvi/TeXFont_PK.cpp b/generators/dvi/TeXFont_PK.cpp
index 809756c..2ffd57d 100644
--- a/generators/dvi/TeXFont_PK.cpp
+++ b/generators/dvi/TeXFont_PK.cpp
@@ -57,7 +57,7 @@
#include "debug_dvi.h"
#include "xdvi.h"
-#include <klocale.h>
+#include <KLocalizedString>
#include <QFile>
#include <QImage>
diff --git a/generators/dvi/dviFile.cpp b/generators/dvi/dviFile.cpp
index c63f9ac..cafeb1d 100644
--- a/generators/dvi/dviFile.cpp
+++ b/generators/dvi/dviFile.cpp
@@ -59,7 +59,7 @@
#include "debug_dvi.h"
#include "pageSize.h"
-#include <klocale.h>
+#include <KLocalizedString>
#include <QtCore/qloggingcategory.h>
#include <QProcess>
diff --git a/generators/dvi/dviRenderer.cpp b/generators/dvi/dviRenderer.cpp
index 2a7b592..74b9c31 100644
--- a/generators/dvi/dviRenderer.cpp
+++ b/generators/dvi/dviRenderer.cpp
@@ -26,7 +26,7 @@
#include <QTime>
#include <kconfig.h>
#include <kglobal.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include <QMimeType>
#include <QMimeDatabase>
#include <kstandarddirs.h>
diff --git a/generators/dvi/dviRenderer_draw.cpp b/generators/dvi/dviRenderer_draw.cpp
index db99d78..0f8079e 100644
--- a/generators/dvi/dviRenderer_draw.cpp
+++ b/generators/dvi/dviRenderer_draw.cpp
@@ -66,7 +66,7 @@
#include "textBox.h"
#include "xdvi.h"
-#include <klocale.h>
+#include <KLocalizedString>
#include <QPainter>
#include <QtCore/qloggingcategory.h>
diff --git a/generators/dvi/dviRenderer_prescan.cpp b/generators/dvi/dviRenderer_prescan.cpp
index 3db0a65..ba0e41b 100644
--- a/generators/dvi/dviRenderer_prescan.cpp
+++ b/generators/dvi/dviRenderer_prescan.cpp
@@ -16,7 +16,7 @@
#include "psgs.h"
#include "TeXFont.h"
-#include <klocale.h>
+#include <KLocalizedString>
#include <QMimeType>
#include <QMimeDatabase>
#include <kprocess.h>
diff --git a/generators/dvi/dviexport.cpp b/generators/dvi/dviexport.cpp
index c7ed698..f7404ac 100644
--- a/generators/dvi/dviexport.cpp
+++ b/generators/dvi/dviexport.cpp
@@ -27,7 +27,7 @@
#include <KStandardDirs>
#include <kfiledialog.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include <kmessagebox.h>
#include <kprocess.h>
#include <ktemporaryfile.h>
diff --git a/generators/dvi/fontpool.cpp b/generators/dvi/fontpool.cpp
index 55b5234..2b65db5 100644
--- a/generators/dvi/fontpool.cpp
+++ b/generators/dvi/fontpool.cpp
@@ -11,7 +11,7 @@
#include "debug_dvi.h"
#include "TeXFont.h"
-#include <klocale.h>
+#include <KLocalizedString>
#include <QApplication>
#include <QPainter>
diff --git a/generators/dvi/generator_dvi.cpp b/generators/dvi/generator_dvi.cpp
index b35d457..c19e074 100644
--- a/generators/dvi/generator_dvi.cpp
+++ b/generators/dvi/generator_dvi.cpp
@@ -35,7 +35,7 @@
#include <KAboutData>
#include <QtCore/QDebug>
-#include <klocale.h>
+#include <KLocalizedString>
#ifdef DVI_OPEN_BUSYLOOP
#ifdef Q_OS_UNIX
diff --git a/generators/dvi/pageSize.cpp b/generators/dvi/pageSize.cpp
index c15fb62..4b18bfa 100644
--- a/generators/dvi/pageSize.cpp
+++ b/generators/dvi/pageSize.cpp
@@ -13,7 +13,7 @@
#include "length.h"
#include <kglobal.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include <QtCore/qloggingcategory.h>
diff --git a/generators/dvi/psgs.cpp b/generators/dvi/psgs.cpp
index 969123e..7b49cca 100644
--- a/generators/dvi/psgs.cpp
+++ b/generators/dvi/psgs.cpp
@@ -16,7 +16,7 @@
#include "pageNumber.h"
#include "debug_dvi.h"
-#include <klocale.h>
+#include <KLocalizedString>
#include <kprocess.h>
#include <ktemporaryfile.h>
#include <kurl.h>
diff --git a/generators/dvi/special.cpp b/generators/dvi/special.cpp
index 2022b79..1d7deda 100644
--- a/generators/dvi/special.cpp
+++ b/generators/dvi/special.cpp
@@ -16,7 +16,7 @@
#include "psgs.h"
//#include "renderedDocumentPage.h"
-#include <klocale.h>
+#include <KLocalizedString>
#include <QMimeType>
#include <QMimeDatabase>
diff --git a/generators/dvi/util.cpp b/generators/dvi/util.cpp
index 4df24a9..50b30cf 100644
--- a/generators/dvi/util.cpp
+++ b/generators/dvi/util.cpp
@@ -56,7 +56,7 @@
#include "xdvi.h"
#include "debug_dvi.h"
-#include <klocale.h>
+#include <KLocalizedString>
#include <kmessagebox.h>
#include <cstdlib>
diff --git a/generators/dvi/vf.cpp b/generators/dvi/vf.cpp
index dc5c0e8..da990fc 100644
--- a/generators/dvi/vf.cpp
+++ b/generators/dvi/vf.cpp
@@ -32,7 +32,7 @@
#include "debug_dvi.h"
#include "xdvi.h"
-#include <klocale.h>
+#include <KLocalizedString>
#include <cstdio>
#include <cstdlib>
diff --git a/generators/epub/converter.cpp b/generators/epub/converter.cpp
index 1e7dc9b..ac0338c 100644
--- a/generators/epub/converter.cpp
+++ b/generators/epub/converter.cpp
@@ -17,7 +17,7 @@
#include <QApplication> // Because of the HACK
#include <QtCore/QDebug>
-#include <klocale.h>
+#include <KLocalizedString>
#include <KStandardDirs>
#include <core/action.h>
diff --git a/generators/fax/generator_fax.cpp b/generators/fax/generator_fax.cpp
index 7d189e1..d6d770d 100644
--- a/generators/fax/generator_fax.cpp
+++ b/generators/fax/generator_fax.cpp
@@ -13,7 +13,7 @@
#include <QtPrintSupport/QPrinter>
#include <KAboutData>
-#include <klocale.h>
+#include <KLocalizedString>
#include <core/document.h>
#include <core/page.h>
diff --git a/generators/fictionbook/converter.cpp b/generators/fictionbook/converter.cpp
index 353cc56..a492222 100644
--- a/generators/fictionbook/converter.cpp
+++ b/generators/fictionbook/converter.cpp
@@ -19,7 +19,7 @@
#include <QtXml/QDomText>
#include <kglobal.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include <core/action.h>
#include <core/document.h>
diff --git a/generators/fictionbook/document.cpp b/generators/fictionbook/document.cpp
index e943566..1da2f51 100644
--- a/generators/fictionbook/document.cpp
+++ b/generators/fictionbook/document.cpp
@@ -11,7 +11,7 @@
#include <QtCore/QFile>
-#include <klocale.h>
+#include <KLocalizedString>
#include <kzip.h>
using namespace FictionBook;
diff --git a/generators/fictionbook/generator_fb.cpp b/generators/fictionbook/generator_fb.cpp
index 98e72d6..d2550a2 100644
--- a/generators/fictionbook/generator_fb.cpp
+++ b/generators/fictionbook/generator_fb.cpp
@@ -12,7 +12,7 @@
#include "converter.h"
#include <KAboutData>
-#include <klocale.h>
+#include <KLocalizedString>
#include <kconfigdialog.h>
static KAboutData createAboutData()
diff --git a/generators/kimgio/generator_kimgio.cpp b/generators/kimgio/generator_kimgio.cpp
index 484ac66..04cf464 100644
--- a/generators/kimgio/generator_kimgio.cpp
+++ b/generators/kimgio/generator_kimgio.cpp
@@ -23,7 +23,7 @@
#include <kactioncollection.h>
#include <QIcon>
#include <kimageio.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include <kexiv2/kexiv2.h>
diff --git a/generators/mobipocket/converter.cpp b/generators/mobipocket/converter.cpp
index afc077a..36e7147 100644
--- a/generators/mobipocket/converter.cpp
+++ b/generators/mobipocket/converter.cpp
@@ -17,7 +17,7 @@
#include <QtCore/QDebug>
#include <QtCore/QFile>
-#include <klocale.h>
+#include <KLocalizedString>
#include <core/action.h>
using namespace Mobi;
diff --git a/generators/ooo/converter.cpp b/generators/ooo/converter.cpp
index 181176a..e34f393 100644
--- a/generators/ooo/converter.cpp
+++ b/generators/ooo/converter.cpp
@@ -25,7 +25,7 @@
#include <core/document.h>
#include <core/utils.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include "document.h"
#include "styleinformation.h"
diff --git a/generators/ooo/document.cpp b/generators/ooo/document.cpp
index 6874cdc..1a12a45 100644
--- a/generators/ooo/document.cpp
+++ b/generators/ooo/document.cpp
@@ -9,7 +9,7 @@
#include "document.h"
-#include <klocale.h>
+#include <KLocalizedString>
#include <kzip.h>
using namespace OOO;
diff --git a/generators/ooo/generator_ooo.cpp b/generators/ooo/generator_ooo.cpp
index 7b75d1c..ad09b2f 100644
--- a/generators/ooo/generator_ooo.cpp
+++ b/generators/ooo/generator_ooo.cpp
@@ -12,7 +12,7 @@
#include "converter.h"
#include <KAboutData>
-#include <klocale.h>
+#include <KLocalizedString>
#include <kconfigdialog.h>
#include <kwallet.h>
diff --git a/generators/ooo/styleparser.cpp b/generators/ooo/styleparser.cpp
index 2795306..fe5a43b 100644
--- a/generators/ooo/styleparser.cpp
+++ b/generators/ooo/styleparser.cpp
@@ -16,7 +16,7 @@
#include <QtXml/QXmlSimpleReader>
#include <kglobal.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include "document.h"
#include "styleinformation.h"
diff --git a/generators/plucker/generator_plucker.cpp b/generators/plucker/generator_plucker.cpp
index 444b93f..afb8672 100644
--- a/generators/plucker/generator_plucker.cpp
+++ b/generators/plucker/generator_plucker.cpp
@@ -16,7 +16,7 @@
#include <QtGui/QTextDocument>
#include <KAboutData>
-#include <klocale.h>
+#include <KLocalizedString>
#include <core/page.h>
diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp
index 2ecd07e..af6a491 100644
--- a/generators/poppler/generator_pdf.cpp
+++ b/generators/poppler/generator_pdf.cpp
@@ -29,7 +29,7 @@
#include <KAboutData>
#include <kconfigdialog.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include <kmessagebox.h>
#include <kglobal.h>
diff --git a/generators/tiff/generator_tiff.cpp b/generators/tiff/generator_tiff.cpp
index ba57d6d..7213de6 100644
--- a/generators/tiff/generator_tiff.cpp
+++ b/generators/tiff/generator_tiff.cpp
@@ -21,7 +21,7 @@
#include <kaboutdata.h>
#include <QtCore/QDebug>
#include <kglobal.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include <core/document.h>
#include <core/page.h>
diff --git a/generators/xps/generator_xps.cpp b/generators/xps/generator_xps.cpp
index c114408..aac12ab 100644
--- a/generators/xps/generator_xps.cpp
+++ b/generators/xps/generator_xps.cpp
@@ -26,7 +26,7 @@
#include <qprinter.h>
#include <KAboutData>
#include <kglobal.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include <kurl.h>
#include <QBuffer>
#include <QImageReader>
diff --git a/ui/annotwindow.cpp b/ui/annotwindow.cpp
index f317b78..df4988e 100644
--- a/ui/annotwindow.cpp
+++ b/ui/annotwindow.cpp
@@ -19,7 +19,6 @@
#include <qframe.h>
#include <qlabel.h>
#include <qlayout.h>
-#include <QPainter>
#include <qpushbutton.h>
#include <qsizegrip.h>
#include <qstyle.h>
diff --git a/ui/latexrenderer.cpp b/ui/latexrenderer.cpp
index c36d799..0b25ccf 100644
--- a/ui/latexrenderer.cpp
+++ b/ui/latexrenderer.cpp
@@ -21,7 +21,6 @@
#include <QFileInfo>
#include <QImage>
#include <qtemporaryfile.h>
-#include <QTextDocument>
#include <QTextStream>
#include "debug_ui.h"
diff --git a/ui/minibar.cpp b/ui/minibar.cpp
index 25e16ff..d10b653 100644
--- a/ui/minibar.cpp
+++ b/ui/minibar.cpp
@@ -17,8 +17,6 @@
#include <qpushbutton.h>
#include <qlabel.h>
#include <qlayout.h>
-#include <QStyleOptionButton>
-#include <QStylePainter>
#include <QtWidgets/QToolButton>
#include <qvalidator.h>
#include <qpainter.h>
diff --git a/ui/pageviewutils.h b/ui/pageviewutils.h
index 2df50c7..ece50eb 100644
--- a/ui/pageviewutils.h
+++ b/ui/pageviewutils.h
@@ -16,7 +16,6 @@
#include <qhash.h>
#include <qtoolbutton.h>
-#include <QIcon>
#include "core/area.h"
diff --git a/ui/sidebar.h b/ui/sidebar.h
index b56f9e9..2c4bfbe 100644
--- a/ui/sidebar.h
+++ b/ui/sidebar.h
@@ -11,7 +11,6 @@
#define _SIDEBAR_H_
#include <qwidget.h>
-#include <KUrl>
class QIcon;
class QListWidgetItem;