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

17 files changed, 34 insertions, 34 deletions

diff --git a/src/gui/configuration/AudioConfigurationPage.cpp b/src/gui/configuration/AudioConfigurationPage.cpp
index 6687afc..f740dd5 100644
--- a/src/gui/configuration/AudioConfigurationPage.cpp
+++ b/src/gui/configuration/AudioConfigurationPage.cpp
@@ -66,7 +66,7 @@ namespace Rosegarden
 
 AudioConfigurationPage::AudioConfigurationPage(
     RosegardenGUIDoc *doc,
-    KConfig *cfg,
+    TDEConfig *cfg,
     TQWidget *parent,
     const char *name):
     TabbedConfigurationPage(cfg, parent, name),
diff --git a/src/gui/configuration/AudioConfigurationPage.h b/src/gui/configuration/AudioConfigurationPage.h
index 2540e0d..2ff2776 100644
--- a/src/gui/configuration/AudioConfigurationPage.h
+++ b/src/gui/configuration/AudioConfigurationPage.h
@@ -37,7 +37,7 @@ class TQPushButton;
 class TQLabel;
 class TQComboBox;
 class TQCheckBox;
-class KConfig;
+class TDEConfig;
 class KComboBox;
 
 
@@ -53,7 +53,7 @@ class AudioConfigurationPage : public TabbedConfigurationPage
   
 public:
     AudioConfigurationPage(RosegardenGUIDoc *doc,
-                               KConfig *cfg,
+                               TDEConfig *cfg,
                                TQWidget *parent=0,
                                const char *name=0);
 
diff --git a/src/gui/configuration/AudioPropertiesPage.cpp b/src/gui/configuration/AudioPropertiesPage.cpp
index 25492e6..8713cd0 100644
--- a/src/gui/configuration/AudioPropertiesPage.cpp
+++ b/src/gui/configuration/AudioPropertiesPage.cpp
@@ -95,7 +95,7 @@ AudioPropertiesPage::calculateStats()
 {
     // This stolen from KDE libs kfile/kpropertiesdialog.cpp
     //
-    TQString mountPoint = KIO::findPathMountPoint(m_path->text());
+    TQString mountPoint = TDEIO::findPathMountPoint(m_path->text());
     KDiskFreeSp * job = new KDiskFreeSp;
     connect(job, TQT_SIGNAL(foundMountPoint(const TQString&, unsigned long, unsigned long,
                                         unsigned long)),
@@ -111,8 +111,8 @@ AudioPropertiesPage::slotFoundMountPoint(const TQString&,
         unsigned long kBAvail )
 {
     m_diskSpace->setText(i18n("%1 out of %2 (%3% used)")
-                         .arg(KIO::convertSizeFromKB(kBAvail))
-                         .arg(KIO::convertSizeFromKB(kBSize))
+                         .arg(TDEIO::convertSizeFromKB(kBAvail))
+                         .arg(TDEIO::convertSizeFromKB(kBSize))
                          .arg( 100 - (int)(100.0 * kBAvail / kBSize) ));
 
 
diff --git a/src/gui/configuration/ConfigurationPage.h b/src/gui/configuration/ConfigurationPage.h
index bf0ccd9..cc23da5 100644
--- a/src/gui/configuration/ConfigurationPage.h
+++ b/src/gui/configuration/ConfigurationPage.h
@@ -32,7 +32,7 @@
 #include <tqwidget.h>
 
 
-class KConfig;
+class TDEConfig;
 
 
 namespace Rosegarden
@@ -55,11 +55,11 @@ public:
                       TQWidget *parent=0, const char *name=0)
         : TQWidget(parent, name), m_doc(doc), m_cfg(0), m_pageIndex(0) {}
 
-    ConfigurationPage(KConfig *cfg,
+    ConfigurationPage(TDEConfig *cfg,
                       TQWidget *parent=0, const char *name=0)
         : TQWidget(parent, name), m_doc(0), m_cfg(cfg), m_pageIndex(0) {}
 
-    ConfigurationPage(RosegardenGUIDoc *doc, KConfig *cfg,
+    ConfigurationPage(RosegardenGUIDoc *doc, TDEConfig *cfg,
                       TQWidget *parent=0, const char *name=0)
         : TQWidget(parent, name), m_doc(doc), m_cfg(cfg), m_pageIndex(0) {}
 
@@ -67,14 +67,14 @@ public:
 
     /**
      * Should set the page up (ie. read the setting from the @ref
-     * KConfig object into the widgets) after creating it in the
+     * TDEConfig object into the widgets) after creating it in the
      * constructor. Called from @ref ConfigureDialog.
     */
 //     virtual void setup() = 0;
 
     /**
      * Should apply the changed settings (ie. read the settings from
-     * the widgets into the @ref KConfig object). Called from @ref
+     * the widgets into the @ref TDEConfig object). Called from @ref
      * ConfigureDialog.
      */
     virtual void apply() = 0;
@@ -94,7 +94,7 @@ protected:
     //--------------- Data members ---------------------------------
 
     RosegardenGUIDoc* m_doc;
-    KConfig* m_cfg;
+    TDEConfig* m_cfg;
 
     int m_pageIndex;
 };
diff --git a/src/gui/configuration/GeneralConfigurationPage.cpp b/src/gui/configuration/GeneralConfigurationPage.cpp
index a5bea6f..3b7864a 100644
--- a/src/gui/configuration/GeneralConfigurationPage.cpp
+++ b/src/gui/configuration/GeneralConfigurationPage.cpp
@@ -58,7 +58,7 @@ namespace Rosegarden
 {
 
 GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
-        KConfig *cfg,
+        TDEConfig *cfg,
         TQWidget *parent, const char *name)
         : TabbedConfigurationPage(cfg, parent, name),
         m_doc(doc),
diff --git a/src/gui/configuration/GeneralConfigurationPage.h b/src/gui/configuration/GeneralConfigurationPage.h
index 51b85bd..2309ce4 100644
--- a/src/gui/configuration/GeneralConfigurationPage.h
+++ b/src/gui/configuration/GeneralConfigurationPage.h
@@ -37,7 +37,7 @@
 #include <kiconloader.h>
 
 class TQWidget;
-class KConfig;
+class TDEConfig;
 
 
 namespace Rosegarden
@@ -71,7 +71,7 @@ public:
     };
 
     GeneralConfigurationPage(RosegardenGUIDoc *doc,
-                             KConfig *cfg,
+                             TDEConfig *cfg,
                              TQWidget *parent=0, const char *name=0);
 
     virtual void apply();
diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index 0558c25..2282261 100644
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@@ -161,7 +161,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent,
     //
 
     // set default expansion to false for this group -- what a faff
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     TQString groupTemp = config->group();
     config->setGroup("CollapsingFrame");
     bool expanded = config->readBoolEntry("nonprintableheaders", false);
@@ -251,7 +251,7 @@ HeadersConfigurationPage::slotDeleteProperty()
 
 void HeadersConfigurationPage::apply()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     // If one of the items still has focus, it won't remember edits.
diff --git a/src/gui/configuration/LatencyConfigurationPage.cpp b/src/gui/configuration/LatencyConfigurationPage.cpp
index 6910d3d..dd7bf19 100644
--- a/src/gui/configuration/LatencyConfigurationPage.cpp
+++ b/src/gui/configuration/LatencyConfigurationPage.cpp
@@ -44,7 +44,7 @@ namespace Rosegarden
 {
 
 LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
-        KConfig *cfg,
+        TDEConfig *cfg,
         TQWidget *parent,
         const char *name)
         : TabbedConfigurationPage(doc, cfg, parent, name)
diff --git a/src/gui/configuration/LatencyConfigurationPage.h b/src/gui/configuration/LatencyConfigurationPage.h
index 812a9a6..21cd926 100644
--- a/src/gui/configuration/LatencyConfigurationPage.h
+++ b/src/gui/configuration/LatencyConfigurationPage.h
@@ -34,7 +34,7 @@
 
 class TQWidget;
 class TQPushButton;
-class KConfig;
+class TDEConfig;
 
 
 namespace Rosegarden
@@ -55,7 +55,7 @@ class LatencyConfigurationPage : public TabbedConfigurationPage
 
 public:
     LatencyConfigurationPage(RosegardenGUIDoc *doc,
-                             KConfig *cfg,
+                             TDEConfig *cfg,
                              TQWidget *parent=0, const char *name=0);
 
     virtual void apply();
diff --git a/src/gui/configuration/MIDIConfigurationPage.cpp b/src/gui/configuration/MIDIConfigurationPage.cpp
index 84d9956..9cbfd82 100644
--- a/src/gui/configuration/MIDIConfigurationPage.cpp
+++ b/src/gui/configuration/MIDIConfigurationPage.cpp
@@ -66,7 +66,7 @@ namespace Rosegarden
 
 MIDIConfigurationPage::MIDIConfigurationPage(
     RosegardenGUIDoc *doc,
-    KConfig *cfg,
+    TDEConfig *cfg,
     TQWidget *parent,
     const char *name):
         TabbedConfigurationPage(cfg, parent, name),
diff --git a/src/gui/configuration/MIDIConfigurationPage.h b/src/gui/configuration/MIDIConfigurationPage.h
index 6b60b38..cf1c63b 100644
--- a/src/gui/configuration/MIDIConfigurationPage.h
+++ b/src/gui/configuration/MIDIConfigurationPage.h
@@ -38,7 +38,7 @@ class TQSlider;
 class TQPushButton;
 class TQLabel;
 class TQComboBox;
-class KConfig;
+class TDEConfig;
 class KComboBox;
 
 
@@ -54,7 +54,7 @@ class MIDIConfigurationPage : public TabbedConfigurationPage
   
 public:
     MIDIConfigurationPage(RosegardenGUIDoc *doc,
-                               KConfig *cfg,
+                               TDEConfig *cfg,
                                TQWidget *parent=0,
                                const char *name=0);
 
diff --git a/src/gui/configuration/MatrixConfigurationPage.cpp b/src/gui/configuration/MatrixConfigurationPage.cpp
index c996922..0178e3e 100644
--- a/src/gui/configuration/MatrixConfigurationPage.cpp
+++ b/src/gui/configuration/MatrixConfigurationPage.cpp
@@ -42,7 +42,7 @@
 namespace Rosegarden
 {
 
-MatrixConfigurationPage::MatrixConfigurationPage(KConfig *cfg,
+MatrixConfigurationPage::MatrixConfigurationPage(TDEConfig *cfg,
         TQWidget *parent,
         const char *name) :
         TabbedConfigurationPage(cfg, parent, name)
diff --git a/src/gui/configuration/MatrixConfigurationPage.h b/src/gui/configuration/MatrixConfigurationPage.h
index 215a419..3b9740e 100644
--- a/src/gui/configuration/MatrixConfigurationPage.h
+++ b/src/gui/configuration/MatrixConfigurationPage.h
@@ -32,7 +32,7 @@
 
 
 class TQWidget;
-class KConfig;
+class TDEConfig;
 
 
 namespace Rosegarden
@@ -49,7 +49,7 @@ class MatrixConfigurationPage : public TabbedConfigurationPage
   
 
 public:
-    MatrixConfigurationPage(KConfig *cfg,
+    MatrixConfigurationPage(TDEConfig *cfg,
                             TQWidget *parent = 0, const char *name=0);
 
     virtual void apply();
diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp
index a9d26c3..191abac 100644
--- a/src/gui/configuration/NotationConfigurationPage.cpp
+++ b/src/gui/configuration/NotationConfigurationPage.cpp
@@ -66,7 +66,7 @@
 namespace Rosegarden
 {
 
-NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
+NotationConfigurationPage::NotationConfigurationPage(TDEConfig *cfg,
         TQWidget *parent,
         const char *name) :
         TabbedConfigurationPage(cfg, parent, name)
diff --git a/src/gui/configuration/NotationConfigurationPage.h b/src/gui/configuration/NotationConfigurationPage.h
index 0c7d049..7dd225d 100644
--- a/src/gui/configuration/NotationConfigurationPage.h
+++ b/src/gui/configuration/NotationConfigurationPage.h
@@ -39,7 +39,7 @@ class TQLabel;
 class TQComboBox;
 class TQCheckBox;
 class KFontRequester;
-class KConfig;
+class TDEConfig;
 
 
 namespace Rosegarden
@@ -57,7 +57,7 @@ class NotationConfigurationPage : public TabbedConfigurationPage
   
 
 public:
-    NotationConfigurationPage(KConfig *cfg,
+    NotationConfigurationPage(TDEConfig *cfg,
                               TQWidget *parent = 0, const char *name=0);
 
     virtual void apply();
diff --git a/src/gui/configuration/TabbedConfigurationPage.cpp b/src/gui/configuration/TabbedConfigurationPage.cpp
index ae64894..fa26a5c 100644
--- a/src/gui/configuration/TabbedConfigurationPage.cpp
+++ b/src/gui/configuration/TabbedConfigurationPage.cpp
@@ -46,7 +46,7 @@ TabbedConfigurationPage::TabbedConfigurationPage(RosegardenGUIDoc *doc,
     init();
 }
 
-TabbedConfigurationPage::TabbedConfigurationPage(KConfig *cfg,
+TabbedConfigurationPage::TabbedConfigurationPage(TDEConfig *cfg,
                                                  TQWidget *parent,
                                                  const char *name)
     : ConfigurationPage(cfg, parent, name)
@@ -55,7 +55,7 @@ TabbedConfigurationPage::TabbedConfigurationPage(KConfig *cfg,
 }
 
 TabbedConfigurationPage::TabbedConfigurationPage(RosegardenGUIDoc *doc,
-                                                 KConfig *cfg,
+                                                 TDEConfig *cfg,
                                                  TQWidget *parent,
                                                  const char *name)
     : ConfigurationPage(doc, cfg, parent, name)
diff --git a/src/gui/configuration/TabbedConfigurationPage.h b/src/gui/configuration/TabbedConfigurationPage.h
index ec561c1..cd5e8d2 100644
--- a/src/gui/configuration/TabbedConfigurationPage.h
+++ b/src/gui/configuration/TabbedConfigurationPage.h
@@ -32,7 +32,7 @@
 
 class TQWidget;
 class TQTabWidget;
-class KConfig;
+class TDEConfig;
 
 
 namespace Rosegarden
@@ -54,11 +54,11 @@ public:
     TabbedConfigurationPage(RosegardenGUIDoc *doc,
                             TQWidget *parent=0, const char *name=0);
 
-    TabbedConfigurationPage(KConfig *cfg,
+    TabbedConfigurationPage(TDEConfig *cfg,
                             TQWidget *parent=0, const char *name=0);
 
     TabbedConfigurationPage(RosegardenGUIDoc *doc,
-                            KConfig *cfg,
+                            TDEConfig *cfg,
                             TQWidget *parent=0, const char *name=0);
 
     static TQString iconName() { return "misc"; }