From cc74f360bb40da3d79f58048f8e8611804980aa6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:30:47 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kicker/extensions/kasbar/ChangeLog       |  4 ++--
 kicker/extensions/kasbar/kasbarapp.cpp   |  2 +-
 kicker/extensions/kasbar/kasprefsdlg.cpp |  4 ++--
 kicker/extensions/kasbar/kasprefsdlg.h   |  2 +-
 kicker/extensions/kasbar/kastasker.cpp   | 12 ++++++------
 kicker/extensions/kasbar/kastasker.h     | 18 +++++++++---------
 6 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'kicker/extensions/kasbar')

diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog
index c8ee55166..cdc356180 100644
--- a/kicker/extensions/kasbar/ChangeLog
+++ b/kicker/extensions/kasbar/ChangeLog
@@ -587,8 +587,8 @@
 
 	* This took me 2 hours to find...
 
-	  -   KConfigGroupSaver( conf, "Appearance" ); +
-	  KConfigGroupSaver saver( conf, "Appearance" );
+	  -   TDEConfigGroupSaver( conf, "Appearance" ); +
+	  TDEConfigGroupSaver saver( conf, "Appearance" );
 
 	  Finally the size is restored correctly.
 
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index 708aeb1e6..abd6337df 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -85,7 +85,7 @@ int main( int argc, char **argv )
 
   int wflags = TQt::WStyle_Customize | TQt::WX11BypassWM | TQt::WStyle_DialogBorder | TQt::WStyle_StaysOnTop;
   KasBar *kasbar;
-  KConfig conf( "kasbarrc" );
+  TDEConfig conf( "kasbarrc" );
 
   if ( args->isSet("test") ) {
       kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQ_WFlags)wflags );
diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp
index 42199272a..31f5c5a33 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.cpp
+++ b/kicker/extensions/kasbar/kasprefsdlg.cpp
@@ -164,7 +164,7 @@ void KasPrefsDialog::addLookPage()
 			  "available space will be used." ) );
    TQLabel *maxBoxesLabel = new TQLabel( i18n("Bo&xes per line: "), maxBoxesBox );
 
-   KConfig *conf = kasbar->config();
+   TDEConfig *conf = kasbar->config();
    if ( conf )
        conf->setGroup( "Layout" );
    maxBoxesSpin = new KIntSpinBox( 0, 50, 1,
@@ -447,7 +447,7 @@ void KasPrefsDialog::customSizeChanged ( int value )
 
 void KasPrefsDialog::accept()
 {
-   KConfig *conf = kasbar->config();
+   TDEConfig *conf = kasbar->config();
    if ( conf ) {
        kasbar->writeConfig( conf );
 
diff --git a/kicker/extensions/kasbar/kasprefsdlg.h b/kicker/extensions/kasbar/kasprefsdlg.h
index cc56f2c7f..c3e8be131 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.h
+++ b/kicker/extensions/kasbar/kasprefsdlg.h
@@ -65,7 +65,7 @@ class TQCheckBox;
 class TQSlider;
 class TQSpinBox;
 class KColorButton;
-class KConfig;
+class TDEConfig;
 class KIntSpinBox;
 
 class KasTasker;
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index 851b7d915..a11c18547 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -539,7 +539,7 @@ void KasTasker::setStandAlone( bool enable )
 // Configuration Loader
 //
 
-void KasTasker::setConfig( KConfig *conf )
+void KasTasker::setConfig( TDEConfig *conf )
 {
     this->conf = conf;
 }
@@ -559,10 +559,10 @@ void KasTasker::writeConfig()
    writeConfig(conf);
 }
 
-void KasTasker::readConfig( KConfig *conf )
+void KasTasker::readConfig( TDEConfig *conf )
 {
     if ( !conf ) {
-	kdWarning() << "KasTasker::readConfig() got a null KConfig" << endl;
+	kdWarning() << "KasTasker::readConfig() got a null TDEConfig" << endl;
 	return;
     }
 
@@ -578,7 +578,7 @@ void KasTasker::readConfig( KConfig *conf )
    //
    // Appearance Settings.
    //
-   KConfigGroupSaver saver( conf, "Appearance" );
+   TDEConfigGroupSaver saver( conf, "Appearance" );
 
    int ext = conf->readNumEntry( "ItemExtent", -1 );
    if ( ext > 0 )
@@ -657,10 +657,10 @@ void KasTasker::readConfig( KConfig *conf )
    emit configChanged();
 }
 
-void KasTasker::writeConfig( KConfig *conf )
+void KasTasker::writeConfig( TDEConfig *conf )
 {
     if ( !conf ) {
-	kdWarning() << "KasTasker::writeConfig() got a null KConfig" << endl;
+	kdWarning() << "KasTasker::writeConfig() got a null TDEConfig" << endl;
 	return;
     }
 
diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h
index 015d9fb37..27dc2ff44 100644
--- a/kicker/extensions/kasbar/kastasker.h
+++ b/kicker/extensions/kasbar/kastasker.h
@@ -62,7 +62,7 @@
 #include <kdemacros.h>
 #include <taskmanager.h>
 
-class KConfig;
+class TDEConfig;
 class KPixmap;
 class KPopupMenu;
 class KAction;
@@ -220,18 +220,18 @@ public slots:
     void showPreferences();
     void showAbout();
 
-    /** Sets the current KConfig object. */
-    void setConfig( KConfig *config );
-    KConfig *config() const { return conf; }
+    /** Sets the current TDEConfig object. */
+    void setConfig( TDEConfig *config );
+    TDEConfig *config() const { return conf; }
 
-    /** Reads the settings from the current KConfig. */
+    /** Reads the settings from the current TDEConfig. */
     void readConfig();
     void writeConfig();
     void writeConfigLater();
     void writeLayout();
 
-    /** Writes the settings of this bar to the specified KConfig. */
-    void writeConfig( KConfig *conf );
+    /** Writes the settings of this bar to the specified TDEConfig. */
+    void writeConfig( TDEConfig *conf );
 
     void setStandAlone( bool enable );
 
@@ -243,11 +243,11 @@ signals:
 
 protected slots:
     /** Load settings from the specified configuration. */
-    void readConfig( KConfig *conf );
+    void readConfig( TDEConfig *conf );
 
 private:
     KPopupMenu *menu;
-    KConfig *conf;
+    TDEConfig *conf;
     KasGrouper *grouper;
     KToggleAction *toggleDetachedAction;
     KToggleAction *showAllWindowsAction;
-- 
cgit v1.2.1