3 files changed, 33 insertions, 33 deletions
diff --git a/src/gvcore/externaltooldialog.cpp b/src/gvcore/externaltooldialog.cpp
index 5ccc277..e0aadb4 100644
--- a/src/gvcore/externaltooldialog.cpp
+++ b/src/gvcore/externaltooldialog.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
 #include <kimageio.h>
@@ -53,22 +53,22 @@ public:
 	ToolListViewItem(TDEListView* parent, const TQString& label)
 	: TDEListViewItem(parent, label), mDesktopFile(0L) {}
 	
-	void setDesktopFile(KDesktopFile* df) {
+	void setDesktopFile(TDEDesktopFile* df) {
 		mDesktopFile=df;
 	}
 
-	KDesktopFile* desktopFile() const {
+	TDEDesktopFile* desktopFile() const {
 		return mDesktopFile;
 	}
 
 private:
-	KDesktopFile* mDesktopFile;
+	TDEDesktopFile* mDesktopFile;
 };
 
 
 struct ExternalToolDialogPrivate {
 	ExternalToolDialogBase* mContent;
-	TQPtrList<KDesktopFile> mDeletedTools;
+	TQPtrList<TDEDesktopFile> mDeletedTools;
 	ToolListViewItem* mSelectedItem;
 
 
@@ -88,9 +88,9 @@ struct ExternalToolDialogPrivate {
 
 	
 	void fillToolListView() {
-		TQDict<KDesktopFile> desktopFiles=ExternalToolManager::instance()->desktopFiles();
+		TQDict<TDEDesktopFile> desktopFiles=ExternalToolManager::instance()->desktopFiles();
 		
-		TQDictIterator<KDesktopFile> it(desktopFiles);
+		TQDictIterator<TDEDesktopFile> it(desktopFiles);
 		for (; it.current(); ++it) {
 			ToolListViewItem* item=new ToolListViewItem(mContent->mToolListView, it.current()->readName());
 			item->setPixmap(0, SmallIcon(it.current()->readIcon()) );
@@ -101,7 +101,7 @@ struct ExternalToolDialogPrivate {
 	}
 
 
-	void writeServiceTypes(KDesktopFile* desktopFile) {
+	void writeServiceTypes(TDEDesktopFile* desktopFile) {
 		TQButton* button=mContent->mFileAssociationGroup->selected();
 		if (!button) {
 			desktopFile->writeEntry("X-TDE-ServiceTypes", "*");
@@ -149,7 +149,7 @@ struct ExternalToolDialogPrivate {
 		}
 		
 		// Save data
-		KDesktopFile* desktopFile=mSelectedItem->desktopFile();
+		TDEDesktopFile* desktopFile=mSelectedItem->desktopFile();
 		if (desktopFile) {
 			if (desktopFile->isReadOnly()) {
 				desktopFile=ExternalToolManager::instance()->editSystemDesktopFile(desktopFile);
@@ -207,7 +207,7 @@ struct ExternalToolDialogPrivate {
 		mContent->mDetails->setEnabled(mSelectedItem!=0);
 		
 		if (mSelectedItem) {
-			KDesktopFile* desktopFile=mSelectedItem->desktopFile();
+			TDEDesktopFile* desktopFile=mSelectedItem->desktopFile();
 			if (desktopFile) {
 				mContent->mName->setText(desktopFile->readName());
 				mContent->mCommand->setURL(desktopFile->readEntry("Exec"));
@@ -226,7 +226,7 @@ struct ExternalToolDialogPrivate {
 	
 	bool apply() {
 		if (!saveChanges()) return false;
-		TQPtrListIterator<KDesktopFile> it(mDeletedTools);
+		TQPtrListIterator<TDEDesktopFile> it(mDeletedTools);
 		for(; it.current(); ++it) {
 			ExternalToolManager::instance()->hideDesktopFile(it.current());
 		}
@@ -332,7 +332,7 @@ void ExternalToolDialog::deleteTool() {
 	ToolListViewItem* item=static_cast<ToolListViewItem*>(view->selectedItem());
 	if (!item) return;
 
-	KDesktopFile* desktopFile=item->desktopFile();
+	TDEDesktopFile* desktopFile=item->desktopFile();
 	delete item;
 	d->mDeletedTools.append(desktopFile);
 	d->mSelectedItem=0L;
diff --git a/src/gvcore/externaltoolmanager.cpp b/src/gvcore/externaltoolmanager.cpp
index 564604a..a76c696 100644
--- a/src/gvcore/externaltoolmanager.cpp
+++ b/src/gvcore/externaltoolmanager.cpp
@@ -25,7 +25,7 @@ Copyright 2000-2004 Aur�lien G�teau
 
 // KDE
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdeglobal.h>
 #include <kservice.h>
 #include <tdestandarddirs.h>
@@ -80,7 +80,7 @@ inline bool isSubSetOf(const TQStringList& subSet, const TQStringList& set) {
 
 
 struct ExternalToolManagerPrivate {
-	TQDict<KDesktopFile> mDesktopFiles;
+	TQDict<TDEDesktopFile> mDesktopFiles;
 	TQPtrList<KService> mServices;
 	TQString mUserToolDir;
 
@@ -125,12 +125,12 @@ struct ExternalToolManagerPrivate {
 
 
 // Helper function for ctor
-void loadDesktopFiles(TQDict<KDesktopFile>& dict, const TQString& dirString) {
+void loadDesktopFiles(TQDict<TDEDesktopFile>& dict, const TQString& dirString) {
 	TQDir dir(dirString);
 	TQStringList list=dir.entryList("*.desktop");
 	TQStringList::ConstIterator it=list.begin();
 	for (; it!=list.end(); ++it) {
-		KDesktopFile* df=new KDesktopFile( dir.filePath(*it) );
+		TDEDesktopFile* df=new TDEDesktopFile( dir.filePath(*it) );
 		dict.insert(*it, df);
 	}
 }
@@ -154,7 +154,7 @@ ExternalToolManager::ExternalToolManager() {
 	LOG("dirs:" << dirs.join(","));
 
 	// Loading desktop files
-	TQDict<KDesktopFile> systemDesktopFiles;
+	TQDict<TDEDesktopFile> systemDesktopFiles;
 	TQStringList::ConstIterator it;
 	for (it=dirs.begin(); it!=dirs.end(); ++it) {
 		if (addSlash(*it)==d->mUserToolDir) {
@@ -164,17 +164,17 @@ ExternalToolManager::ExternalToolManager() {
 		LOG("loading system desktop files from " << *it);
 		loadDesktopFiles(systemDesktopFiles, *it);
 	}
-	TQDict<KDesktopFile> userDesktopFiles;
+	TQDict<TDEDesktopFile> userDesktopFiles;
 	loadDesktopFiles(userDesktopFiles, d->mUserToolDir);
 
-	// Merge system and user desktop files into our KDesktopFile dictionary
+	// Merge system and user desktop files into our TDEDesktopFile dictionary
 	d->mDesktopFiles=systemDesktopFiles;
 	d->mDesktopFiles.setAutoDelete(true);
-	TQDictIterator<KDesktopFile> itDict(userDesktopFiles);
+	TQDictIterator<TDEDesktopFile> itDict(userDesktopFiles);
 	
 	for (; itDict.current(); ++itDict) {
 		TQString name=itDict.currentKey();
-		KDesktopFile* df=itDict.current();
+		TDEDesktopFile* df=itDict.current();
 		if (d->mDesktopFiles.find(name)) {
 			d->mDesktopFiles.remove(name);
 		}
@@ -203,9 +203,9 @@ ExternalToolManager* ExternalToolManager::instance() {
 
 void ExternalToolManager::updateServices() {
 	d->mServices.clear();
-	TQDictIterator<KDesktopFile> it(d->mDesktopFiles);
+	TQDictIterator<TDEDesktopFile> it(d->mDesktopFiles);
 	for (; it.current(); ++it) {
-		KDesktopFile* desktopFile=it.current();
+		TDEDesktopFile* desktopFile=it.current();
 		// If sync() is not called, KService does not read up to date content
 		desktopFile->sync();
 		KService* service=new KService(desktopFile);
@@ -214,19 +214,19 @@ void ExternalToolManager::updateServices() {
 }
 
 
-TQDict<KDesktopFile>& ExternalToolManager::desktopFiles() const {
+TQDict<TDEDesktopFile>& ExternalToolManager::desktopFiles() const {
 	return d->mDesktopFiles;
 }
 
 
-void ExternalToolManager::hideDesktopFile(KDesktopFile* desktopFile) {
+void ExternalToolManager::hideDesktopFile(TDEDesktopFile* desktopFile) {
 	TQFileInfo fi(desktopFile->fileName());
 	TQString name=TQString("%1.desktop").arg( fi.baseName(true) );
 	d->mDesktopFiles.take(name);
 	
 	if (desktopFile->isReadOnly()) {
 		delete desktopFile;
-		desktopFile=new KDesktopFile(d->mUserToolDir + "/" + name, false);
+		desktopFile=new TDEDesktopFile(d->mUserToolDir + "/" + name, false);
 	}
 	desktopFile->writeEntry("Hidden", true);
 	desktopFile->sync();
@@ -234,7 +234,7 @@ void ExternalToolManager::hideDesktopFile(KDesktopFile* desktopFile) {
 }
 
 
-KDesktopFile* ExternalToolManager::editSystemDesktopFile(const KDesktopFile* desktopFile) {
+TDEDesktopFile* ExternalToolManager::editSystemDesktopFile(const TDEDesktopFile* desktopFile) {
 	Q_ASSERT(desktopFile);
 	TQFileInfo fi(desktopFile->fileName());
 
@@ -245,9 +245,9 @@ KDesktopFile* ExternalToolManager::editSystemDesktopFile(const KDesktopFile* des
 }
 
 
-KDesktopFile* ExternalToolManager::createUserDesktopFile(const TQString& name) {
+TDEDesktopFile* ExternalToolManager::createUserDesktopFile(const TQString& name) {
 	Q_ASSERT(!name.isEmpty());
-	KDesktopFile* desktopFile=new KDesktopFile(
+	TDEDesktopFile* desktopFile=new TDEDesktopFile(
 		d->mUserToolDir + "/" + name + ".desktop", false);
 	d->mDesktopFiles.insert(TQString("%1.desktop").arg(name), desktopFile);	
 
diff --git a/src/gvcore/externaltoolmanager.h b/src/gvcore/externaltoolmanager.h
index 82734dd..ad5a2f9 100644
--- a/src/gvcore/externaltoolmanager.h
+++ b/src/gvcore/externaltoolmanager.h
@@ -45,15 +45,15 @@ public:
 	ExternalToolContext* createContext(TQObject* parent, const KURL&);
 
 	static ExternalToolManager* instance();
-	TQDict<KDesktopFile>& desktopFiles() const;
+	TQDict<TDEDesktopFile>& desktopFiles() const;
 
-	void hideDesktopFile(KDesktopFile*);
+	void hideDesktopFile(TDEDesktopFile*);
 	
 	// Create a new desktop file
-	KDesktopFile* createUserDesktopFile(const TQString& name);
+	TDEDesktopFile* createUserDesktopFile(const TQString& name);
 
 	// Create a desktop file based on a existing (system) desktop file
-	KDesktopFile* editSystemDesktopFile(const KDesktopFile* desktopFile);
+	TDEDesktopFile* editSystemDesktopFile(const TDEDesktopFile* desktopFile);
 	void updateServices();
 
 private: