diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/webpage.cpp | 35 | ||||
| -rw-r--r-- | src/webpage.h | 18 |
3 files changed, 2 insertions, 52 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4faece61..279d9519 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -64,7 +64,6 @@ TARGET_LINK_LIBRARIES ( rekonq ${QT_LIBRARIES} ${QT_QTNETWORK_LIBRARY} ${QT_QTWEBKIT_LIBRARY} - ${QT_QTUITOOLS_LIBRARY} ${KDE4_KUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} diff --git a/src/webpage.cpp b/src/webpage.cpp index 3754444b..b8662f14 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -65,8 +65,6 @@ #include <QtGui/QClipboard> #include <QtGui/QKeyEvent> -#include <QtUiTools/QUiLoader> - WebPage::WebPage(QObject *parent) : QWebPage(parent) @@ -264,39 +262,6 @@ QString WebPage::errorPage(QNetworkReply *reply) } -void WebPage::javaScriptAlert(QWebFrame *frame, const QString &msg) -{ - KMessageBox::error(frame->page()->view(), msg, i18n("JavaScript")); -} - - -bool WebPage::javaScriptConfirm(QWebFrame *frame, const QString &msg) -{ - return (KMessageBox::warningYesNo(frame->page()->view(), msg, i18n("JavaScript"), KStandardGuiItem::ok(), KStandardGuiItem::cancel()) - == KMessageBox::Yes); -} - - -bool WebPage::javaScriptPrompt(QWebFrame *frame, const QString &msg, const QString &defaultValue, QString *result) -{ - bool ok = false; - *result = KInputDialog::getText(i18n("JavaScript"), msg, defaultValue, &ok, frame->page()->view()); - return ok; -} - - -QObject *WebPage::createPlugin(const QString &classId, const QUrl &url, const QStringList ¶mNames, const QStringList ¶mValues) -{ - kDebug() << "create Plugin requested:"; - kDebug() << "classid:" << classId; - kDebug() << "url:" << url; - kDebug() << "paramNames:" << paramNames << " paramValues:" << paramValues; - - QUiLoader loader; - return loader.createWidget(classId, view()); -} - - // TODO FIXME: sometimes url.fileName() fails to retrieve url file name void WebPage::slotDownloadRequested(const QNetworkRequest &request) { diff --git a/src/webpage.h b/src/webpage.h index 86024a9d..abbaba22 100644 --- a/src/webpage.h +++ b/src/webpage.h @@ -60,22 +60,8 @@ protected: virtual bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type); - - void javaScriptAlert(QWebFrame *frame, - const QString &msg); - - bool javaScriptConfirm(QWebFrame *frame, - const QString &msg); - - bool javaScriptPrompt(QWebFrame *frame, - const QString &msg, - const QString &defaultValue, QString *result); - - QObject *createPlugin(const QString &classId, - const QUrl &url, - const QStringList ¶mNames, - const QStringList ¶mValues); - + + protected Q_SLOTS: virtual void slotHandleUnsupportedContent(QNetworkReply *reply); virtual void slotDownloadRequested(const QNetworkRequest &request); |