summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-08-08 22:20:47 (GMT)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-08-08 22:21:04 (GMT)
commit4cf3df32e349c361dbe8304ae3cdd683bbc2da48 (patch)
tree4ae9c9000bc18e35223d4e2a7ef63ab046f82c99
parent39787e4324e3a7560e44a39408183dab97ff90b9 (diff)
Fix includes and KQAction
-rw-r--r--aboutdata.h2
-rw-r--r--shell/shell.cpp3
-rw-r--r--shell/shell.h11
3 files changed, 11 insertions, 5 deletions
diff --git a/aboutdata.h b/aboutdata.h
index 8d7d5d1..f9ef151 100644
--- a/aboutdata.h
+++ b/aboutdata.h
@@ -22,7 +22,7 @@ inline KAboutData okularAboutData( const char* name, const char* iname )
ki18n(iname), //I18N_NOOP("okular"),
OKULAR_VERSION_STRING,
ki18n("Okular, a universal document viewer"),
- KAboutData::License_GPL,
+ KAboutLicense::GPL,
ki18n("(C) 2002 Wilco Greven, Christophe Devriese\n"
"(C) 2004-2005 Enrico Ros\n"
"(C) 2005 Piotr Szymanski\n"
diff --git a/shell/shell.cpp b/shell/shell.cpp
index 55f4f12..cc3292f 100644
--- a/shell/shell.cpp
+++ b/shell/shell.cpp
@@ -47,6 +47,9 @@
#include <kxmlguifactory.h>
#include <QDragMoveEvent>
#include <QTabBar>
+#include <kicon.h>
+#include <kglobal.h>
+#include <kconfiggroup.h>
#ifdef KActivities_FOUND
#include <KActivities/ResourceInstance>
diff --git a/shell/shell.h b/shell/shell.h
index e540054..9761f4b 100644
--- a/shell/shell.h
+++ b/shell/shell.h
@@ -17,7 +17,10 @@
#define _OKULAR_SHELL_H_
#include <kparts/mainwindow.h>
+#include <kparts/readwritepart.h>
#include <kmimetype.h>
+#include <kurl.h>
+#include <kaction.h>
#include <QtDBus/QtDBus>
@@ -130,8 +133,8 @@ private:
KRecentFilesAction* m_recent;
QStringList m_fileformats;
bool m_fileformatsscanned;
- KAction* m_printAction;
- KAction* m_closeAction;
+ QAction* m_printAction;
+ QAction* m_closeAction;
KToggleAction* m_fullScreenAction;
KToggleAction* m_showMenuBarAction;
bool m_menuBarWasShown, m_toolBarWasShown;
@@ -152,8 +155,8 @@ private:
bool closeEnabled;
};
QList<TabState> m_tabs;
- KAction* m_nextTabAction;
- KAction* m_prevTabAction;
+ QAction* m_nextTabAction;
+ QAction* m_prevTabAction;
#ifdef KActivities_FOUND
KActivities::ResourceInstance* m_activityResource;