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

5 files changed, 31 insertions, 31 deletions

diff --git a/klipper/applet.cpp b/klipper/applet.cpp
index 358209876..2ec01c2a9 100644
--- a/klipper/applet.cpp
+++ b/klipper/applet.cpp
@@ -102,7 +102,7 @@ void KlipperApplet::about()
 
 KlipperAppletWidget::KlipperAppletWidget( TQWidget* parent )
 // init() is called first, before KlipperWidget is called with ( parent, kconfig )
-    : KlipperWidget( ( init(), parent ), new KConfig( "klipperrc" ))
+    : KlipperWidget( ( init(), parent ), new TDEConfig( "klipperrc" ))
 {
 }
 
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index 1a8010cc2..163c8eb5f 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -123,10 +123,10 @@ extern bool tqt_qclipboard_bailout_hack;
 #error Check status of #80072 with Qt4.
 #endif
 
-static void ensureGlobalSyncOff(KConfig* config);
+static void ensureGlobalSyncOff(TDEConfig* config);
 
 // config == kapp->config for process, otherwise applet
-KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config )
+KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
     : TQWidget( parent )
     , DCOPObject( "klipper" )
     , m_overflowCounter( 0 )
@@ -182,7 +182,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config )
                               "quitAction" );
     quitAction->setGroup( "exit" );
     myURLGrabber = 0L;
-    KConfig *kc = m_config;
+    TDEConfig *kc = m_config;
     readConfiguration( kc );
     setURLGrabberEnabled( bURLGrabber );
 
@@ -448,7 +448,7 @@ void KlipperWidget::saveHistory() {
     *history_file.dataStream() << crc << data;
 }
 
-void KlipperWidget::readProperties(KConfig *kc)
+void KlipperWidget::readProperties(TDEConfig *kc)
 {
     TQStringList dataList;
 
@@ -458,7 +458,7 @@ void KlipperWidget::readProperties(KConfig *kc)
         if ( !loadHistory() ) {
             // Try to load from the old config file.
             // Remove this at some point.
-            KConfigGroupSaver groupSaver(kc, "General");
+            TDEConfigGroupSaver groupSaver(kc, "General");
             dataList = kc->readListEntry("ClipboardData");
 
             for (TQStringList::ConstIterator it = dataList.end();
@@ -480,7 +480,7 @@ void KlipperWidget::readProperties(KConfig *kc)
 }
 
 
-void KlipperWidget::readConfiguration( KConfig *kc )
+void KlipperWidget::readConfiguration( TDEConfig *kc )
 {
     kc->setGroup("General");
     bPopupAtMouse = kc->readBoolEntry("PopupAtMousePosition", false);
@@ -496,7 +496,7 @@ void KlipperWidget::readConfiguration( KConfig *kc )
     bIgnoreImages = kc->readBoolEntry("IgnoreImages",true);
 }
 
-void KlipperWidget::writeConfiguration( KConfig *kc )
+void KlipperWidget::writeConfiguration( TDEConfig *kc )
 {
     kc->setGroup("General");
     kc->writeEntry("PopupAtMousePosition", bPopupAtMouse);
@@ -606,7 +606,7 @@ void KlipperWidget::slotQuit()
     saveSession();
     int autoStart = KMessageBox::questionYesNoCancel( 0L, i18n("Should Klipper start automatically\nwhen you login?"), i18n("Automatically Start Klipper?"), i18n("Start"), i18n("Do Not Start") );
 
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("General");
     if ( autoStart == KMessageBox::Yes ) {
         config->writeEntry("AutoStart", true);
@@ -647,7 +647,7 @@ void KlipperWidget::setURLGrabberEnabled( bool enable )
 {
     if (enable != bURLGrabber) {
       bURLGrabber = enable;
-      KConfig *kc = m_config;
+      TDEConfig *kc = m_config;
       kc->setGroup("General");
       kc->writeEntry("URLGrabberEnabled", bURLGrabber);
       m_lastURLGrabberTextSelection = TQString();
@@ -1167,7 +1167,7 @@ void Klipper::quitProcess()
     kapp->quit();
 }
 
-static void ensureGlobalSyncOff(KConfig* config) {
+static void ensureGlobalSyncOff(TDEConfig* config) {
     config->setGroup("General");
     if ( config->readBoolEntry( "SynchronizeClipboardAndSelection" ) ) {
         kdDebug() << "Shutting off global synchronization" << endl;
diff --git a/klipper/toplevel.h b/klipper/toplevel.h
index b072bd187..1d967a213 100644
--- a/klipper/toplevel.h
+++ b/klipper/toplevel.h
@@ -55,7 +55,7 @@ k_dcop:
     TQString getClipboardHistoryItem(int i);
 
 public:
-    KlipperWidget( TQWidget *parent, KConfig* config );
+    KlipperWidget( TQWidget *parent, TDEConfig* config );
     ~KlipperWidget();
 
     virtual void adjustSize();
@@ -88,8 +88,8 @@ protected:
 
     void paintEvent(TQPaintEvent *);
     void mousePressEvent(TQMouseEvent *);
-    void readProperties(KConfig *);
-    void readConfiguration(KConfig *);
+    void readProperties(TDEConfig *);
+    void readConfiguration(TDEConfig *);
 
     /**
      * Loads history from disk.
@@ -101,7 +101,7 @@ protected:
      */
     void saveHistory();
 
-    void writeConfiguration(KConfig *);
+    void writeConfiguration(TDEConfig *);
     /**
      * @returns the contents of the selection or, if empty, the contents of
      * the clipboard.
@@ -127,7 +127,7 @@ protected:
     void setClipboard( const HistoryItem& item, int mode );
     bool ignoreClipboardChanges() const;
 
-    KConfig* config() const { return m_config; }
+    TDEConfig* config() const { return m_config; }
     bool isApplet() const { return m_config != kapp->config(); }
 
 protected slots:
@@ -199,7 +199,7 @@ private:
     URLGrabber *myURLGrabber;
     TQString m_lastURLGrabberTextSelection;
     TQString m_lastURLGrabberTextClipboard;
-    KConfig* m_config;
+    TDEConfig* m_config;
     TQTimer m_overflowClearTimer;
     TQTimer m_pendingCheckTimer;
     bool m_pendingContentsCheck;
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index f04bdf22f..cb891a33d 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -46,7 +46,7 @@
 #define DO_NOTHING_ITEM 11
 #define DISABLE_POPUP 12
 
-URLGrabber::URLGrabber( KConfig* config )
+URLGrabber::URLGrabber( TDEConfig* config )
  : m_config( config )
 {
     if( m_config == NULL )
@@ -291,7 +291,7 @@ void URLGrabber::editData()
 }
 
 
-void URLGrabber::readConfiguration( KConfig *kc )
+void URLGrabber::readConfiguration( TDEConfig *kc )
 {
     myActions->clear();
     kc->setGroup( "General" );
@@ -308,7 +308,7 @@ void URLGrabber::readConfiguration( KConfig *kc )
 }
 
 
-void URLGrabber::writeConfiguration( KConfig *kc )
+void URLGrabber::writeConfiguration( TDEConfig *kc )
 {
     kc->setGroup( "General" );
     kc->writeEntry( "Number of Actions", myActions->count() );
@@ -439,7 +439,7 @@ ClipAction::ClipAction( const ClipAction& action )
 }
 
 
-ClipAction::ClipAction( KConfig *kc )
+ClipAction::ClipAction( TDEConfig *kc )
     : myRegExp( kc->readEntry( "Regexp" ) ),
       myDescription( kc->readEntry( "Description" ) )
 {
@@ -477,8 +477,8 @@ void ClipAction::addCommand( const TQString& command,
 }
 
 
-// precondition: we're in the correct action's group of the KConfig object
-void ClipAction::save( KConfig *kc ) const
+// precondition: we're in the correct action's group of the TDEConfig object
+void ClipAction::save( TDEConfig *kc ) const
 {
     kc->writeEntry( "Description", description() );
     kc->writeEntry( "Regexp", regExp() );
diff --git a/klipper/urlgrabber.h b/klipper/urlgrabber.h
index b5212890b..a40e48bf6 100644
--- a/klipper/urlgrabber.h
+++ b/klipper/urlgrabber.h
@@ -31,7 +31,7 @@
 
 class TQTimer;
 
-class KConfig;
+class TDEConfig;
 class KPopupMenu;
 
 class ClipAction;
@@ -44,7 +44,7 @@ class URLGrabber : public TQObject
   Q_OBJECT
 
 public:
-  URLGrabber( KConfig* config );
+  URLGrabber( TDEConfig* config );
   ~URLGrabber();
 
   /**
@@ -58,8 +58,8 @@ public:
 
   const ActionList * actionList() const { return myActions; }
   void setActionList( ActionList * );
-  void readConfiguration( KConfig * );
-  void writeConfiguration( KConfig * );
+  void readConfiguration( TDEConfig * );
+  void writeConfiguration( TDEConfig * );
 
   int popupTimeout() const { return myPopupKillTimeout; }
   void setPopupTimeout( int timeout ) { myPopupKillTimeout = timeout; }
@@ -89,7 +89,7 @@ private:
   TQTimer *myPopupKillTimer;
   int myPopupKillTimeout;
   bool m_stripWhiteSpace;
-  KConfig* m_config;
+  TDEConfig* m_config;
 
 private slots:
   void slotActionMenu() { actionMenu( true ); }
@@ -124,7 +124,7 @@ class ClipAction
 public:
   ClipAction( const TQString& regExp, const TQString& description );
   ClipAction( const ClipAction& );
-  ClipAction( KConfig *kc );
+  ClipAction( TDEConfig *kc );
   ~ClipAction();
 
   void  setRegExp( const TQString& r) 	      { myRegExp = TQRegExp( r ); }
@@ -150,9 +150,9 @@ public:
   const TQPtrList<ClipCommand>& commands() 	const { return myCommands; }
 
   /**
-   * Saves this action to a a given KConfig object
+   * Saves this action to a a given TDEConfig object
    */
-  void save( KConfig * ) const;
+  void save( TDEConfig * ) const;
 
   /**
    * Returns the most recent list of matched group backreferences.