diff options
Diffstat (limited to 'noatun')
25 files changed, 91 insertions, 91 deletions
diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp index 2db96950..3b03971b 100644 --- a/noatun/library/app.cpp +++ b/noatun/library/app.cpp @@ -68,7 +68,7 @@ NoatunApp::NoatunApp() // set the default config data // TODO: Maybe a first time wizard instead? - KConfig *config=KGlobal::config(); // + + KConfig *config=TDEGlobal::config(); // + config->setGroup(TQString()); // 1 if (!config->readEntry("Modules").length()) { @@ -146,7 +146,7 @@ NoatunApp::NoatunApp() NoatunApp::~NoatunApp() { saveEngineState(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("Volume", player()->volume()); config->writeEntry("LoopStyle", player()->loopStyle()); @@ -184,7 +184,7 @@ inline bool logicalXOR(bool A, bool B) #define READBOOLOPT_EX(name, string, def, group, reversal) \ bool NoatunApp::name() const \ { \ - KConfig *config=KGlobal::config(); \ + KConfig *config=TDEGlobal::config(); \ config->setGroup(group); \ return logicalXOR(config->readBoolEntry(string, def), reversal); \ } @@ -211,14 +211,14 @@ bool NoatunApp::clearOnStart() const int NoatunApp::startupPlayMode() const { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); return config->readNumEntry("StartupPlayMode", autoPlay() ? Play : Restore); } void NoatunApp::setStartupPlayMode(int mode) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("StartupPlayMode", mode); config->sync(); @@ -226,7 +226,7 @@ void NoatunApp::setStartupPlayMode(int mode) void NoatunApp::setHackUpPlaylist(bool b) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("HackUpPlaylist", b); config->sync(); @@ -237,7 +237,7 @@ void NoatunApp::setFastMixer(bool b) bool whatBefore=fastMixer(); if (whatBefore!=b) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("FastMixer", b); config->sync(); @@ -247,7 +247,7 @@ void NoatunApp::setFastMixer(bool b) void NoatunApp::setOneInstance(bool b) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("KDE"); config->writeEntry("MultipleInstances", !b); config->sync(); @@ -255,31 +255,31 @@ void NoatunApp::setOneInstance(bool b) void NoatunApp::setLoopList(bool b) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("LoopList", b); - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); } void NoatunApp::setAutoPlay(bool b) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("AutoPlay", b); - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); } void NoatunApp::setRememberPositions(bool b) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("RememberPositions", b); - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); } void NoatunApp::setSaveDirectory(const TQString &s) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writePathEntry("SaveDirectory", s); config->sync(); @@ -287,21 +287,21 @@ void NoatunApp::setSaveDirectory(const TQString &s) TQString NoatunApp::saveDirectory() const { - KConfig *c=KGlobal::config(); + KConfig *c=TDEGlobal::config(); c->setGroup(TQString()); return c->readPathEntry("SaveDirectory", TQString(getenv("HOME"))); } TQString NoatunApp::titleFormat() const { - KConfig *c=KGlobal::config(); + KConfig *c=TDEGlobal::config(); c->setGroup(TQString()); return c->readEntry("TitleFormat", "$(\"[\"author\"] - \")$(title)$(\" (\"bitrate\"kbps)\")"); } void NoatunApp::setTitleFormat(const TQString &format) { - KConfig *c=KGlobal::config(); + KConfig *c=TDEGlobal::config(); c->setGroup(TQString()); return c->writeEntry("TitleFormat", format); } @@ -313,7 +313,7 @@ void NoatunApp::setClearOnStart(bool b) void NoatunApp::setClearOnOpen(bool b) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("ClearOnOpen", b); config->sync(); @@ -321,7 +321,7 @@ void NoatunApp::setClearOnOpen(bool b) void NoatunApp::setDisplayRemaining(bool b) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("DisplayRemaining", b); config->sync(); @@ -501,7 +501,7 @@ TQImage NoatunApp::readPNG(const TQString &filename) void NoatunApp::restoreEngineState() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(TQString()); int state = config->readNumEntry("EngineState", Arts::posPlaying); switch (state) @@ -521,7 +521,7 @@ void NoatunApp::restoreEngineState() void NoatunApp::saveEngineState() { - KConfig* config=KGlobal::config(); + KConfig* config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("EngineState", player()->engine()->state()); // we don't sync here since it's done in the destructor afterwards anyway diff --git a/noatun/library/noatun/plugin.h b/noatun/library/noatun/plugin.h index 14b53ec8..23b6e481 100644 --- a/noatun/library/noatun/plugin.h +++ b/noatun/library/noatun/plugin.h @@ -77,7 +77,7 @@ class TimerThingy; * then exec() to be able to use this. * Its perfectly safe to create * a visualization in a binary executed by - * KProcess. + * TDEProcess. **/ class Visualization { diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp index b1ea94d5..add75782 100644 --- a/noatun/library/noatuntags/tags.cpp +++ b/noatun/library/noatuntags/tags.cpp @@ -21,14 +21,14 @@ TagsGetter::TagsGetter() int TagsGetter::interval() const { - KGlobal::config()->setGroup("Tags"); - return KGlobal::config()->readNumEntry("interval", 250); + TDEGlobal::config()->setGroup("Tags"); + return TDEGlobal::config()->readNumEntry("interval", 250); } bool TagsGetter::loadAuto() const { - KGlobal::config()->setGroup("Tags"); - return KGlobal::config()->readBoolEntry("LoadAuto", true); + TDEGlobal::config()->setGroup("Tags"); + return TDEGlobal::config()->readBoolEntry("LoadAuto", true); } void TagsGetter::added(PlaylistItem &i) @@ -93,17 +93,17 @@ void TagsGetter::setInterval(int ms) killTimers(); startTimer(ms); - KGlobal::config()->setGroup("Tags"); - KGlobal::config()->writeEntry("interval", ms); - KGlobal::config()->sync(); + TDEGlobal::config()->setGroup("Tags"); + TDEGlobal::config()->writeEntry("interval", ms); + TDEGlobal::config()->sync(); } void TagsGetter::setLoadAuto(bool eh) { - KGlobal::config()->setGroup("Tags"); - KGlobal::config()->writeEntry("LoadAuto", eh); - KGlobal::config()->sync(); + TDEGlobal::config()->setGroup("Tags"); + TDEGlobal::config()->writeEntry("LoadAuto", eh); + TDEGlobal::config()->sync(); killTimers(); diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp index 0897e76d..f715590a 100644 --- a/noatun/library/pluginloader.cpp +++ b/noatun/library/pluginloader.cpp @@ -52,7 +52,7 @@ LibraryLoader::~LibraryLoader() TQValueList<NoatunLibraryInfo> LibraryLoader::available() const { TQValueList<NoatunLibraryInfo> items; - TQStringList files=KGlobal::dirs()->findAllResources("appdata", "*.plugin", false, true); + TQStringList files=TDEGlobal::dirs()->findAllResources("appdata", "*.plugin", false, true); for (TQStringList::Iterator i=files.begin(); i!=files.end(); ++i) items.append(getInfo(*i)); @@ -69,7 +69,7 @@ TQPtrList<Plugin> LibraryLoader::plugins() const bool LibraryLoader::loadAll() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(""); TQStringList modules = config->readListEntry("Modules"); return loadAll(modules); @@ -135,7 +135,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules) NoatunLibraryInfo LibraryLoader::getInfo(const TQString &spec) const { NoatunLibraryInfo info; - TQString specPath = (spec[0]=='/') ? spec : KGlobal::dirs()->findResource("appdata", spec); + TQString specPath = (spec[0]=='/') ? spec : TDEGlobal::dirs()->findResource("appdata", spec); if (!TQFile::exists(specPath)) return info; KSimpleConfig file(specPath); @@ -180,7 +180,7 @@ bool LibraryLoader::loadSO(const TQString &spec) if (!listitem) { - TQString filename = KGlobal::dirs()->findResource("module", info.filename); + TQString filename = TDEGlobal::dirs()->findResource("module", info.filename); KLibrary *lib = loader->library(TQFile::encodeName(filename)); if (!lib) return false; @@ -221,7 +221,7 @@ void LibraryLoader::add(const TQString &spec) void LibraryLoader::setModules(const TQStringList &mods) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(0); config->writeEntry("Modules", mods); config->sync(); diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp index 98c05453..73285ad1 100644 --- a/noatun/library/pref.cpp +++ b/noatun/library/pref.cpp @@ -55,7 +55,7 @@ void NoatunPreferences::remove(CModule *page) } CModule::CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *owner) - : TQWidget(napp->preferencesBox()->addPage(name, description, KGlobal::iconLoader()->loadIcon( + : TQWidget(napp->preferencesBox()->addPage(name, description, TDEGlobal::iconLoader()->loadIcon( icon, KIcon::Small,0, KIcon::DefaultState,0, true))) { if (owner) diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp index 71a40663..76c2215d 100644 --- a/noatun/library/vequalizer.cpp +++ b/noatun/library/vequalizer.cpp @@ -712,7 +712,7 @@ VPreset VEqualizer::createPreset(const TQString &name, bool smart) TQValueList<VPreset> VEqualizer::presets() const { - KConfig *conf=KGlobal::config(); + KConfig *conf=TDEGlobal::config(); conf->setGroup("Equalizer"); TQStringList list; @@ -761,7 +761,7 @@ VPreset VEqualizer::presetByName(const TQString &name) VPreset VEqualizer::presetByFile(const TQString &file) { - KConfig *conf=KGlobal::config(); + KConfig *conf=TDEGlobal::config(); conf->setGroup("Equalizer"); TQStringList list=kapp->config()->readListEntry("presets"); if (list.contains(file)) diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp index 9c255485..9876b3c1 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 = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); toolBar("main")->applySettings(&config, "Excellent main"); @@ -192,7 +192,7 @@ Excellent::Excellent() Excellent::~Excellent() { - KConfig &config = *KGlobal::config(); + KConfig &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 = KGlobal::config(); + KConfig *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 = KGlobal::config(); + KConfig *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 2a4c53eb..19097212 100644 --- a/noatun/modules/htmlexport/htmlexport.cpp +++ b/noatun/modules/htmlexport/htmlexport.cpp @@ -22,7 +22,7 @@ HTMLExport::HTMLExport(): TQObject(0, "HTMLExport"), Plugin() napp->pluginActionMenu()->insert(mAction); new Prefs(this); - config = KGlobal::config(); + config = TDEGlobal::config(); } HTMLExport::~HTMLExport() @@ -176,7 +176,7 @@ Prefs::Prefs(TQObject *parent) { // Init Config - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("HTMLExport"); // Set default values @@ -275,7 +275,7 @@ Prefs::Prefs(TQObject *parent) void Prefs::save() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQString bgRealURL = bgPicPath->url(); @@ -295,7 +295,7 @@ void Prefs::save() void Prefs::reopen() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); headColorSelect->setColor(config->readColorEntry( "headColor" ) ); hoverColorSelect->setColor( config->readColorEntry( "hoverColor" ) ); bgColorSelect->setColor( config->readColorEntry( "bgColor" ) ); diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp index 1077613b..eea42474 100644 --- a/noatun/modules/kaiman/pref.cpp +++ b/noatun/modules/kaiman/pref.cpp @@ -52,7 +52,7 @@ KaimanPrefDlg::~KaimanPrefDlg() void KaimanPrefDlg::save() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Kaiman"); config->writeEntry("SkinResource", skin() ); config->sync(); @@ -67,13 +67,13 @@ void KaimanPrefDlg::reopen() { _skinList->clear(); // fill with available skins - KGlobal::dirs()->addResourceType("skins", KStandardDirs::kde_default("data") + "noatun/skins/kaiman/"); - TQStringList list = KGlobal::dirs()->resourceDirs("skins"); + TDEGlobal::dirs()->addResourceType("skins", KStandardDirs::kde_default("data") + "noatun/skins/kaiman/"); + TQStringList list = TDEGlobal::dirs()->resourceDirs("skins"); for (TQStringList::ConstIterator it = list.begin(); it != list.end(); it++) readSkinDir(*it); // load current config - KConfig *config=KGlobal::config(); + KConfig *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 7faecc3b..e5dec5b5 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=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Kaiman"); // load skin diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp index 0229f619..3a3bb547 100644 --- a/noatun/modules/keyz/keyz.cpp +++ b/noatun/modules/keyz/keyz.cpp @@ -20,7 +20,7 @@ extern "C" } } -KGlobalAccel * Keyz::s_accel = 0L; +TDEGlobalAccel * Keyz::s_accel = 0L; Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0) { @@ -29,7 +29,7 @@ Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0) if ( !s_accel ) { - s_accel = new KGlobalAccel( this, "noatunglobalaccel" ); + s_accel = new TDEGlobalAccel( this, "noatunglobalaccel" ); s_accel->insert( "PlayPause", i18n("Play/Pause"), TQString(), CTRL+ALT+Key_P, KKey::QtWIN+CTRL+Key_P, player, TQT_SLOT( playpause() )); diff --git a/noatun/modules/keyz/keyz.h b/noatun/modules/keyz/keyz.h index ad3fe550..2145448b 100644 --- a/noatun/modules/keyz/keyz.h +++ b/noatun/modules/keyz/keyz.h @@ -14,7 +14,7 @@ public: Keyz(); ~Keyz(); - static KGlobalAccel *accel() { return s_accel; } + static TDEGlobalAccel *accel() { return s_accel; } public slots: void slotVolumeUp(); @@ -28,7 +28,7 @@ void slotVolumeUp(); void slotCopyTitle(); private: - static KGlobalAccel *s_accel; + static TDEGlobalAccel *s_accel; int preMuteVol; }; diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index ad843376..4401ee01 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -814,7 +814,7 @@ void KJLoader::showSplash() TQSize sh = splashScreen->sizeHint(); - TQRect desk = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect desk = TDEGlobalSettings::splashScreenDesktopGeometry(); splashScreen->move (desk.x() + (desk.width() - sh.width())/2, desk.y() + (desk.height() - sh.height())/2 ); diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp index 4231d0ff..6fa576f5 100644 --- a/noatun/modules/kjofol-skin/kjprefs.cpp +++ b/noatun/modules/kjofol-skin/kjprefs.cpp @@ -48,7 +48,7 @@ static TQString expand(TQString s); KJPrefs::KJPrefs(TQObject* parent) : CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", parent) { - cfg = KGlobal::config(); + cfg = TDEGlobal::config(); TQVBoxLayout *vbox = new TQVBoxLayout(this); vbox->setAutoAdd(true); @@ -87,7 +87,7 @@ void KJPrefs::reopen() // reload config and set stuff in dialog mGuiSettingsWidget->useSysFont->setChecked( cfg->readBoolEntry("Use SysFont", false) ); mGuiSettingsWidget->cmbSysFont->setCurrentFont( - cfg->readEntry("SysFont Family", KGlobalSettings::generalFont().family()) ); + cfg->readEntry("SysFont Family", TDEGlobalSettings::generalFont().family()) ); TQColor tmpColor = TQColor(255,255,255); mGuiSettingsWidget->cmbSysFontColor->setColor( cfg->readColorEntry("SysFont Color", &tmpColor)); @@ -128,7 +128,7 @@ void KJPrefs::reopen() // reload config and set stuff in dialog } TQStringList skins; - TQStringList skinLocations = KGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); + TQStringList skinLocations = TDEGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); // iterate through all paths where Noatun is searching for kjofol-skins for (uint i = 0; i < skinLocations.count(); ++i ) { @@ -416,7 +416,7 @@ void KJPrefs::installNewSkin( void ) proc << "unzip -d " << proc.quote(tmpUnpackPath) << " " << proc.quote(srcFile.path()); kdDebug(66666) << "unzip -d " << tmpUnpackPath.latin1() << " " << srcFile.path().latin1() << endl; - proc.start( KProcess::Block, KProcess::NoCommunication ); + proc.start( TDEProcess::Block, TDEProcess::NoCommunication ); // "unzip" spits out errorcodes > 0 only, 0 on success if ( proc.exitStatus() != 0 ) @@ -525,7 +525,7 @@ void KJPrefs::removeSelectedSkin( void ) // Now find the dir to delete !!! TQString dirToDelete = TQString (""); - TQStringList skinLocations = KGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); + TQStringList skinLocations = TDEGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); // iterate through all paths where Noatun is searching for kjofol-skins for (uint i = 0; i < skinLocations.count(); ++i ) @@ -601,7 +601,7 @@ static TQString expand(TQString s) { // kdDebug(66666) << "expand( "<< s.latin1() << " )" << endl; - TQStringList skinLocations = KGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); + TQStringList skinLocations = TDEGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); // iterate through all paths where Noatun is searching for kjofol-skins for (uint i = 0; i < skinLocations.count(); ++i ) diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp index 2661f27c..d89c1e3f 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 = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup( "Simple" ); TQString str = config.readEntry( "View", "NormalSize" ); @@ -104,7 +104,7 @@ SimpleUI::SimpleUI() SimpleUI::~SimpleUI() { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); saveMainWindowSettings( &config, "Simple" ); config.setGroup( "Simple" ); TQString str; @@ -359,7 +359,7 @@ void SimpleUI::slotVolumeFrame() int y = -(volumeFrame->height() + 5); TQPoint point( volumeButton->mapToGlobal( TQPoint( x, y ) ) ); - TQRect deskRect = KGlobalSettings::desktopGeometry( point ); + TQRect deskRect = TDEGlobalSettings::desktopGeometry( point ); bool bottom = (point.y() + volumeFrame->height()) > (deskRect.y() + deskRect.height()); bool right = (point.x() + volumeFrame->width()) > (deskRect.x() + deskRect.width()); diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp index 15963929..764cbc7e 100644 --- a/noatun/modules/splitplaylist/view.cpp +++ b/noatun/modules/splitplaylist/view.cpp @@ -662,7 +662,7 @@ View::View(SplitPlaylist *) mFinder = new Finder(this); - applyMainWindowSettings(KGlobal::config(), "SPL Window"); + applyMainWindowSettings(TDEGlobal::config(), "SPL Window"); list->setFocus(); } @@ -797,7 +797,7 @@ void View::init() list->openGlobal(internalURL); } - KConfig &config = *KGlobal::config(); + KConfig &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 = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup("splitplaylist"); config.writeEntry("modified", modified); @@ -955,14 +955,14 @@ void View::saveState(void) item=SPL->getAfter(item), i++; config.writeEntry("current", i); - saveMainWindowSettings(KGlobal::config(), "SPL Window"); + saveMainWindowSettings(TDEGlobal::config(), "SPL Window"); config.sync(); } void View::configureToolBars() { - saveMainWindowSettings(KGlobal::config(), "SPL Window"); + saveMainWindowSettings(TDEGlobal::config(), "SPL Window"); KEditToolbar dlg(actionCollection(), "splui.rc"); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig())); dlg.exec(); @@ -971,7 +971,7 @@ void View::configureToolBars() void View::newToolBarConfig() { createGUI("splui.rc"); - applyMainWindowSettings(KGlobal::config(), "SPL Window"); + applyMainWindowSettings(TDEGlobal::config(), "SPL Window"); } // turns the sorting on or off diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp index 255dd6c9..9a45212b 100644 --- a/noatun/modules/systray/systray.cpp +++ b/noatun/modules/systray/systray.cpp @@ -394,7 +394,7 @@ void NoatunSystray::showPassivePopup() NETRect frame, win; ni.kdeGeometry(frame, win); - TQRect bounds = KGlobalSettings::desktopGeometry(TQPoint(win.pos.x, win.pos.y)); + TQRect bounds = TDEGlobalSettings::desktopGeometry(TQPoint(win.pos.x, win.pos.y)); if(win.pos.x < bounds.center().x()) { diff --git a/noatun/modules/voiceprint/prefs.cpp b/noatun/modules/voiceprint/prefs.cpp index b90d4b03..4a252d75 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=KGlobal::config(); + KConfig *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=KGlobal::config(); + KConfig *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 cab5be35..16d01a96 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 = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Winskin"); setVisualizationMode(config->readNumEntry("visualizationMode", MODE_ANALYSER)); @@ -61,7 +61,7 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser() GuiSpectrumAnalyser::~GuiSpectrumAnalyser() { - KConfig *config = KGlobal::config(); + KConfig *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 b81a0da2..f19266b1 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 = KGlobal::config(); + KConfig *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 = KGlobal::config(); + KConfig *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 5f670953..2692a742 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=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Winskin"); int s = config->readNumEntry("ScrollDelay", 15); if (s!=0) diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp index fdf2e768..d6d8fe58 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=KGlobal::config(); + KConfig *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 08804885..4288119e 100644 --- a/noatun/modules/winskin/waSkinManager.cpp +++ b/noatun/modules/winskin/waSkinManager.cpp @@ -20,7 +20,7 @@ WaSkinManager::~WaSkinManager() { } TQStringList WaSkinManager::availableSkins() { - TQStringList skinDirs = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp"); + TQStringList skinDirs = TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp"); TQStringList skin_list; // This loop adds them all to our skin list @@ -55,7 +55,7 @@ TQString WaSkinManager::defaultSkin() { } bool WaSkinManager::loadSkin(TQString skinName) { - TQStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); + TQStringList skins = TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); if (!skins.count()) mCurrentSkin = defaultSkin(); @@ -66,7 +66,7 @@ bool WaSkinManager::loadSkin(TQString skinName) { } bool WaSkinManager::installSkin(TQString _url) { - TQString location = KGlobal::dirs()->saveLocation("data", "noatun/skins/winamp"); + TQString location = TDEGlobal::dirs()->saveLocation("data", "noatun/skins/winamp"); KURL url(_url); TQString mimetype = KMimeType::findByURL(_url)->name(); @@ -96,7 +96,7 @@ bool WaSkinManager::removeSkin(TQString skinName) { if (!skinRemovable(skinName)) return false; - TQStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + 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())); @@ -105,7 +105,7 @@ bool WaSkinManager::removeSkin(TQString skinName) { } bool WaSkinManager::skinRemovable(TQString skinName) { - TQStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); + TQStringList skins = TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); if (!skins.count()) return false; diff --git a/noatun/modules/winskin/waSkinModel.cpp b/noatun/modules/winskin/waSkinModel.cpp index e7562c04..88c1f460 100644 --- a/noatun/modules/winskin/waSkinModel.cpp +++ b/noatun/modules/winskin/waSkinModel.cpp @@ -82,7 +82,7 @@ bool WaSkinModel::load(TQString skinDir) if (findFile(dir, "main.bmp").isEmpty()) { // Ack, our skin dir doesn't exist, fall back to the default - dir = TQDir(KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + WaSkin::defaultSkin())[0]); + dir = TQDir(TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + WaSkin::defaultSkin())[0]); success = false; } diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 70a22ea5..13e626fa 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=KGlobal::config(); + KConfig *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=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Winskin"); scrollSpeed->setValue(config->readNumEntry("ScrollDelay", 15)); } |