summaryrefslogtreecommitdiffstats
path: root/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:28:24 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:28:24 -0600
commit20de04ce44f63fb911103d7870d39d2782d14cda (patch)
treebddd13cef2fae98892caf538dc64b5357732c517 /konq-plugins/sidebar/metabar/src/settingsplugin.cpp
parent4c097708c4cc24f3b8e4c21f14644f5715767d47 (diff)
downloadtdeaddons-20de04ce44f63fb911103d7870d39d2782d14cda.tar.gz
tdeaddons-20de04ce44f63fb911103d7870d39d2782d14cda.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/sidebar/metabar/src/settingsplugin.cpp')
-rw-r--r--konq-plugins/sidebar/metabar/src/settingsplugin.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
index 76853c6..95c5119 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
@@ -57,9 +57,9 @@ void SettingsPlugin::loadActions(DOM::HTMLElement node)
KURL url = m_items.getFirst()->url();
if(url.path().endsWith("/")){
- list_job = KIO::listDir(url, true, false);
- connect(list_job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)), this, TQT_SLOT(slotGotEntries(KIO::Job *, const KIO::UDSEntryList &)));
- connect(list_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobFinished(KIO::Job *)));
+ list_job = TDEIO::listDir(url, true, false);
+ connect(list_job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), this, TQT_SLOT(slotGotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
+ connect(list_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobFinished(TDEIO::Job *)));
m_functions->show("actions");
}
@@ -69,7 +69,7 @@ void SettingsPlugin::loadActions(DOM::HTMLElement node)
KService::Ptr service = KService::serviceByStorageId(name);
if(service && service->isValid()){
- KCModuleInfo kcminfo(service);
+ TDECModuleInfo kcminfo(service);
DOM::DOMString innerHTML;
MetabarWidget::addEntry(innerHTML, i18n("Run"), "kcmshell:/" + name, kcminfo.icon());
@@ -95,7 +95,7 @@ void SettingsPlugin::loadInformation(DOM::HTMLElement node)
KService::Ptr service = KService::serviceByStorageId(name);
if(service && service->isValid()){
- KCModuleInfo kcminfo(service);
+ TDECModuleInfo kcminfo(service);
bool needsRoot = kcminfo.needsRootPrivileges();
@@ -141,7 +141,7 @@ bool SettingsPlugin::handleRequest(const KURL &)
return false;
}
-void SettingsPlugin::slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list)
+void SettingsPlugin::slotGotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &list)
{
if(!job){
return;
@@ -151,28 +151,28 @@ void SettingsPlugin::slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list
DOM::HTMLElement node = doc.getElementById("actions");
DOM::DOMString innerHTML;
- KIO::UDSEntryList::ConstIterator it = list.begin();
- KIO::UDSEntryList::ConstIterator it_end = list.end();
+ TDEIO::UDSEntryList::ConstIterator it = list.begin();
+ TDEIO::UDSEntryList::ConstIterator it_end = list.end();
for(; it != it_end; ++it){
TQString name;
TQString icon;
TQString url;
long type;
- KIO::UDSEntry::ConstIterator atomit = (*it).begin();
- KIO::UDSEntry::ConstIterator atomit_end = (*it).end();
+ TDEIO::UDSEntry::ConstIterator atomit = (*it).begin();
+ TDEIO::UDSEntry::ConstIterator atomit_end = (*it).end();
for(; atomit != atomit_end; ++atomit){
- if((*atomit).m_uds == KIO::UDS_NAME){
+ if((*atomit).m_uds == TDEIO::UDS_NAME){
name = (*atomit).m_str;
}
- else if((*atomit).m_uds == KIO::UDS_ICON_NAME){
+ else if((*atomit).m_uds == TDEIO::UDS_ICON_NAME){
icon = (*atomit).m_str;
}
- else if((*atomit).m_uds == KIO::UDS_URL){
+ else if((*atomit).m_uds == TDEIO::UDS_URL){
url = (*atomit).m_str;
}
- else if((*atomit).m_uds == KIO::UDS_FILE_TYPE){
+ else if((*atomit).m_uds == TDEIO::UDS_FILE_TYPE){
type = (*atomit).m_long;
}
}
@@ -189,7 +189,7 @@ void SettingsPlugin::slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list
node.setInnerHTML(innerHTML);
}
-void SettingsPlugin::slotJobFinished(KIO::Job *job)
+void SettingsPlugin::slotJobFinished(TDEIO::Job *job)
{
if(list_job && job == list_job){
list_job = 0;