Fix includes

2024-08-27 03:30:20 +00:00 · 2014-10-08 13:37:04 +02:00 · 2014-10-08 13:37:04 +02:00 · 3b4ee788b8
parent ef8d018a72
commit 3b4ee788b8
44 changed files with 39 additions and 45 deletions
--- 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"

--- 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"

--- 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"
--- 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>
--- 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>
--- 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>
--- 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)
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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>

--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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;
--- 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()
--- 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>

--- 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;
--- 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"
--- 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;
--- 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>

--- 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"
--- 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>

--- 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>

--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- a/ui/pageviewutils.h
+++ b/ui/pageviewutils.h
@ -16,7 +16,6 @@
 #include <qhash.h>
 #include <qtoolbutton.h>

-#include <QIcon>

 #include "core/area.h"

--- a/ui/sidebar.h
+++ b/ui/sidebar.h
@ -11,7 +11,6 @@
 #define _SIDEBAR_H_

 #include <qwidget.h>
-#include <KUrl>

 class QIcon;
 class QListWidgetItem;