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

11 files changed, 22 insertions, 22 deletions

diff --git a/kipi-plugins/htmlexport/abstractthemeparameter.cpp b/kipi-plugins/htmlexport/abstractthemeparameter.cpp
index 2ba5e3f..90b84f9 100644
--- a/kipi-plugins/htmlexport/abstractthemeparameter.cpp
+++ b/kipi-plugins/htmlexport/abstractthemeparameter.cpp
@@ -45,7 +45,7 @@ AbstractThemeParameter::~AbstractThemeParameter() {
 }
 
 
-void AbstractThemeParameter::init(const TQCString& internalName, const KConfigBase* configFile) {
+void AbstractThemeParameter::init(const TQCString& internalName, const TDEConfigBase* configFile) {
 	d->mInternalName = internalName;
 	d->mName = configFile->readEntry(NAME_KEY);
 	d->mDefaultValue = configFile->readEntry(DEFAULT_VALUE_KEY);
diff --git a/kipi-plugins/htmlexport/abstractthemeparameter.h b/kipi-plugins/htmlexport/abstractthemeparameter.h
index 97d8a88..4388d00 100644
--- a/kipi-plugins/htmlexport/abstractthemeparameter.h
+++ b/kipi-plugins/htmlexport/abstractthemeparameter.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 class TQCString;
 class TQString;
 class TQWidget;
-class KConfigBase;
+class TDEConfigBase;
 
 namespace KIPIHTMLExport {
 
@@ -42,7 +42,7 @@ public:
 	 * Reads theme parameters from configFile. Initializes the internalName,
 	 * name and defaultValue fields.
 	 */
-	virtual void init(const TQCString& internalName, const KConfigBase* configFile);
+	virtual void init(const TQCString& internalName, const TDEConfigBase* configFile);
 
 	TQCString internalName() const;
 
diff --git a/kipi-plugins/htmlexport/galleryinfo.cpp b/kipi-plugins/htmlexport/galleryinfo.cpp
index e529213..e84c008 100644
--- a/kipi-plugins/htmlexport/galleryinfo.cpp
+++ b/kipi-plugins/htmlexport/galleryinfo.cpp
@@ -38,7 +38,7 @@ TQString GalleryInfo::getThemeParameterValue(
 	const TQString& defaultValue) const
 {
 	TQString groupName = THEME_GROUP_PREFIX + theme;
-	KConfigGroupSaver saver(config(), groupName);
+	TDEConfigGroupSaver saver(config(), groupName);
 	return config()->readEntry(parameter, defaultValue);
 }
 
@@ -49,10 +49,10 @@ void GalleryInfo::setThemeParameterValue(
 	const TQString& value)
 {
 	// FIXME: This is hackish, but config() is const :'(
-	KConfig* localConfig = const_cast<KConfig*>(config());
+	TDEConfig* localConfig = const_cast<TDEConfig*>(config());
 
 	TQString groupName = THEME_GROUP_PREFIX + theme;
-	KConfigGroupSaver saver(localConfig, groupName);
+	TDEConfigGroupSaver saver(localConfig, groupName);
 	return localConfig->writeEntry(parameter, value);
 }
 
diff --git a/kipi-plugins/htmlexport/galleryinfo.h b/kipi-plugins/htmlexport/galleryinfo.h
index f4c4a4b..e0c6095 100644
--- a/kipi-plugins/htmlexport/galleryinfo.h
+++ b/kipi-plugins/htmlexport/galleryinfo.h
@@ -66,21 +66,21 @@ public:
 private:
 
 	/**
-	 * KConfigXT enums are mapped to ints.
+	 * TDEConfigXT enums are mapped to ints.
 	 * This method returns the string associated to the enum value.
 	 */
 	TQString getEnumString(const TQString& itemName) const {
 		// findItem is not marked const :-(
 		GalleryInfo* that=const_cast<GalleryInfo*>(this);
-		KConfigSkeletonItem* tmp=that->findItem(itemName);
+		TDEConfigSkeletonItem* tmp=that->findItem(itemName);
 
-		KConfigSkeleton::ItemEnum* item=dynamic_cast<KConfigSkeleton::ItemEnum*>(tmp);
+		TDEConfigSkeleton::ItemEnum* item=dynamic_cast<TDEConfigSkeleton::ItemEnum*>(tmp);
 		Q_ASSERT(item);
 		if (!item) return TQString();
 
 		int value=item->value();
-		TQValueList<KConfigSkeleton::ItemEnum::Choice> lst=item->choices();
-		TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator
+		TQValueList<TDEConfigSkeleton::ItemEnum::Choice> lst=item->choices();
+		TQValueList<TDEConfigSkeleton::ItemEnum::Choice>::ConstIterator
 			it=lst.begin(), end=lst.end();
 
 		for (int pos=0; it!=end; ++it, pos++) {
diff --git a/kipi-plugins/htmlexport/generator.cpp b/kipi-plugins/htmlexport/generator.cpp
index d1bbe1c..96dd4c2 100644
--- a/kipi-plugins/htmlexport/generator.cpp
+++ b/kipi-plugins/htmlexport/generator.cpp
@@ -187,9 +187,9 @@ struct Generator::Private {
 		destURL.addPath(srcURL.filename());
 		
 		if (TQFile::exists(destURL.path())) {
-			KIO::NetAccess::del(destURL, mProgressDialog);
+			TDEIO::NetAccess::del(destURL, mProgressDialog);
 		}
-		bool ok=KIO::NetAccess::dircopy(srcURL, destURL, mProgressDialog);
+		bool ok=TDEIO::NetAccess::dircopy(srcURL, destURL, mProgressDialog);
 		if (!ok) {
 			logError(i18n("Could not copy theme"));
 			return false;
diff --git a/kipi-plugins/htmlexport/intthemeparameter.cpp b/kipi-plugins/htmlexport/intthemeparameter.cpp
index 17388e2..cf5b2f5 100644
--- a/kipi-plugins/htmlexport/intthemeparameter.cpp
+++ b/kipi-plugins/htmlexport/intthemeparameter.cpp
@@ -51,7 +51,7 @@ IntThemeParameter::~IntThemeParameter() {
 }
 
 
-void IntThemeParameter::init(const TQCString& internalName, const KConfigBase* configFile) {
+void IntThemeParameter::init(const TQCString& internalName, const TDEConfigBase* configFile) {
 	AbstractThemeParameter::init(internalName, configFile);
 
 	d->mMinValue = configFile->readNumEntry(MIN_VALUE_KEY, 0);
diff --git a/kipi-plugins/htmlexport/intthemeparameter.h b/kipi-plugins/htmlexport/intthemeparameter.h
index 4aa354c..b70f23c 100644
--- a/kipi-plugins/htmlexport/intthemeparameter.h
+++ b/kipi-plugins/htmlexport/intthemeparameter.h
@@ -39,7 +39,7 @@ public:
 	IntThemeParameter();
 	~IntThemeParameter();
 
-	virtual void init(const TQCString& internalName, const KConfigBase* configFile);
+	virtual void init(const TQCString& internalName, const TDEConfigBase* configFile);
 	virtual TQWidget* createWidget(TQWidget* parent, const TQString& value) const;
 	virtual TQString valueFromWidget(TQWidget*) const;
 
diff --git a/kipi-plugins/htmlexport/listthemeparameter.cpp b/kipi-plugins/htmlexport/listthemeparameter.cpp
index e2bb23e..27111a1 100644
--- a/kipi-plugins/htmlexport/listthemeparameter.cpp
+++ b/kipi-plugins/htmlexport/listthemeparameter.cpp
@@ -45,7 +45,7 @@ ListThemeParameter::~ListThemeParameter() {
 	delete d;
 }
 
-void ListThemeParameter::init(const TQCString& internalName, const KConfigBase* configFile) {
+void ListThemeParameter::init(const TQCString& internalName, const TDEConfigBase* configFile) {
 	AbstractThemeParameter::init(internalName, configFile);
 
 	for (int pos=0;; ++pos) {
diff --git a/kipi-plugins/htmlexport/listthemeparameter.h b/kipi-plugins/htmlexport/listthemeparameter.h
index 8de2e1f..bb46eb5 100644
--- a/kipi-plugins/htmlexport/listthemeparameter.h
+++ b/kipi-plugins/htmlexport/listthemeparameter.h
@@ -35,7 +35,7 @@ public:
 	ListThemeParameter();
 	~ListThemeParameter();
 
-	virtual void init(const TQCString& internalName, const KConfigBase* configFile);
+	virtual void init(const TQCString& internalName, const TDEConfigBase* configFile);
 	virtual TQWidget* createWidget(TQWidget* parent, const TQString& value) const;
 	virtual TQString valueFromWidget(TQWidget*) const;
 
diff --git a/kipi-plugins/htmlexport/theme.cpp b/kipi-plugins/htmlexport/theme.cpp
index 10a1bf0..9bcd80a 100644
--- a/kipi-plugins/htmlexport/theme.cpp
+++ b/kipi-plugins/htmlexport/theme.cpp
@@ -104,7 +104,7 @@ struct Theme::Private {
 			TQString group = PARAMETER_GROUP_PREFIX + *it;
 			TQCString internalName = (*it).utf8();
 
-			KConfigGroupSaver saver(mDesktopFile, group);
+			TDEConfigGroupSaver saver(mDesktopFile, group);
 			TQString type = mDesktopFile->readEntry(PARAMETER_TYPE_KEY);
 			AbstractThemeParameter* parameter;
 			if (type == STRING_PARAMETER_TYPE) {
@@ -192,13 +192,13 @@ TQString Theme::directory() const {
 
 
 TQString Theme::authorName() const {
-	KConfigGroupSaver saver(d->mDesktopFile, AUTHOR_GROUP);
+	TDEConfigGroupSaver saver(d->mDesktopFile, AUTHOR_GROUP);
 	return d->mDesktopFile->readEntry("Name");
 }
 
 
 TQString Theme::authorUrl() const {
-	KConfigGroupSaver saver(d->mDesktopFile, AUTHOR_GROUP);
+	TDEConfigGroupSaver saver(d->mDesktopFile, AUTHOR_GROUP);
 	return d->mDesktopFile->readEntry("Url");
 }
 
diff --git a/kipi-plugins/htmlexport/wizard.cpp b/kipi-plugins/htmlexport/wizard.cpp
index 28ee474..0ff604f 100644
--- a/kipi-plugins/htmlexport/wizard.cpp
+++ b/kipi-plugins/htmlexport/wizard.cpp
@@ -76,7 +76,7 @@ public:
 
 struct Wizard::Private {
 	GalleryInfo* mInfo;
-	KConfigDialogManager* mConfigManager;
+	TDEConfigDialogManager* mConfigManager;
 	
 	KIPI::ImageCollectionSelector* mCollectionSelector;
 	ThemePage* mThemePage;
@@ -209,7 +209,7 @@ Wizard::Wizard(TQWidget* parent, KIPI::Interface* interface, GalleryInfo* info)
 	connect(d->mOutputPage->kcfg_destURL, TQT_SIGNAL(textChanged(const TQString&)),
 		this, TQT_SLOT(updateFinishButton()) );
 
-	d->mConfigManager=new KConfigDialogManager(this, d->mInfo);
+	d->mConfigManager=new TDEConfigDialogManager(this, d->mInfo);
 	d->mConfigManager->updateWidgets();
 
 	// Set page states