diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2012-03-16 16:54:26 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2012-03-25 09:28:44 +0200 |
| commit | 2fcbe68fbc19614a053428bdc37d7c6a3c84e8c8 (patch) | |
| tree | dee0c99417e1267aaec995e51040b301a0a5b645 /src/application.h | |
| parent | Check if user has a default search engine set and eventually (diff) | |
| download | rekonq-2fcbe68fbc19614a053428bdc37d7c6a3c84e8c8.tar.xz | |
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
Diffstat (limited to 'src/application.h')
| -rw-r--r-- | src/application.h | 15 |
1 files changed, 6 insertions, 9 deletions
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<MainWindow> > 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 |