summaryrefslogtreecommitdiffstats
path: root/src/optiondialog.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:07:22 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:07:22 -0600
commitbfd3620cd83f108b5f82d034ffb250748755dfd5 (patch)
treed14f8bc2abaa71dc9216b85dcf323cc3df62f845 /src/optiondialog.cpp
parent672c9c39de40e4da2849acbacf0b943dd26a31ac (diff)
downloadkdiff3-bfd3620cd83f108b5f82d034ffb250748755dfd5.tar.gz
kdiff3-bfd3620cd83f108b5f82d034ffb250748755dfd5.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src/optiondialog.cpp')
-rw-r--r--src/optiondialog.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp
index 7c70004..a67c665 100644
--- a/src/optiondialog.cpp
+++ b/src/optiondialog.cpp
@@ -1627,9 +1627,9 @@ void OptionDialog::setState()
class ConfigValueMap : public ValueMap
{
private:
- KConfig* m_pConfig;
+ TDEConfig* m_pConfig;
public:
- ConfigValueMap( KConfig* pConfig ) { m_pConfig = pConfig; }
+ ConfigValueMap( TDEConfig* pConfig ) { m_pConfig = pConfig; }
void writeEntry(const TQString& s, const TQFont& v ){ m_pConfig->writeEntry(s,v); }
void writeEntry(const TQString& s, const TQColor& v ){ m_pConfig->writeEntry(s,v); }
@@ -1651,7 +1651,7 @@ public:
TQString readEntry (const TQString& s, const TQString& defaultVal){ return m_pConfig->readEntry(s,defaultVal); }
};
-void OptionDialog::saveOptions( KConfig* config )
+void OptionDialog::saveOptions( TDEConfig* config )
{
// No i18n()-Translations here!
@@ -1665,7 +1665,7 @@ void OptionDialog::saveOptions( KConfig* config )
}
}
-void OptionDialog::readOptions( KConfig* config )
+void OptionDialog::readOptions( TDEConfig* config )
{
// No i18n()-Translations here!