From 53dc629fee682a0c2e37ef0798415de444a64b69 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:08:56 -0600 Subject: [PATCH] Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- src/knowit.h | 4 ++-- src/knowitpref.cpp | 4 ++-- src/knowitpref.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/knowit.h b/src/knowit.h index b1f15a1..712c29d 100644 --- a/src/knowit.h +++ b/src/knowit.h @@ -37,7 +37,7 @@ class TQSplitter; class TQTimer; class KAction; -class KConfig; +class TDEConfig; class KListBox; class KToggleAction; class KRecentFilesAction; @@ -54,7 +54,7 @@ class Knowit : public KMainWindow private: static const TQString Untitled; - KConfig *config; + TDEConfig *config; TQSplitter* Layout; KnowitTree* Items; KListBox* Links; diff --git a/src/knowitpref.cpp b/src/knowitpref.cpp index 8b2580f..f4dddf6 100644 --- a/src/knowitpref.cpp +++ b/src/knowitpref.cpp @@ -40,7 +40,7 @@ #include #include -void KnowitOptions::save(KConfig* config) const +void KnowitOptions::save(TDEConfig* config) const { config->setGroup("KDE"); config->writeEntry("MultipleInstances", multipleInstances); @@ -84,7 +84,7 @@ void KnowitOptions::save(KConfig* config) const } -void KnowitOptions::read(KConfig* config) +void KnowitOptions::read(TDEConfig* config) { config->setGroup("KDE"); multipleInstances = config->readBoolEntry("MultipleInstances", true); diff --git a/src/knowitpref.h b/src/knowitpref.h index ca8595a..6c2ef63 100644 --- a/src/knowitpref.h +++ b/src/knowitpref.h @@ -27,7 +27,7 @@ class TQToolButton; class KLineEdit; class KColorButton; class KDualColorButton; -class KConfig; +class TDEConfig; class KComboBox; class KnowitOptions @@ -62,8 +62,8 @@ public: /* Date format */ TQString insertDateFormat, insertDateColor; bool insertDateBold, insertDateItalic, insertDateUnderline; - void save(KConfig* config) const; - void read(KConfig* config); + void save(TDEConfig* config) const; + void read(TDEConfig* config); /* Export */ int exportFlags; };