Fix includes and KQAction

frameworks
Frederik Gladhorn 12 years ago
parent 39787e4324
commit 4cf3df32e3
  1. 2
      aboutdata.h
  2. 3
      shell/shell.cpp
  3. 11
      shell/shell.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"

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

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

Loading…
Cancel
Save