diff options
author | Panagiotis Papadopoulos <pano_90@gmx.net> | 2009-12-09 17:23:35 +0100 |
---|---|---|
committer | Panagiotis Papadopoulos <pano_90@gmx.net> | 2009-12-09 17:23:35 +0100 |
commit | ba21553e2e6ce17fc4ad84b5ab587b4e7bc5345c (patch) | |
tree | 64f7b3a5cec066f06268e954899a78523dcaedf5 /src/application.h | |
parent | Change a bit the WebKit settings UI (diff) | |
parent | xss attach prevention. (diff) | |
download | rekonq-ba21553e2e6ce17fc4ad84b5ab587b4e7bc5345c.tar.xz |
Merge branch 'master' of git://gitorious.org/rekonq/mainline into click-to-flash-ui
Diffstat (limited to 'src/application.h')
-rw-r--r-- | src/application.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/application.h b/src/application.h index b15720f5..fa2354f2 100644 --- a/src/application.h +++ b/src/application.h @@ -33,7 +33,6 @@ // KDE Includes #include <KUniqueApplication> #include <KIcon> -#include <KUrl> #include <kio/job.h> #include <kio/jobclasses.h> @@ -135,9 +134,8 @@ private slots: void postLaunch(); private: - - KUrl guessUrlFromString(const QString &url); - + KUrl xssSanitization(const KUrl &url); + static QPointer<HistoryManager> s_historyManager; static QPointer<BookmarkProvider> s_bookmarkProvider; static QPointer<SessionManager> s_sessionManager; |