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/htmlopts.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'kcontrol/konqhtml/htmlopts.cpp') diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp index 153692082..ada8f31a6 100644 --- a/kcontrol/konqhtml/htmlopts.cpp +++ b/kcontrol/konqhtml/htmlopts.cpp @@ -230,13 +230,13 @@ void KMiscHTMLOptions::load() void KMiscHTMLOptions::load( bool useDefaults ) { - TDEConfig khtmlrc("khtmlrc", true, false); - khtmlrc.setReadDefaults( useDefaults ); + TDEConfig tdehtmlrc("tdehtmlrc", true, false); + tdehtmlrc.setReadDefaults( useDefaults ); m_pConfig->setReadDefaults( useDefaults ); -#define SET_GROUP(x) m_pConfig->setGroup(x); khtmlrc.setGroup(x) -#define READ_BOOL(x,y) m_pConfig->readBoolEntry(x, khtmlrc.readBoolEntry(x, y)) -#define READ_ENTRY(x) m_pConfig->readEntry(x, khtmlrc.readEntry(x)) +#define SET_GROUP(x) m_pConfig->setGroup(x); tdehtmlrc.setGroup(x) +#define READ_BOOL(x,y) m_pConfig->readBoolEntry(x, tdehtmlrc.readBoolEntry(x, y)) +#define READ_ENTRY(x) m_pConfig->readEntry(x, tdehtmlrc.readEntry(x)) // *** load *** -- cgit v1.2.1