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 /kcontrol/fonts | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/fonts')
| -rw-r--r-- | kcontrol/fonts/fonts.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index ef338d92b..93d76c28e 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -162,7 +162,7 @@ void FontUseItem::readFont( bool useDefaults ) bool deleteme = false; if (_rcfile.isEmpty()) - config = KGlobal::config(); + config = TDEGlobal::config(); else { config = new KConfig(_rcfile, true); @@ -182,7 +182,7 @@ void FontUseItem::writeFont() KConfigBase *config; if (_rcfile.isEmpty()) { - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup(_rcgroup); config->writeEntry(_rckey, font(), true, true); } else { @@ -713,7 +713,7 @@ void KFonts::save() for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() ) i->writeFont(); - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); KConfig cfgfonts("kcmfonts"); cfgfonts.setGroup("General"); @@ -729,7 +729,7 @@ void KFonts::save() proc << "xrdb" << "-quiet" << "-remove" << "-nocpp"; proc.writeStdin( TQCString( "Xft.dpi" ), true ); proc.closeWhenDone(); - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); } // KDE-1.x support |