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

6 files changed, 30 insertions, 30 deletions

diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 1eaa2c8b..e2992d21 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -595,7 +595,7 @@ void CatalogManager::saveSettings( TQString configFile )
 
     _project->setSettings( _settings );
 
-    config = new KConfig(configFile);
+    config = new TDEConfig(configFile);
 
     _catalogManager->saveView(config);
 
diff --git a/kbabel/catalogmanager/catalogmanager.h b/kbabel/catalogmanager/catalogmanager.h
index 9cabc311..d7cd467e 100644
--- a/kbabel/catalogmanager/catalogmanager.h
+++ b/kbabel/catalogmanager/catalogmanager.h
@@ -58,7 +58,7 @@ class TQPopupMenu;
 class TQTimer;
 class KProgress;
 class KAction;
-class KConfig;
+class TDEConfig;
 class FindInFilesDialog;
 
 namespace KBabel
@@ -211,7 +211,7 @@ private:
    TQString _configFile;
    KBabel::Project::Ptr _project;
 
-   KConfig* config;
+   TDEConfig* config;
 
    TQMap<TQString,uint> actionMap;
 };
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 1be2cba8..c2fffb9e 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -221,7 +221,7 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* p
    connect( svnhandler, TQT_SIGNAL( signalFilesCommitted( const TQStringList& ) ),
             this, TQT_SLOT( updateFiles( const TQStringList& ) ) );
 
-   KConfig *config = TDEGlobal::config();
+   TDEConfig *config = TDEGlobal::config();
    restoreView(config);
 
    _dictBox->readSettings(_project->config());
@@ -252,18 +252,18 @@ CatalogManagerView::~CatalogManagerView()
 }
 
 
-void CatalogManagerView::saveView( KConfig *config) const
+void CatalogManagerView::saveView( TDEConfig *config) const
 {
     saveMarker(config);
 
-    KConfigGroupSaver( config, "CatalogManager" );
+    TDEConfigGroupSaver( config, "CatalogManager" );
 
     config->writeEntry( "ValidateMarkAsFuzzy", _markAsFuzzy );
     config->writeEntry( "ValidateIgnoreFuzzy", _ignoreFuzzy );
 }
 
 
-void CatalogManagerView::restoreView( KConfig *config)
+void CatalogManagerView::restoreView( TDEConfig *config)
 {
     readMarker(config);
 
@@ -439,9 +439,9 @@ void CatalogManagerView::loadMarks()
 
     TQString filename;
 #if KDE_IS_VERSION( 3, 2, 90 )
-    if (!KIO::NetAccess::download( url, filename, this ) )
+    if (!TDEIO::NetAccess::download( url, filename, this ) )
 #else
-    if( !KIO::NetAccess::download( url, filename ) )
+    if( !TDEIO::NetAccess::download( url, filename ) )
 #endif
     {
 	KMessageBox::error(this,i18n(
@@ -483,7 +483,7 @@ void CatalogManagerView::loadMarks()
 	    "Error while trying to open file:\n %1").arg(url.prettyURL()));
     }
 
-    KIO::NetAccess::removeTempFile( filename );
+    TDEIO::NetAccess::removeTempFile( filename );
 
     // test validity of list items
     TQStringList testedList;
@@ -514,7 +514,7 @@ void CatalogManagerView::saveMarks()
     if( url2.isEmpty() ) return;
 
     // ### FIXME: why is the file dialog not doing this?
-    if ( KIO::NetAccess::exists( url2, false, this ) )
+    if ( TDEIO::NetAccess::exists( url2, false, this ) )
     {
         if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. "
 	            "Do you want to overwrite it?").arg(url2.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
@@ -525,7 +525,7 @@ void CatalogManagerView::saveMarks()
 
 #if KDE_IS_VERSION( 3, 4, 92 )
     // Support for partially remote KIO slave like media:
-    const KURL url ( KIO::NetAccess::mostLocalURL( url2, this ) );
+    const KURL url ( TDEIO::NetAccess::mostLocalURL( url2, this ) );
 #else
     const KURL url ( url2 );
 #endif
@@ -573,7 +573,7 @@ void CatalogManagerView::saveMarks()
     else if ( !localFile )
     {
         tempFile->close();
-        if( !KIO::NetAccess::upload( tempFile->name(), url, this ) )
+        if( !TDEIO::NetAccess::upload( tempFile->name(), url, this ) )
         {
             // ### KDE4 FIXME: strip the final \n of the message
             KMessageBox::error(this,
@@ -2552,16 +2552,16 @@ void CatalogManagerView::contentsMouseMoveEvent(TQMouseEvent* event)
    }
 }
 
-void CatalogManagerView::readMarker( KConfig* config)
+void CatalogManagerView::readMarker( TDEConfig* config)
 {
-   KConfigGroupSaver cs(config,"CatalogManager");
+   TDEConfigGroupSaver cs(config,"CatalogManager");
 
    _markerList = config->readListEntry("Marker");
 }
 
-void CatalogManagerView::saveMarker( KConfig* config) const
+void CatalogManagerView::saveMarker( TDEConfig* config) const
 {
-   KConfigGroupSaver cs(config,"CatalogManager");
+   TDEConfigGroupSaver cs(config,"CatalogManager");
 
    config->writeEntry("Marker",_markerList);
    config->sync();
diff --git a/kbabel/catalogmanager/catalogmanagerview.h b/kbabel/catalogmanager/catalogmanagerview.h
index 1238ed52..1743ce73 100644
--- a/kbabel/catalogmanager/catalogmanagerview.h
+++ b/kbabel/catalogmanager/catalogmanagerview.h
@@ -60,7 +60,7 @@ class KBabelDictBox;
 class CatManPreferences;
 class TQTextEdit;
 class KProgress;
-class KConfig;
+class TDEConfig;
 class KDataToolInfo;
 class ValidateProgressDialog;
 class CVSHandler;
@@ -97,8 +97,8 @@ public:
    bool isActive() const {return _active;}
    bool isStopped() const {return _stop;}
 
-   void restoreView(KConfig *config);
-   void saveView(KConfig *config) const;
+   void restoreView(TDEConfig *config);
+   void saveView(TDEConfig *config) const;
 
    void setRMBMenuFile( TQPopupMenu *m);
    void setRMBMenuDir( TQPopupMenu *m);
@@ -379,8 +379,8 @@ private slots:
 private:
    void toggleColumn( uint id, bool show);
 
-   void readMarker(KConfig *config);
-   void saveMarker(KConfig *config) const;
+   void readMarker(TDEConfig *config);
+   void saveMarker(TDEConfig *config) const;
    /**
    * remove marked entries, which are not in the current file list
    */
diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp
index f70d9d10..b035666a 100644
--- a/kbabel/catalogmanager/findinfilesdialog.cpp
+++ b/kbabel/catalogmanager/findinfilesdialog.cpp
@@ -156,10 +156,10 @@ void FindInFilesDialog::setReplaceOpts(ReplaceOptions options)
 
 void FindInFilesDialog::readSettings()
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 
 	if(isReplaceDialog()) {
-		KConfigGroupSaver cgs(config,"ReplaceDialog");
+		TDEConfigGroupSaver cgs(config,"ReplaceDialog");
 		
 		ReplaceOptions options = replaceOpts();
 	
@@ -178,7 +178,7 @@ void FindInFilesDialog::readSettings()
 		FindDialog::setReplaceOpts(options);
 	}
 	else {
-		KConfigGroupSaver cgs(config,"FindDialog");
+		TDEConfigGroupSaver cgs(config,"FindDialog");
 
 		FindOptions options = findOpts();
 
@@ -201,10 +201,10 @@ void FindInFilesDialog::readSettings()
 
 void FindInFilesDialog::saveSettings()
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 
 	if(isReplaceDialog()) {
-		KConfigGroupSaver cgs(config,"ReplaceDialog");
+		TDEConfigGroupSaver cgs(config,"ReplaceDialog");
 		ReplaceOptions options = replaceOpts();
 
 		config->writeEntry("AllFiles", options.inAllFiles);
@@ -214,7 +214,7 @@ void FindInFilesDialog::saveSettings()
 		config->writeEntry("AskForSave",options.askForSave);
 	}
 	else {
-		KConfigGroupSaver cgs(config,"FindDialog");
+		TDEConfigGroupSaver cgs(config,"FindDialog");
 		
 		FindOptions options = findOpts();
 
diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp
index 7d134e31..458611ab 100644
--- a/kbabel/catalogmanager/markpatterndialog.cpp
+++ b/kbabel/catalogmanager/markpatterndialog.cpp
@@ -140,7 +140,7 @@ void MarkPatternDialog::slotRegexpButtonClicked( )
 
 void MarkPatternDialog::restoreSettings( )
 {
-  KConfig * config = TDEGlobal::config( );
+  TDEConfig * config = TDEGlobal::config( );
   config->setGroup("MarkPatternDialog");
   
   patternList = config->readListEntry("Patterns");
@@ -160,7 +160,7 @@ void MarkPatternDialog::restoreSettings( )
 
 void MarkPatternDialog::saveSettings( )
 {
-  KConfig * config = TDEGlobal::config( );
+  TDEConfig * config = TDEGlobal::config( );
   config->setGroup("MarkPatternDialog");
   
   config->writeEntry("Patterns", patternList);