4 files changed, 14 insertions, 14 deletions
diff --git a/tdescreensaver/blankscrn.cpp b/tdescreensaver/blankscrn.cpp
index fce4491e7..69dcce638 100644
--- a/tdescreensaver/blankscrn.cpp
+++ b/tdescreensaver/blankscrn.cpp
@@ -23,16 +23,16 @@
 // libtdescreensaver interface
 extern "C"
 {
-    KDE_EXPORT const char *kss_applicationName = "kblankscrn.kss";
-    KDE_EXPORT const char *kss_description = I18N_NOOP( "KBlankScreen" );
-    KDE_EXPORT const char *kss_version = "2.2.0";
+    TDE_EXPORT const char *kss_applicationName = "kblankscrn.kss";
+    TDE_EXPORT const char *kss_description = I18N_NOOP( "KBlankScreen" );
+    TDE_EXPORT const char *kss_version = "2.2.0";
 
-    KDE_EXPORT KScreenSaver* kss_create( WId id )
+    TDE_EXPORT KScreenSaver* kss_create( WId id )
     {
         return new KBlankSaver( id );
     }
 
-    KDE_EXPORT TQDialog* kss_setup()
+    TDE_EXPORT TQDialog* kss_setup()
     {
         return new KBlankSetup();
     }
@@ -55,8 +55,8 @@ KBlankSetup::KBlankSetup( TQWidget *parent, const char *name )
 
 	KColorButton *colorPush = new KColorButton( color, main );
 	colorPush->setMinimumWidth(80);
-	connect( colorPush, TQT_SIGNAL( changed(const TQColor &) ),
-		TQT_SLOT( slotColor(const TQColor &) ) );
+	connect( colorPush, TQ_SIGNAL( changed(const TQColor &) ),
+		TQ_SLOT( slotColor(const TQColor &) ) );
 	grid->addWidget(colorPush, 1, 0);
 
 	preview = new TQWidget( main );
diff --git a/tdescreensaver/blankscrn.h b/tdescreensaver/blankscrn.h
index ba6da0226..4fefb9dfd 100644
--- a/tdescreensaver/blankscrn.h
+++ b/tdescreensaver/blankscrn.h
@@ -17,7 +17,7 @@ class KColorButton;
 
 class KBlankSaver : public KScreenSaver
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KBlankSaver( WId drawable );
 	virtual ~KBlankSaver();
@@ -34,7 +34,7 @@ private:
 
 class KBlankSetup : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KBlankSetup( TQWidget *parent = NULL, const char *name = NULL );
 
diff --git a/tdescreensaver/random.cpp b/tdescreensaver/random.cpp
index b7c90db97..bd8c1d640 100644
--- a/tdescreensaver/random.cpp
+++ b/tdescreensaver/random.cpp
@@ -22,10 +22,10 @@
 #include <tqfileinfo.h>
 
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <krandomsequence.h>
 #include <kdebug.h>
 #include <tdecmdlineargs.h>
@@ -166,7 +166,7 @@ int main(int argc, char *argv[])
                         howoften = 0;
                 }
 
-		KDesktopFile saver(tempSaverFileList[i], true);
+		TDEDesktopFile saver(tempSaverFileList[i], true);
                 if (!saver.tryExec())
                     continue;
 		TQString saverType = saver.readEntry("X-TDE-Type");
@@ -203,7 +203,7 @@ int main(int argc, char *argv[])
 	int indx = rnd.getLong(saverFileList.count());
 	TQString filename = *(saverFileList.at(indx));
 
-	KDesktopFile config(filename, true);
+	TDEDesktopFile config(filename, true);
 
 	TQString cmd;
 	if (windowId && config.hasActionGroup("InWindow"))
diff --git a/tdescreensaver/random.h b/tdescreensaver/random.h
index e34556662..3b7fb8ea4 100644
--- a/tdescreensaver/random.h
+++ b/tdescreensaver/random.h
@@ -19,7 +19,7 @@ class TQCheckBox;
 
 class KRandomSetup : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		KRandomSetup( TQWidget *parent = NULL, const char *name = NULL );