[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [okular] /: Fix minor EBN issues
From: Yuri Chornoivan <null () kde ! org>
Date: 2018-08-31 9:24:21
Message-ID: E1fvffB-0007z4-FW () code ! kde ! org
[Download RAW message or body]
Git commit c04ca1fa96d840a67b1d683065b0512e86886e5f by Yuri Chornoivan.
Committed on 31/08/2018 at 09:23.
Pushed by yurchor into branch 'master'.
Fix minor EBN issues
M +1 -1 autotests/addremoveannotationtest.cpp
M +1 -1 autotests/generatorstest.cpp
M +1 -1 autotests/testingutils.cpp
M +2 -2 conf/editannottooldialog.cpp
M +2 -2 conf/widgetannottools.cpp
M +3 -3 conf/widgetdrawingtools.cpp
M +2 -2 core/action.h
M +2 -2 core/annotations.cpp
M +7 -7 core/annotations.h
M +4 -4 core/annotations_p.h
M +3 -3 core/area.cpp
M +5 -5 core/area.h
M +1 -1 core/audioplayer.cpp
M +1 -1 core/audioplayer.h
M +2 -2 core/chooseenginedialog.cpp
M +1 -1 core/chooseenginedialog_p.h
M +1 -1 core/debug_p.h
M +12 -14 core/document.cpp
M +5 -5 core/document.h
M +5 -5 core/document_p.h
M +1 -1 core/documentcommands_p.h
M +7 -7 core/fileprinter.cpp
M +3 -3 core/fileprinter.h
M +4 -4 core/fontinfo.h
M +1 -1 core/form.cpp
M +1 -1 core/form.h
M +1 -1 core/form_p.h
M +2 -2 core/generator.cpp
M +7 -7 core/generator.h
M +1 -1 core/generator_p.cpp
M +3 -3 core/generator_p.h
M +1 -1 core/global.h
M +1 -1 core/misc.cpp
M +1 -1 core/movie.cpp
M +1 -1 core/movie.h
M +1 -1 core/observer.h
M +10 -10 core/page.cpp
M +1 -1 core/page.h
M +1 -1 core/pagecontroller_p.h
M +3 -3 core/pagesize.h
M +1 -1 core/rotationjob.cpp
M +2 -2 core/rotationjob_p.h
M +1 -1 core/script/executor_kjs.cpp
M +1 -1 core/script/kjs_console.cpp
M +1 -1 core/script/kjs_document.cpp
M +1 -1 core/script/kjs_field.cpp
M +1 -1 core/script/kjs_spell.cpp
M +1 -1 core/scripter.cpp
M +1 -1 core/sound.cpp
M +2 -2 core/sound.h
M +2 -2 core/sourcereference.cpp
M +10 -10 core/textdocumentgenerator.cpp
M +3 -3 core/textdocumentgenerator_p.h
M +2 -0 core/textdocumentsettings_p.h
M +1 -1 core/textpage.cpp
M +2 -2 core/textpage.h
M +4 -4 core/textpage_p.h
M +1 -1 core/tilesmanager.cpp
M +1 -1 core/utils.cpp
M +2 -2 core/view_p.h
M +2 -2 generators/chm/generator_chm.h
M +1 -1 generators/chm/lib/ebook_epub.cpp
M +3 -3 generators/comicbook/debug_comicbook.h
M +4 -4 generators/comicbook/directory.cpp
M +1 -1 generators/comicbook/directory.h
M +3 -3 generators/comicbook/document.cpp
M +1 -1 generators/comicbook/document.h
M +2 -2 generators/comicbook/generator_comicbook.cpp
M +1 -1 generators/comicbook/qnatsort.h
M +6 -6 generators/comicbook/unrar.cpp
M +3 -3 generators/comicbook/unrar.h
M +2 -2 generators/comicbook/unrarflavours.cpp
M +1 -1 generators/comicbook/unrarflavours.h
M +7 -7 generators/djvu/generator_djvu.cpp
M +10 -10 generators/djvu/kdjvu.cpp
M +1 -1 generators/dvi/TeXFontDefinition.cpp
M +1 -1 generators/dvi/TeXFontDefinition.h
M +1 -1 generators/dvi/TeXFont_PFB.cpp
M +1 -1 generators/dvi/TeXFont_TFM.cpp
M +1 -1 generators/dvi/debug_dvi.h
M +1 -1 generators/dvi/dviFile.cpp
M +1 -1 generators/dvi/dviFile.h
M +1 -1 generators/dvi/dviRenderer.h
M +1 -1 generators/dvi/dviRenderer_draw.cpp
M +1 -1 generators/dvi/dviexport.cpp
M +1 -1 generators/dvi/dviexport.h
M +1 -1 generators/dvi/fontEncoding.cpp
M +1 -1 generators/dvi/fontMap.cpp
M +9 -9 generators/dvi/generator_dvi.cpp
M +1 -1 generators/dvi/pageSize.cpp
M +1 -1 generators/dvi/psgs.cpp
M +1 -1 generators/dvi/psgs.h
M +1 -1 generators/dvi/simplePageSize.cpp
M +1 -1 generators/dvi/util.cpp
M +4 -4 generators/epub/converter.cpp
M +1 -2 generators/epub/epubdocument.h
M +3 -2 generators/fax/faxdocument.cpp
M +1 -1 generators/fax/faxdocument.h
M +3 -2 generators/fax/faxexpand.cpp
M +1 -1 generators/fax/faxexpand.h
M +2 -2 generators/fax/generator_fax.cpp
M +1 -1 generators/fax/generator_fax.h
M +8 -8 generators/fictionbook/converter.cpp
M +1 -1 generators/fictionbook/document.cpp
M +4 -4 generators/fictionbook/document.h
M +1 -1 generators/kimgio/generator_kimgio.h
M +3 -3 generators/markdown/debug_md.h
M +7 -7 generators/mobipocket/converter.cpp
M +4 -4 generators/mobipocket/mobidocument.cpp
M +10 -10 generators/ooo/converter.cpp
M +2 -2 generators/ooo/converter.h
M +3 -3 generators/ooo/document.h
M +1 -1 generators/ooo/formatproperty.cpp
M +2 -2 generators/ooo/formatproperty.h
M +4 -4 generators/ooo/manifest.h
M +1 -1 generators/ooo/styleinformation.h
M +5 -5 generators/ooo/styleparser.cpp
M +5 -5 generators/plucker/generator_plucker.cpp
M +1 -1 generators/plucker/generator_plucker.h
M +2 -2 generators/plucker/unpluck/image.cpp
M +16 -17 generators/plucker/unpluck/qunpluck.cpp
M +4 -3 generators/plucker/unpluck/qunpluck.h
M +4 -3 generators/poppler/annots.cpp
M +3 -3 generators/poppler/debug_pdf.h
M +1 -1 generators/poppler/generator_pdf.cpp
M +6 -6 generators/spectre/generator_ghostview.cpp
M +2 -2 generators/tiff/generator_tiff.cpp
M +2 -2 generators/tiff/generator_tiff.h
M +2 -2 generators/txt/converter.cpp
M +3 -3 generators/txt/debug_txt.h
M +2 -2 generators/txt/document.cpp
M +5 -1 generators/txt/document.h
M +2 -2 generators/txt/generator_txt.h
M +1 -1 generators/xps/generator_xps.h
M +1 -1 interfaces/configinterface.h
M +1 -1 interfaces/guiinterface.h
M +1 -1 interfaces/printinterface.h
M +1 -1 interfaces/saveinterface.h
M +2 -2 interfaces/viewerinterface.h
M +1 -1 mobile/app/package/contents/ui/Bookmarks.qml
M +1 -1 mobile/components/test.qml
M +1 -1 mobile/components/testDocumentView.qml
M +4 -3 part.cpp
M +1 -1 shell/main.cpp
M +2 -2 shell/okular_main.cpp
M +5 -0 shell/okular_main.h
M +1 -1 shell/shell.h
M +1 -1 shell/shellutils.cpp
M +13 -13 ui/ktreeviewsearchline.cpp
M +1 -1 ui/latexrenderer.cpp
M +2 -2 ui/pageview.cpp
M +3 -3 ui/presentationwidget.cpp
M +1 -1 ui/snapshottaker.h
https://commits.kde.org/okular/c04ca1fa96d840a67b1d683065b0512e86886e5f
diff --git a/autotests/addremoveannotationtest.cpp b/autotests/addremoveannotationtest.cpp
index 10ce2b766..71931237a 100644
--- a/autotests/addremoveannotationtest.cpp
+++ b/autotests/addremoveannotationtest.cpp
@@ -182,7 +182,7 @@ void AddRemoveAnnotationTest::testRemoveAnnotations()
QString annot1Name = annot1->uniqueName();
annot1->setDisposeDataFunction( TestingUtils::AnnotationDisposeWatcher::disposeAnnotation );
TestingUtils::AnnotationDisposeWatcher::resetDisposedAnnotationName();
- QVERIFY( TestingUtils::AnnotationDisposeWatcher::disposedAnnotationName() == QString() );
+ QVERIFY( TestingUtils::AnnotationDisposeWatcher::disposedAnnotationName().isEmpty() );
m_document->closeDocument();
QVERIFY( TestingUtils::AnnotationDisposeWatcher::disposedAnnotationName() == annot1Name );
}
diff --git a/autotests/generatorstest.cpp b/autotests/generatorstest.cpp
index e8e196211..a8209dc99 100644
--- a/autotests/generatorstest.cpp
+++ b/autotests/generatorstest.cpp
@@ -7,7 +7,7 @@
* (at your option) any later version. *
***************************************************************************/
-#include <QtTest/QTest>
+#include <QTest>
#include <QDirIterator>
#include <QDebug>
#include <QStringList>
diff --git a/autotests/testingutils.cpp b/autotests/testingutils.cpp
index 49ab04b31..59fc3a83b 100644
--- a/autotests/testingutils.cpp
+++ b/autotests/testingutils.cpp
@@ -36,7 +36,7 @@ namespace TestingUtils
return !it1.hasNext() && !it2.hasNext();
}
- QString AnnotationDisposeWatcher::m_disposedAnnotationName = QString();
+ QString AnnotationDisposeWatcher::m_disposedAnnotationName = QString(); \
//krazy:exclude=nullstrassign
QString AnnotationDisposeWatcher::disposedAnnotationName() {
return m_disposedAnnotationName;
diff --git a/conf/editannottooldialog.cpp b/conf/editannottooldialog.cpp
index 18b81e1e5..cf79d83c9 100644
--- a/conf/editannottooldialog.cpp
+++ b/conf/editannottooldialog.cpp
@@ -15,8 +15,8 @@
#include <QListWidgetItem>
#include <QPushButton>
#include <QStackedWidget>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+#include <QDomDocument>
+#include <QDomElement>
#include <KConfigGroup>
#include <QDialogButtonBox>
diff --git a/conf/widgetannottools.cpp b/conf/widgetannottools.cpp
index cbc32064b..f94278a8e 100644
--- a/conf/widgetannottools.cpp
+++ b/conf/widgetannottools.cpp
@@ -18,8 +18,8 @@
#include <QHBoxLayout>
#include <QListWidget>
#include <QListWidgetItem>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+#include <QDomDocument>
+#include <QDomElement>
#include <KConfigGroup>
#include <QDialogButtonBox>
#include <QPushButton>
diff --git a/conf/widgetdrawingtools.cpp b/conf/widgetdrawingtools.cpp
index 0fa0e9b6a..79f1e3f15 100644
--- a/conf/widgetdrawingtools.cpp
+++ b/conf/widgetdrawingtools.cpp
@@ -12,11 +12,11 @@
#include "editdrawingtooldialog.h"
#include <KLocalizedString>
+#include <KMessageBox>
#include <QDebug>
#include <QDomElement>
#include <QListWidgetItem>
-#include <QMessageBox>
#include <QPainter>
// Used to store tools' XML description in m_list's items
@@ -145,7 +145,7 @@ void WidgetDrawingTools::slotAdd()
{
QListWidgetItem * listEntry = m_list->item( i );
if (itemText == listEntry->text()) {
- QMessageBox::information( this, i18n("Duplicated Name"), i18n("There's already a tool with \
that name. Using a default one") ); + KMessageBox::information( this, i18n("There's already a \
tool with that name. Using a default one"), i18n("Duplicated Name") ); itemText = defaultName();
break;
}
@@ -189,7 +189,7 @@ void WidgetDrawingTools::slotEdit()
{
QListWidgetItem * auxListEntry = m_list->item( i );
if (itemText == auxListEntry->text() && auxListEntry != listEntry) {
- QMessageBox::information( this, i18n("Duplicated Name"), i18n("There's already a tool with \
that name. Using a default one") ); + KMessageBox::information( this, i18n("There's already a \
tool with that name. Using a default one"), i18n("Duplicated Name") ); itemText = defaultName();
break;
}
diff --git a/core/action.h b/core/action.h
index b3bb770d9..0b3ad370d 100644
--- a/core/action.h
+++ b/core/action.h
@@ -13,8 +13,8 @@
#include "global.h"
#include "okularcore_export.h"
-#include <QtCore/QString>
-#include <QtCore/QVariant>
+#include <QString>
+#include <QVariant>
namespace Okular {
diff --git a/core/annotations.cpp b/core/annotations.cpp
index d9f3fd439..3ac567063 100644
--- a/core/annotations.cpp
+++ b/core/annotations.cpp
@@ -11,8 +11,8 @@
#include "annotations_p.h"
// qt/kde includes
-#include <QtWidgets/QApplication>
-#include <QtGui/QColor>
+#include <QApplication>
+#include <QColor>
// DBL_MAX
#include <float.h>
diff --git a/core/annotations.h b/core/annotations.h
index d5771c8cc..5c9397cb1 100644
--- a/core/annotations.h
+++ b/core/annotations.h
@@ -10,13 +10,13 @@
#ifndef _OKULAR_ANNOTATIONS_H_
#define _OKULAR_ANNOTATIONS_H_
-#include <QtCore/QString>
-#include <QtCore/QDateTime>
-#include <QtCore/QLinkedList>
-#include <QtCore/QRect>
-#include <QtGui/QFont>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+#include <QString>
+#include <QDateTime>
+#include <QLinkedList>
+#include <QRect>
+#include <QFont>
+#include <QDomDocument>
+#include <QDomElement>
#include "okularcore_export.h"
#include "area.h"
diff --git a/core/annotations_p.h b/core/annotations_p.h
index bb6492de7..25dee11be 100644
--- a/core/annotations_p.h
+++ b/core/annotations_p.h
@@ -14,10 +14,10 @@
#include "annotations.h"
// qt/kde includes
-#include <QtCore/QDateTime>
-#include <QtCore/QString>
-#include <QtCore/QVariant>
-#include <QtGui/QColor>
+#include <QDateTime>
+#include <QString>
+#include <QVariant>
+#include <QColor>
class QTransform;
diff --git a/core/area.cpp b/core/area.cpp
index 327d43099..2a97b6d72 100644
--- a/core/area.cpp
+++ b/core/area.cpp
@@ -9,9 +9,9 @@
#include "area.h"
-#include <QtCore/QRect>
-#include <QtGui/QPolygonF>
-#include <QtCore/QDebug>
+#include <QRect>
+#include <QPolygonF>
+#include <QDebug>
#include <math.h>
diff --git a/core/area.h b/core/area.h
index 4299b003c..964f9da65 100644
--- a/core/area.h
+++ b/core/area.h
@@ -12,11 +12,11 @@
#include <math.h>
-#include <QtCore/QList>
-#include <QtGui/QColor>
-#include <QtGui/QPainterPath>
-#include <QtGui/QTransform>
-#include <QtCore/QDebug>
+#include <QList>
+#include <QColor>
+#include <QPainterPath>
+#include <QTransform>
+#include <QDebug>
#include "global.h"
#include "okularcore_export.h"
diff --git a/core/audioplayer.cpp b/core/audioplayer.cpp
index f66132384..8a8975384 100644
--- a/core/audioplayer.cpp
+++ b/core/audioplayer.cpp
@@ -13,7 +13,7 @@
// qt/kde includes
#include <qbuffer.h>
#include <qdir.h>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <krandom.h>
#include <phonon/path.h>
#include <phonon/audiooutput.h>
diff --git a/core/audioplayer.h b/core/audioplayer.h
index a221b031b..9b28be260 100644
--- a/core/audioplayer.h
+++ b/core/audioplayer.h
@@ -12,7 +12,7 @@
#include "okularcore_export.h"
-#include <QtCore/QObject>
+#include <QObject>
namespace Okular {
diff --git a/core/chooseenginedialog.cpp b/core/chooseenginedialog.cpp
index 2800d989c..06f44db3c 100644
--- a/core/chooseenginedialog.cpp
+++ b/core/chooseenginedialog.cpp
@@ -9,8 +9,8 @@
#include "chooseenginedialog_p.h"
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QLabel>
+#include <QComboBox>
+#include <QLabel>
#include <KLocalizedString>
#include <QDialogButtonBox>
diff --git a/core/chooseenginedialog_p.h b/core/chooseenginedialog_p.h
index 9477ceb0f..f15cacee8 100644
--- a/core/chooseenginedialog_p.h
+++ b/core/chooseenginedialog_p.h
@@ -10,7 +10,7 @@
#ifndef _CHOOSEENGINEDIALOG_H
#define _CHOOSEENGINEDIALOG_H
-#include <QtCore/QStringList>
+#include <QStringList>
#include <QDialog>
#include <QMimeType>
diff --git a/core/debug_p.h b/core/debug_p.h
index ff302e4e8..e62f8f3a4 100644
--- a/core/debug_p.h
+++ b/core/debug_p.h
@@ -11,7 +11,7 @@
#ifndef OKULAR_DEBUG_P_H
#define OKULAR_DEBUG_P_H
-#include <QtCore/qloggingcategory.h>
+#include <qloggingcategory.h>
Q_DECLARE_LOGGING_CATEGORY(OkularCoreDebug)
diff --git a/core/document.cpp b/core/document.cpp
index 5e3c169fc..bffbcf86c 100644
--- a/core/document.cpp
+++ b/core/document.cpp
@@ -27,18 +27,18 @@
#endif
// qt/kde/system includes
-#include <QtCore/QtAlgorithms>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QMap>
-#include <QtCore/qtemporaryfile.h>
-#include <QtCore/QTextStream>
-#include <QtCore/QTimer>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QLabel>
-#include <QtPrintSupport/QPrinter>
-#include <QtPrintSupport/QPrintDialog>
+#include <QtAlgorithms>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QMap>
+#include <qtemporaryfile.h>
+#include <QTextStream>
+#include <QTimer>
+#include <QApplication>
+#include <QLabel>
+#include <QPrinter>
+#include <QPrintDialog>
#include <QStack>
#include <QUndoCommand>
#include <QMimeDatabase>
@@ -94,8 +94,6 @@
#include "form.h"
#include "utils.h"
-#include <memory>
-
#include <config-okular.h>
#if HAVE_MALLOC_TRIM
diff --git a/core/document.h b/core/document.h
index 3354e55ae..7651291b5 100644
--- a/core/document.h
+++ b/core/document.h
@@ -19,11 +19,11 @@
#include "global.h"
#include "pagesize.h"
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
-#include <QtPrintSupport/QPrinter>
-#include <QtXml/QDomDocument>
+#include <QObject>
+#include <QStringList>
+#include <QVector>
+#include <QPrinter>
+#include <QDomDocument>
#include <QMimeType>
#include <QUrl>
diff --git a/core/document_p.h b/core/document_p.h
index 631b86fe8..c47229118 100644
--- a/core/document_p.h
+++ b/core/document_p.h
@@ -16,11 +16,11 @@
#include "synctex/synctex_parser.h"
// qt/kde/system includes
-#include <QtCore/QHash>
-#include <QtCore/QLinkedList>
-#include <QtCore/QMap>
-#include <QtCore/QMutex>
-#include <QtCore/QPointer>
+#include <QHash>
+#include <QLinkedList>
+#include <QMap>
+#include <QMutex>
+#include <QPointer>
#include <QUrl>
#include <KPluginMetaData>
diff --git a/core/documentcommands_p.h b/core/documentcommands_p.h
index 2f4cc2d7a..b17abdc93 100644
--- a/core/documentcommands_p.h
+++ b/core/documentcommands_p.h
@@ -13,7 +13,7 @@
#ifndef _OKULAR_DOCUMENT_COMMANDS_P_H_
#define _OKULAR_DOCUMENT_COMMANDS_P_H_
-#include <QtWidgets/QUndoCommand>
+#include <QUndoCommand>
#include <QDomNode>
#include "area.h"
diff --git a/core/fileprinter.cpp b/core/fileprinter.cpp
index c4d8fb415..cc476a2f2 100644
--- a/core/fileprinter.cpp
+++ b/core/fileprinter.cpp
@@ -12,19 +12,19 @@
#include "fileprinter.h"
-#include <QtPrintSupport/QPrinter>
+#include <QPrinter>
#include <QPrintEngine>
#include <QStringList>
#include <QSize>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtWidgets/QLabel>
-#include <QtGui/QShowEvent>
-#include <QtNetwork/QTcpSocket>
+#include <QFile>
+#include <QFileInfo>
+#include <QLabel>
+#include <QShowEvent>
+#include <QTcpSocket>
#include <KProcess>
#include <KShell>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <QStandardPaths>
#include "debug_p.h"
diff --git a/core/fileprinter.h b/core/fileprinter.h
index a60c2c0f5..8e687bad7 100644
--- a/core/fileprinter.h
+++ b/core/fileprinter.h
@@ -14,9 +14,9 @@
#ifndef FILEPRINTER_H
#define FILEPRINTER_H
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtPrintSupport/QPrinter>
+#include <QList>
+#include <QString>
+#include <QPrinter>
#include "okularcore_export.h"
#include "generator.h"
diff --git a/core/fontinfo.h b/core/fontinfo.h
index 42cfa56f3..b0f7fdb72 100644
--- a/core/fontinfo.h
+++ b/core/fontinfo.h
@@ -10,10 +10,10 @@
#ifndef _OKULAR_FONTINFO_H_
#define _OKULAR_FONTINFO_H_
-#include <QtCore/QList>
-#include <QtCore/QMetaType>
-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QString>
+#include <QList>
+#include <QMetaType>
+#include <QSharedDataPointer>
+#include <QString>
#include "okularcore_export.h"
diff --git a/core/form.cpp b/core/form.cpp
index 2071da0f2..3adceae27 100644
--- a/core/form.cpp
+++ b/core/form.cpp
@@ -11,7 +11,7 @@
#include "form_p.h"
// qt includes
-#include <QtCore/QVariant>
+#include <QVariant>
#include "action.h"
diff --git a/core/form.h b/core/form.h
index bcc41de43..16acb8ffd 100644
--- a/core/form.h
+++ b/core/form.h
@@ -14,7 +14,7 @@
#include "area.h"
#include "annotations.h"
-#include <QtCore/QStringList>
+#include <QStringList>
namespace Okular {
diff --git a/core/form_p.h b/core/form_p.h
index ff4e1211e..7e8389bf2 100644
--- a/core/form_p.h
+++ b/core/form_p.h
@@ -12,7 +12,7 @@
#include "form.h"
-#include <QtCore/QString>
+#include <QString>
namespace Okular {
diff --git a/core/generator.cpp b/core/generator.cpp
index 4c05620d6..f2af4612f 100644
--- a/core/generator.cpp
+++ b/core/generator.cpp
@@ -17,9 +17,9 @@
#include <QApplication>
#include <qeventloop.h>
-#include <QtPrintSupport/QPrinter>
+#include <QPrinter>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <QIcon>
#include <QMimeDatabase>
#include <QTimer>
diff --git a/core/generator.h b/core/generator.h
index 3146b6b07..ceaa43ced 100644
--- a/core/generator.h
+++ b/core/generator.h
@@ -21,13 +21,13 @@
#include "global.h"
#include "pagesize.h"
-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QSizeF>
-#include <QtCore/QString>
-#include <QtCore/QVariant>
-#include <QtCore/QVector>
+#include <QList>
+#include <QObject>
+#include <QSharedDataPointer>
+#include <QSizeF>
+#include <QString>
+#include <QVariant>
+#include <QVector>
#include <QMimeType>
#include <kpluginfactory.h>
diff --git a/core/generator_p.cpp b/core/generator_p.cpp
index f884bf34e..57945c08d 100644
--- a/core/generator_p.cpp
+++ b/core/generator_p.cpp
@@ -9,7 +9,7 @@
#include "generator_p.h"
-#include <QtCore/QDebug>
+#include <QDebug>
#include "fontinfo.h"
#include "generator.h"
diff --git a/core/generator_p.h b/core/generator_p.h
index 8e1f05e47..62858a9eb 100644
--- a/core/generator_p.h
+++ b/core/generator_p.h
@@ -15,9 +15,9 @@
#include "area.h"
-#include <QtCore/QSet>
-#include <QtCore/QThread>
-#include <QtGui/QImage>
+#include <QSet>
+#include <QThread>
+#include <QImage>
class QEventLoop;
class QMutex;
diff --git a/core/global.h b/core/global.h
index 24cef77b4..93d76fe2f 100644
--- a/core/global.h
+++ b/core/global.h
@@ -10,7 +10,7 @@
#ifndef OKULAR_GLOBAL_H
#define OKULAR_GLOBAL_H
-#include <QtCore/QGlobalStatic>
+#include <QGlobalStatic>
namespace Okular {
diff --git a/core/misc.cpp b/core/misc.cpp
index 36b99e28a..17bdb7966 100644
--- a/core/misc.cpp
+++ b/core/misc.cpp
@@ -9,7 +9,7 @@
#include "core/misc.h"
-#include <QtCore/QDebug>
+#include <QDebug>
#include "debug_p.h"
diff --git a/core/movie.cpp b/core/movie.cpp
index 55de744b7..bf792b15f 100644
--- a/core/movie.cpp
+++ b/core/movie.cpp
@@ -16,7 +16,7 @@
#include <qstring.h>
#include <qtemporaryfile.h>
-#include <QtCore/QDebug>
+#include <QDebug>
#include "debug_p.h"
diff --git a/core/movie.h b/core/movie.h
index eecf0f573..1779347ec 100644
--- a/core/movie.h
+++ b/core/movie.h
@@ -14,7 +14,7 @@
#include "global.h"
#include "okularcore_export.h"
-#include <QtCore/QSize>
+#include <QSize>
class QImage;
diff --git a/core/observer.h b/core/observer.h
index 9e01c8707..9474b5192 100644
--- a/core/observer.h
+++ b/core/observer.h
@@ -14,7 +14,7 @@
#ifndef _OKULAR_DOCUMENTOBSERVER_H_
#define _OKULAR_DOCUMENTOBSERVER_H_
-#include <QtCore/QVector>
+#include <QVector>
#include "okularcore_export.h"
diff --git a/core/page.cpp b/core/page.cpp
index 7994cfe9f..c1410a597 100644
--- a/core/page.cpp
+++ b/core/page.cpp
@@ -14,16 +14,16 @@
#include "page_p.h"
// qt/kde includes
-#include <QtCore/QHash>
-#include <QtCore/QSet>
-#include <QtCore/QString>
-#include <QtCore/QVariant>
-#include <QtCore/QUuid>
-#include <QtGui/QPixmap>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+#include <QHash>
+#include <QSet>
+#include <QString>
+#include <QVariant>
+#include <QUuid>
+#include <QPixmap>
+#include <QDomDocument>
+#include <QDomElement>
-#include <QtCore/QDebug>
+#include <QDebug>
// local includes
#include "action.h"
@@ -49,7 +49,7 @@
#include <limits>
#ifdef PAGE_PROFILE
-#include <QtCore/QTime>
+#include <QTime>
#endif
using namespace Okular;
diff --git a/core/page.h b/core/page.h
index 7324b2be4..b33f0e039 100644
--- a/core/page.h
+++ b/core/page.h
@@ -13,7 +13,7 @@
#ifndef _OKULAR_PAGE_H_
#define _OKULAR_PAGE_H_
-#include <QtCore/QLinkedList>
+#include <QLinkedList>
#include "okularcore_export.h"
#include "area.h"
diff --git a/core/pagecontroller_p.h b/core/pagecontroller_p.h
index 84beb5a05..fa1253beb 100644
--- a/core/pagecontroller_p.h
+++ b/core/pagecontroller_p.h
@@ -10,7 +10,7 @@
#ifndef _OKULAR_PAGECONTROLLER_P_H_
#define _OKULAR_PAGECONTROLLER_P_H_
-#include <QtCore/QObject>
+#include <QObject>
#include <threadweaver/queue.h>
diff --git a/core/pagesize.h b/core/pagesize.h
index 96bebeaa8..1ad479f93 100644
--- a/core/pagesize.h
+++ b/core/pagesize.h
@@ -10,9 +10,9 @@
#ifndef _OKULAR_PAGESIZE_H_
#define _OKULAR_PAGESIZE_H_
-#include <QtCore/QList>
-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QString>
+#include <QList>
+#include <QSharedDataPointer>
+#include <QString>
#include "okularcore_export.h"
diff --git a/core/rotationjob.cpp b/core/rotationjob.cpp
index d34862446..e75942b06 100644
--- a/core/rotationjob.cpp
+++ b/core/rotationjob.cpp
@@ -9,7 +9,7 @@
#include "rotationjob_p.h"
-#include <QtGui/QTransform>
+#include <QTransform>
using namespace Okular;
diff --git a/core/rotationjob_p.h b/core/rotationjob_p.h
index b0662f549..d33ab0cef 100644
--- a/core/rotationjob_p.h
+++ b/core/rotationjob_p.h
@@ -10,8 +10,8 @@
#ifndef _OKULAR_ROTATIONJOB_P_H_
#define _OKULAR_ROTATIONJOB_P_H_
-#include <QtGui/QImage>
-#include <QtGui/QTransform>
+#include <QImage>
+#include <QTransform>
#include <threadweaver/qobjectdecorator.h>
#include <threadweaver/job.h>
diff --git a/core/script/executor_kjs.cpp b/core/script/executor_kjs.cpp
index b60e85170..8aab42b93 100644
--- a/core/script/executor_kjs.cpp
+++ b/core/script/executor_kjs.cpp
@@ -15,7 +15,7 @@
#include <kjs/kjsprototype.h>
#include <kjs/kjsarguments.h>
-#include <QtCore/QDebug>
+#include <QDebug>
#include "../debug_p.h"
#include "../document_p.h"
diff --git a/core/script/kjs_console.cpp b/core/script/kjs_console.cpp
index 55d1eb7f2..8412bcadc 100644
--- a/core/script/kjs_console.cpp
+++ b/core/script/kjs_console.cpp
@@ -14,7 +14,7 @@
#include <kjs/kjsprototype.h>
#include <kjs/kjsarguments.h>
-#include <QtCore/QDebug>
+#include <QDebug>
#include "../debug_p.h"
diff --git a/core/script/kjs_document.cpp b/core/script/kjs_document.cpp
index 097268ebe..f7971ebc2 100644
--- a/core/script/kjs_document.cpp
+++ b/core/script/kjs_document.cpp
@@ -16,7 +16,7 @@
#include <kjs/kjsprototype.h>
#include <kjs/kjsarguments.h>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <assert.h>
#include "../document_p.h"
diff --git a/core/script/kjs_field.cpp b/core/script/kjs_field.cpp
index 8c98ca502..75f07b705 100644
--- a/core/script/kjs_field.cpp
+++ b/core/script/kjs_field.cpp
@@ -16,7 +16,7 @@
#include <qhash.h>
-#include <QtCore/QDebug>
+#include <QDebug>
#include "../debug_p.h"
#include "../document_p.h"
diff --git a/core/script/kjs_spell.cpp b/core/script/kjs_spell.cpp
index 7f43c2d0a..db1a1603a 100644
--- a/core/script/kjs_spell.cpp
+++ b/core/script/kjs_spell.cpp
@@ -13,7 +13,7 @@
#include <kjs/kjsobject.h>
#include <kjs/kjsprototype.h>
-#include <QtCore/QString>
+#include <QString>
using namespace Okular;
diff --git a/core/scripter.cpp b/core/scripter.cpp
index af499e098..46462793b 100644
--- a/core/scripter.cpp
+++ b/core/scripter.cpp
@@ -9,7 +9,7 @@
#include "scripter.h"
-#include <QtCore/QDebug>
+#include <QDebug>
#include <QFile>
#include "debug_p.h"
diff --git a/core/sound.cpp b/core/sound.cpp
index f1e3b7c52..50d18dafd 100644
--- a/core/sound.cpp
+++ b/core/sound.cpp
@@ -9,7 +9,7 @@
#include "sound.h"
-#include <QtCore/QVariant>
+#include <QVariant>
using namespace Okular;
diff --git a/core/sound.h b/core/sound.h
index f412b6873..e71dbe8c0 100644
--- a/core/sound.h
+++ b/core/sound.h
@@ -12,8 +12,8 @@
#include "okularcore_export.h"
-#include <QtCore/QByteArray>
-#include <QtCore/QString>
+#include <QByteArray>
+#include <QString>
namespace Okular {
diff --git a/core/sourcereference.cpp b/core/sourcereference.cpp
index bde8bc1bd..eb109de45 100644
--- a/core/sourcereference.cpp
+++ b/core/sourcereference.cpp
@@ -10,8 +10,8 @@
#include "sourcereference.h"
#include "sourcereference_p.h"
-#include <QtCore/QString>
-#include <QtCore/QUrl>
+#include <QString>
+#include <QUrl>
#include <KLocalizedString>
using namespace Okular;
diff --git a/core/textdocumentgenerator.cpp b/core/textdocumentgenerator.cpp
index 78a571425..37286789a 100644
--- a/core/textdocumentgenerator.cpp
+++ b/core/textdocumentgenerator.cpp
@@ -10,16 +10,16 @@
#include "textdocumentgenerator.h"
#include "textdocumentgenerator_p.h"
-#include <QtCore/QFile>
-#include <QtCore/QMutex>
-#include <QtCore/QStack>
-#include <QtCore/QTextStream>
-#include <QtCore/QVector>
-#include <QtGui/QFontDatabase>
-#include <QtGui/QImage>
-#include <QtGui/QPainter>
-#include <QtPrintSupport/QPrinter>
-#include <QtGui/QTextDocumentWriter>
+#include <QFile>
+#include <QMutex>
+#include <QStack>
+#include <QTextStream>
+#include <QVector>
+#include <QFontDatabase>
+#include <QImage>
+#include <QPainter>
+#include <QPrinter>
+#include <QTextDocumentWriter>
#include "action.h"
#include "annotations.h"
diff --git a/core/textdocumentgenerator_p.h b/core/textdocumentgenerator_p.h
index df5431c43..1a4b869c5 100644
--- a/core/textdocumentgenerator_p.h
+++ b/core/textdocumentgenerator_p.h
@@ -10,9 +10,9 @@
#ifndef _OKULAR_TEXTDOCUMENTGENERATOR_P_H_
#define _OKULAR_TEXTDOCUMENTGENERATOR_P_H_
-#include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QTextBlock>
-#include <QtGui/QTextDocument>
+#include <QAbstractTextDocumentLayout>
+#include <QTextBlock>
+#include <QTextDocument>
#include "action.h"
#include "document.h"
diff --git a/core/textdocumentsettings_p.h b/core/textdocumentsettings_p.h
index 5f09ba605..998156b0f 100644
--- a/core/textdocumentsettings_p.h
+++ b/core/textdocumentsettings_p.h
@@ -33,6 +33,8 @@ class TextDocumentSettingsWidgetPrivate
class TextDocumentSettingsPrivate : public QObject
{
+ Q_OBJECT
+
public:
TextDocumentSettingsPrivate(QObject *parent)
: QObject(parent)
diff --git a/core/textpage.cpp b/core/textpage.cpp
index 9622f5506..95de94762 100644
--- a/core/textpage.cpp
+++ b/core/textpage.cpp
@@ -10,7 +10,7 @@
#include "textpage.h"
#include "textpage_p.h"
-#include <QtCore/QDebug>
+#include <QDebug>
#include "area.h"
#include "debug_p.h"
diff --git a/core/textpage.h b/core/textpage.h
index f338d5a4f..a343f31e3 100644
--- a/core/textpage.h
+++ b/core/textpage.h
@@ -10,8 +10,8 @@
#ifndef _OKULAR_TEXTPAGE_H_
#define _OKULAR_TEXTPAGE_H_
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QList>
+#include <QString>
#include "okularcore_export.h"
#include "global.h"
diff --git a/core/textpage_p.h b/core/textpage_p.h
index 6b68b51b3..758671241 100644
--- a/core/textpage_p.h
+++ b/core/textpage_p.h
@@ -11,10 +11,10 @@
#ifndef _OKULAR_TEXTPAGE_P_H_
#define _OKULAR_TEXTPAGE_P_H_
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QPair>
-#include <QtGui/QTransform>
+#include <QList>
+#include <QMap>
+#include <QPair>
+#include <QTransform>
class SearchPoint;
class TinyTextEntity;
diff --git a/core/tilesmanager.cpp b/core/tilesmanager.cpp
index d20c1b1e0..7f3c7f2ac 100644
--- a/core/tilesmanager.cpp
+++ b/core/tilesmanager.cpp
@@ -9,7 +9,7 @@
#include "tilesmanager_p.h"
#include <QPixmap>
-#include <QtCore/qmath.h>
+#include <qmath.h>
#include <QList>
#include <QPainter>
diff --git a/core/utils.cpp b/core/utils.cpp
index 0789132ac..8733982d0 100644
--- a/core/utils.cpp
+++ b/core/utils.cpp
@@ -14,7 +14,7 @@
#include "debug_p.h"
#include "settings_core.h"
-#include <QtCore/QRect>
+#include <QRect>
#include <QApplication>
#include <QDesktopWidget>
#include <QImage>
diff --git a/core/view_p.h b/core/view_p.h
index 17a8b6999..53602803b 100644
--- a/core/view_p.h
+++ b/core/view_p.h
@@ -10,8 +10,8 @@
#ifndef OKULAR_VIEW_P_H
#define OKULAR_VIEW_P_H
-#include <QtCore/QHash>
-#include <QtCore/QString>
+#include <QHash>
+#include <QString>
namespace Okular {
diff --git a/generators/chm/generator_chm.h b/generators/chm/generator_chm.h
index 13fa7108f..728feeee4 100644
--- a/generators/chm/generator_chm.h
+++ b/generators/chm/generator_chm.h
@@ -8,8 +8,8 @@
* (at your option) any later version. *
***************************************************************************/
-#ifndef _OKULAR_CHMGENERATOR_H_
-#define _OKULAR_CHMGENERATOR_H_
+#ifndef _OKULAR_GENERATOR_CHM_H_
+#define _OKULAR_GENERATOR_CHM_H_
#include <core/document.h>
#include <core/generator.h>
diff --git a/generators/chm/lib/ebook_epub.cpp b/generators/chm/lib/ebook_epub.cpp
index 83a777339..f3d14402f 100644
--- a/generators/chm/lib/ebook_epub.cpp
+++ b/generators/chm/lib/ebook_epub.cpp
@@ -23,7 +23,7 @@
#endif
#include <QMessageBox>
-#include <QtXml/QXmlSimpleReader>
+#include <QXmlSimpleReader>
#include "ebook_epub.h"
#include "helperxmlhandler_epubcontainer.h"
diff --git a/generators/comicbook/debug_comicbook.h b/generators/comicbook/debug_comicbook.h
index 6abd4b3d9..69005c780 100644
--- a/generators/comicbook/debug_comicbook.h
+++ b/generators/comicbook/debug_comicbook.h
@@ -7,10 +7,10 @@
* (at your option) any later version. *
***************************************************************************/
-#ifndef OKULAR_COMICBOOK_DEBUG_P_H
-#define OKULAR_COMICBOOK_DEBUG_P_H
+#ifndef OKULAR_DEBUG_COMICBOOK_H
+#define OKULAR_DEBUG_COMICBOOK_H
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(OkularComicbookDebug)
diff --git a/generators/comicbook/directory.cpp b/generators/comicbook/directory.cpp
index 6ad1bab6c..cc705c986 100644
--- a/generators/comicbook/directory.cpp
+++ b/generators/comicbook/directory.cpp
@@ -10,10 +10,10 @@
#include "directory.h"
-#include <QtCore/QDir>
-#include <QtCore/QDirIterator>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <QDir>
+#include <QDirIterator>
+#include <QFile>
+#include <QFileInfo>
#include <memory>
diff --git a/generators/comicbook/directory.h b/generators/comicbook/directory.h
index 01dd473de..c0bd20b39 100644
--- a/generators/comicbook/directory.h
+++ b/generators/comicbook/directory.h
@@ -11,7 +11,7 @@
#ifndef DIRECTORY_H
#define DIRECTORY_H
-#include <QtCore/QStringList>
+#include <QStringList>
class QIODevice;
diff --git a/generators/comicbook/document.cpp b/generators/comicbook/document.cpp
index 8ba2d89c9..c59874427 100644
--- a/generators/comicbook/document.cpp
+++ b/generators/comicbook/document.cpp
@@ -9,9 +9,9 @@
#include "document.h"
-#include <QtCore/QScopedPointer>
-#include <QtGui/QImage>
-#include <QtGui/QImageReader>
+#include <QScopedPointer>
+#include <QImage>
+#include <QImageReader>
#include <KLocalizedString>
#include <QMimeType>
diff --git a/generators/comicbook/document.h b/generators/comicbook/document.h
index 22c321342..a7fe034c0 100644
--- a/generators/comicbook/document.h
+++ b/generators/comicbook/document.h
@@ -10,7 +10,7 @@
#ifndef COMICBOOK_DOCUMENT_H
#define COMICBOOK_DOCUMENT_H
-#include <QtCore/QStringList>
+#include <QStringList>
class KArchiveDirectory;
class KArchive;
diff --git a/generators/comicbook/generator_comicbook.cpp b/generators/comicbook/generator_comicbook.cpp
index 2687f9b59..2cc9063c8 100644
--- a/generators/comicbook/generator_comicbook.cpp
+++ b/generators/comicbook/generator_comicbook.cpp
@@ -9,8 +9,8 @@
#include "generator_comicbook.h"
-#include <QtGui/QPainter>
-#include <QtPrintSupport/QPrinter>
+#include <QPainter>
+#include <QPrinter>
#include <KAboutData>
#include <KLocalizedString>
diff --git a/generators/comicbook/qnatsort.h b/generators/comicbook/qnatsort.h
index eb63c79ac..00e7a697d 100644
--- a/generators/comicbook/qnatsort.h
+++ b/generators/comicbook/qnatsort.h
@@ -22,7 +22,7 @@
#ifndef QNATSORT_H
#define QNATSORT_H
-#include <QtCore/QString>
+#include <QString>
/**
* The two methods can be used in qSort to sort strings which contain
diff --git a/generators/comicbook/unrar.cpp b/generators/comicbook/unrar.cpp
index 587a3c125..fb8318af5 100644
--- a/generators/comicbook/unrar.cpp
+++ b/generators/comicbook/unrar.cpp
@@ -9,14 +9,14 @@
#include "unrar.h"
-#include <QtCore/QEventLoop>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QRegExp>
-#include <QtCore/QGlobalStatic>
+#include <QEventLoop>
+#include <QFile>
+#include <QFileInfo>
+#include <QRegExp>
+#include <QGlobalStatic>
#include <QTemporaryDir>
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#if defined(WITH_KPTY)
#include <KPty/kptyprocess.h>
#include <KPty/kptydevice.h>
diff --git a/generators/comicbook/unrar.h b/generators/comicbook/unrar.h
index e528b7ba8..cf5e7f220 100644
--- a/generators/comicbook/unrar.h
+++ b/generators/comicbook/unrar.h
@@ -10,9 +10,9 @@
#ifndef UNRAR_H
#define UNRAR_H
-#include <QtCore/QObject>
-#include <QtCore/QProcess>
-#include <QtCore/QStringList>
+#include <QObject>
+#include <QProcess>
+#include <QStringList>
class QEventLoop;
class QTemporaryDir;
diff --git a/generators/comicbook/unrarflavours.cpp b/generators/comicbook/unrarflavours.cpp
index 7119a46bd..9e591e453 100644
--- a/generators/comicbook/unrarflavours.cpp
+++ b/generators/comicbook/unrarflavours.cpp
@@ -9,8 +9,8 @@
#include "unrarflavours.h"
-#include <QtCore/QRegExp>
-#include <QtCore/QStringList>
+#include <QRegExp>
+#include <QStringList>
UnrarFlavour::UnrarFlavour()
{
diff --git a/generators/comicbook/unrarflavours.h b/generators/comicbook/unrarflavours.h
index f72bdc3e6..cb6333d92 100644
--- a/generators/comicbook/unrarflavours.h
+++ b/generators/comicbook/unrarflavours.h
@@ -10,7 +10,7 @@
#ifndef UNRARFLAVOURS_H
#define UNRARFLAVOURS_H
-#include <QtCore/QString>
+#include <QString>
class QStringList;
diff --git a/generators/djvu/generator_djvu.cpp b/generators/djvu/generator_djvu.cpp
index 644f746ca..391210014 100644
--- a/generators/djvu/generator_djvu.cpp
+++ b/generators/djvu/generator_djvu.cpp
@@ -18,17 +18,17 @@
#include <core/utils.h>
#include <core/fileprinter.h>
-#include <qdom.h>
-#include <qmutex.h>
-#include <qpixmap.h>
-#include <qstring.h>
-#include <quuid.h>
+#include <QDomDocument>
+#include <QMutex>
+#include <QPixmap>
+#include <QString>
+#include <QUuid>
#include <QPrinter>
#include <KAboutData>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <KLocalizedString>
-#include <qtemporaryfile.h>
+#include <QTemporaryFile>
#include <QDir>
static void recurseCreateTOC( QDomDocument &maindoc, const QDomNode &parent, QDomNode \
&parentDestination, KDjVu *djvu )
diff --git a/generators/djvu/kdjvu.cpp b/generators/djvu/kdjvu.cpp
index e107fc738..b629a6645 100644
--- a/generators/djvu/kdjvu.cpp
+++ b/generators/djvu/kdjvu.cpp
@@ -9,16 +9,16 @@
#include "kdjvu.h"
-#include <qbytearray.h>
-#include <qdom.h>
-#include <qfile.h>
-#include <qhash.h>
-#include <qlist.h>
-#include <qpainter.h>
-#include <qqueue.h>
-#include <qstring.h>
-
-#include <QtCore/QDebug>
+#include <QByteArray>
+#include <QDomDocument>
+#include <QFile>
+#include <QHash>
+#include <QList>
+#include <QPainter>
+#include <QQueue>
+#include <QString>
+
+#include <QDebug>
#include <KLocalizedString>
#include <libdjvu/ddjvuapi.h>
diff --git a/generators/dvi/TeXFontDefinition.cpp b/generators/dvi/TeXFontDefinition.cpp
index f15d8d1b0..78d7eda90 100644
--- a/generators/dvi/TeXFontDefinition.cpp
+++ b/generators/dvi/TeXFontDefinition.cpp
@@ -14,7 +14,7 @@
#include <KLocalizedString>
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#include <QFile>
extern const int MFResolutions[];
diff --git a/generators/dvi/TeXFontDefinition.h b/generators/dvi/TeXFontDefinition.h
index 4d0789281..0b209865a 100644
--- a/generators/dvi/TeXFontDefinition.h
+++ b/generators/dvi/TeXFontDefinition.h
@@ -16,7 +16,7 @@
#define _FONT_H
#include <QHash>
-#include <QtCore/qstring.h>
+#include <QString>
class dviRenderer;
class TeXFont;
diff --git a/generators/dvi/TeXFont_PFB.cpp b/generators/dvi/TeXFont_PFB.cpp
index 38cc7d1e6..d3cac2fed 100644
--- a/generators/dvi/TeXFont_PFB.cpp
+++ b/generators/dvi/TeXFont_PFB.cpp
@@ -20,7 +20,7 @@
#include <KLocalizedString>
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#include <QImage>
//#define DEBUG_PFB 1
diff --git a/generators/dvi/TeXFont_TFM.cpp b/generators/dvi/TeXFont_TFM.cpp
index a55c6deaf..14a31fdcb 100644
--- a/generators/dvi/TeXFont_TFM.cpp
+++ b/generators/dvi/TeXFont_TFM.cpp
@@ -12,7 +12,7 @@
#include "debug_dvi.h"
#include "debug_dvi.h"
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#include <QDataStream>
#include <QFile>
diff --git a/generators/dvi/debug_dvi.h b/generators/dvi/debug_dvi.h
index cae7b2f56..16b650795 100644
--- a/generators/dvi/debug_dvi.h
+++ b/generators/dvi/debug_dvi.h
@@ -11,7 +11,7 @@
#ifndef OKULAR_DVI_DEBUG_P_H
#define OKULAR_DVI_DEBUG_P_H
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(OkularDviDebug)
Q_DECLARE_LOGGING_CATEGORY(OkularDviShellDebug)
diff --git a/generators/dvi/dviFile.cpp b/generators/dvi/dviFile.cpp
index 0874ca667..75dfe7496 100644
--- a/generators/dvi/dviFile.cpp
+++ b/generators/dvi/dviFile.cpp
@@ -61,7 +61,7 @@
#include <KLocalizedString>
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#include <QProcess>
#include <QSysInfo>
#include <QTemporaryFile>
diff --git a/generators/dvi/dviFile.h b/generators/dvi/dviFile.h
index 1f65ff09b..6a0b0b56a 100644
--- a/generators/dvi/dviFile.h
+++ b/generators/dvi/dviFile.h
@@ -16,7 +16,7 @@
#include <QHash>
#include <QMap>
#include <QVector>
-#include <QtCore/qstring.h>
+#include <QString>
class fontPool;
class pageSize;
diff --git a/generators/dvi/dviRenderer.h b/generators/dvi/dviRenderer.h
index 8b62edbbf..189039ec2 100644
--- a/generators/dvi/dviRenderer.h
+++ b/generators/dvi/dviRenderer.h
@@ -29,7 +29,7 @@
#include <QVector>
#include <QTimer>
#include <QMutex>
-#include <QtPrintSupport/QPrinter>
+#include <QPrinter>
class Anchor;
class DocumentWidget;
diff --git a/generators/dvi/dviRenderer_draw.cpp b/generators/dvi/dviRenderer_draw.cpp
index d6ed17dda..70e915fc4 100644
--- a/generators/dvi/dviRenderer_draw.cpp
+++ b/generators/dvi/dviRenderer_draw.cpp
@@ -69,7 +69,7 @@
#include <KLocalizedString>
#include <QPainter>
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
diff --git a/generators/dvi/dviexport.cpp b/generators/dvi/dviexport.cpp
index 63e8b766b..4e9d33dc6 100644
--- a/generators/dvi/dviexport.cpp
+++ b/generators/dvi/dviexport.cpp
@@ -33,7 +33,7 @@
#include <QEventLoop>
#include <QFileInfo>
#include <QLabel>
-#include <QtPrintSupport/QPrinter>
+#include <QPrinter>
#include <QTemporaryFile>
#include <cassert>
diff --git a/generators/dvi/dviexport.h b/generators/dvi/dviexport.h
index a15197e8d..63b6d3f07 100644
--- a/generators/dvi/dviexport.h
+++ b/generators/dvi/dviexport.h
@@ -22,7 +22,7 @@
#include <QExplicitlySharedDataPointer>
#include <QObject>
-#include <QtPrintSupport/QPrinter>
+#include <QPrinter>
class dviRenderer;
diff --git a/generators/dvi/fontEncoding.cpp b/generators/dvi/fontEncoding.cpp
index b51ea363e..c3da59ebe 100644
--- a/generators/dvi/fontEncoding.cpp
+++ b/generators/dvi/fontEncoding.cpp
@@ -13,7 +13,7 @@
#include "fontEncoding.h"
#include "debug_dvi.h"
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#include <QFile>
#include <QProcess>
#include <QTextStream>
diff --git a/generators/dvi/fontMap.cpp b/generators/dvi/fontMap.cpp
index f6d19fc7a..f6d7c3864 100644
--- a/generators/dvi/fontMap.cpp
+++ b/generators/dvi/fontMap.cpp
@@ -12,7 +12,7 @@
#include "fontMap.h"
#include "debug_dvi.h"
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#include <QFile>
#include <QProcess>
#include <QTextStream>
diff --git a/generators/dvi/generator_dvi.cpp b/generators/dvi/generator_dvi.cpp
index 16a64f940..d9fe8341f 100644
--- a/generators/dvi/generator_dvi.cpp
+++ b/generators/dvi/generator_dvi.cpp
@@ -23,17 +23,17 @@
#include "dviexport.h"
#include "TeXFont.h"
-#include <qapplication.h>
-#include <qdir.h>
-#include <qstring.h>
-#include <qurl.h>
-#include <qvector.h>
-#include <qstack.h>
-#include <qtemporaryfile.h>
-#include <qmutex.h>
+#include <QApplication>
+#include <QDir>
+#include <QString>
+#include <QUrl>
+#include <QVector>
+#include <QStack>
+#include <QTemporaryFile>
+#include <QMutex>
#include <KAboutData>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <KLocalizedString>
#ifdef DVI_OPEN_BUSYLOOP
diff --git a/generators/dvi/pageSize.cpp b/generators/dvi/pageSize.cpp
index 1ae72068d..6c380bc96 100644
--- a/generators/dvi/pageSize.cpp
+++ b/generators/dvi/pageSize.cpp
@@ -14,7 +14,7 @@
#include <KLocalizedString>
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
struct pageSizeItem
{
diff --git a/generators/dvi/psgs.cpp b/generators/dvi/psgs.cpp
index 7a404b9d7..fec91b97b 100644
--- a/generators/dvi/psgs.cpp
+++ b/generators/dvi/psgs.cpp
@@ -21,7 +21,7 @@
#include <qtemporaryfile.h>
#include <QUrl>
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#include <QDir>
#include <QPainter>
#include <QPixmap>
diff --git a/generators/dvi/psgs.h b/generators/dvi/psgs.h
index 14fe4384b..f021945fb 100644
--- a/generators/dvi/psgs.h
+++ b/generators/dvi/psgs.h
@@ -12,7 +12,7 @@
#include <QApplication>
#include <QColor>
-#include <QtGui/qevent.h>
+#include <QEvent>
#include <QHash>
#include <QObject>
diff --git a/generators/dvi/simplePageSize.cpp b/generators/dvi/simplePageSize.cpp
index 61687c6e6..e7e6f4d29 100644
--- a/generators/dvi/simplePageSize.cpp
+++ b/generators/dvi/simplePageSize.cpp
@@ -11,7 +11,7 @@
#include "simplePageSize.h"
#include "debug_dvi.h"
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#include <QPaintDevice>
diff --git a/generators/dvi/util.cpp b/generators/dvi/util.cpp
index 4557eaa88..7a993aa9e 100644
--- a/generators/dvi/util.cpp
+++ b/generators/dvi/util.cpp
@@ -61,7 +61,7 @@
#include <cstdlib>
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
/*
* General utility routines.
diff --git a/generators/epub/converter.cpp b/generators/epub/converter.cpp
index ade26a049..071951800 100644
--- a/generators/epub/converter.cpp
+++ b/generators/epub/converter.cpp
@@ -9,14 +9,14 @@
#include "converter.h"
-#include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QTextDocument>
-#include <QtGui/QTextFrame>
+#include <QAbstractTextDocumentLayout>
+#include <QTextDocument>
+#include <QTextFrame>
#include <QTextDocumentFragment>
#include <QFileInfo>
#include <QApplication> // Because of the HACK
-#include <QtCore/QDebug>
+#include <QDebug>
#include <KLocalizedString>
diff --git a/generators/epub/epubdocument.h b/generators/epub/epubdocument.h
index da261ab6c..e823e3d06 100644
--- a/generators/epub/epubdocument.h
+++ b/generators/epub/epubdocument.h
@@ -14,9 +14,8 @@
#include <QUrl>
#include <QVariant>
#include <QImage>
-#include <QUrl>
#include <epub.h>
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
namespace Epub {
diff --git a/generators/fax/faxdocument.cpp b/generators/fax/faxdocument.cpp
index ad63273cf..cdeb41a6a 100644
--- a/generators/fax/faxdocument.cpp
+++ b/generators/fax/faxdocument.cpp
@@ -7,12 +7,13 @@
* (at your option) any later version. *
***************************************************************************/
+#include "faxdocument.h"
+
#include <stdlib.h>
-#include <QtCore/QFile>
+#include <QFile>
#include "faxexpand.h"
-#include "faxdocument.h"
static const char FAXMAGIC[] = "\000PC Research, Inc\000\000\000\000\000\000";
diff --git a/generators/fax/faxdocument.h b/generators/fax/faxdocument.h
index e917895a2..b45a37ddd 100644
--- a/generators/fax/faxdocument.h
+++ b/generators/fax/faxdocument.h
@@ -10,7 +10,7 @@
#ifndef FAXDOCUMENT_H
#define FAXDOCUMENT_H
-#include <QtGui/QImage>
+#include <QImage>
/**
* Loads a G3/G4 fax document and provides methods
diff --git a/generators/fax/faxexpand.cpp b/generators/fax/faxexpand.cpp
index c551c7d60..11a1f68ea 100644
--- a/generators/fax/faxexpand.cpp
+++ b/generators/fax/faxexpand.cpp
@@ -17,13 +17,14 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+#include "faxexpand.h"
+
#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
-#include <QtCore/QDebug>
+#include <QDebug>
-#include "faxexpand.h"
#include "fax_debug.h"
//Uncomment this for verbose debug output
//#define DEBUG_FAX
diff --git a/generators/fax/faxexpand.h b/generators/fax/faxexpand.h
index 9203187c1..b874de32f 100644
--- a/generators/fax/faxexpand.h
+++ b/generators/fax/faxexpand.h
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
#ifndef _faxexpand_h_
#define _faxexpand_h_
-#include <QtGui/QImage>
+#include <QImage>
#include <sys/types.h>
#ifndef Q_OS_WIN
diff --git a/generators/fax/generator_fax.cpp b/generators/fax/generator_fax.cpp
index 5bbbbd3cd..8e5eae062 100644
--- a/generators/fax/generator_fax.cpp
+++ b/generators/fax/generator_fax.cpp
@@ -9,8 +9,8 @@
#include "generator_fax.h"
-#include <QtGui/QPainter>
-#include <QtPrintSupport/QPrinter>
+#include <QPainter>
+#include <QPrinter>
#include <KAboutData>
#include <KLocalizedString>
diff --git a/generators/fax/generator_fax.h b/generators/fax/generator_fax.h
index 048d176d5..9a2179e55 100644
--- a/generators/fax/generator_fax.h
+++ b/generators/fax/generator_fax.h
@@ -12,7 +12,7 @@
#include <core/generator.h>
-#include <QtGui/QImage>
+#include <QImage>
#include "faxdocument.h"
diff --git a/generators/fictionbook/converter.cpp b/generators/fictionbook/converter.cpp
index 1bdb4aa83..0cf2babcb 100644
--- a/generators/fictionbook/converter.cpp
+++ b/generators/fictionbook/converter.cpp
@@ -9,14 +9,14 @@
#include "converter.h"
-#include <QtCore/QDate>
-#include <QtCore/QUrl>
-#include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QTextCursor>
-#include <QtGui/QTextDocument>
-#include <QtGui/QTextFrame>
-#include <QtXml/QDomElement>
-#include <QtXml/QDomText>
+#include <QDate>
+#include <QUrl>
+#include <QAbstractTextDocumentLayout>
+#include <QTextCursor>
+#include <QTextDocument>
+#include <QTextFrame>
+#include <QDomElement>
+#include <QDomText>
#include <KLocalizedString>
diff --git a/generators/fictionbook/document.cpp b/generators/fictionbook/document.cpp
index 49c4aaabc..df5bf3970 100644
--- a/generators/fictionbook/document.cpp
+++ b/generators/fictionbook/document.cpp
@@ -9,7 +9,7 @@
#include "document.h"
-#include <QtCore/QFile>
+#include <QFile>
#include <KLocalizedString>
#include <kzip.h>
diff --git a/generators/fictionbook/document.h b/generators/fictionbook/document.h
index 0abf5848e..de0b83260 100644
--- a/generators/fictionbook/document.h
+++ b/generators/fictionbook/document.h
@@ -10,10 +10,10 @@
#ifndef FICTIONBOOK_DOCUMENT_H
#define FICTIONBOOK_DOCUMENT_H
-#include <QtCore/QByteArray>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtXml/QDomDocument>
+#include <QByteArray>
+#include <QMap>
+#include <QString>
+#include <QDomDocument>
namespace FictionBook {
diff --git a/generators/kimgio/generator_kimgio.h b/generators/kimgio/generator_kimgio.h
index bd09bbed0..2242b121f 100644
--- a/generators/kimgio/generator_kimgio.h
+++ b/generators/kimgio/generator_kimgio.h
@@ -16,7 +16,7 @@
#include <core/generator.h>
#include <core/document.h>
-#include <QtGui/QImage>
+#include <QImage>
class KIMGIOGenerator : public Okular::Generator
{
diff --git a/generators/markdown/debug_md.h b/generators/markdown/debug_md.h
index 9c06d7742..cab7ec487 100644
--- a/generators/markdown/debug_md.h
+++ b/generators/markdown/debug_md.h
@@ -9,10 +9,10 @@
* (at your option) any later version. *
***************************************************************************/
-#ifndef OKULAR_MD_DEBUG_P_H
-#define OKULAR_MD_DEBUG_P_H
+#ifndef OKULAR_DEBUG_MD_H
+#define OKULAR_DEBUG_MD_H
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(OkularMdDebug)
diff --git a/generators/mobipocket/converter.cpp b/generators/mobipocket/converter.cpp
index 09ac087bd..9888a1ec9 100644
--- a/generators/mobipocket/converter.cpp
+++ b/generators/mobipocket/converter.cpp
@@ -9,13 +9,13 @@
#include "converter.h"
-#include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QTextDocument>
-#include <QtGui/QTextBlock>
-#include <QtGui/QTextFrame>
-#include <QtGui/QTextDocumentFragment>
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
+#include <QAbstractTextDocumentLayout>
+#include <QTextDocument>
+#include <QTextBlock>
+#include <QTextFrame>
+#include <QTextDocumentFragment>
+#include <QDebug>
+#include <QFile>
#include <KLocalizedString>
#include <core/action.h>
diff --git a/generators/mobipocket/mobidocument.cpp b/generators/mobipocket/mobidocument.cpp
index c3b1f81d3..d89d5580a 100644
--- a/generators/mobipocket/mobidocument.cpp
+++ b/generators/mobipocket/mobidocument.cpp
@@ -9,10 +9,10 @@
#include "mobidocument.h"
#include <qmobipocket/mobipocket.h>
#include <qmobipocket/qfilestream.h>
-#include <QtGui/QColor>
-#include <QtCore/QFile>
-#include <QtCore/QRegExp>
-#include <QtCore/QDebug>
+#include <QColor>
+#include <QFile>
+#include <QRegExp>
+#include <QDebug>
#include <QApplication> // Because of the HACK
#include <QPalette> // Because of the HACK
diff --git a/generators/ooo/converter.cpp b/generators/ooo/converter.cpp
index 202e14071..159a94f8e 100644
--- a/generators/ooo/converter.cpp
+++ b/generators/ooo/converter.cpp
@@ -9,16 +9,16 @@
#include "converter.h"
-#include <QtCore/QQueue>
-#include <QtCore/QUrl>
-#include <QtGui/QTextCursor>
-#include <QtGui/QTextDocument>
-#include <QtGui/QTextFrame>
-#include <QtGui/QTextList>
-#include <QtGui/QTextTableCell>
-#include <QtXml/QDomElement>
-#include <QtXml/QDomText>
-#include <QtXml/QXmlSimpleReader>
+#include <QQueue>
+#include <QUrl>
+#include <QTextCursor>
+#include <QTextDocument>
+#include <QTextFrame>
+#include <QTextList>
+#include <QTextTableCell>
+#include <QDomElement>
+#include <QDomText>
+#include <QXmlSimpleReader>
#include <core/action.h>
#include <core/annotations.h>
diff --git a/generators/ooo/converter.h b/generators/ooo/converter.h
index 05cb12a70..056028803 100644
--- a/generators/ooo/converter.h
+++ b/generators/ooo/converter.h
@@ -10,8 +10,8 @@
#ifndef OOO_CONVERTER_H
#define OOO_CONVERTER_H
-#include <QtGui/QTextCharFormat>
-#include <QtXml/QDomDocument>
+#include <QTextCharFormat>
+#include <QDomDocument>
#include <core/textdocumentgenerator.h>
diff --git a/generators/ooo/document.h b/generators/ooo/document.h
index f1dc033fc..9c6bc97f6 100644
--- a/generators/ooo/document.h
+++ b/generators/ooo/document.h
@@ -10,9 +10,9 @@
#ifndef OOO_DOCUMENT_H
#define OOO_DOCUMENT_H
-#include <QtCore/QByteArray>
-#include <QtCore/QMap>
-#include <QtCore/QString>
+#include <QByteArray>
+#include <QMap>
+#include <QString>
#include "manifest.h"
diff --git a/generators/ooo/formatproperty.cpp b/generators/ooo/formatproperty.cpp
index f3dfbb477..4d1eed557 100644
--- a/generators/ooo/formatproperty.cpp
+++ b/generators/ooo/formatproperty.cpp
@@ -9,7 +9,7 @@
#include "formatproperty.h"
-#include <QtGui/QTextFormat>
+#include <QTextFormat>
#include "styleinformation.h"
diff --git a/generators/ooo/formatproperty.h b/generators/ooo/formatproperty.h
index 279e3ee3b..268066906 100644
--- a/generators/ooo/formatproperty.h
+++ b/generators/ooo/formatproperty.h
@@ -10,8 +10,8 @@
#ifndef OOO_FORMATPROPERTY_H
#define OOO_FORMATPROPERTY_H
-#include <QtCore/QVector>
-#include <QtGui/QColor>
+#include <QVector>
+#include <QColor>
class QTextBlockFormat;
class QTextCharFormat;
diff --git a/generators/ooo/manifest.h b/generators/ooo/manifest.h
index f1b0d5e13..fb5565664 100644
--- a/generators/ooo/manifest.h
+++ b/generators/ooo/manifest.h
@@ -10,15 +10,15 @@
#ifndef OOO_MANIFEST_H
#define OOO_MANIFEST_H
-#include <QtCore/QByteArray>
-#include <QtCore/QMap>
-#include <QtCore/QString>
+#include <QByteArray>
+#include <QMap>
+#include <QString>
#ifdef QCA2
#include <QtCrypto>
#endif
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(OkularOooDebug)
diff --git a/generators/ooo/styleinformation.h b/generators/ooo/styleinformation.h
index b21826513..7f5b5ce46 100644
--- a/generators/ooo/styleinformation.h
+++ b/generators/ooo/styleinformation.h
@@ -10,7 +10,7 @@
#ifndef OOO_STYLEINFORMATION_H
#define OOO_STYLEINFORMATION_H
-#include <QtCore/QMap>
+#include <QMap>
#include "formatproperty.h"
diff --git a/generators/ooo/styleparser.cpp b/generators/ooo/styleparser.cpp
index 4277a5359..70fd4712a 100644
--- a/generators/ooo/styleparser.cpp
+++ b/generators/ooo/styleparser.cpp
@@ -9,11 +9,11 @@
#include "styleparser.h"
-#include <QtCore/QDateTime>
-#include <QtGui/QFont>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
-#include <QtXml/QXmlSimpleReader>
+#include <QDateTime>
+#include <QFont>
+#include <QDomDocument>
+#include <QDomElement>
+#include <QXmlSimpleReader>
#include <KLocalizedString>
diff --git a/generators/plucker/generator_plucker.cpp b/generators/plucker/generator_plucker.cpp
index 25f8e4978..85c205cea 100644
--- a/generators/plucker/generator_plucker.cpp
+++ b/generators/plucker/generator_plucker.cpp
@@ -9,11 +9,11 @@
#include "generator_plucker.h"
-#include <QtCore/QFile>
-#include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QPainter>
-#include <QtPrintSupport/QPrinter>
-#include <QtGui/QTextDocument>
+#include <QFile>
+#include <QAbstractTextDocumentLayout>
+#include <QPainter>
+#include <QPrinter>
+#include <QTextDocument>
#include <KAboutData>
#include <KLocalizedString>
diff --git a/generators/plucker/generator_plucker.h b/generators/plucker/generator_plucker.h
index 11d714d87..2de7e1835 100644
--- a/generators/plucker/generator_plucker.h
+++ b/generators/plucker/generator_plucker.h
@@ -13,7 +13,7 @@
#include <core/document.h>
#include <core/generator.h>
-#include <QtGui/QTextBlock>
+#include <QTextBlock>
#include "qunpluck.h"
diff --git a/generators/plucker/unpluck/image.cpp b/generators/plucker/unpluck/image.cpp
index 9179c0e44..5ab1c6e34 100644
--- a/generators/plucker/unpluck/image.cpp
+++ b/generators/plucker/unpluck/image.cpp
@@ -9,8 +9,8 @@
* (at your option) any later version. *
***************************************************************************/
-#include <QtCore/QTemporaryFile>
-#include <QtGui/QImage>
+#include <QTemporaryFile>
+#include <QImage>
#include <stdio.h>
#include <stdlib.h>
diff --git a/generators/plucker/unpluck/qunpluck.cpp b/generators/plucker/unpluck/qunpluck.cpp
index 59ad74d73..9176c9d30 100644
--- a/generators/plucker/unpluck/qunpluck.cpp
+++ b/generators/plucker/unpluck/qunpluck.cpp
@@ -9,27 +9,26 @@
* (at your option) any later version. *
***************************************************************************/
-#include <QtCore/QDateTime>
-#include <QtCore/QFile>
-#include <QtCore/QHash>
-#include <QtCore/QStack>
-#include <QtCore/QString>
-#include <QtCore/QUrl>
-#include <QtCore/QDateTime>
-#include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QFont>
-#include <QtGui/QTextBlock>
-#include <QtGui/QTextCharFormat>
-#include <QtGui/QTextCursor>
-#include <QtGui/QTextDocument>
-#include <QtGui/QTextFrame>
-
-#include <QtWidgets/QLabel>
+#include "qunpluck.h"
+
+#include <QDateTime>
+#include <QFile>
+#include <QHash>
+#include <QStack>
+#include <QString>
+#include <QUrl>
+#include <QDateTime>
+#include <QAbstractTextDocumentLayout>
+#include <QFont>
+#include <QTextCharFormat>
+#include <QTextCursor>
+#include <QTextDocument>
+#include <QTextFrame>
+#include <QLabel>
#include <core/action.h>
#include <core/document.h>
-#include "qunpluck.h"
#include "image.h"
#define GET_FUNCTION_CODE_TYPE(x) (((x)>>3) & 0x1F)
diff --git a/generators/plucker/unpluck/qunpluck.h b/generators/plucker/unpluck/qunpluck.h
index fdbc5d769..e1caf5f4b 100644
--- a/generators/plucker/unpluck/qunpluck.h
+++ b/generators/plucker/unpluck/qunpluck.h
@@ -12,9 +12,10 @@
#ifndef QUNPLUCK_H
#define QUNPLUCK_H
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtGui/QImage>
+#include <QList>
+#include <QMap>
+#include <QImage>
+#include <QTextBlock>
#include "unpluck.h"
diff --git a/generators/poppler/annots.cpp b/generators/poppler/annots.cpp
index a24539e75..a195a0714 100644
--- a/generators/poppler/annots.cpp
+++ b/generators/poppler/annots.cpp
@@ -11,16 +11,17 @@
* (at your option) any later version. *
***************************************************************************/
+#include "annots.h"
+
#include <poppler-annotation.h>
// qt/kde includes
-#include <QtCore/qloggingcategory.h>
-#include <qvariant.h>
+#include <QLoggingCategory>
+#include <QVariant>
#include <core/annotations.h>
#include <core/area.h>
-#include "annots.h"
#include "debug_pdf.h"
#include "generator_pdf.h"
#include "popplerembeddedfile.h"
diff --git a/generators/poppler/debug_pdf.h b/generators/poppler/debug_pdf.h
index 7e3d61d57..039579035 100644
--- a/generators/poppler/debug_pdf.h
+++ b/generators/poppler/debug_pdf.h
@@ -7,10 +7,10 @@
* (at your option) any later version. *
***************************************************************************/
-#ifndef OKULAR_DEBUG_P_H
-#define OKULAR_DEBUG_P_H
+#ifndef OKULAR_DEBUG_PDF_H
+#define OKULAR_DEBUG_PDF_H
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(OkularPdfDebug)
diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp
index 2c5e6c6e0..d2066b1e0 100644
--- a/generators/poppler/generator_pdf.cpp
+++ b/generators/poppler/generator_pdf.cpp
@@ -29,7 +29,7 @@
#include <QPrinter>
#include <QPainter>
#include <QTimer>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <KAboutData>
#include <kconfigdialog.h>
diff --git a/generators/spectre/generator_ghostview.cpp b/generators/spectre/generator_ghostview.cpp
index b990c699e..866c738d9 100644
--- a/generators/spectre/generator_ghostview.cpp
+++ b/generators/spectre/generator_ghostview.cpp
@@ -11,18 +11,18 @@
#include <math.h>
-#include <qfile.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qsize.h>
+#include <QFile>
+#include <QPainter>
+#include <QPixmap>
+#include <QSize>
#include <QPrinter>
#include <KAboutData>
#include <kconfigdialog.h>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <QMimeType>
#include <QMimeDatabase>
-#include <qtemporaryfile.h>
+#include <QTemporaryFile>
#include <QDir>
#include <KLocalizedString>
diff --git a/generators/tiff/generator_tiff.cpp b/generators/tiff/generator_tiff.cpp
index 27a921f20..9f122dbc7 100644
--- a/generators/tiff/generator_tiff.cpp
+++ b/generators/tiff/generator_tiff.cpp
@@ -16,10 +16,10 @@
#include <qimage.h>
#include <qlist.h>
#include <qpainter.h>
-#include <QtPrintSupport/QPrinter>
+#include <QPrinter>
#include <kaboutdata.h>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <KLocalizedString>
#include <core/document.h>
diff --git a/generators/tiff/generator_tiff.h b/generators/tiff/generator_tiff.h
index d867b2b6f..6302c5d70 100644
--- a/generators/tiff/generator_tiff.h
+++ b/generators/tiff/generator_tiff.h
@@ -12,8 +12,8 @@
#include <core/generator.h>
-#include <QtCore/qloggingcategory.h>
-#include <qhash.h>
+#include <QLoggingCategory>
+#include <QHash>
class TIFFGenerator : public Okular::Generator
{
diff --git a/generators/txt/converter.cpp b/generators/txt/converter.cpp
index 1dad8daf0..77075c46f 100644
--- a/generators/txt/converter.cpp
+++ b/generators/txt/converter.cpp
@@ -7,10 +7,10 @@
* (at your option) any later version. *
***************************************************************************/
+#include "converter.h"
-#include <QtGui/QTextFrame>
+#include <QTextFrame>
-#include "converter.h"
#include "document.h"
using namespace Txt;
diff --git a/generators/txt/debug_txt.h b/generators/txt/debug_txt.h
index 81b36f1b3..f0f21ca80 100644
--- a/generators/txt/debug_txt.h
+++ b/generators/txt/debug_txt.h
@@ -8,10 +8,10 @@
* (at your option) any later version. *
***************************************************************************/
-#ifndef OKULAR_TXT_DEBUG_P_H
-#define OKULAR_TXT_DEBUG_P_H
+#ifndef OKULAR_DEBUG_TXT_H
+#define OKULAR_DEBUG_TXT_H
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(OkularTxtDebug)
diff --git a/generators/txt/document.cpp b/generators/txt/document.cpp
index 0bf5a256e..ee3f8240d 100644
--- a/generators/txt/document.cpp
+++ b/generators/txt/document.cpp
@@ -7,15 +7,15 @@
* (at your option) any later version. *
***************************************************************************/
+#include "document.h"
#include <QFile>
#include <QDataStream>
#include <QTextCodec>
#include <kencodingprober.h>
-#include <QtCore/QDebug>
+#include <QDebug>
-#include "document.h"
#include "debug_txt.h"
using namespace Txt;
diff --git a/generators/txt/document.h b/generators/txt/document.h
index 1c3d7a892..adfcbab52 100644
--- a/generators/txt/document.h
+++ b/generators/txt/document.h
@@ -7,8 +7,10 @@
* (at your option) any later version. *
***************************************************************************/
+#ifndef _TXT_DOCUMENT_H_
+#define _TXT_DOCUMENT_H_
-#include <QtGui/QTextDocument>
+#include <QTextDocument>
namespace Txt
{
@@ -24,3 +26,5 @@ namespace Txt
QString toUnicode( const QByteArray &array );
};
}
+
+#endif
diff --git a/generators/txt/generator_txt.h b/generators/txt/generator_txt.h
index 9bfa7aac2..558ed1253 100644
--- a/generators/txt/generator_txt.h
+++ b/generators/txt/generator_txt.h
@@ -8,8 +8,8 @@
***************************************************************************/
-#ifndef _TXT_GENERATOR_H_
-#define _TXT_GENERATOR_H_
+#ifndef _GENERATOR_TXT_H_
+#define _GENERATOR_TXT_H_
#include <core/textdocumentgenerator.h>
diff --git a/generators/xps/generator_xps.h b/generators/xps/generator_xps.h
index 6097dd1fe..4b99437aa 100644
--- a/generators/xps/generator_xps.h
+++ b/generators/xps/generator_xps.h
@@ -31,7 +31,7 @@
#include <QXmlDefaultHandler>
#include <QStack>
#include <QVariant>
-#include <QtCore/qloggingcategory.h>
+#include <QLoggingCategory>
#include <kzip.h>
diff --git a/interfaces/configinterface.h b/interfaces/configinterface.h
index 1f4cdc923..bb6181cf7 100644
--- a/interfaces/configinterface.h
+++ b/interfaces/configinterface.h
@@ -12,7 +12,7 @@
#include "../core/okularcore_export.h"
-#include <QtCore/QObject>
+#include <QObject>
class KConfigDialog;
diff --git a/interfaces/guiinterface.h b/interfaces/guiinterface.h
index deb076944..c860d44d9 100644
--- a/interfaces/guiinterface.h
+++ b/interfaces/guiinterface.h
@@ -12,7 +12,7 @@
#include "../core/okularcore_export.h"
-#include <QtCore/QObject>
+#include <QObject>
#include <kxmlguiclient.h>
diff --git a/interfaces/printinterface.h b/interfaces/printinterface.h
index 919a0d745..ac51272f8 100644
--- a/interfaces/printinterface.h
+++ b/interfaces/printinterface.h
@@ -12,7 +12,7 @@
#include "../core/okularcore_export.h"
-#include <QtCore/QObject>
+#include <QObject>
class QWidget;
diff --git a/interfaces/saveinterface.h b/interfaces/saveinterface.h
index 95e7ccb49..f052209e9 100644
--- a/interfaces/saveinterface.h
+++ b/interfaces/saveinterface.h
@@ -12,7 +12,7 @@
#include "../core/okularcore_export.h"
-#include <QtCore/QObject>
+#include <QObject>
namespace Okular {
diff --git a/interfaces/viewerinterface.h b/interfaces/viewerinterface.h
index 9a16ea421..929bc1c19 100644
--- a/interfaces/viewerinterface.h
+++ b/interfaces/viewerinterface.h
@@ -17,8 +17,8 @@
#define VIEWERINTERFACE_EXPORT OKULARCORE_EXPORT
#endif
-#include <QtCore/QObject>
-#include <QtCore/QString>
+#include <QObject>
+#include <QString>
namespace Okular {
diff --git a/mobile/app/package/contents/ui/Bookmarks.qml b/mobile/app/package/contents/ui/Bookmarks.qml
index 4b4023365..a6063b3b4 100644
--- a/mobile/app/package/contents/ui/Bookmarks.qml
+++ b/mobile/app/package/contents/ui/Bookmarks.qml
@@ -25,4 +25,4 @@ ThumbnailsBase {
onPageClicked: {
pageArea.delegate.pageItem.goToBookmark(pageArea.delegate.pageItem.bookmarks[0])
}
-}
\ No newline at end of file
+}
diff --git a/mobile/components/test.qml b/mobile/components/test.qml
index fc996f8e0..4c029cafc 100644
--- a/mobile/components/test.qml
+++ b/mobile/components/test.qml
@@ -47,4 +47,4 @@ Item {
onClicked: page.pageNumber++
}
}
-}
\ No newline at end of file
+}
diff --git a/mobile/components/testDocumentView.qml b/mobile/components/testDocumentView.qml
index 79abaf165..d3205b9f4 100644
--- a/mobile/components/testDocumentView.qml
+++ b/mobile/components/testDocumentView.qml
@@ -32,4 +32,4 @@ Item {
anchors.fill: parent
document: docItem
}
-}
\ No newline at end of file
+}
diff --git a/part.cpp b/part.cpp
index 2974159c3..704feddcc 100644
--- a/part.cpp
+++ b/part.cpp
@@ -2500,9 +2500,10 @@ bool Part::saveAs( const QUrl & saveUrl, SaveAsFlags flags )
// since we only have poppler as saving backend for now we're skipping that check
if ( m_fileLastModified != QFileInfo( localFilePath() ).lastModified() )
{
- QMessageBox::warning( widget(),
- i18n( "File Changed" ),
- i18n( "The file '%1' has been modified by another program, which means it \
can no longer be saved.", url().fileName() ) ); + KMessageBox::sorry( widget(),
+ i18n( "The file '%1' has been modified by another program, which means it \
can no longer be saved.", url().fileName() ), + i18n( "File Changed" )
+ );
return false;
}
diff --git a/shell/main.cpp b/shell/main.cpp
index c8d731b61..983690d08 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -15,7 +15,7 @@
#include "shell.h"
#include <KLocalizedString>
-#include <QtDBus/qdbusinterface.h>
+#include <QDBusInterface>
#include <QTextStream>
#include <kwindowsystem.h>
#include <QApplication>
diff --git a/shell/okular_main.cpp b/shell/okular_main.cpp
index 2285f64a9..1d33f5ab7 100644
--- a/shell/okular_main.cpp
+++ b/shell/okular_main.cpp
@@ -15,9 +15,9 @@
#include "okular_main.h"
#include "shell.h"
-#include <QtWidgets/qapplication.h>
+#include <QApplication>
#include <KLocalizedString>
-#include <QtDBus/qdbusinterface.h>
+#include <QDBusInterface>
#include <QTextStream>
#include <kwindowsystem.h>
#include "aboutdata.h"
diff --git a/shell/okular_main.h b/shell/okular_main.h
index 950b18ef0..c4dd42e31 100644
--- a/shell/okular_main.h
+++ b/shell/okular_main.h
@@ -12,6 +12,9 @@
* (at your option) any later version. *
***************************************************************************/
+#ifndef _OKULAR_MAIN_H_
+#define _OKULAR_MAIN_H_
+
class QString;
class QStringList;
@@ -24,4 +27,6 @@ Status main(const QStringList &paths, const QString &serializedOptions);
}
+#endif
+
/* kate: replace-tabs on; indent-width 4; */
diff --git a/shell/shell.h b/shell/shell.h
index 4c5604be7..a66c60675 100644
--- a/shell/shell.h
+++ b/shell/shell.h
@@ -22,7 +22,7 @@
#include <QMimeDatabase>
#include <qaction.h>
-#include <QtDBus/QtDBus>
+#include <QtDBus>
class KRecentFilesAction;
class KToggleAction;
diff --git a/shell/shellutils.cpp b/shell/shellutils.cpp
index c9cc221ad..a465d6579 100644
--- a/shell/shellutils.cpp
+++ b/shell/shellutils.cpp
@@ -15,7 +15,7 @@
#include <QFileInfo>
#include <QDir>
#include <QDebug>
-#include <QtCore/qcommandlineparser.h>
+#include <QCommandLineParser>
namespace ShellUtils
{
diff --git a/ui/ktreeviewsearchline.cpp b/ui/ktreeviewsearchline.cpp
index 8a280b9fc..070234f59 100644
--- a/ui/ktreeviewsearchline.cpp
+++ b/ui/ktreeviewsearchline.cpp
@@ -21,19 +21,19 @@
#include "ktreeviewsearchline.h"
-#include <QtCore/QList>
-#include <QtCore/QTimer>
-#include <QtCore/QRegExp>
-#include <QtWidgets/QApplication>
-#include <QtGui/QContextMenuEvent>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QToolButton>
-#include <QtWidgets/QTreeView>
-
-#include <QtCore/QDebug>
+#include <QList>
+#include <QTimer>
+#include <QRegExp>
+#include <QApplication>
+#include <QContextMenuEvent>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QMenu>
+#include <QToolButton>
+#include <QTreeView>
+
+#include <QDebug>
#include <kiconloader.h>
#include <KLocalizedString>
#include <ktoolbar.h>
diff --git a/ui/latexrenderer.cpp b/ui/latexrenderer.cpp
index 47f976109..bed55e2ab 100644
--- a/ui/latexrenderer.cpp
+++ b/ui/latexrenderer.cpp
@@ -12,7 +12,7 @@
#include "latexrenderer.h"
-#include <QtCore/QDebug>
+#include <QDebug>
#include <kprocess.h>
diff --git a/ui/pageview.cpp b/ui/pageview.cpp
index 7c804f072..985aaab4c 100644
--- a/ui/pageview.cpp
+++ b/ui/pageview.cpp
@@ -23,7 +23,7 @@
#include "pageview.h"
// qt/kde includes
-#include <QtCore/qloggingcategory.h>
+#include <qloggingcategory.h>
#include <qcursor.h>
#include <qevent.h>
#include <qimage.h>
@@ -49,7 +49,7 @@
#include <KLocalizedString>
#include <kselectaction.h>
#include <ktoggleaction.h>
-#include <QtCore/QDebug>
+#include <QDebug>
#include <kmessagebox.h>
#include <QIcon>
#include <kurifilter.h>
diff --git a/ui/presentationwidget.cpp b/ui/presentationwidget.cpp
index 9d81f4e45..3e75e0bd3 100644
--- a/ui/presentationwidget.cpp
+++ b/ui/presentationwidget.cpp
@@ -11,9 +11,9 @@
// qt/kde includes
#include <qloggingcategory.h>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusReply>
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <QDBusReply>
#include <qevent.h>
#include <qfontmetrics.h>
diff --git a/ui/snapshottaker.h b/ui/snapshottaker.h
index 19bee5681..4f624b26c 100644
--- a/ui/snapshottaker.h
+++ b/ui/snapshottaker.h
@@ -12,7 +12,7 @@
#include <phonon/videoplayer.h>
-#include <QtCore/QObject>
+#include <QObject>
class QImage;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic