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

13 files changed, 30 insertions, 30 deletions

diff --git a/src/gui/dialogs/AddTracksDialog.cpp b/src/gui/dialogs/AddTracksDialog.cpp
index 498e010..d088b9c 100644
--- a/src/gui/dialogs/AddTracksDialog.cpp
+++ b/src/gui/dialogs/AddTracksDialog.cpp
@@ -66,7 +66,7 @@ AddTracksDialog::AddTracksDialog(TQWidget *parent, int currentTrack) :
     m_position->insertItem(i18n("Below the current selected track"));
     m_position->insertItem(i18n("At the bottom"));
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     m_position->setCurrentItem(config->readUnsignedNumEntry("lastaddtracksposition", 2));
 }
@@ -82,7 +82,7 @@ AddTracksDialog::getInsertPosition()
 {
     int opt = m_position->currentItem();
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     config->writeEntry("lastaddtracksposition", opt);
 
diff --git a/src/gui/dialogs/ConfigureDialog.cpp b/src/gui/dialogs/ConfigureDialog.cpp
index cbb3b56..24e004f 100644
--- a/src/gui/dialogs/ConfigureDialog.cpp
+++ b/src/gui/dialogs/ConfigureDialog.cpp
@@ -60,7 +60,7 @@ static TQPixmap loadIcon(const char *name)
 
 
 ConfigureDialog::ConfigureDialog(RosegardenGUIDoc *doc,
-                                 KConfig* cfg,
+                                 TDEConfig* cfg,
                                  TQWidget *parent,
                                  const char *name)
         : ConfigureDialogBase(parent, i18n("Configure Rosegarden"), name)
diff --git a/src/gui/dialogs/ConfigureDialog.h b/src/gui/dialogs/ConfigureDialog.h
index 8709e75..ee4af19 100644
--- a/src/gui/dialogs/ConfigureDialog.h
+++ b/src/gui/dialogs/ConfigureDialog.h
@@ -30,7 +30,7 @@
 
 
 class TQWidget;
-class KConfig;
+class TDEConfig;
 
 
 namespace Rosegarden
@@ -45,7 +45,7 @@ class ConfigureDialog : public ConfigureDialogBase
   
 public:
     ConfigureDialog(RosegardenGUIDoc *doc,
-                    KConfig* cfg,
+                    TDEConfig* cfg,
                     TQWidget *parent=0,
                     const char *name=0);
 signals:
diff --git a/src/gui/dialogs/EventFilterDialog.h b/src/gui/dialogs/EventFilterDialog.h
index 4a78ecc..60ca24f 100644
--- a/src/gui/dialogs/EventFilterDialog.h
+++ b/src/gui/dialogs/EventFilterDialog.h
@@ -39,7 +39,7 @@ class TQWidget;
 class TQSpinBox;
 class TQPushButton;
 class TQGridLayout;
-class KConfig;
+class TDEConfig;
 
 
 namespace Rosegarden
@@ -66,7 +66,7 @@ public:
     EventFilterDialog(TQWidget* parent);
     ~EventFilterDialog();
 
-    KConfig *cfg;
+    TDEConfig *cfg;
 
     //-------[ accessor functions ]------------------------
 
diff --git a/src/gui/dialogs/ImportDeviceDialog.cpp b/src/gui/dialogs/ImportDeviceDialog.cpp
index c68bc4f..ab7cb17 100644
--- a/src/gui/dialogs/ImportDeviceDialog.cpp
+++ b/src/gui/dialogs/ImportDeviceDialog.cpp
@@ -83,7 +83,7 @@ ImportDeviceDialog::doImport()
     }
 
     TQString target;
-    if (KIO::NetAccess::download(m_url, target) == false) {
+    if (TDEIO::NetAccess::download(m_url, target) == false) {
         KMessageBox::error(this, i18n("Cannot download file %1").arg(m_url.prettyURL()));
         return false;
     }
@@ -168,7 +168,7 @@ ImportDeviceDialog::doImport()
     m_mergeBanks = new TQRadioButton(i18n("Merge banks"), m_buttonGroup);
     m_overwriteBanks = new TQRadioButton(i18n("Overwrite banks"), m_buttonGroup);
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
 
     m_importBanks->setChecked(config->readBoolEntry("importbanks", true));
@@ -197,7 +197,7 @@ ImportDeviceDialog::slotOk()
     m_device = m_devices[index];
 
     int v = m_buttonGroup->id(m_buttonGroup->selected());
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     config->writeEntry("importbanksoverwrite", v == 1);
     if (m_rename)
diff --git a/src/gui/dialogs/InterpretDialog.cpp b/src/gui/dialogs/InterpretDialog.cpp
index 465a50d..62ceeec 100644
--- a/src/gui/dialogs/InterpretDialog.cpp
+++ b/src/gui/dialogs/InterpretDialog.cpp
@@ -60,7 +60,7 @@ InterpretDialog::InterpretDialog(TQWidget *parent) :
     m_allInterpretations = new TQCheckBox
                            (i18n("All available interpretations"), groupBox);
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     m_allInterpretations->setChecked
@@ -93,7 +93,7 @@ InterpretDialog::slotAllBoxChanged()
 int
 InterpretDialog::getInterpretations()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     config->writeEntry("interpretall", m_allInterpretations->isChecked());
diff --git a/src/gui/dialogs/LilyPondOptionsDialog.cpp b/src/gui/dialogs/LilyPondOptionsDialog.cpp
index 4eda3fe..dedc702 100644
--- a/src/gui/dialogs/LilyPondOptionsDialog.cpp
+++ b/src/gui/dialogs/LilyPondOptionsDialog.cpp
@@ -65,7 +65,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent,
 {
     setHelp("file-printing");
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     TQVBox * mainbox = makeVBoxMainWidget();
@@ -298,7 +298,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent,
 void
 LilyPondOptionsDialog::slotApply()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     config->writeEntry("lilylanguage", m_lilyLanguage->currentItem());
@@ -329,7 +329,7 @@ LilyPondOptionsDialog::slotOk()
 void
 LilyPondOptionsDialog::setDefaultLilyPondVersion(TQString version)
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
     int index = -1;
     bool unstable = false;
diff --git a/src/gui/dialogs/RescaleDialog.cpp b/src/gui/dialogs/RescaleDialog.cpp
index 702443d..fe75a35 100644
--- a/src/gui/dialogs/RescaleDialog.cpp
+++ b/src/gui/dialogs/RescaleDialog.cpp
@@ -61,7 +61,7 @@ RescaleDialog::RescaleDialog(TQWidget *parent,
         TQGroupBox *optionBox = new TQGroupBox(1, Qt::Horizontal, i18n("Options"), vbox);
         m_closeGap = new TQCheckBox(i18n("Adjust times of following events accordingly"),
                                    optionBox);
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         config->setGroup(GeneralOptionsConfigGroup);
         m_closeGap->setChecked
         (config->readBoolEntry("rescaledialogadjusttimes", true));
@@ -84,7 +84,7 @@ bool
 RescaleDialog::shouldCloseGap()
 {
     if (m_closeGap) {
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         config->setGroup(GeneralOptionsConfigGroup);
         config->writeEntry("rescaledialogadjusttimes", m_closeGap->isChecked());
         return m_closeGap->isChecked();
diff --git a/src/gui/dialogs/TextEventDialog.cpp b/src/gui/dialogs/TextEventDialog.cpp
index e7984dd..7e88fc6 100644
--- a/src/gui/dialogs/TextEventDialog.cpp
+++ b/src/gui/dialogs/TextEventDialog.cpp
@@ -315,7 +315,7 @@ TextEventDialog::TextEventDialog(TQWidget *parent,
     m_staffBelowLabel->setPixmap(map);
 
     // restore last setting for shortcut combos
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     m_dynamicShortcutCombo->setCurrentItem(config->readNumEntry("dynamic_shortcut", 0));
@@ -511,7 +511,7 @@ void
 TextEventDialog::slotOK()
 {
     // store last setting for shortcut combos
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     config->writeEntry("dynamic_shortcut", m_dynamicShortcutCombo->currentItem());
diff --git a/src/gui/dialogs/TimeSignatureDialog.cpp b/src/gui/dialogs/TimeSignatureDialog.cpp
index f9de575..e814f28 100644
--- a/src/gui/dialogs/TimeSignatureDialog.cpp
+++ b/src/gui/dialogs/TimeSignatureDialog.cpp
@@ -169,7 +169,7 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent,
     }
 
     groupBox = new TQGroupBox(1, Qt::Horizontal, i18n("Options"), vbox);
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
 
     m_hideSignatureButton = new TQCheckBox
@@ -203,7 +203,7 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent,
 TimeSignature
 TimeSignatureDialog::getTimeSignature() const
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
 
     config->writeEntry("timesigdialogmakehidden", m_hideSignatureButton->isChecked());
diff --git a/src/gui/dialogs/TransportDialog.cpp b/src/gui/dialogs/TransportDialog.cpp
index af19b79..aec2f52 100644
--- a/src/gui/dialogs/TransportDialog.cpp
+++ b/src/gui/dialogs/TransportDialog.cpp
@@ -123,7 +123,7 @@ TransportDialog::TransportDialog(TQWidget *parent,
 // Disable the loop button if JACK transport enabled, because this
 // causes a nasty race condition, and it just seems our loops are not JACK compatible
 // #1240039 - DMM
-//    KConfig* config = rgapp->config();
+//    TDEConfig* config = rgapp->config();
 //    config->setGroup(SequencerOptionsConfigGroup);
 //    if (config->readBoolEntry("jacktransport", false))
 //    {
@@ -267,7 +267,7 @@ TransportDialog::TransportDialog(TQWidget *parent,
 TransportDialog::~TransportDialog()
 {
     if (isVisible()) {
-        KConfig* config = rgapp->config();
+        TDEConfig* config = rgapp->config();
         config->setGroup(GeneralOptionsConfigGroup);
         config->writeEntry("transportx", x());
         config->writeEntry("transporty", y());
@@ -306,7 +306,7 @@ TransportDialog::initModeMap()
 void
 TransportDialog::show()
 {
-    KConfig* config = rgapp->config();
+    TDEConfig* config = rgapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     int x = config->readNumEntry("transportx", -1);
     int y = config->readNumEntry("transporty", -1);
@@ -328,7 +328,7 @@ void
 TransportDialog::hide()
 {
     if (isVisible()) {
-        KConfig* config = rgapp->config();
+        TDEConfig* config = rgapp->config();
         config->setGroup(GeneralOptionsConfigGroup);
         config->writeEntry("transportx", x());
         config->writeEntry("transporty", y());
@@ -1033,7 +1033,7 @@ void
 TransportDialog::slotLoopButtonClicked()
 {
     // disable if JACK transport has been set #1240039 - DMM
-    //    KConfig* config = rgapp->config();
+    //    TDEConfig* config = rgapp->config();
     //    config->setGroup(SequencerOptionsConfigGroup);
     //    if (config->readBoolEntry("jacktransport", false))
     //    {
diff --git a/src/gui/dialogs/TriggerSegmentDialog.cpp b/src/gui/dialogs/TriggerSegmentDialog.cpp
index 85035df..c4fc333 100644
--- a/src/gui/dialogs/TriggerSegmentDialog.cpp
+++ b/src/gui/dialogs/TriggerSegmentDialog.cpp
@@ -94,7 +94,7 @@ TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent,
 void
 TriggerSegmentDialog::setupFromConfig()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
 
     int seg = config->readNumEntry("triggersegmentlastornament", 0);
@@ -167,7 +167,7 @@ TriggerSegmentDialog::getTimeAdjust() const
 void
 TriggerSegmentDialog::slotOk()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
 
     config->writeEntry("triggersegmenttiming", strtoqstr(getTimeAdjust()));
diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp
index 279f9f7..f21a85d 100644
--- a/src/gui/dialogs/UseOrnamentDialog.cpp
+++ b/src/gui/dialogs/UseOrnamentDialog.cpp
@@ -142,7 +142,7 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
 void
 UseOrnamentDialog::setupFromConfig()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     Mark mark = qstrtostr(config->readEntry("useornamentmark", "trill"));
@@ -249,7 +249,7 @@ UseOrnamentDialog::slotMarkChanged(int i)
 void
 UseOrnamentDialog::slotOk()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     config->writeEntry("useornamentmark", strtoqstr(getMark()));