Use TDEDesktopFile

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

9 files changed, 22 insertions, 22 deletions

diff --git a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp
index 5ebd976b1..0888a8f40 100644
--- a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp
+++ b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp
@@ -23,7 +23,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tdestandarddirs.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdelocale.h>
 
 NotifierServiceAction::NotifierServiceAction()
@@ -150,7 +150,7 @@ bool NotifierServiceAction::supportsMimetype(const TQString &mimetype) const
 void NotifierServiceAction::save() const
 {
 	TQFile::remove( m_filePath );
-	KDesktopFile desktopFile(m_filePath);
+	TDEDesktopFile desktopFile(m_filePath);
 
 	desktopFile.setGroup(TQString("Desktop Action ") + m_service.m_strName);
 	desktopFile.writeEntry(TQString("Icon"), m_service.m_strIcon);
diff --git a/tdeioslave/media/libmediacommon/notifiersettings.cpp b/tdeioslave/media/libmediacommon/notifiersettings.cpp
index 9bfc062b7..86e118acc 100644
--- a/tdeioslave/media/libmediacommon/notifiersettings.cpp
+++ b/tdeioslave/media/libmediacommon/notifiersettings.cpp
@@ -20,7 +20,7 @@
 #include "notifiersettings.h"
 
 #include <tdeglobal.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdestandarddirs.h>
 #include <tqdir.h>
 #include <tqfile.h>
@@ -298,7 +298,7 @@ void NotifierSettings::save()
 	}
 }
 
-TQValueList<NotifierServiceAction*> NotifierSettings::loadActions( KDesktopFile &desktop ) const
+TQValueList<NotifierServiceAction*> NotifierSettings::loadActions( TDEDesktopFile &desktop ) const
 {
 	desktop.setDesktopGroup();
 
@@ -328,7 +328,7 @@ TQValueList<NotifierServiceAction*> NotifierSettings::loadActions( KDesktopFile
 }
 
 
-bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const TQString &mimetype ) const
+bool NotifierSettings::shouldLoadActions( TDEDesktopFile &desktop, const TQString &mimetype ) const
 {
 	desktop.setDesktopGroup();
 
@@ -386,7 +386,7 @@ TQValueList<NotifierServiceAction*> NotifierSettings::listServices( const TQStri
 		{
 			TQString filename = *dir_it + *entry_it;
 			
-			KDesktopFile desktop( filename, true );
+			TDEDesktopFile desktop( filename, true );
 			
 			if ( shouldLoadActions(desktop, mimetype) )
 			{
diff --git a/tdeioslave/media/libmediacommon/notifiersettings.h b/tdeioslave/media/libmediacommon/notifiersettings.h
index dee5c440b..0bb033945 100644
--- a/tdeioslave/media/libmediacommon/notifiersettings.h
+++ b/tdeioslave/media/libmediacommon/notifiersettings.h
@@ -51,8 +51,8 @@ public:
 	
 private:
 	TQValueList<NotifierServiceAction*> listServices( const TQString &mimetype = TQString() ) const;
-	bool shouldLoadActions( KDesktopFile &desktop, const TQString &mimetype ) const;
-	TQValueList<NotifierServiceAction*> loadActions( KDesktopFile &desktop ) const;
+	bool shouldLoadActions( TDEDesktopFile &desktop, const TQString &mimetype ) const;
+	TQValueList<NotifierServiceAction*> loadActions( TDEDesktopFile &desktop ) const;
 
 	TQStringList m_supportedMimetypes;
 	TQValueList<NotifierAction*> m_actions;
diff --git a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
index 474201350..22bd19e7b 100644
--- a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
+++ b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
@@ -22,7 +22,7 @@
 #include <tdelocale.h>
 #include <tdeglobal.h>
 #include <tdestandarddirs.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 
 #include <kdirnotify_stub.h>
 
diff --git a/tdeioslave/remote/remoteimpl.cpp b/tdeioslave/remote/remoteimpl.cpp
index 4f11381ed..659273834 100644
--- a/tdeioslave/remote/remoteimpl.cpp
+++ b/tdeioslave/remote/remoteimpl.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <tdeglobalsettings.h>
 #include <tdestandarddirs.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kservice.h>
 #include <tdelocale.h>
 
@@ -140,7 +140,7 @@ KURL RemoteImpl::findBaseURL(const TQString &filename) const
 	TQString file = findDesktopFile(filename);
 	if (!file.isEmpty())
 	{
-		KDesktopFile desktop(file, true);
+		TDEDesktopFile desktop(file, true);
 		return desktop.readURL();
 	}
 	
@@ -219,7 +219,7 @@ void RemoteImpl::createEntry(TDEIO::UDSEntry &entry,
 	kdDebug(1220) << "RemoteImpl::createEntry" << endl;
 
 	TQString desktopPath(directory + file);
-	KDesktopFile desktop(desktopPath, true);
+	TDEDesktopFile desktop(desktopPath, true);
 
 	kdDebug(1220) << "path = " << directory << file << endl;
 
@@ -289,7 +289,7 @@ bool RemoteImpl::renameFolders(const TQString &src, const TQString &dest,
 		bool res = dir.rename(src+".desktop", dest+".desktop");
 		if (res)
 		{
-			KDesktopFile desktop(directory+dest+".desktop");
+			TDEDesktopFile desktop(directory+dest+".desktop");
 			desktop.writeEntry("Name", dest);
 		}
 		return res;
diff --git a/tdeioslave/system/kdedmodule/systemdirnotify.cpp b/tdeioslave/system/kdedmodule/systemdirnotify.cpp
index 3a404d85b..80e27d212 100644
--- a/tdeioslave/system/kdedmodule/systemdirnotify.cpp
+++ b/tdeioslave/system/kdedmodule/systemdirnotify.cpp
@@ -22,7 +22,7 @@
 #include <tdelocale.h>
 #include <tdeglobal.h>
 #include <tdestandarddirs.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 
 #include <kdirnotify_stub.h>
 
@@ -65,7 +65,7 @@ void SystemDirNotify::init()
 		{
 			if (!names_found.contains(*name))
 			{
-				KDesktopFile desktop(*dirpath+*name, true);
+				TDEDesktopFile desktop(*dirpath+*name, true);
 
 				TQString system_name = *name;
 				system_name.truncate(system_name.length()-8);
diff --git a/tdeioslave/system/systemimpl.cpp b/tdeioslave/system/systemimpl.cpp
index 9a44bc4e4..52f1ace36 100644
--- a/tdeioslave/system/systemimpl.cpp
+++ b/tdeioslave/system/systemimpl.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <tdeglobalsettings.h>
 #include <tdestandarddirs.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 
 #include <tqapplication.h>
 #include <tqeventloop.h>
@@ -169,7 +169,7 @@ KURL SystemImpl::findBaseURL(const TQString &filename) const
 		{
 			if (*name==filename+".desktop")
 			{
-				KDesktopFile desktop(*dirpath+filename+".desktop", true);
+				TDEDesktopFile desktop(*dirpath+filename+".desktop", true);
 				if ( desktop.readURL().isEmpty() )
 				{
 					KURL url;
@@ -226,7 +226,7 @@ TQString SystemImpl::readPathINL(TQString filename)
 		line = s.readLine();
 	}
  	if (isPathExpanded == false) {
-		KDesktopFile desktop(filename, true);
+		TDEDesktopFile desktop(filename, true);
 		return desktop.readPath();
 	}
 	else {
@@ -240,7 +240,7 @@ void SystemImpl::createEntry(TDEIO::UDSEntry &entry,
 {
 	kdDebug() << "SystemImpl::createEntry" << endl;
 
-	KDesktopFile desktop(directory+file, true);
+	TDEDesktopFile desktop(directory+file, true);
 
 	kdDebug() << "path = " << directory << file << endl;
 
diff --git a/tdeioslave/system/systemimpl.h b/tdeioslave/system/systemimpl.h
index d4cc0e1cb..41d0242a3 100644
--- a/tdeioslave/system/systemimpl.h
+++ b/tdeioslave/system/systemimpl.h
@@ -22,7 +22,7 @@
 
 #include <tdeio/global.h>
 #include <tdeio/job.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kurl.h>
 #include <dcopobject.h>
 
diff --git a/tdeioslave/trash/ktrashpropsdlgplugin.cpp b/tdeioslave/trash/ktrashpropsdlgplugin.cpp
index 7b36aaaf4..76882f956 100644
--- a/tdeioslave/trash/ktrashpropsdlgplugin.cpp
+++ b/tdeioslave/trash/ktrashpropsdlgplugin.cpp
@@ -35,7 +35,7 @@
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
 
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kgenericfactory.h>
 #include <tdeglobal.h>
 #include <kiconloader.h>
@@ -63,7 +63,7 @@ KTrashPropsDlgPlugin::KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const cha
 		if (!KPropsDlgPlugin::isDesktopFile(item))
 			return;
 
-		KDesktopFile deskFile( itemUrl.path(), true /* readonly */ );
+		TDEDesktopFile deskFile( itemUrl.path(), true /* readonly */ );
 		if ( deskFile.readURL() != "trash:/" )
 			return;
 	}