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

24 files changed, 54 insertions, 54 deletions

diff --git a/katapult/common/imagedisplay.cpp b/katapult/common/imagedisplay.cpp
index dbbc40d..a1ba512 100644
--- a/katapult/common/imagedisplay.cpp
+++ b/katapult/common/imagedisplay.cpp
@@ -384,7 +384,7 @@ void ImageDisplay::updateOffset()
 	offset[3] = margin[3] + padding;
 }
 
-void ImageDisplay::readSettings(KConfigBase *config)
+void ImageDisplay::readSettings(TDEConfigBase *config)
 {
 	fadeTime = config->readUnsignedNumEntry("FadeTime", 250);
 	updateFadeStep();
@@ -395,7 +395,7 @@ void ImageDisplay::readSettings(KConfigBase *config)
 	maxFontSize = config->readUnsignedNumEntry("MaxFontSize", 14);
 }
 
-void ImageDisplay::writeSettings(KConfigBase *config)
+void ImageDisplay::writeSettings(TDEConfigBase *config)
 {
 	config->writeEntry("FadeTime", fadeTime);
 	config->writeEntry("FontFace", fontFace);
diff --git a/katapult/common/imagedisplay.h b/katapult/common/imagedisplay.h
index 45edac0..a9de837 100644
--- a/katapult/common/imagedisplay.h
+++ b/katapult/common/imagedisplay.h
@@ -45,8 +45,8 @@ public slots:
 	void continueFade();
 	virtual void hide();
 
-	virtual void readSettings(KConfigBase *);
-	virtual void writeSettings(KConfigBase *);
+	virtual void readSettings(TDEConfigBase *);
+	virtual void writeSettings(TDEConfigBase *);
 	virtual TQWidget * configure();
 	
 	void setFont(const TQString &);
diff --git a/katapult/common/katapultcatalog.cpp b/katapult/common/katapultcatalog.cpp
index 65ff83d..7ffe8c8 100644
--- a/katapult/common/katapultcatalog.cpp
+++ b/katapult/common/katapultcatalog.cpp
@@ -75,11 +75,11 @@ Match KatapultCatalog::bestMatch() const
 	return _bestMatch;
 }
 
-void KatapultCatalog::readSettings(KConfigBase *)
+void KatapultCatalog::readSettings(TDEConfigBase *)
 {
 }
 
-void KatapultCatalog::writeSettings(KConfigBase *)
+void KatapultCatalog::writeSettings(TDEConfigBase *)
 {
 }
 
diff --git a/katapult/common/katapultcatalog.h b/katapult/common/katapultcatalog.h
index 388b958..3ffef8d 100644
--- a/katapult/common/katapultcatalog.h
+++ b/katapult/common/katapultcatalog.h
@@ -27,7 +27,7 @@
 #include "match.h"
 
 class TQWidget;
-class KConfigBase;
+class TDEConfigBase;
 
 /**
 @author Joe Ferris
@@ -46,8 +46,8 @@ public:
 	Match bestMatch() const;
 	
 	virtual void initialize();
-	virtual void readSettings(KConfigBase *);
-	virtual void writeSettings(KConfigBase *);
+	virtual void readSettings(TDEConfigBase *);
+	virtual void writeSettings(TDEConfigBase *);
 	virtual TQWidget * configure();
 	
 protected:
diff --git a/katapult/common/katapultdisplay.cpp b/katapult/common/katapultdisplay.cpp
index b6d3dc6..5102496 100644
--- a/katapult/common/katapultdisplay.cpp
+++ b/katapult/common/katapultdisplay.cpp
@@ -101,11 +101,11 @@ int KatapultDisplay::status() const
 	return _status;
 }
 
-void KatapultDisplay::readSettings(KConfigBase *)
+void KatapultDisplay::readSettings(TDEConfigBase *)
 {
 }
 
-void KatapultDisplay::writeSettings(KConfigBase *)
+void KatapultDisplay::writeSettings(TDEConfigBase *)
 {
 }
 
diff --git a/katapult/common/katapultdisplay.h b/katapult/common/katapultdisplay.h
index b3f789c..4757d3e 100644
--- a/katapult/common/katapultdisplay.h
+++ b/katapult/common/katapultdisplay.h
@@ -28,7 +28,7 @@
 #include "katapultaction.h"
 
 class Katapult;
-class KConfigBase;
+class TDEConfigBase;
 
 /**
 @author Joe Ferris
@@ -48,8 +48,8 @@ public:
 	void setAction(const KatapultAction *);
 	void setStatus(int);
 
-	virtual void readSettings(KConfigBase *);
-	virtual void writeSettings(KConfigBase *);
+	virtual void readSettings(TDEConfigBase *);
+	virtual void writeSettings(TDEConfigBase *);
 	virtual TQWidget * configure();
 	
 signals:
diff --git a/katapult/katapult/katapultsettings.cpp b/katapult/katapult/katapultsettings.cpp
index ec20e79..b283ed0 100644
--- a/katapult/katapult/katapultsettings.cpp
+++ b/katapult/katapult/katapultsettings.cpp
@@ -59,7 +59,7 @@ KatapultSettings::~KatapultSettings()
 
 void KatapultSettings::readSettings()
 {
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	_hideSessionNotification = config->readNumEntry("HideSessionNotification", 1);
 	_hideUserNotification = config->readNumEntry("HideUserNotification", 0);
 	_notificationTimeout = config->readNumEntry("NotificationTimeout", 5000);
@@ -83,7 +83,7 @@ void KatapultSettings::readSettings()
 
 void KatapultSettings::writeSettings()
 {
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	int hideSession = _hideSessionNotification;
 	int hideUser = _hideUserNotification;
 
@@ -109,14 +109,14 @@ void KatapultSettings::writeSettings()
 	KatapultCatalog *catalog;
 	while((catalog = it.current()) != 0)
 	{
-		KConfigGroup group(config, TQString("Catalogs/%1").arg(it.currentKey()));
+		TDEConfigGroup group(config, TQString("Catalogs/%1").arg(it.currentKey()));
 		catalog->writeSettings(&group);
 		++it;
 	}
 	
 	if(_display != 0)
 	{
-		KConfigGroup group(config, TQString("Displays/%1").arg(_displayName));
+		TDEConfigGroup group(config, TQString("Displays/%1").arg(_displayName));
 		_display->writeSettings(&group);
 	}
 
@@ -323,7 +323,7 @@ void KatapultSettings::loadCatalogPlugins()
 				(service, 0, 0, TQStringList(), &errCode);
 			if(catalog != 0)
 			{
-				KConfigGroup group(kapp->config(), TQString("Catalogs/%1").arg(id));
+				TDEConfigGroup group(kapp->config(), TQString("Catalogs/%1").arg(id));
 				catalog->readSettings(&group);
 				catalog->initialize();
 				_activeCatalogs.insert(id, catalog);
@@ -364,7 +364,7 @@ void KatapultSettings::loadDisplayPlugins()
 	}
 	if(_display != 0)
 	{
-		KConfigGroup group(kapp->config(), TQString("Displays/%1").arg(_displayName));
+		TDEConfigGroup group(kapp->config(), TQString("Displays/%1").arg(_displayName));
 		_display->readSettings(&group);
 	}
 }
diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
index 6ad0892..0bade79 100644
--- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
+++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
@@ -331,12 +331,12 @@ void AmarokCatalog::minQueryLenChanged(int _minQueryLen)
 	this->_minQueryLen = _minQueryLen;
 }
 
-void AmarokCatalog::readSettings(KConfigBase *config)
+void AmarokCatalog::readSettings(TDEConfigBase *config)
 {
 	_minQueryLen = config->readUnsignedNumEntry("MinQueryLen", 3);
 }
 
-void AmarokCatalog::writeSettings(KConfigBase *config)
+void AmarokCatalog::writeSettings(TDEConfigBase *config)
 {
 	config->writeEntry("MinQueryLen", _minQueryLen);
 }
diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h
index 1bf1cad..0e2b527 100644
--- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h
+++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h
@@ -40,8 +40,8 @@ public:
 	virtual ~AmarokCatalog();
 	
 	unsigned int minQueryLen() const;
-	void readSettings(KConfigBase *);
-	void writeSettings(KConfigBase *);
+	void readSettings(TDEConfigBase *);
+	void writeSettings(TDEConfigBase *);
 	TQWidget * configure();
 	//virtual void initialize();
 	
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp
index 6a0267e..c8391af 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp
+++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp
@@ -144,7 +144,7 @@ unsigned int BookmarkCatalog::minQueryLen() const
 	return _minQueryLen;
 }
 
-void BookmarkCatalog::readSettings(KConfigBase *config)
+void BookmarkCatalog::readSettings(TDEConfigBase *config)
 {
 	_minQueryLen = config->readUnsignedNumEntry("MinQueryLen", 3);
 	_mozEnabled = config->readBoolEntry("MozEnabled", TRUE);
@@ -152,7 +152,7 @@ void BookmarkCatalog::readSettings(KConfigBase *config)
 	_mozFile = config->readEntry("MozFile", "");
 }
 
-void BookmarkCatalog::writeSettings(KConfigBase *config)
+void BookmarkCatalog::writeSettings(TDEConfigBase *config)
 {
 	config->writeEntry("MinQueryLen", _minQueryLen);
 	config->writeEntry("MozEnabled", _mozEnabled);
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h
index 6bd48dc..7381e86 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h
+++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h
@@ -44,8 +44,8 @@ public:
 	virtual ~BookmarkCatalog();
 	
 	virtual void initialize();
-	virtual void readSettings(KConfigBase *);
-	virtual void writeSettings(KConfigBase *);
+	virtual void readSettings(TDEConfigBase *);
+	virtual void writeSettings(TDEConfigBase *);
 	virtual unsigned int minQueryLen() const;
 	virtual TQWidget * configure();
 	
diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp
index 724c371..e8ae53c 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp
+++ b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp
@@ -256,7 +256,7 @@ void CalculatorCatalog::initialize()
 }
 */
 
-void CalculatorCatalog::readSettings(KConfigBase* config)
+void CalculatorCatalog::readSettings(TDEConfigBase* config)
 {
 	_fracDigits = config->readUnsignedNumEntry("FracDigits", 2);
 	_bScientific = config->readBoolEntry("Scientific", false);
@@ -265,7 +265,7 @@ void CalculatorCatalog::readSettings(KConfigBase* config)
 	_formatString = config->readEntry("FormatString", "%1 = %2");
 }
 
-void CalculatorCatalog::writeSettings(KConfigBase* config)
+void CalculatorCatalog::writeSettings(TDEConfigBase* config)
 {
 	config->writeEntry("FracDigits", fracDigits());
 	config->writeEntry("Scientific", scientific());
diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h
index fb2a94e..39e7b57 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h
+++ b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h
@@ -64,8 +64,8 @@ class CalculatorCatalog : public KatapultCatalog
 		virtual ~CalculatorCatalog();
 
 		//virtual void initialize();
-		virtual void readSettings(KConfigBase*);
-		virtual void writeSettings(KConfigBase*);
+		virtual void readSettings(TDEConfigBase*);
+		virtual void writeSettings(TDEConfigBase*);
 		virtual TQWidget* configure();
 
 		int getVarID(const char*);
diff --git a/katapult/plugins/catalogs/documentcatalog/document.cpp b/katapult/plugins/catalogs/documentcatalog/document.cpp
index d91f05d..3c0f703 100644
--- a/katapult/plugins/catalogs/documentcatalog/document.cpp
+++ b/katapult/plugins/catalogs/documentcatalog/document.cpp
@@ -44,12 +44,12 @@ Document::~Document()
 TQPixmap Document::icon(int size) const
 {
 	KURL u;
-	KIO::PreviewJob *doc;
+	TDEIO::PreviewJob *doc;
 	u.setPath(_absPath);
 	if (this->_showPreview)
 	{
 
-		doc=KIO::filePreview(u,size);
+		doc=TDEIO::filePreview(u,size);
 		connect(doc, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
 			TQT_SLOT(gotPreview(const KFileItem*, const TQPixmap&)));
 	
diff --git a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp
index 1ed595e..587b119 100644
--- a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp
+++ b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp
@@ -191,13 +191,13 @@ unsigned int DocumentCatalog::minQueryLen() const
 	return _minQueryLen;
 }
 
-void DocumentCatalog::readSettings(KConfigBase *config)
+void DocumentCatalog::readSettings(TDEConfigBase *config)
 {
 	_minQueryLen = config->readUnsignedNumEntry("MinQueryLen", 1);
 	_showPreview = config->readBoolEntry("showPreview", FALSE);
 }
 
-void DocumentCatalog::writeSettings(KConfigBase *config)
+void DocumentCatalog::writeSettings(TDEConfigBase *config)
 {
 	config->writeEntry("MinQueryLen", _minQueryLen);
 	config->writeEntry("showPreview", _showPreview);
diff --git a/katapult/plugins/catalogs/documentcatalog/documentcatalog.h b/katapult/plugins/catalogs/documentcatalog/documentcatalog.h
index a15f921..d406370 100644
--- a/katapult/plugins/catalogs/documentcatalog/documentcatalog.h
+++ b/katapult/plugins/catalogs/documentcatalog/documentcatalog.h
@@ -45,8 +45,8 @@ public:
 
 	virtual void initialize();
 	virtual void queryChanged();
-	virtual void readSettings(KConfigBase *);
-	virtual void writeSettings(KConfigBase *);
+	virtual void readSettings(TDEConfigBase *);
+	virtual void writeSettings(TDEConfigBase *);
 	virtual unsigned int minQueryLen() const;
 	virtual TQWidget * configure();
 	
diff --git a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp
index 7915065..9aed4e8 100644
--- a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp
+++ b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp
@@ -82,12 +82,12 @@ bool ExecCatalog::accepts(const TQString& str) const
 	return str.left(length + 1) == _triggerWord + " ";
 }
 
-void ExecCatalog::readSettings(KConfigBase* config)
+void ExecCatalog::readSettings(TDEConfigBase* config)
 {
         _triggerWord = config->readEntry("TriggerWord", i18n("Should be short, easy and quick to type", "exec"));
 }
 
-void ExecCatalog::writeSettings(KConfigBase* config)
+void ExecCatalog::writeSettings(TDEConfigBase* config)
 {
         config->writeEntry("TriggerWord", _triggerWord);
 }
diff --git a/katapult/plugins/catalogs/execcatalog/execcatalog.h b/katapult/plugins/catalogs/execcatalog/execcatalog.h
index fd27ab2..5c5c5f3 100644
--- a/katapult/plugins/catalogs/execcatalog/execcatalog.h
+++ b/katapult/plugins/catalogs/execcatalog/execcatalog.h
@@ -51,8 +51,8 @@ class ExecCatalog : public KatapultCatalog
 		ExecCatalog(TQObject*, const char*, const TQStringList&);
 		virtual ~ExecCatalog();
 
-		virtual void readSettings(KConfigBase*);
-		virtual void writeSettings(KConfigBase*);
+		virtual void readSettings(TDEConfigBase*);
+		virtual void writeSettings(TDEConfigBase*);
 		virtual TQWidget* configure();
 		int triggerWordLength();
 
diff --git a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
index a6493e6..0db0782 100644
--- a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
+++ b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
@@ -82,12 +82,12 @@ bool GoogleCatalog::accepts(const TQString& str) const
 	return str.left(length + 1) == _triggerWord + " ";
 }
 
-void GoogleCatalog::readSettings(KConfigBase* config)
+void GoogleCatalog::readSettings(TDEConfigBase* config)
 {
         _triggerWord = config->readEntry("TriggerWord", i18n("Should be short, easy and quick to type", "google"));
 }
 
-void GoogleCatalog::writeSettings(KConfigBase* config)
+void GoogleCatalog::writeSettings(TDEConfigBase* config)
 {
         config->writeEntry("TriggerWord", _triggerWord);
 }
diff --git a/katapult/plugins/catalogs/googlecatalog/googlecatalog.h b/katapult/plugins/catalogs/googlecatalog/googlecatalog.h
index 3341d5f..29f3bd6 100644
--- a/katapult/plugins/catalogs/googlecatalog/googlecatalog.h
+++ b/katapult/plugins/catalogs/googlecatalog/googlecatalog.h
@@ -51,8 +51,8 @@ class GoogleCatalog : public KatapultCatalog
 		GoogleCatalog(TQObject*, const char*, const TQStringList&);
 		virtual ~GoogleCatalog();
 
-		virtual void readSettings(KConfigBase*);
-		virtual void writeSettings(KConfigBase*);
+		virtual void readSettings(TDEConfigBase*);
+		virtual void writeSettings(TDEConfigBase*);
 		virtual TQWidget* configure();
 		int triggerWordLength();
 
diff --git a/katapult/plugins/catalogs/programcatalog/programcatalog.cpp b/katapult/plugins/catalogs/programcatalog/programcatalog.cpp
index 54a0fa3..ef5ac83 100644
--- a/katapult/plugins/catalogs/programcatalog/programcatalog.cpp
+++ b/katapult/plugins/catalogs/programcatalog/programcatalog.cpp
@@ -95,7 +95,7 @@ unsigned int ProgramCatalog::minQueryLen() const
 	return _minQueryLen;
 }
 
-void ProgramCatalog::readSettings(KConfigBase *config)
+void ProgramCatalog::readSettings(TDEConfigBase *config)
 {
 	_minQueryLen = config->readUnsignedNumEntry("MinQueryLen", 1);
 	_ignoreIconless = config->readBoolEntry("IgnoreIconless", TRUE);
@@ -103,7 +103,7 @@ void ProgramCatalog::readSettings(KConfigBase *config)
 	_ignoreTerminal = config->readBoolEntry("IgnoreTerminal", TRUE);
 }
 
-void ProgramCatalog::writeSettings(KConfigBase *config)
+void ProgramCatalog::writeSettings(TDEConfigBase *config)
 {
 	config->writeEntry("MinQueryLen", _minQueryLen);
 	config->writeEntry("IgnoreIconless", _ignoreIconless);
diff --git a/katapult/plugins/catalogs/programcatalog/programcatalog.h b/katapult/plugins/catalogs/programcatalog/programcatalog.h
index 21a206c..af20c70 100644
--- a/katapult/plugins/catalogs/programcatalog/programcatalog.h
+++ b/katapult/plugins/catalogs/programcatalog/programcatalog.h
@@ -41,8 +41,8 @@ public:
 	virtual ~ProgramCatalog();
 
 	virtual void initialize();	
-	virtual void readSettings(KConfigBase *);
-	virtual void writeSettings(KConfigBase *);
+	virtual void readSettings(TDEConfigBase *);
+	virtual void writeSettings(TDEConfigBase *);
 	virtual unsigned int minQueryLen() const;
 	virtual TQWidget * configure();
 	
diff --git a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp
index fce2495..0e75cd8 100644
--- a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp
+++ b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp
@@ -82,12 +82,12 @@ bool SpellCatalog::accepts(const TQString& str) const
 	return str.left(length + 1) == _triggerWord + " ";
 }
 
-void SpellCatalog::readSettings(KConfigBase* config)
+void SpellCatalog::readSettings(TDEConfigBase* config)
 {
         _triggerWord = config->readEntry("TriggerWord", i18n("Should be short, easy and quick to type", "spell"));
 }
 
-void SpellCatalog::writeSettings(KConfigBase* config)
+void SpellCatalog::writeSettings(TDEConfigBase* config)
 {
         config->writeEntry("TriggerWord", _triggerWord);
 }
diff --git a/katapult/plugins/catalogs/spellcatalog/spellcatalog.h b/katapult/plugins/catalogs/spellcatalog/spellcatalog.h
index 0e1d3fb..8dd9215 100644
--- a/katapult/plugins/catalogs/spellcatalog/spellcatalog.h
+++ b/katapult/plugins/catalogs/spellcatalog/spellcatalog.h
@@ -48,8 +48,8 @@ class SpellCatalog : public KatapultCatalog
 		SpellCatalog(TQObject*, const char*, const TQStringList&);
 		virtual ~SpellCatalog();
 
-		virtual void readSettings(KConfigBase*);
-		virtual void writeSettings(KConfigBase*);
+		virtual void readSettings(TDEConfigBase*);
+		virtual void writeSettings(TDEConfigBase*);
 		virtual TQWidget* configure();
 		int triggerWordLength();