summaryrefslogtreecommitdiffstats
path: root/noatun/modules
diff options
context:
space:
mode:
Diffstat (limited to 'noatun/modules')
-rw-r--r--noatun/modules/excellent/userinterface.cpp8
-rw-r--r--noatun/modules/htmlexport/htmlexport.cpp8
-rw-r--r--noatun/modules/htmlexport/htmlexport.h2
-rw-r--r--noatun/modules/infrared/irprefs.cpp8
-rw-r--r--noatun/modules/kaiman/pref.cpp4
-rw-r--r--noatun/modules/kaiman/userinterface.cpp2
-rw-r--r--noatun/modules/kjofol-skin/kjprefs.cpp18
-rw-r--r--noatun/modules/kjofol-skin/kjprefs.h6
-rw-r--r--noatun/modules/marquis/marquis.cpp8
-rw-r--r--noatun/modules/marquis/marquis.h4
-rw-r--r--noatun/modules/simple/userinterface.cpp4
-rw-r--r--noatun/modules/splitplaylist/view.cpp30
-rw-r--r--noatun/modules/splitplaylist/view.h12
-rw-r--r--noatun/modules/systray/systray.cpp2
-rw-r--r--noatun/modules/voiceprint/prefs.cpp4
-rw-r--r--noatun/modules/winskin/guiSpectrumAnalyser.cpp4
-rw-r--r--noatun/modules/winskin/waDigit.cpp4
-rw-r--r--noatun/modules/winskin/waInfo.cpp2
-rw-r--r--noatun/modules/winskin/waRegion.cpp2
-rw-r--r--noatun/modules/winskin/waSkin.cpp2
-rw-r--r--noatun/modules/winskin/waSkinManager.cpp12
-rw-r--r--noatun/modules/winskin/winSkinConfig.cpp4
22 files changed, 75 insertions, 75 deletions
diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp
index 9876b3c1..42eaf19c 100644
--- a/noatun/modules/excellent/userinterface.cpp
+++ b/noatun/modules/excellent/userinterface.cpp
@@ -157,7 +157,7 @@ Excellent::Excellent()
setMinimumWidth(250);
resize(300, 75);
- KConfig &config = *TDEGlobal::config();
+ TDEConfig &config = *TDEGlobal::config();
toolBar("main")->applySettings(&config, "Excellent main");
@@ -192,7 +192,7 @@ Excellent::Excellent()
Excellent::~Excellent()
{
- KConfig &config = *TDEGlobal::config();
+ TDEConfig &config = *TDEGlobal::config();
saveMainWindowSettings(&config, "excellent");
toolBar("main")->saveSettings(&config, "Excellent main");
config.setGroup("excellent");
@@ -205,7 +205,7 @@ Excellent::~Excellent()
void Excellent::showEvent(TQShowEvent *e)
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("excellent");
config->writeEntry("mappingState", NET::Visible);
config->sync();
@@ -215,7 +215,7 @@ void Excellent::showEvent(TQShowEvent *e)
void Excellent::hideEvent(TQHideEvent *e)
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("excellent");
config->writeEntry("mappingState", NET::Withdrawn);
config->sync();
diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp
index 19097212..ab6c9194 100644
--- a/noatun/modules/htmlexport/htmlexport.cpp
+++ b/noatun/modules/htmlexport/htmlexport.cpp
@@ -129,7 +129,7 @@ void HTMLExport::slotExport()
file.close();
// tempfile -> userdefined file
- KIO::NetAccess::upload(temp.name(), url, 0);
+ TDEIO::NetAccess::upload(temp.name(), url, 0);
}
TQString HTMLExport::htmlEscape(const TQString &source) {
@@ -176,7 +176,7 @@ Prefs::Prefs(TQObject *parent)
{
// Init Config
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("HTMLExport");
// Set default values
@@ -275,7 +275,7 @@ Prefs::Prefs(TQObject *parent)
void Prefs::save()
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
TQString bgRealURL = bgPicPath->url();
@@ -295,7 +295,7 @@ void Prefs::save()
void Prefs::reopen()
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
headColorSelect->setColor(config->readColorEntry( "headColor" ) );
hoverColorSelect->setColor( config->readColorEntry( "hoverColor" ) );
bgColorSelect->setColor( config->readColorEntry( "bgColor" ) );
diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h
index acadeabd..9e710547 100644
--- a/noatun/modules/htmlexport/htmlexport.h
+++ b/noatun/modules/htmlexport/htmlexport.h
@@ -44,7 +44,7 @@ public:
private:
TQString htmlEscape(const TQString &source);
TQString getColorByEntry(TQString s);
- KConfig *config;
+ TDEConfig *config;
KAction *mAction;
private slots:
diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp
index 4e3a0711..77753cf4 100644
--- a/noatun/modules/infrared/irprefs.cpp
+++ b/noatun/modules/infrared/irprefs.cpp
@@ -103,8 +103,8 @@ IRPrefs::IRPrefs(TQObject *parent)
void IRPrefs::save()
{
- KConfig *c = kapp->config();
- KConfigGroupSaver groupSaver(c, "Infrared");
+ TDEConfig *c = kapp->config();
+ TDEConfigGroupSaver groupSaver(c, "Infrared");
c->writeEntry("CommandCount", s_commands.count());
int i = 1;
for (TQMap<TQString, Command>::ConstIterator it = s_commands.begin(); it != s_commands.end(); ++it)
@@ -282,8 +282,8 @@ void IRPrefs::readConfig()
{
if (s_configRead)
return;
- KConfig *c = kapp->config();
- KConfigGroupSaver groupSaver(c, "Infrared");
+ TDEConfig *c = kapp->config();
+ TDEConfigGroupSaver groupSaver(c, "Infrared");
int count = c->readNumEntry("CommandCount");
for (int i = 1; i <= count; ++i)
{
diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp
index eea42474..a53ed72f 100644
--- a/noatun/modules/kaiman/pref.cpp
+++ b/noatun/modules/kaiman/pref.cpp
@@ -52,7 +52,7 @@ KaimanPrefDlg::~KaimanPrefDlg()
void KaimanPrefDlg::save()
{
- KConfig *config=TDEGlobal::config();
+ TDEConfig *config=TDEGlobal::config();
config->setGroup("Kaiman");
config->writeEntry("SkinResource", skin() );
config->sync();
@@ -73,7 +73,7 @@ void KaimanPrefDlg::reopen()
readSkinDir(*it);
// load current config
- KConfig *config=TDEGlobal::config();
+ TDEConfig *config=TDEGlobal::config();
config->setGroup("Kaiman");
TQString skin = config->readEntry( "SkinResource", Kaiman::DEFAULT_SKIN );
TQListBoxItem *item = _skinList->findItem( skin );
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index e5dec5b5..462f5718 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -80,7 +80,7 @@ Kaiman::Kaiman()
_altSkin = false;
// init config
- KConfig *config=TDEGlobal::config();
+ TDEConfig *config=TDEGlobal::config();
config->setGroup("Kaiman");
// load skin
diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp
index 6fa576f5..b6d8e6eb 100644
--- a/noatun/modules/kjofol-skin/kjprefs.cpp
+++ b/noatun/modules/kjofol-skin/kjprefs.cpp
@@ -425,7 +425,7 @@ void KJPrefs::installNewSkin( void )
// FIXME: Do I have to wait for the job to finish?
// I'd say no because I don't care about the temp-dir
// anyway after leaving this method :)
- KIO::del( tmpUnpackPath );
+ TDEIO::del( tmpUnpackPath );
return;
}
@@ -471,10 +471,10 @@ void KJPrefs::installNewSkin( void )
KMessageBox::error ( this,
i18n("Installing new skin failed: Destination path is invalid.\n"
"Please report a bug to the K-Jöfol maintainer") );
- KIO::del( tmpUnpackPath );
+ TDEIO::del( tmpUnpackPath );
return;
}
- KIO::mkdir( dst );
+ TDEIO::mkdir( dst );
}
if ( !src.isValid() || !dst.isValid() )
@@ -487,8 +487,8 @@ void KJPrefs::installNewSkin( void )
{
kdDebug(66666) << "src: " << src.path().latin1() << endl;
kdDebug(66666) << "dst: " << dst.path().latin1() << endl;
- KIO::Job *job = KIO::copy(src,dst);
- connect ( job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotResult(KIO::Job*)) );
+ TDEIO::Job *job = TDEIO::copy(src,dst);
+ connect ( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotResult(TDEIO::Job*)) );
skinInstalled = true;
}
} // END iterate trough dirList
@@ -502,7 +502,7 @@ void KJPrefs::installNewSkin( void )
KMessageBox::information ( this, i18n("The new skin has been successfully installed") );
}
- KIO::del( tmpUnpackPath );
+ TDEIO::del( tmpUnpackPath );
}
@@ -554,8 +554,8 @@ void KJPrefs::removeSelectedSkin( void )
if ( dirToDelete.length() != 0 )
{
kdDebug(66666) << "Deleting Skindir: " << dirToDelete.latin1() << endl;
- KIO::Job *job = KIO::del( dirToDelete, false, true );
- connect ( job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotResult(KIO::Job*)) );
+ TDEIO::Job *job = TDEIO::del( dirToDelete, false, true );
+ connect ( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotResult(TDEIO::Job*)) );
}
int item = -1;
@@ -579,7 +579,7 @@ void KJPrefs::removeSelectedSkin( void )
save();
}
-void KJPrefs::slotResult(KIO::Job *job )
+void KJPrefs::slotResult(TDEIO::Job *job )
{
if ( job->error() )
{
diff --git a/noatun/modules/kjofol-skin/kjprefs.h b/noatun/modules/kjofol-skin/kjprefs.h
index 218e20cb..0bb4540d 100644
--- a/noatun/modules/kjofol-skin/kjprefs.h
+++ b/noatun/modules/kjofol-skin/kjprefs.h
@@ -19,7 +19,7 @@ class TQComboBox;
class TQLabel;
class TQPushButton;
class TQTabWidget;
-class KConfig;
+class TDEConfig;
class KJLoader;
class KJPrefs : public CModule
@@ -72,14 +72,14 @@ public slots:
// gets called after a KIO-action has finished
// KIO is used for installing/removing skins
- void slotResult(KIO::Job *job);
+ void slotResult(TDEIO::Job *job);
signals:
void configChanged();
private:
TQPixmap mPixmap; // preview Pixmap
- KConfig *cfg;
+ TDEConfig *cfg;
// Dialog-Widgets
TQTabWidget *mTabWidget;
diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp
index 566e291d..62c959ac 100644
--- a/noatun/modules/marquis/marquis.cpp
+++ b/noatun/modules/marquis/marquis.cpp
@@ -94,7 +94,7 @@ void Marquis::restore(void)
}
// unload every window, and save the config as TQStringList of those loaded
-void Marquis::saveSessionConfig(KConfig *c)
+void Marquis::saveSessionConfig(TDEConfig *c)
{
kdDebug(66666) << k_funcinfo << endl;
@@ -135,7 +135,7 @@ void Marquis::saveSessionConfig(KConfig *c)
}
// get the list of loaded plugins from the config, and load them
-void Marquis::readSessionConfig(KConfig *c)
+void Marquis::readSessionConfig(TDEConfig *c)
{
Player *player = napp->player();
@@ -173,13 +173,13 @@ void Marquis::readSessionConfig(KConfig *c)
void Marquis::dynamicSave()
{
- KConfig config( "marquisrc" );
+ TDEConfig config( "marquisrc" );
saveSessionConfig( &config );
}
void Marquis::dynamicRestore()
{
- KConfig config( "marquisrc" );
+ TDEConfig config( "marquisrc" );
readSessionConfig( &config );
}
diff --git a/noatun/modules/marquis/marquis.h b/noatun/modules/marquis/marquis.h
index c96a6bd1..d07ed297 100644
--- a/noatun/modules/marquis/marquis.h
+++ b/noatun/modules/marquis/marquis.h
@@ -43,8 +43,8 @@ public:
virtual void restore(void);
private:
- void saveSessionConfig(KConfig *);
- void readSessionConfig(KConfig *);
+ void saveSessionConfig(TDEConfig *);
+ void readSessionConfig(TDEConfig *);
private slots:
void dynamicSave();
void dynamicRestore();
diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp
index d89c1e3f..d76f3b54 100644
--- a/noatun/modules/simple/userinterface.cpp
+++ b/noatun/modules/simple/userinterface.cpp
@@ -83,7 +83,7 @@ SimpleUI::SimpleUI()
extra_height = (height() - video->height());
// Load configuration
- KConfig &config = *TDEGlobal::config();
+ TDEConfig &config = *TDEGlobal::config();
config.setGroup( "Simple" );
TQString str = config.readEntry( "View", "NormalSize" );
@@ -104,7 +104,7 @@ SimpleUI::SimpleUI()
SimpleUI::~SimpleUI()
{
- KConfig &config = *TDEGlobal::config();
+ TDEConfig &config = *TDEGlobal::config();
saveMainWindowSettings( &config, "Simple" );
config.setGroup( "Simple" );
TQString str;
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);
diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h
index caad3a66..48a30df5 100644
--- a/noatun/modules/splitplaylist/view.h
+++ b/noatun/modules/splitplaylist/view.h
@@ -12,7 +12,7 @@
class Finder;
class View;
-namespace KIO { class ListJob; }
+namespace TDEIO { class ListJob; }
class SafeListViewItem
@@ -87,15 +87,15 @@ protected:
TQListViewItem *recursiveAddAfter;
protected slots:
- // used when adding directories via KIO::listRecursive
- void slotResult(KIO::Job *job);
- void slotEntries(KIO::Job *job, const KIO::UDSEntryList &entries);
- void slotRedirection(KIO::Job *, const KURL & url);
+ // used when adding directories via TDEIO::listRecursive
+ void slotResult(TDEIO::Job *job);
+ void slotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &entries);
+ void slotRedirection(TDEIO::Job *, const KURL & url);
protected:
void addNextPendingDirectory();
KURL::List pendingAddDirectories;
- KIO::ListJob *listJob;
+ TDEIO::ListJob *listJob;
KURL currentJobURL;
};
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 9a45212b..0788ceb3 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -352,7 +352,7 @@ void NoatunSystray::updateCover()
void NoatunSystray::removeCover()
{
if(TQFile::exists(tmpCoverPath))
- KIO::NetAccess::del(KURL(tmpCoverPath), this);
+ TDEIO::NetAccess::del(KURL(tmpCoverPath), this);
}
diff --git a/noatun/modules/voiceprint/prefs.cpp b/noatun/modules/voiceprint/prefs.cpp
index 4a252d75..882c05a4 100644
--- a/noatun/modules/voiceprint/prefs.cpp
+++ b/noatun/modules/voiceprint/prefs.cpp
@@ -38,7 +38,7 @@ Prefs::Prefs(TQObject* parent)
void Prefs::reopen()
{
- KConfig *config=TDEGlobal::config();
+ TDEConfig *config=TDEGlobal::config();
config->setGroup("VoicePrint");
TQColor black(0, 0, 0);
TQColor blue(0, 0, 222);
@@ -49,7 +49,7 @@ void Prefs::reopen()
void Prefs::save()
{
- KConfig *config=TDEGlobal::config();
+ TDEConfig *config=TDEGlobal::config();
config->setGroup("VoicePrint");
config->writeEntry("Background", mBackground->color());
config->writeEntry("Foreground", mForeground->color());
diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
index 16d01a96..d0447397 100644
--- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp
+++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
@@ -51,7 +51,7 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser()
analyserCache = NULL;
winSkinVis = NULL;
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("Winskin");
setVisualizationMode(config->readNumEntry("visualizationMode", MODE_ANALYSER));
@@ -61,7 +61,7 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser()
GuiSpectrumAnalyser::~GuiSpectrumAnalyser()
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("Winskin");
config->writeEntry("visualizationMode", visualization_mode);
diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp
index f19266b1..d18d9ead 100644
--- a/noatun/modules/winskin/waDigit.cpp
+++ b/noatun/modules/winskin/waDigit.cpp
@@ -20,7 +20,7 @@
WaDigit::WaDigit() : WaWidget(_WA_MAPPING_DIGITS)
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("Winskin");
reverse_time = config->readNumEntry("timeReversed", false);
@@ -29,7 +29,7 @@ WaDigit::WaDigit() : WaWidget(_WA_MAPPING_DIGITS)
WaDigit::~WaDigit()
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("Winskin");
config->writeEntry("timeReversed", reverse_time);
}
diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp
index 2692a742..80375a90 100644
--- a/noatun/modules/winskin/waInfo.cpp
+++ b/noatun/modules/winskin/waInfo.cpp
@@ -69,7 +69,7 @@ void WaInfo::scrollerSetup()
if (completePixmap->width() > size.width()) {
xScrollDirection = 1;
- KConfig *config=TDEGlobal::config();
+ TDEConfig *config=TDEGlobal::config();
config->setGroup("Winskin");
int s = config->readNumEntry("ScrollDelay", 15);
if (s!=0)
diff --git a/noatun/modules/winskin/waRegion.cpp b/noatun/modules/winskin/waRegion.cpp
index f76cdabb..fdbad9af 100644
--- a/noatun/modules/winskin/waRegion.cpp
+++ b/noatun/modules/winskin/waRegion.cpp
@@ -27,7 +27,7 @@ const char *pointListNames[] = {"PointList", "pointlist", "Pointlist", "pointLis
const char *numPointsNames[] = {"NumPoints", "numpoints", "Numpoints", "numPoints", "NUMPOINTS", 0};
WaRegion::WaRegion(TQString filename) {
- // Load the region file, which happens to be in KConfig format
+ // Load the region file, which happens to be in TDEConfig format
KSimpleConfig regionFile(filename, true);
// Clear our variables by default
diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp
index d6d8fe58..4512d067 100644
--- a/noatun/modules/winskin/waSkin.cpp
+++ b/noatun/modules/winskin/waSkin.cpp
@@ -95,7 +95,7 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface()
connect(napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()));
connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(timetick()));
- KConfig *config=TDEGlobal::config();
+ TDEConfig *config=TDEGlobal::config();
config->setGroup("Winskin");
TQString skin = config->readEntry("CurrentSkin", WaSkin::defaultSkin());
diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp
index 4288119e..f7d9b777 100644
--- a/noatun/modules/winskin/waSkinManager.cpp
+++ b/noatun/modules/winskin/waSkinManager.cpp
@@ -72,8 +72,8 @@ bool WaSkinManager::installSkin(TQString _url) {
if (mimetype == "inode/directory")
{
- KIO::Job *job = KIO::copy(url, location, !url.isLocalFile());
- connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
+ TDEIO::Job *job = TDEIO::copy(url, location, !url.isLocalFile());
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
return true;
}
else if ((mimetype == "interface/x-winamp-skin") || (mimetype == "application/x-zip"))
@@ -83,8 +83,8 @@ bool WaSkinManager::installSkin(TQString _url) {
TQString base_path;
base_path = location + "/" + TQFileInfo(url.path()).baseName().replace(TQRegExp("_"), " ");
- KIO::Job *job = KIO::copy("zip:" + url.path(), base_path);
- connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
+ TDEIO::Job *job = TDEIO::copy("zip:" + url.path(), base_path);
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
return true;
}
@@ -98,8 +98,8 @@ bool WaSkinManager::removeSkin(TQString skinName) {
TQStringList skins = TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName);
- KIO::Job *job = KIO::del(KURL(skins[0]), false, false);
- connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
+ TDEIO::Job *job = TDEIO::del(KURL(skins[0]), false, false);
+ connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
return true;
}
diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp
index 13e626fa..7d2c866d 100644
--- a/noatun/modules/winskin/winSkinConfig.cpp
+++ b/noatun/modules/winskin/winSkinConfig.cpp
@@ -78,7 +78,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) :
void WinSkinConfig::save()
{
- KConfig *config=TDEGlobal::config();
+ TDEConfig *config=TDEGlobal::config();
config->setGroup("Winskin");
config->writeEntry("CurrentSkin", skin_list->currentText());
config->writeEntry("ScrollDelay", scrollSpeed->value());
@@ -123,7 +123,7 @@ void WinSkinConfig::reopen() {
skin_list->setCurrentItem( 0 );
}
- KConfig *config=TDEGlobal::config();
+ TDEConfig *config=TDEGlobal::config();
config->setGroup("Winskin");
scrollSpeed->setValue(config->readNumEntry("ScrollDelay", 15));
}