summaryrefslogtreecommitdiffstats
path: root/kcontrol/input/core
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/input/core
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/input/core')
-rw-r--r--kcontrol/input/core/themepage.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index e61d57941..ed3975fc9 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -178,7 +178,7 @@ void ThemePage::fixCursorFile()
//
// Run mkfontdir to update fonts.dir in that dir.
- KGlobal::dirs()->addResourceType( "font", "share/fonts/" );
+ TDEGlobal::dirs()->addResourceType( "font", "share/fonts/" );
KIO::mkdir( KURL::fromPathOrURL(TQDir::homeDirPath() + "/.fonts/kde-override") );
TQString overrideDir = TQDir::homeDirPath() + "/.fonts/kde-override/";
@@ -200,12 +200,12 @@ void ThemePage::fixCursorFile()
KIO::NetAccess::file_copy( source, installedFont, -1, true );
}
- TQString cmd = KGlobal::dirs()->findExe( "mkfontdir" );
+ TQString cmd = TDEGlobal::dirs()->findExe( "mkfontdir" );
if ( !cmd.isEmpty() )
{
- KProcess p;
+ TDEProcess p;
p << cmd << overrideDir;
- p.start(KProcess::Block);
+ p.start(TDEProcess::Block);
}
}