summaryrefslogtreecommitdiff
path: root/src/filterurljob.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-03-16 16:54:26 +0100
committerAndrea Diamantini <adjam7@gmail.com>2012-03-25 09:28:44 +0200
commit2fcbe68fbc19614a053428bdc37d7c6a3c84e8c8 (patch)
treedee0c99417e1267aaec995e51040b301a0a5b645 /src/filterurljob.cpp
parentCheck if user has a default search engine set and eventually (diff)
downloadrekonq-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/filterurljob.cpp')
-rw-r--r--src/filterurljob.cpp80
1 files changed, 0 insertions, 80 deletions
diff --git a/src/filterurljob.cpp b/src/filterurljob.cpp
deleted file mode 100644
index ff017a07..00000000
--- a/src/filterurljob.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
-*
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License or (at your option) version 3 or any later version
-* accepted by the membership of KDE e.V. (or its successor approved
-* by the membership of KDE e.V.), which shall act as a proxy
-* defined in Section 14 of version 3 of the license.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*
-* ============================================================ */
-
-
-// Self Includes
-#include "filterurljob.h"
-
-// KDE Includes
-#include <KUriFilterData>
-
-
-KUriFilter *FilterUrlJob::s_uriFilter;
-
-
-FilterUrlJob::FilterUrlJob(WebView *view, const QString &urlString, QObject *parent)
- : Job(parent)
- , _view(view)
- , _urlString(urlString)
-{
- if (!s_uriFilter)
- s_uriFilter = KUriFilter::self();
-}
-
-
-WebView *FilterUrlJob::view()
-{
- return _view;
-}
-
-
-KUrl FilterUrlJob::url()
-{
- return _url;
-}
-
-
-void FilterUrlJob::run()
-{
- // Bookmarklets handling
- if (_urlString.startsWith(QL1S("javascript:")))
- {
- _url = KUrl(_urlString);
- return;
- }
-
- // this should let rekonq filtering URI info and supporting
- // the beautiful KDE web browsing shortcuts
- KUriFilterData data(_urlString);
- data.setCheckForExecutables(false); // if true, queries like "rekonq" or "dolphin" are considered as executables
-
- if (s_uriFilter->filterUri(data) && data.uriType() != KUriFilterData::Error)
- {
- QString tempUrlString = data.uri().url();
- _url = KUrl(tempUrlString);
- }
- else
- _url = QUrl::fromUserInput(_urlString);
-}