5 files changed, 16 insertions, 16 deletions
diff --git a/tdeioslave/system/kdedmodule/systemdirnotify.cpp b/tdeioslave/system/kdedmodule/systemdirnotify.cpp
index 059c7cfc9..80e27d212 100644
--- a/tdeioslave/system/kdedmodule/systemdirnotify.cpp
+++ b/tdeioslave/system/kdedmodule/systemdirnotify.cpp
@@ -21,8 +21,8 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
-#include <kdesktopfile.h>
+#include <tdestandarddirs.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/kdedmodule/systemdirnotifymodule.cpp b/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp
index ec95c0e32..7b12ffb7f 100644
--- a/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp
+++ b/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp
@@ -28,7 +28,7 @@ SystemDirNotifyModule::SystemDirNotifyModule(const TQCString &obj)
 }
 
 extern "C" {
-	KDE_EXPORT KDEDModule *create_systemdirnotify(const TQCString &obj)
+	TDE_EXPORT KDEDModule *create_systemdirnotify(const TQCString &obj)
 	{
 		TDEGlobal::locale()->insertCatalogue("tdeio_system");
 		return new SystemDirNotifyModule(obj);
diff --git a/tdeioslave/system/systemimpl.cpp b/tdeioslave/system/systemimpl.cpp
index 21a9da7da..52f1ace36 100644
--- a/tdeioslave/system/systemimpl.cpp
+++ b/tdeioslave/system/systemimpl.cpp
@@ -21,8 +21,8 @@
 
 #include <kdebug.h>
 #include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
-#include <kdesktopfile.h>
+#include <tdestandarddirs.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;
 
@@ -279,12 +279,12 @@ void SystemImpl::createEntry(TDEIO::UDSEntry &entry,
 		m_lastListingEmpty = true;
 
 		TDEIO::ListJob *job = TDEIO::listDir(url, false, false);
-		connect( job, TQT_SIGNAL( entries(TDEIO::Job *,
+		connect( job, TQ_SIGNAL( entries(TDEIO::Job *,
 		                      const TDEIO::UDSEntryList &) ),
-		         this, TQT_SLOT( slotEntries(TDEIO::Job *,
+		         this, TQ_SLOT( slotEntries(TDEIO::Job *,
 			             const TDEIO::UDSEntryList &) ) );
-		connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
-		         this, TQT_SLOT( slotResult(TDEIO::Job *) ) );
+		connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+		         this, TQ_SLOT( slotResult(TDEIO::Job *) ) );
 		tqApp->eventLoop()->enterLoop();
 
 		if (m_lastListingEmpty) icon = empty_icon;
diff --git a/tdeioslave/system/systemimpl.h b/tdeioslave/system/systemimpl.h
index 6270489c8..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>
 
@@ -31,7 +31,7 @@
 
 class SystemImpl : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	SystemImpl();
 
diff --git a/tdeioslave/system/tdeio_system.cpp b/tdeioslave/system/tdeio_system.cpp
index 54dd0da6d..76bfc7f82 100644
--- a/tdeioslave/system/tdeio_system.cpp
+++ b/tdeioslave/system/tdeio_system.cpp
@@ -39,7 +39,7 @@ static const TDECmdLineOptions options[] =
 };
 
 extern "C" {
-	KDE_EXPORT int kdemain( int argc, char **argv )
+	TDE_EXPORT int kdemain( int argc, char **argv )
 	{
 		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));