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

5 files changed, 33 insertions, 33 deletions

diff --git a/kpat/CHANGES b/kpat/CHANGES
index 208b9819..784fc847 100644
--- a/kpat/CHANGES
+++ b/kpat/CHANGES
@@ -88,7 +88,7 @@ since kpat-0.6
 	- new KDE FSSTND compliant
 	- depending on display colors sets either a 
 	  16 color or high color icon and miniicon
-	- fixes for new KConfig
+	- fixes for new TDEConfig
 
 since kpat-0.5
 
diff --git a/kpat/cardmaps.cpp b/kpat/cardmaps.cpp
index 9b50c356..5c5427f1 100644
--- a/kpat/cardmaps.cpp
+++ b/kpat/cardmaps.cpp
@@ -52,8 +52,8 @@ cardMap::cardMap(const TQColor &dim) : dimcolor(dim)
     card_height = 0;
 
     kdDebug(11111) << "cardMap\n";
-    KConfig *config = kapp->config();
-    KConfigGroupSaver cs(config, settings_group );
+    TDEConfig *config = kapp->config();
+    TDEConfigGroupSaver cs(config, settings_group );
 
     TQString bg = config->readEntry( "Back", KCardDialog::getDefaultDeck());
     setBackSide( bg, false);
@@ -67,8 +67,8 @@ cardMap::cardMap(const TQColor &dim) : dimcolor(dim)
 
 bool cardMap::setCardDir( const TQString &dir)
 {
-    KConfig *config = kapp->config();
-    KConfigGroupSaver cs(config, settings_group );
+    TDEConfig *config = kapp->config();
+    TDEConfigGroupSaver cs(config, settings_group );
 
     // create an animation window while loading pixmaps (this
     // may take a while (approx. 3 seconds on my AMD K6PR200)
diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp
index dbd27787..42d895c0 100644
--- a/kpat/dealer.cpp
+++ b/kpat/dealer.cpp
@@ -1157,9 +1157,9 @@ void Dealer::won()
     _won = true;
 
     // update score, 'win' in demo mode also counts (keep it that way?)
-    { // wrap in own scope to make KConfigGroupSave work
-	KConfig *config = kapp->config();
-	KConfigGroupSaver kcs(config, scores_group);
+    { // wrap in own scope to make TDEConfigGroupSave work
+	TDEConfig *config = kapp->config();
+	TDEConfigGroupSaver kcs(config, scores_group);
 	unsigned int n = config->readUnsignedNumEntry(TQString("won%1").arg(_id),0) + 1;
 	config->writeEntry(TQString("won%1").arg(_id),n);
 	n = config->readUnsignedNumEntry(TQString("winstreak%1").arg(_id),0) + 1;
@@ -1428,8 +1428,8 @@ void Dealer::countGame()
 {
     if ( !_gameRecorded ) {
         kdDebug(11111) << "counting game as played." << endl;
-        KConfig *config = kapp->config();
-        KConfigGroupSaver kcs(config, scores_group);
+        TDEConfig *config = kapp->config();
+        TDEConfigGroupSaver kcs(config, scores_group);
         unsigned int Total = config->readUnsignedNumEntry(TQString("total%1").arg(_id),0);
         ++Total;
         config->writeEntry(TQString("total%1").arg(_id),Total);
@@ -1441,8 +1441,8 @@ void Dealer::countLoss()
 {
     if ( _gameRecorded ) {
         // update score
-        KConfig *config = kapp->config();
-        KConfigGroupSaver kcs(config, scores_group);
+        TDEConfig *config = kapp->config();
+        TDEConfigGroupSaver kcs(config, scores_group);
         unsigned int n = config->readUnsignedNumEntry(TQString("loosestreak%1").arg(_id),0) + 1;
         config->writeEntry(TQString("loosestreak%1").arg(_id),n);
         unsigned int m = config->readUnsignedNumEntry(TQString("maxloosestreak%1").arg(_id),0);
diff --git a/kpat/gamestatsimpl.cpp b/kpat/gamestatsimpl.cpp
index 11b95fee..355768d4 100644
--- a/kpat/gamestatsimpl.cpp
+++ b/kpat/gamestatsimpl.cpp
@@ -40,8 +40,8 @@ void GameStatsImpl::setGameType(int id)
 {
 	// Trick to reset string to original value
 	languageChange();
-	KConfig *config = kapp->config();
-	KConfigGroupSaver kcs(config, scores_group);
+	TDEConfig *config = kapp->config();
+	TDEConfigGroupSaver kcs(config, scores_group);
 	unsigned int t = config->readUnsignedNumEntry(TQString("total%1").arg(id),0);
 	Played->setText(Played->text().arg(t));
 	unsigned int w = config->readUnsignedNumEntry(TQString("won%1").arg(id),0);
diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp
index 288ebc6a..f79bb4d2 100644
--- a/kpat/pwidget.cpp
+++ b/kpat/pwidget.cpp
@@ -145,8 +145,8 @@ pWidget::pWidget()
                                    actionCollection(), "enable_autodrop");
     dropaction->setCheckedState(i18n("Disable Autodrop"));
 
-    KConfig *config = kapp->config();
-    KConfigGroupSaver cs(config, settings_group );
+    TDEConfig *config = kapp->config();
+    TDEConfigGroupSaver cs(config, settings_group );
 
     TQString bgpath = config->readPathEntry("Background");
     kdDebug(11111) << "bgpath '" << bgpath << "'" << endl;
@@ -198,8 +198,8 @@ void pWidget::undoPossible(bool poss)
 }
 
 void pWidget::changeBackside() {
-    KConfig *config = kapp->config();
-    KConfigGroupSaver kcs(config, settings_group);
+    TDEConfig *config = kapp->config();
+    TDEConfigGroupSaver kcs(config, settings_group);
 
     TQString deck = config->readEntry("Back", KCardDialog::getDefaultDeck());
     TQString cards = config->readEntry("Cards", KCardDialog::getDefaultCardDir());
@@ -262,8 +262,8 @@ void pWidget::changeWallpaper()
     midcolor = TQColor(r, b, g);
 
     if (dill) {
-        KConfig *config = kapp->config();
-        KConfigGroupSaver kcs(config, settings_group);
+        TDEConfig *config = kapp->config();
+        TDEConfigGroupSaver kcs(config, settings_group);
 
         TQString deck = config->readEntry("Back", KCardDialog::getDefaultDeck());
         TQString dummy = config->readEntry("Cards", KCardDialog::getDefaultCardDir());
@@ -278,16 +278,16 @@ void pWidget::changeWallpaper()
 
 void pWidget::animationChanged() {
     bool anim = animation->isChecked();
-    KConfig *config = kapp->config();
-    KConfigGroupSaver cs(config, settings_group );
+    TDEConfig *config = kapp->config();
+    TDEConfigGroupSaver cs(config, settings_group );
     config->writeEntry( "Animation", anim);
 }
 
 void pWidget::enableAutoDrop()
 {
     bool drop = dropaction->isChecked();
-    KConfig *config = kapp->config();
-    KConfigGroupSaver cs(config, settings_group );
+    TDEConfig *config = kapp->config();
+    TDEConfigGroupSaver cs(config, settings_group );
     config->writeEntry( "Autodrop", drop);
     dill->setAutoDropEnabled(drop);
 }
@@ -377,8 +377,8 @@ void pWidget::newGameType()
 
     setGameCaption();
 
-    KConfig *config = kapp->config();
-    KConfigGroupSaver kcs(config, settings_group);
+    TDEConfig *config = kapp->config();
+    TDEConfigGroupSaver kcs(config, settings_group);
     config->writeEntry("DefaultGame", id);
 
     TQSize min(700,400);
@@ -411,8 +411,8 @@ void pWidget::slotUpdateMoves()
 
 void pWidget::setBackSide(const TQString &deck, const TQString &cards)
 {
-    KConfig *config = kapp->config();
-    KConfigGroupSaver kcs(config, settings_group);
+    TDEConfig *config = kapp->config();
+    TDEConfigGroupSaver kcs(config, settings_group);
     TQPixmap pm(deck);
     if(!pm.isNull()) {
         cardMap::self()->setBackSide(pm, false);
@@ -467,11 +467,11 @@ void pWidget::gameLost()
 
     // The following code is taken out of kmessagebox.cpp in tdeui.
     // Is there a better way?
-    KConfig  *config = 0;
+    TDEConfig  *config = 0;
     TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
 
     config = TDEGlobal::config();
-    KConfigGroupSaver saver(config,
+    TDEConfigGroupSaver saver(config,
 			    TQString::fromLatin1("Notification Messages"));
     TQString dontAsk = config->readEntry(dontAskAgainName).lower();
 
@@ -498,7 +498,7 @@ void pWidget::gameLost()
 void pWidget::openGame(const KURL &url)
 {
     TQString tmpFile;
-    if( KIO::NetAccess::download( url, tmpFile, this ) )
+    if( TDEIO::NetAccess::download( url, tmpFile, this ) )
     {
         TQFile of(tmpFile);
         of.open(IO_ReadOnly);
@@ -522,7 +522,7 @@ void pWidget::openGame(const KURL &url)
         }
         dill->openGame(doc);
         setGameCaption();
-        KIO::NetAccess::removeTempFile( tmpFile );
+        TDEIO::NetAccess::removeTempFile( tmpFile );
         recent->addURL(url);
         recent->saveEntries(TDEGlobal::config());
     }
@@ -543,7 +543,7 @@ void pWidget::saveGame()
     TQTextStream *stream = file.textStream();
     *stream << doc.toString();
     file.close();
-    KIO::NetAccess::upload(file.name(), url, this);
+    TDEIO::NetAccess::upload(file.name(), url, this);
     recent->addURL(url);
     recent->saveEntries(TDEGlobal::config());
 }