diff options
| author | Jon Ander Peñalba <jonan88@gmail.com> | 2010-09-02 18:10:46 +0200 |
|---|---|---|
| committer | Jon Ander Peñalba <jonan88@gmail.com> | 2010-09-03 08:27:20 +0200 |
| commit | d0ab264b8aa5f5c7fcb21dd172a1f3f5b777356b (patch) | |
| tree | f89adefce79c8bf0d5cde2e1bc015a443ccb39fe /src/protocolhandler.cpp | |
| parent | This commit hacks a merge request, to fast fixing a crash calling the bk toolbar (diff) | |
| download | rekonq-d0ab264b8aa5f5c7fcb21dd172a1f3f5b777356b.tar.xz | |
Include clean-up in the big src directory
Diffstat (limited to 'src/protocolhandler.cpp')
| -rw-r--r-- | src/protocolhandler.cpp | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp index a260ad06..c469d0c3 100644 --- a/src/protocolhandler.cpp +++ b/src/protocolhandler.cpp @@ -25,43 +25,33 @@ // Self Includes #include "protocolhandler.h" -#include "protocolhandler.moc" // Auto Includes #include "rekonq.h" // Local Includes -#include "newtabpage.h" +#include "adblockmanager.h" #include "application.h" -#include "mainwindow.h" +#include "historymanager.h" #include "mainview.h" +#include "mainwindow.h" +#include "newtabpage.h" #include "urlbar.h" +#include "webpage.h" #include "webtab.h" -#include "historymanager.h" -#include "adblockmanager.h" // KDE Includes -#include <klocalizedstring.h> -#include <KUrl> -#include <KRun> -#include <KToolInvocation> -#include <KStandardDirs> -#include <KMimeType> -#include <KIconLoader> +#include <KIO/Job> #include <KDirLister> -#include <KFileItem> -#include <KJob> -#include <kio/udsentry.h> +#include <KLocalizedString> #include <KMessageBox> -#include <kprocess.h> +#include <KProcess> +#include <KStandardDirs> +#include <KToolInvocation> // Qt Includes -#include <QLatin1String> -#include <QNetworkRequest> -#include <QWebFrame> -#include <QDir> -#include <QFile> -#include <QDateTime> +#include <QtNetwork/QNetworkRequest> +#include <QtWebKit/QWebFrame> ProtocolHandler::ProtocolHandler(QObject *parent) @@ -108,7 +98,7 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra if(scriptSource.isEmpty()) return false; } - + kDebug() << "EVALUATING JAVASCRIPT..."; QVariant result = frame->evaluateJavaScript(scriptSource); return true; @@ -132,11 +122,11 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra if ( KProcess::execute (apturl,host)==0) return true; - else + else return false; } - + // "abp" handling if (_url.protocol() == QL1S("abp")) { |