summaryrefslogtreecommitdiffstats
path: root/src/optiondialog.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:07:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:07:22 -0600
commitbfd3620cd83f108b5f82d034ffb250748755dfd5 (patch)
treed14f8bc2abaa71dc9216b85dcf323cc3df62f845 /src/optiondialog.h
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.h')
-rw-r--r--src/optiondialog.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/optiondialog.h b/src/optiondialog.h
index 3fd6cf7..03803c0 100644
--- a/src/optiondialog.h
+++ b/src/optiondialog.h
@@ -27,7 +27,7 @@ class TQLabel;
class TQLineEdit;
class KColorButton;
class KFontChooser;
-class KConfig;
+class TDEConfig;
#include <kdialogbase.h>
#include <tqstringlist.h>
@@ -165,8 +165,8 @@ public:
TQString m_ignorableCmdLineOptions;
bool m_bIntegrateWithClearCase;
- void saveOptions(KConfig* config);
- void readOptions(KConfig* config);
+ void saveOptions(TDEConfig* config);
+ void readOptions(TDEConfig* config);
void setState(); // Must be called before calling exec();