summaryrefslogtreecommitdiffstats
path: root/kcontrol/fonts/fonts.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/fonts/fonts.cpp
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/fonts/fonts.cpp')
-rw-r--r--kcontrol/fonts/fonts.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index 93d76c28e..7efe76b6d 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -158,14 +158,14 @@ void FontUseItem::setDefault()
void FontUseItem::readFont( bool useDefaults )
{
- KConfigBase *config;
+ TDEConfigBase *config;
bool deleteme = false;
if (_rcfile.isEmpty())
config = TDEGlobal::config();
else
{
- config = new KConfig(_rcfile, true);
+ config = new TDEConfig(_rcfile, true);
deleteme = true;
}
@@ -179,7 +179,7 @@ void FontUseItem::readFont( bool useDefaults )
void FontUseItem::writeFont()
{
- KConfigBase *config;
+ TDEConfigBase *config;
if (_rcfile.isEmpty()) {
config = TDEGlobal::config();
@@ -326,7 +326,7 @@ bool FontAASettings::load( bool useDefaults )
if(!xft.getHintStyle(hStyle) || KXftConfig::Hint::NotSet==hStyle)
{
- KConfig kglobals("kdeglobals", false, false);
+ TDEConfig kglobals("kdeglobals", false, false);
kglobals.setReadDefaults( useDefaults );
@@ -350,7 +350,7 @@ bool FontAASettings::load( bool useDefaults )
bool FontAASettings::save( bool useAA )
{
KXftConfig xft(KXftConfig::constStyleSettings);
- KConfig kglobals("kdeglobals", false, false);
+ TDEConfig kglobals("kdeglobals", false, false);
kglobals.setGroup("General");
@@ -507,7 +507,7 @@ static TQCString desktopConfigName()
}
KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
- : KCModule(FontFactory::instance(), parent, name)
+ : TDECModule(FontFactory::instance(), parent, name)
{
TQStringList nameGroupKeyRc;
@@ -693,7 +693,7 @@ void KFonts::load( bool useDefaults )
useAA_original = useAA = aaSettings->load( useDefaults ) ? AAEnabled : AADisabled;
cbAA->setCurrentItem( useAA );
- KConfig cfgfonts("kcmfonts", true);
+ TDEConfig cfgfonts("kcmfonts", true);
cfgfonts.setGroup("General");
int dpicfg = cfgfonts.readNumEntry( "forceFontDPI", 0 );
DPISetting dpi = dpicfg == 120 ? DPI120 : dpicfg == 96 ? DPI96 : DPINone;
@@ -715,7 +715,7 @@ void KFonts::save()
i->writeFont();
TDEGlobal::config()->sync();
- KConfig cfgfonts("kcmfonts");
+ TDEConfig cfgfonts("kcmfonts");
cfgfonts.setGroup("General");
DPISetting dpi = static_cast< DPISetting >( comboForceDpi->currentItem());
const int dpi2value[] = { 0, 96, 120 };