Commit 4cf3df32 authored by Frederik Gladhorn's avatar Frederik Gladhorn

Fix includes and KQAction

parent 39787e43
...@@ -22,7 +22,7 @@ inline KAboutData okularAboutData( const char* name, const char* iname ) ...@@ -22,7 +22,7 @@ inline KAboutData okularAboutData( const char* name, const char* iname )
ki18n(iname), //I18N_NOOP("okular"), ki18n(iname), //I18N_NOOP("okular"),
OKULAR_VERSION_STRING, OKULAR_VERSION_STRING,
ki18n("Okular, a universal document viewer"), ki18n("Okular, a universal document viewer"),
KAboutData::License_GPL, KAboutLicense::GPL,
ki18n("(C) 2002 Wilco Greven, Christophe Devriese\n" ki18n("(C) 2002 Wilco Greven, Christophe Devriese\n"
"(C) 2004-2005 Enrico Ros\n" "(C) 2004-2005 Enrico Ros\n"
"(C) 2005 Piotr Szymanski\n" "(C) 2005 Piotr Szymanski\n"
......
...@@ -47,6 +47,9 @@ ...@@ -47,6 +47,9 @@
#include <kxmlguifactory.h> #include <kxmlguifactory.h>
#include <QDragMoveEvent> #include <QDragMoveEvent>
#include <QTabBar> #include <QTabBar>
#include <kicon.h>
#include <kglobal.h>
#include <kconfiggroup.h>
#ifdef KActivities_FOUND #ifdef KActivities_FOUND
#include <KActivities/ResourceInstance> #include <KActivities/ResourceInstance>
......
...@@ -17,7 +17,10 @@ ...@@ -17,7 +17,10 @@
#define _OKULAR_SHELL_H_ #define _OKULAR_SHELL_H_
#include <kparts/mainwindow.h> #include <kparts/mainwindow.h>
#include <kparts/readwritepart.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <kurl.h>
#include <kaction.h>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
...@@ -130,8 +133,8 @@ private: ...@@ -130,8 +133,8 @@ private:
KRecentFilesAction* m_recent; KRecentFilesAction* m_recent;
QStringList m_fileformats; QStringList m_fileformats;
bool m_fileformatsscanned; bool m_fileformatsscanned;
KAction* m_printAction; QAction* m_printAction;
KAction* m_closeAction; QAction* m_closeAction;
KToggleAction* m_fullScreenAction; KToggleAction* m_fullScreenAction;
KToggleAction* m_showMenuBarAction; KToggleAction* m_showMenuBarAction;
bool m_menuBarWasShown, m_toolBarWasShown; bool m_menuBarWasShown, m_toolBarWasShown;
...@@ -152,8 +155,8 @@ private: ...@@ -152,8 +155,8 @@ private:
bool closeEnabled; bool closeEnabled;
}; };
QList<TabState> m_tabs; QList<TabState> m_tabs;
KAction* m_nextTabAction; QAction* m_nextTabAction;
KAction* m_prevTabAction; QAction* m_prevTabAction;
#ifdef KActivities_FOUND #ifdef KActivities_FOUND
KActivities::ResourceInstance* m_activityResource; KActivities::ResourceInstance* m_activityResource;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment