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

12 files changed, 22 insertions, 22 deletions

diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp
index cc971ab..50929f4 100644
--- a/src/gui/editors/notation/NotationEraser.cpp
+++ b/src/gui/editors/notation/NotationEraser.cpp
@@ -47,7 +47,7 @@ NotationEraser::NotationEraser(NotationView* view)
         : NotationTool("NotationEraser", view),
         m_collapseRest(false)
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
     m_collapseRest = config->readBoolEntry("collapse", false);
 
diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp
index 4d891a6..32a47e2 100644
--- a/src/gui/editors/notation/NotationHLayout.cpp
+++ b/src/gui/editors/notation/NotationHLayout.cpp
@@ -75,7 +75,7 @@ NotationHLayout::NotationHLayout(Composition *c, NotePixmapFactory *npf,
 {
     //    NOTATION_DEBUG << "NotationHLayout::NotationHLayout()" << endl;
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Notation Options");
     m_keySigCancelMode = config->readNumEntry("keysigcancelmode", 1);
 }
@@ -255,7 +255,7 @@ NotationHLayout::scanStaff(Staff &staff, timeT startTime, timeT endTime)
 
     NOTATION_DEBUG << "ottava shift at start:" << ottavaShift << ", ottavaEnd " << ottavaEnd << endl;
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Notation Options");
 
     int accOctaveMode = config->readNumEntry("accidentaloctavemode", 1);
@@ -1266,7 +1266,7 @@ NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
 
     int startBar = getComposition()->getBarNumber(startTime);
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Notation Options");
     bool showInvisibles = config->readBoolEntry("showinvisibles", true);
 
diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp
index 1baa33c..3be47ae 100644
--- a/src/gui/editors/notation/NotationStaff.cpp
+++ b/src/gui/editors/notation/NotationStaff.cpp
@@ -98,7 +98,7 @@ NotationStaff::NotationStaff(TQCanvas *canvas, Segment *segment,
         m_ready(false),
         m_lastRenderedBar(0)
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
     m_colourQuantize = config->readBoolEntry("colourquantize", false);
 
@@ -433,7 +433,7 @@ NotationStaff::getNoteNameAtCanvasCoords(double x, int y,
     ::Rosegarden::Key key;
     getClefAndKeyAtCanvasCoords(x, y, clef, key);
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     int baseOctave = config->readNumEntry("midipitchoctave", -2);
 
@@ -917,7 +917,7 @@ NotationStaff::renderSingleElement(ViewElementList::iterator &vli,
             <Bool>(BaseProperties::INVISIBLE, invisible) && invisible) {
         if (m_printPainter)
             return ;
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         config->setGroup("Notation Options");
         bool showInvisibles = config->readBoolEntry("showinvisibles", true);
         if (!showInvisibles)
diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp
index 9bbc6e6..f81ad1e 100644
--- a/src/gui/editors/notation/NotationStrings.cpp
+++ b/src/gui/editors/notation/NotationStrings.cpp
@@ -260,7 +260,7 @@ NotationStrings::makeNoteMenuLabel(timeT duration,
         }
     }
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     GeneralConfigurationPage::NoteNameStyle noteNameStyle =
         (GeneralConfigurationPage::NoteNameStyle)
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index 4a8fd00..032b8cb 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -4807,7 +4807,7 @@ void NotationView::slotEditPaste()
         (clipboard->getSingleSegment()->getEndTime() -
          clipboard->getSingleSegment()->getStartTime());
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
     PasteEventsCommand::PasteType defaultType = (PasteEventsCommand::PasteType)
         config->readUnsignedNumEntry("pastetype",
@@ -4841,7 +4841,7 @@ void NotationView::slotEditGeneralPaste()
     LinedStaff *staff = getCurrentLinedStaff();
     Segment &segment = staff->getSegment();
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
     PasteEventsCommand::PasteType defaultType = (PasteEventsCommand::PasteType)
         config->readUnsignedNumEntry("pastetype",
diff --git a/src/gui/editors/notation/NoteFontFactory.cpp b/src/gui/editors/notation/NoteFontFactory.cpp
index 20c3ba8..9099b58 100644
--- a/src/gui/editors/notation/NoteFontFactory.cpp
+++ b/src/gui/editors/notation/NoteFontFactory.cpp
@@ -57,7 +57,7 @@ NoteFontFactory::getFontNames(bool forceRescan)
     if (!m_fontNames.empty())
         return m_fontNames;
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     TQString fontNameList = "";
diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp
index 5b192cc..a2b6b56 100644
--- a/src/gui/editors/notation/NoteInserter.cpp
+++ b/src/gui/editors/notation/NoteInserter.cpp
@@ -71,7 +71,7 @@ NoteInserter::NoteInserter(NotationView* view)
 {
     TQIconSet icon;
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
     m_autoBeam = config->readBoolEntry("autobeam", true);
     m_matrixInsertType = (config->readNumEntry("inserttype", 0) > 0);
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index cb028c5..7474d4e 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -226,7 +226,7 @@ NotePixmapFactory::init(std::string fontName, int size)
     // sizes only and we want pixels
     TQFont timeSigFont(defaultTimeSigFontFamily),
         textFont(defaultSerifFontFamily);
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup(NotationViewConfigGroup);
 
     m_timeSigFont = config->readFontEntry("timesigfont", &timeSigFont);
@@ -3219,7 +3219,7 @@ NotePixmapFactory::getTextFont(const Text &text) const
         tiny = true;
     }
     
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     TQFont textFont;
 
diff --git a/src/gui/editors/parameters/SegmentParameterBox.cpp b/src/gui/editors/parameters/SegmentParameterBox.cpp
index 3f270dc..2eb39f8 100644
--- a/src/gui/editors/parameters/SegmentParameterBox.cpp
+++ b/src/gui/editors/parameters/SegmentParameterBox.cpp
@@ -1013,7 +1013,7 @@ SegmentParameterBox::updateHighLow()
     Pitch highest(m_highestPlayable, accidental);
     Pitch lowest(m_lowestPlayable, accidental);
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     int base = config->readNumEntry("midipitchoctave", -2);
     //!!! FIXME this code is broken, and needs to be fixed after the fashion of
diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp
index 08ac430..d627b01 100644
--- a/src/gui/editors/parameters/TrackParameterBox.cpp
+++ b/src/gui/editors/parameters/TrackParameterBox.cpp
@@ -108,7 +108,7 @@ TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc,
     title_font.setBold(true);
 
     // Set up default expansions for the collapsing elements
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     TQString groupTemp = config->group();
     config->setGroup("CollapsingFrame");
     bool expanded = config->readBoolEntry("trackparametersplayback", true);
@@ -595,7 +595,7 @@ TrackParameterBox::updateHighLow()
     Pitch highest(m_highestPlayable, accidental);
     Pitch lowest(m_lowestPlayable, accidental);
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
     int base = config->readNumEntry("midipitchoctave", -2);
     bool useSharps = true;
diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp
index 90dae37..9bd2079 100644
--- a/src/gui/editors/segment/PlayList.cpp
+++ b/src/gui/editors/segment/PlayList.cpp
@@ -229,8 +229,8 @@ void PlayList::save()
         item = dynamic_cast<PlayListViewItem*>(item->nextSibling());
     }
 
-    KConfig *kc = TDEGlobal::config();
-    KConfigGroupSaver cs(kc, PlayListConfigGroup);
+    TDEConfig *kc = TDEGlobal::config();
+    TDEConfigGroupSaver cs(kc, PlayListConfigGroup);
     kc->writeEntry("Playlist Files", urlList);
 
     getListView()->saveLayout(kc, PlayListConfigGroup);
@@ -238,10 +238,10 @@ void PlayList::save()
 
 void PlayList::restore()
 {
-    KConfig *kc = TDEGlobal::config();
+    TDEConfig *kc = TDEGlobal::config();
     getListView()->restoreLayout(kc, PlayListConfigGroup);
 
-    KConfigGroupSaver cs(kc, PlayListConfigGroup);
+    TDEConfigGroupSaver cs(kc, PlayListConfigGroup);
     TQStringList urlList = kc->readListEntry("Playlist Files");
 
     for (TQStringList::Iterator it = urlList.begin();
diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp b/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
index 786e1a4..3515e16 100644
--- a/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
+++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
@@ -147,7 +147,7 @@ void AudioPreviewPainter::paintPreviewImage()
 	haveTempoChange = true;
     }
 
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup(GeneralOptionsConfigGroup);
 
     bool meterLevels = (config->readUnsignedNumEntry("audiopreviewstyle", 1)