summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-08-07 23:35:27 (GMT)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-08-07 23:59:55 (GMT)
commit75031eee7e4196a04bd41ab294c1f0b14f5ecd6f (patch)
tree7dc3825f46cd695c02bf2ed91b25d044d9564e3a
parent5ab5212e21c7e5401c503fdcc101f5a34358daa8 (diff)
Fix includes
-rw-r--r--conf/widgetannottools.cpp2
-rw-r--r--core/annotations.cpp2
-rw-r--r--core/audioplayer.cpp2
-rw-r--r--core/bookmarkmanager.cpp2
-rw-r--r--core/bookmarkmanager.h2
-rw-r--r--core/chooseenginedialog.cpp4
-rw-r--r--core/document.cpp9
-rw-r--r--core/document.h2
-rw-r--r--core/document_p.h1
-rw-r--r--core/documentcommands_p.h2
-rw-r--r--core/fileprinter.cpp4
-rw-r--r--core/fileprinter.h2
-rw-r--r--core/generator.cpp2
-rw-r--r--core/textdocumentgenerator.cpp2
-rw-r--r--part.cpp2
-rw-r--r--ui/fileprinterpreview.cpp2
-rw-r--r--ui/ktreeviewsearchline.cpp2
17 files changed, 24 insertions, 20 deletions
diff --git a/conf/widgetannottools.cpp b/conf/widgetannottools.cpp
index 6d05eed..d87c9ae 100644
--- a/conf/widgetannottools.cpp
+++ b/conf/widgetannottools.cpp
@@ -22,7 +22,7 @@
#include <QtGui/QHBoxLayout>
#include <QtGui/QVBoxLayout>
#include <QtGui/QGroupBox>
-#include <QtGui/QLabel>
+#include <QtWidgets/QLabel>
#include <QtGui/QListWidget>
#include <QtGui/QListWidgetItem>
#include <QtGui/QStackedWidget>
diff --git a/core/annotations.cpp b/core/annotations.cpp
index e029946..ac45a5a 100644
--- a/core/annotations.cpp
+++ b/core/annotations.cpp
@@ -11,7 +11,7 @@
#include "annotations_p.h"
// qt/kde includes
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
#include <QtGui/QColor>
// DBL_MAX
diff --git a/core/audioplayer.cpp b/core/audioplayer.cpp
index 3638040..ab735f3 100644
--- a/core/audioplayer.cpp
+++ b/core/audioplayer.cpp
@@ -15,7 +15,7 @@
#include <qdir.h>
#include <kdebug.h>
#include <krandom.h>
-#include <Phonon/Path>
+#include <phonon/path.h>
#include <phonon/audiooutput.h>
#include <phonon/abstractmediastream.h>
#include <phonon/mediaobject.h>
diff --git a/core/bookmarkmanager.cpp b/core/bookmarkmanager.cpp
index 22951b2..caef1ee 100644
--- a/core/bookmarkmanager.cpp
+++ b/core/bookmarkmanager.cpp
@@ -12,11 +12,13 @@
// qt/kde includes
#include <qhash.h>
#include <qset.h>
+#include <kbookmarkaction.h>
#include <kbookmarkmanager.h>
#include <kbookmarkmenu.h>
#include <kdebug.h>
#include <kglobal.h>
#include <kstandarddirs.h>
+#include <kurl.h>
// local includes
#include "document_p.h"
diff --git a/core/bookmarkmanager.h b/core/bookmarkmanager.h
index e24efc6..f470d73 100644
--- a/core/bookmarkmanager.h
+++ b/core/bookmarkmanager.h
@@ -13,9 +13,9 @@
#include <kbookmark.h>
#include "okular_export.h"
+#include <kurl.h>
class QAction;
-class KUrl;
namespace Okular {
diff --git a/core/chooseenginedialog.cpp b/core/chooseenginedialog.cpp
index 657c95d..34f59b9 100644
--- a/core/chooseenginedialog.cpp
+++ b/core/chooseenginedialog.cpp
@@ -9,8 +9,8 @@
#include "chooseenginedialog_p.h"
-#include <QtGui/QComboBox>
-#include <QtGui/QLabel>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QLabel>
#include <klocale.h>
diff --git a/core/document.cpp b/core/document.cpp
index 921a7e8..49d922a 100644
--- a/core/document.cpp
+++ b/core/document.cpp
@@ -30,13 +30,14 @@
#include <QtCore/QMap>
#include <QtCore/QTextStream>
#include <QtCore/QTimer>
-#include <QtGui/QApplication>
-#include <QtGui/QLabel>
-#include <QtGui/QPrinter>
-#include <QtGui/QPrintDialog>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QLabel>
+#include <QtPrintSupport/QPrinter>
+#include <QtPrintSupport/QPrintDialog>
#include <QUndoCommand>
#include <kaboutdata.h>
+#include <k4aboutdata.h>
#include <kauthorized.h>
#include <kcomponentdata.h>
#include <kconfigdialog.h>
diff --git a/core/document.h b/core/document.h
index 06bac8a..5674173 100644
--- a/core/document.h
+++ b/core/document.h
@@ -19,7 +19,7 @@
#include <QtCore/QObject>
#include <QtCore/QStringList>
#include <QtCore/QVector>
-#include <QtGui/QPrinter>
+#include <QtPrintSupport/QPrinter>
#include <QtXml/QDomDocument>
#include <kmimetype.h>
diff --git a/core/document_p.h b/core/document_p.h
index aabd192..0a61220 100644
--- a/core/document_p.h
+++ b/core/document_p.h
@@ -22,6 +22,7 @@
#include <kcomponentdata.h>
#include <kservicetypetrader.h>
+#include <kurl.h>
// local includes
#include "fontinfo.h"
diff --git a/core/documentcommands_p.h b/core/documentcommands_p.h
index 17394f2..616999d 100644
--- a/core/documentcommands_p.h
+++ b/core/documentcommands_p.h
@@ -10,7 +10,7 @@
#ifndef _OKULAR_DOCUMENT_COMMANDS_P_H_
#define _OKULAR_DOCUMENT_COMMANDS_P_H_
-#include <QtGui/QUndoCommand>
+#include <QtWidgets/QUndoCommand>
#include <QDomNode>
#include "area.h"
diff --git a/core/fileprinter.cpp b/core/fileprinter.cpp
index 55977a1..d6a8fd5 100644
--- a/core/fileprinter.cpp
+++ b/core/fileprinter.cpp
@@ -12,13 +12,13 @@
#include "fileprinter.h"
-#include <QtGui/QPrinter>
+#include <QtPrintSupport/QPrinter>
#include <QPrintEngine>
#include <QStringList>
#include <QSize>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
-#include <QtGui/QLabel>
+#include <QtWidgets/QLabel>
#include <QtGui/QShowEvent>
#include <QtNetwork/QTcpSocket>
diff --git a/core/fileprinter.h b/core/fileprinter.h
index c7cd32a..a509d5c 100644
--- a/core/fileprinter.h
+++ b/core/fileprinter.h
@@ -16,7 +16,7 @@
#include <QtCore/QList>
#include <QtCore/QString>
-#include <QtGui/QPrinter>
+#include <QtPrintSupport/QPrinter>
#include "okular_export.h"
#include "generator.h"
diff --git a/core/generator.cpp b/core/generator.cpp
index ec1d1f7..f45c9a1 100644
--- a/core/generator.cpp
+++ b/core/generator.cpp
@@ -13,7 +13,7 @@
#include "observer.h"
#include <qeventloop.h>
-#include <QtGui/QPrinter>
+#include <QtPrintSupport/QPrinter>
#include <kdebug.h>
#include <kicon.h>
diff --git a/core/textdocumentgenerator.cpp b/core/textdocumentgenerator.cpp
index d598ccc..05af426 100644
--- a/core/textdocumentgenerator.cpp
+++ b/core/textdocumentgenerator.cpp
@@ -18,7 +18,7 @@
#include <QtGui/QFontDatabase>
#include <QtGui/QImage>
#include <QtGui/QPainter>
-#include <QtGui/QPrinter>
+#include <QtPrintSupport/QPrinter>
#if QT_VERSION >= 0x040500
#include <QtGui/QTextDocumentWriter>
#endif
diff --git a/part.cpp b/part.cpp
index d9f1682..ae804da 100644
--- a/part.cpp
+++ b/part.cpp
@@ -29,7 +29,7 @@
#include <qlayout.h>
#include <qlabel.h>
#include <qtimer.h>
-#include <QtGui/QPrinter>
+#include <QtPrintSupport/QPrinter>
#include <QtGui/QPrintDialog>
#include <QScrollBar>
diff --git a/ui/fileprinterpreview.cpp b/ui/fileprinterpreview.cpp
index 47035d6..2bee0fa 100644
--- a/ui/fileprinterpreview.cpp
+++ b/ui/fileprinterpreview.cpp
@@ -15,7 +15,7 @@
#include <QFile>
#include <QSize>
#include <QtCore/QFile>
-#include <QtGui/QLabel>
+#include <QtWidgets/QLabel>
#include <QtGui/QShowEvent>
#include <kmimetypetrader.h>
diff --git a/ui/ktreeviewsearchline.cpp b/ui/ktreeviewsearchline.cpp
index cdf4c14..9623eb9 100644
--- a/ui/ktreeviewsearchline.cpp
+++ b/ui/ktreeviewsearchline.cpp
@@ -28,7 +28,7 @@
#include <QtGui/QContextMenuEvent>
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
+#include <QtWidgets/QLabel>
#include <QtGui/QMenu>
#include <QtGui/QToolButton>
#include <QtGui/QTreeView>