From 23b44d0344304499ba8e1f199720202381920827 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Thu, 24 Feb 2011 18:35:20 +0100 Subject: No more static members in the Application class, an rApp shortcut for Application::instance, clean up code switching to use the new shortcut Reviewed by: adjam --- src/webtab.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/webtab.cpp') diff --git a/src/webtab.cpp b/src/webtab.cpp index c2f00160..be45aff5 100644 --- a/src/webtab.cpp +++ b/src/webtab.cpp @@ -267,7 +267,7 @@ KUrl WebTab::extractOpensearchUrl(QWebElement e) bool WebTab::hasNewSearchEngine() { QWebElement e = page()->mainFrame()->findFirstElement(QLatin1String("head >link[rel=\"search\"][ type=\"application/opensearchdescription+xml\"]")); - return !e.isNull() && !Application::opensearchManager()->engineExists(extractOpensearchUrl(e)); + return !e.isNull() && !rApp->opensearchManager()->engineExists(extractOpensearchUrl(e)); } @@ -281,8 +281,8 @@ void WebTab::showSearchEngine(const QPoint &pos) widget->setWindowFlags(Qt::Popup); connect(widget, SIGNAL(webShortcutSet(const KUrl &, const QString &, const QString &)), - Application::opensearchManager(), SLOT(addOpenSearchEngine(const KUrl &, const QString &, const QString &))); - connect(Application::opensearchManager(), SIGNAL(openSearchEngineAdded(const QString &, const QString &, const QString &)), + rApp->opensearchManager(), SLOT(addOpenSearchEngine(const KUrl &, const QString &, const QString &))); + connect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(const QString &, const QString &, const QString &)), this, SLOT(openSearchEngineAdded())); widget->show(extractOpensearchUrl(e), title, pos); @@ -295,6 +295,6 @@ void WebTab::openSearchEngineAdded() // If the providers changed, tell sycoca to rebuild its database... KBuildSycocaProgressDialog::rebuildKSycoca(this); - disconnect(Application::opensearchManager(), SIGNAL(openSearchEngineAdded(const QString &, const QString &, const QString &)), + disconnect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(const QString &, const QString &, const QString &)), this, SLOT(openSearchEngineAdded())); } -- cgit v1.2.1