diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /ksplashml/kcmksplash | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'ksplashml/kcmksplash')
| -rw-r--r-- | ksplashml/kcmksplash/installer.cpp | 16 | ||||
| -rw-r--r-- | ksplashml/kcmksplash/main.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp index 860844ffe..a1fa7a033 100644 --- a/ksplashml/kcmksplash/installer.cpp +++ b/ksplashml/kcmksplash/installer.cpp @@ -68,7 +68,7 @@ void ThemeListBox::mouseMoveEvent(TQMouseEvent *e) { if (((e->state() & Qt::LeftButton) != 0) && !mDragFile.isEmpty()) { - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); TQPoint newPos = e->globalPos(); if(newPos.x() > mOldPos.x()+delay || newPos.x() < mOldPos.x()-delay || newPos.y() > mOldPos.y()+delay || newPos.y() < mOldPos.y()-delay) @@ -88,7 +88,7 @@ void ThemeListBox::mouseMoveEvent(TQMouseEvent *e) SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aInit) : TQWidget(aParent, aName), mGui(!aInit) { - KGlobal::dirs()->addResourceType("ksplashthemes", KStandardDirs::kde_default("data") + "ksplash/Themes"); + TDEGlobal::dirs()->addResourceType("ksplashthemes", KStandardDirs::kde_default("data") + "ksplash/Themes"); if (!mGui) return; @@ -161,7 +161,7 @@ int SplashInstaller::addTheme(const TQString &path, const TQString &name) // Copy theme package into themes directory void SplashInstaller::addNewTheme(const KURL &srcURL) { - TQString dir = KGlobal::dirs()->saveLocation("ksplashthemes"); + TQString dir = TDEGlobal::dirs()->saveLocation("ksplashthemes"); KURL url; TQString filename = srcURL.fileName(); int i = filename.findRev('.'); @@ -222,7 +222,7 @@ void SplashInstaller::readThemesList() mThemesList->clear(); // Read local themes - TQStringList entryList = KGlobal::dirs()->resourceDirs("ksplashthemes"); + TQStringList entryList = TDEGlobal::dirs()->resourceDirs("ksplashthemes"); //kdDebug() << "readThemesList: " << entryList << endl; TQDir dir; TQStringList subdirs; @@ -468,15 +468,15 @@ void SplashInstaller::slotTest() return; if( themeName == "Simple" ) { - KProcess proc; + TDEProcess proc; proc << "ksplashsimple" << "--test"; - if (!proc.start(KProcess::Block)) + if (!proc.start(TDEProcess::Block)) KMessageBox::error(this,i18n("Unable to start ksplashsimple.")); return; } - KProcess proc; + TDEProcess proc; proc << "ksplash" << "--test" << "--theme" << themeName; - if (!proc.start(KProcess::Block)) + if (!proc.start(TDEProcess::Block)) KMessageBox::error(this,i18n("Unable to start ksplash.")); } diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp index 53c5d45fd..7c062ea51 100644 --- a/ksplashml/kcmksplash/main.cpp +++ b/ksplashml/kcmksplash/main.cpp @@ -86,7 +86,7 @@ TQString KSplashThemeMgr::quickHelp() const void KSplashThemeMgr::init() { - KGlobal::dirs()->addResourceType("ksplashthemes", KStandardDirs::kde_default("data") + "ksplash/Themes"); + TDEGlobal::dirs()->addResourceType("ksplashthemes", KStandardDirs::kde_default("data") + "ksplash/Themes"); } void KSplashThemeMgr::save() |