Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

4 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/general/EditViewBase.h b/src/gui/general/EditViewBase.h
index 293e7cc..a5da4ad 100644
--- a/src/gui/general/EditViewBase.h
+++ b/src/gui/general/EditViewBase.h
@@ -40,7 +40,7 @@ class TQFrame;
 class TQCloseEvent;
 class TQAccel;
 class KToggleAction;
-class KConfig;
+class TDEConfig;
 class KCommand;
 namespace Rosegarden { class EditViewTimeSigNotifier; }
 
@@ -361,7 +361,7 @@ protected:
     int m_viewNumber;
     std::string m_viewLocalPropertyPrefix;
 
-    KConfig* m_config;
+    TDEConfig* m_config;
 
     RosegardenGUIDoc* m_doc;
     std::vector<Segment *> m_segments;
diff --git a/src/gui/general/GUIPalette.cpp b/src/gui/general/GUIPalette.cpp
index fec72ca..e43d1de 100644
--- a/src/gui/general/GUIPalette.cpp
+++ b/src/gui/general/GUIPalette.cpp
@@ -37,7 +37,7 @@ namespace Rosegarden
 
 TQColor GUIPalette::getColour(const char* const colourName)
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup(ColoursConfigGroup);
 
     TQColor res = getInstance()->m_defaultsMap[colourName];
diff --git a/src/gui/general/MidiPitchLabel.cpp b/src/gui/general/MidiPitchLabel.cpp
index 51742c3..17138df 100644
--- a/src/gui/general/MidiPitchLabel.cpp
+++ b/src/gui/general/MidiPitchLabel.cpp
@@ -50,7 +50,7 @@ MidiPitchLabel::MidiPitchLabel(int pitch)
 
     } else {
 
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         config->setGroup(GeneralOptionsConfigGroup);
         int baseOctave = config->readNumEntry("midipitchoctave", -2);
 
diff --git a/src/gui/general/PresetHandlerDialog.h b/src/gui/general/PresetHandlerDialog.h
index 36dad7a..83c617f 100644
--- a/src/gui/general/PresetHandlerDialog.h
+++ b/src/gui/general/PresetHandlerDialog.h
@@ -35,7 +35,7 @@
 #include "CategoryElement.h"
 
 class TQWidget;
-class KConfig;
+class TDEConfig;
 class KComboBox;
 
 
@@ -58,7 +58,7 @@ public:
     PresetGroup *m_presets;
     CategoriesContainer m_categories;
 
-    KConfig *m_config;
+    TDEConfig *m_config;
     bool m_fromNotation;
 
     //-------[ accessor functions ]------------------------