summaryrefslogtreecommitdiff
path: root/src/application.h
diff options
context:
space:
mode:
authorPanagiotis Papadopoulos <pano_90@gmx.net>2010-02-02 23:08:40 +0100
committerPanagiotis Papadopoulos <pano_90@gmx.net>2010-02-02 23:08:40 +0100
commit5efd06bc3dd4c494aa799f5e774a9475a4fa717a (patch)
tree9540281ba60e520c5edb8949dc38766aae1b72ad /src/application.h
parenti18n fixes (diff)
parentrekonq 0.3.34 (diff)
downloadrekonq-5efd06bc3dd4c494aa799f5e774a9475a4fa717a.tar.xz
Merge branch 'master' of git://gitorious.org/rekonq/mainline into i18n
Diffstat (limited to 'src/application.h')
-rw-r--r--src/application.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/application.h b/src/application.h
index 12ff2e3b..4b951ded 100644
--- a/src/application.h
+++ b/src/application.h
@@ -35,6 +35,7 @@
#include <KIcon>
#include <kio/job.h>
#include <kio/jobclasses.h>
+#include <ThreadWeaver/Job>
// Qt Includes
#include <QPointer>
@@ -48,6 +49,7 @@ class HistoryManager;
class MainWindow;
class SessionManager;
class AdBlockManager;
+class WebView;
typedef QList< QPointer<MainWindow> > MainWindowList;
@@ -110,6 +112,7 @@ public:
public slots:
/**
* Save application's configuration
+ *
* @see ReKonfig::self()->writeConfig();
*/
void saveConfiguration() const;
@@ -133,6 +136,8 @@ private slots:
*/
void postLaunch();
+ void loadResolvedUrl(ThreadWeaver::Job *);
+
private:
static QPointer<HistoryManager> s_historyManager;
static QPointer<BookmarkProvider> s_bookmarkProvider;