diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2009-04-28 03:19:14 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2009-04-28 03:19:14 +0200 |
commit | 32da13f039241349c894f5c13cc1954c16c2e783 (patch) | |
tree | 63e42d04ac8d38a0650e35c08057be854ebfb508 /src/application.h | |
parent | Merge commit 'avaddon/master' into MERGING (diff) | |
download | rekonq-32da13f039241349c894f5c13cc1954c16c2e783.tar.xz |
Revert "Some changes ported for merge to mainline (bookmarks & links handling related)"
links hadling problem
This reverts commit fdbd70a77a8c294e0a578073c738f3bc4dfa6ab5.
Diffstat (limited to 'src/application.h')
-rw-r--r-- | src/application.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/application.h b/src/application.h index dfcfab62..98b213a3 100644 --- a/src/application.h +++ b/src/application.h @@ -47,18 +47,6 @@ class MainWindow; class NetworkAccessManager; class WebView; -namespace Rekonq { - /** - * @short Open link options - * Defferent modes of opening new tab - */ - enum OpenType { - Default, ///< open url according to users settings - Current, ///< open url in current tab - New, ///< open url in new tab and make it current - Background ///< open url in new tab in background - }; -} /** * @@ -74,7 +62,7 @@ public: static Application *instance(); MainWindow *mainWindow(); - WebView* newWebView(bool makeCurrent = true); + WebView* newWebView(); KIcon icon(const KUrl &url) const; @@ -84,16 +72,13 @@ public: static DownloadManager *downloadManager(); static BookmarkProvider *bookmarkProvider(); -signals: - void openUrl(const KUrl &url, Rekonq::OpenType type=Rekonq::Current); - public slots: /** * Save application's configuration * @see ReKonfig::self()->writeConfig(); */ void slotSaveConfiguration() const; - + private slots: @@ -101,6 +86,7 @@ private slots: * Any actions that can be delayed until the window is visible */ void postLaunch(); + void openUrl(const KUrl &url); private: static QPointer<HistoryManager> s_historyManager; |