summaryrefslogtreecommitdiffstats
path: root/noatun/modules/splitplaylist/view.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:36 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:36 -0600
commitde9a6aa007626eba4e333ac4080cbdfcb9f98386 (patch)
tree79166818db79c0ac7acfbbb545a4929c0cd62b04 /noatun/modules/splitplaylist/view.cpp
parent27430f06c6cc2187c639f59f342f07f1fde91a8b (diff)
downloadtdemultimedia-de9a6aa007626eba4e333ac4080cbdfcb9f98386.tar.gz
tdemultimedia-de9a6aa007626eba4e333ac4080cbdfcb9f98386.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'noatun/modules/splitplaylist/view.cpp')
-rw-r--r--noatun/modules/splitplaylist/view.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index 764cbc7e..50245140 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -490,7 +490,7 @@ void View::exportTo(const KURL &url)
}
saver.close();
- KIO::NetAccess::upload(local, url, this);
+ TDEIO::NetAccess::upload(local, url, this);
saver.remove();
}
@@ -567,18 +567,18 @@ void List::addNextPendingDirectory()
if (!listJob && (pendingIt!= pendingAddDirectories.end()))
{
currentJobURL= *pendingIt;
- listJob= KIO::listRecursive(currentJobURL, false,false);
+ listJob= TDEIO::listRecursive(currentJobURL, false,false);
connect(
- listJob, TQT_SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)),
- TQT_SLOT(slotEntries(KIO::Job*, const KIO::UDSEntryList&))
+ listJob, TQT_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)),
+ TQT_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&))
);
connect(
- listJob, TQT_SIGNAL(result(KIO::Job *)),
- TQT_SLOT(slotResult(KIO::Job *))
+ listJob, TQT_SIGNAL(result(TDEIO::Job *)),
+ TQT_SLOT(slotResult(TDEIO::Job *))
);
connect(
- listJob, TQT_SIGNAL(redirection(KIO::Job *, const KURL &)),
- TQT_SLOT(slotRedirection(KIO::Job *, const KURL &))
+ listJob, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL &)),
+ TQT_SLOT(slotRedirection(TDEIO::Job *, const KURL &))
);
pendingAddDirectories.remove(pendingIt);
}
@@ -592,7 +592,7 @@ void List::addDirectoryRecursive(const KURL &dir, TQListViewItem *after)
addNextPendingDirectory();
}
-void List::slotResult(KIO::Job *job)
+void List::slotResult(TDEIO::Job *job)
{
listJob= 0;
if (job && job->error())
@@ -600,12 +600,12 @@ void List::slotResult(KIO::Job *job)
addNextPendingDirectory();
}
-void List::slotEntries(KIO::Job *, const KIO::UDSEntryList &entries)
+void List::slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &entries)
{
TQMap<TQString,KURL> __list; // temp list to sort entries
- KIO::UDSEntryListConstIterator it = entries.begin();
- KIO::UDSEntryListConstIterator end = entries.end();
+ TDEIO::UDSEntryListConstIterator it = entries.begin();
+ TDEIO::UDSEntryListConstIterator end = entries.end();
for (; it != end; ++it)
{
@@ -626,7 +626,7 @@ void List::slotEntries(KIO::Job *, const KIO::UDSEntryList &entries)
}
}
-void List::slotRedirection(KIO::Job *, const KURL & url)
+void List::slotRedirection(TDEIO::Job *, const KURL & url)
{
currentJobURL= url;
}
@@ -797,7 +797,7 @@ void View::init()
list->openGlobal(internalURL);
}
- KConfig &config = *TDEGlobal::config();
+ TDEConfig &config = *TDEGlobal::config();
config.setGroup("splitplaylist");
// this has to come after openGlobal, since openGlobal emits modified()
@@ -942,7 +942,7 @@ void View::setModified(void)
void View::saveState(void)
{
- KConfig &config = *TDEGlobal::config();
+ TDEConfig &config = *TDEGlobal::config();
config.setGroup("splitplaylist");
config.writeEntry("modified", modified);