diff options
Diffstat (limited to 'konq-plugins/sidebar')
6 files changed, 14 insertions, 14 deletions
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp index f198b9e..47bfa19 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.cpp +++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp @@ -229,7 +229,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent } } else{ - DCOPRef action(kapp->dcopClient()->appId(), TQCString(topWidgetName).append("/action/").append((*it).utf8())); + DCOPRef action(tdeApp->dcopClient()->appId(), TQCString(topWidgetName).append("/action/").append((*it).utf8())); TQString text = action.call("plainText()"); TQString icon = iconConfig->readEntry(*it, action.call("icon()")); @@ -351,7 +351,7 @@ void ConfigDialog::createLink() if(!name_str.isEmpty() && !url_str.isEmpty()){ if(icon_str.isEmpty()){ - icon_str = kapp->iconLoader()->iconPath("folder", TDEIcon::Small); + icon_str = tdeApp->iconLoader()->iconPath("folder", TDEIcon::Small); } TQPixmap icon(icon_str); @@ -434,7 +434,7 @@ void ConfigDialog::editLink(TQListViewItem *item) if(!name_str.isEmpty() && !url_str.isEmpty()){ if(icon_str.isEmpty()){ - icon_str = kapp->iconLoader()->iconPath("folder", TDEIcon::Small); + icon_str = tdeApp->iconLoader()->iconPath("folder", TDEIcon::Small); } TQPixmap icon(icon_str); @@ -529,7 +529,7 @@ void ConfigDialog::loadAvailableActions() TQByteArray data, replyData; TQCString replyType; - if(DCOPClient::mainClient()->call(kapp->dcopClient()->appId(), topWidgetName, "actionMap()", data, replyType, replyData)){ + if(DCOPClient::mainClient()->call(tdeApp->dcopClient()->appId(), topWidgetName, "actionMap()", data, replyType, replyData)){ if(replyType == "TQMap<TQCString,DCOPRef>"){ TQMap<TQCString,DCOPRef> actionMap; @@ -568,7 +568,7 @@ void ConfigDialog::loadThemes() TQString theme = config->readEntry("Theme", "default"); bool foundTheme = false; - TQStringList dirs = kapp->dirs()->findDirs("data", "metabar/themes"); + TQStringList dirs = tdeApp->dirs()->findDirs("data", "metabar/themes"); for(TQStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it){ TQStringList theme_list = TQDir(*it).entryList(TQDir::Dirs); @@ -599,7 +599,7 @@ void ConfigDialog::installTheme() KTar archive(file); archive.open(IO_ReadOnly); - kapp->processEvents(); + tdeApp->processEvents(); const KArchiveDirectory* rootDir = archive.directory(); rootDir->copyTo(themedir); diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp index 79b1ea7..8e0d1bf 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp @@ -104,7 +104,7 @@ void DefaultPlugin::loadActions(DOM::HTMLElement node) } } else{ - DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8())); + DCOPRef action(tdeApp->dcopClient()->appId(), TQCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8())); if(!action.isNull()){ if(action.call("enabled()")){ diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp index 5930589..7a1c5c4 100644 --- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp @@ -107,7 +107,7 @@ bool HTTPPlugin::handleRequest(const KURL &url) KURL url("http://www.google.com/search"); url.addQueryItem("q", keyword); - DCOPRef ref(kapp->dcopClient()->appId(), m_html->view()->topLevelWidget()->name()); + DCOPRef ref(tdeApp->dcopClient()->appId(), m_html->view()->topLevelWidget()->name()); DCOPReply reply = ref.call("openURL", url.url()); } diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index c66fc19..c90c35e 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -210,7 +210,7 @@ void MetabarWidget::setFileItems(const KFileItemList &items, bool check) TQString MetabarWidget::getCurrentURL() { - DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); + DCOPRef ref(tdeApp->dcopClient()->appId(), this->topLevelWidget()->name()); DCOPReply reply = ref.call("currentURL()"); if (reply.isValid()) { @@ -226,19 +226,19 @@ TQString MetabarWidget::getCurrentURL() void MetabarWidget::openURL(const TQString &url) { - DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); + DCOPRef ref(tdeApp->dcopClient()->appId(), this->topLevelWidget()->name()); DCOPReply reply = ref.call("openURL", url); } void MetabarWidget::openTab(const TQString &url) { - DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); + DCOPRef ref(tdeApp->dcopClient()->appId(), this->topLevelWidget()->name()); DCOPReply reply = ref.call("newTab", url); } void MetabarWidget::callAction(const TQString &action) { - DCOPRef ref(kapp->dcopClient()->appId(), TQString(TQString(this->topLevelWidget()->name()).append("/action/").append(action)).utf8()); + DCOPRef ref(tdeApp->dcopClient()->appId(), TQString(TQString(this->topLevelWidget()->name()).append("/action/").append(action)).utf8()); if(ref.call("enabled()")){ ref.call("activate()"); } diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index 4749f53..0ab683f 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -78,7 +78,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int if(cfg.hasKey("X-TDE-ShowIfRunning" )){ const TQString app = cfg.readEntry( "X-TDE-ShowIfRunning" ); - if(!kapp->dcopClient()->isApplicationRegistered(app.utf8())){ + if(!tdeApp->dcopClient()->isApplicationRegistered(app.utf8())){ continue; } } diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp index 99497af..f701ae2 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp +++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp @@ -123,7 +123,7 @@ namespace KSB_News { TQString rdfservice_error; int err = 0; - if (! kapp->dcopClient()->isApplicationRegistered("rssservice")) + if (! tdeApp->dcopClient()->isApplicationRegistered("rssservice")) if (TDEApplication::startServiceByDesktopName("rssservice", TQString(), &rdfservice_error) > 0) err = 1; |