diff --git a/aboutdata.h b/aboutdata.h index 8d7d5d11f..f9ef151c5 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 55f4f1248..cc3292fa0 100644 --- a/shell/shell.cpp +++ b/shell/shell.cpp @@ -47,6 +47,9 @@ #include #include #include +#include +#include +#include #ifdef KActivities_FOUND #include diff --git a/shell/shell.h b/shell/shell.h index e540054f1..9761f4b6e 100644 --- a/shell/shell.h +++ b/shell/shell.h @@ -17,7 +17,10 @@ #define _OKULAR_SHELL_H_ #include +#include #include +#include +#include #include @@ -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 m_tabs; - KAction* m_nextTabAction; - KAction* m_prevTabAction; + QAction* m_nextTabAction; + QAction* m_prevTabAction; #ifdef KActivities_FOUND KActivities::ResourceInstance* m_activityResource;