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/mainwindow.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 789c0c1a..d652a499 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -50,7 +50,10 @@ class WebInspectorPanel; class WebTab; class ZoomBar; +class KUriFilter; + class QWebFrame; +class QWebHistory; class QLabel; @@ -67,6 +70,11 @@ public: MainWindow(); ~MainWindow(); + + static KUriFilter *s_uriFilter; + static KUrl filterUrlToLoad(const KUrl &url); + + inline MainView *mainView() const { return m_view; @@ -82,6 +90,10 @@ public: QString selectedText() const; + void loadCheckedUrl(const KUrl& url, + const Rekonq::OpenType& type = Rekonq::CurrentTab, + QWebHistory *webHistory = 0 + ); private: void setupBookmarksAndToolsShortcuts(); void setupActions(); @@ -90,6 +102,11 @@ private: void setupPanels(); public Q_SLOTS: + void loadUrl(const KUrl& url, + const Rekonq::OpenType& type = Rekonq::CurrentTab, + QWebHistory *webHistory = 0 + ); + void openDownloadsPage(); void homePage(); -- cgit v1.2.1