summaryrefslogtreecommitdiffstats
path: root/noatun/modules/kjofol-skin
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:47:46 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:47:46 -0600
commit27430f06c6cc2187c639f59f342f07f1fde91a8b (patch)
tree493c1095950b7f0a82690cedac1b749666be1b47 /noatun/modules/kjofol-skin
parent794a886cbd6d6893d62026f3800b95051652fc5a (diff)
downloadtdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz
tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'noatun/modules/kjofol-skin')
-rw-r--r--noatun/modules/kjofol-skin/kjloader.cpp2
-rw-r--r--noatun/modules/kjofol-skin/kjprefs.cpp12
2 files changed, 7 insertions, 7 deletions
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 )