From 2fcbe68fbc19614a053428bdc37d7c6a3c84e8c8 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 16 Mar 2012 16:54:26 +0100 Subject: Add loadUrl API to mainwindow - Get rid of unused NewBackTab enum - move loading url code to MainWindow class - Remove ThreadWeaver API. (And take it easy...) - Changed logic: calculate url BEFORE creating a tab... REVIEW:104326 --- src/application.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 5e078756..2fe1499e 100644 --- a/src/application.h +++ b/src/application.h @@ -60,11 +60,6 @@ class WebTab; class KAction; -namespace ThreadWeaver -{ -class Job; -} - typedef QList< QWeakPointer > MainWindowList; @@ -107,8 +102,6 @@ public: return _privateBrowsingAction; }; - WebTab *loadUrl(const KUrl& url, QWebHistory *webHistory, const Rekonq::OpenType& type = Rekonq::CurrentTab); - public Q_SLOTS: /** * Save application's configuration @@ -117,6 +110,12 @@ public Q_SLOTS: */ void saveConfiguration() const; + /** + * @short load url + * + * @param url The url to load + * @param type the type where loading the url. @see Rekonq::OpenType + */ void loadUrl(const KUrl& url, const Rekonq::OpenType& type = Rekonq::CurrentTab ); @@ -129,8 +128,6 @@ protected: bool eventFilter(QObject *watched, QEvent *event); private Q_SLOTS: - void loadResolvedUrl(ThreadWeaver::Job *); - void updateConfiguration(); // the general place to set private browsing -- cgit v1.2.1