From dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:16:20 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kcontrol/konqhtml/appearance.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'kcontrol/konqhtml/appearance.cpp') diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index 78619d818..163bdd4f4 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include @@ -320,15 +320,15 @@ void KAppearanceOptions::load() void KAppearanceOptions::load( bool useDefaults ) { - TDEConfig khtmlrc("khtmlrc", true, false); + TDEConfig tdehtmlrc("tdehtmlrc", true, false); m_pConfig->setReadDefaults( useDefaults ); - khtmlrc.setReadDefaults( useDefaults ); + tdehtmlrc.setReadDefaults( useDefaults ); -#define SET_GROUP(x) m_pConfig->setGroup(x); khtmlrc.setGroup(x) -#define READ_NUM(x,y) m_pConfig->readNumEntry(x, khtmlrc.readNumEntry(x, y)) -#define READ_ENTRY(x,y) m_pConfig->readEntry(x, khtmlrc.readEntry(x, y)) -#define READ_LIST(x) m_pConfig->readListEntry(x, khtmlrc.readListEntry(x)) +#define SET_GROUP(x) m_pConfig->setGroup(x); tdehtmlrc.setGroup(x) +#define READ_NUM(x,y) m_pConfig->readNumEntry(x, tdehtmlrc.readNumEntry(x, y)) +#define READ_ENTRY(x,y) m_pConfig->readEntry(x, tdehtmlrc.readEntry(x, y)) +#define READ_LIST(x) m_pConfig->readListEntry(x, tdehtmlrc.readListEntry(x)) SET_GROUP(m_groupname); fSize = READ_NUM( "MediumFontSize", 12 ); @@ -348,7 +348,7 @@ void KAppearanceOptions::load( bool useDefaults ) if (m_pConfig->hasKey("Fonts")) fonts = m_pConfig->readListEntry( "Fonts" ); else - fonts = khtmlrc.readListEntry( "Fonts" ); + fonts = tdehtmlrc.readListEntry( "Fonts" ); while (fonts.count() < 7) fonts.append(TQString::null); -- cgit v1.2.1