9 files changed, 9 insertions, 13 deletions
diff --git a/tdefile-plugins/ics/Makefile.am b/tdefile-plugins/ics/Makefile.am
index 8cb1a415..856afada 100644
--- a/tdefile-plugins/ics/Makefile.am
+++ b/tdefile-plugins/ics/Makefile.am
@@ -11,7 +11,7 @@ noinst_HEADERS   = tdefile_ics.h
 kde_module_LTLIBRARIES = tdefile_ics.la
 
 tdefile_ics_la_SOURCES = tdefile_ics.cpp
-tdefile_ics_la_LDFLAGS =  $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore
+tdefile_ics_la_LDFLAGS =  $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore
 tdefile_ics_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(LIB_TDESYCOCA)
 
 
diff --git a/tdefile-plugins/ics/tdefile_ics.h b/tdefile-plugins/ics/tdefile_ics.h
index 756a11be..aa8e6c2e 100644
--- a/tdefile-plugins/ics/tdefile_ics.h
+++ b/tdefile-plugins/ics/tdefile_ics.h
@@ -26,7 +26,7 @@ class TQStringList;
 
 class ICSPlugin : public KFilePlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   ICSPlugin( TQObject *parent, const char *name, const TQStringList& args );
diff --git a/tdefile-plugins/palm-databases/Makefile.am b/tdefile-plugins/palm-databases/Makefile.am
index 7711d192..490afba9 100644
--- a/tdefile-plugins/palm-databases/Makefile.am
+++ b/tdefile-plugins/palm-databases/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS   = tdefile_palm.h
 kde_module_LTLIBRARIES = tdefile_palm.la
 
 tdefile_palm_la_SOURCES = tdefile_palm.cpp 
-tdefile_palm_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore
+tdefile_palm_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore
 tdefile_palm_la_LIBADD = $(LIB_TDESYCOCA) $(PISOCK_LIB)
 
 # let automoc handle all of the meta source files (moc)
diff --git a/tdefile-plugins/palm-databases/tdefile_palm.h b/tdefile-plugins/palm-databases/tdefile_palm.h
index 22124aa7..e9521543 100644
--- a/tdefile-plugins/palm-databases/tdefile_palm.h
+++ b/tdefile-plugins/palm-databases/tdefile_palm.h
@@ -28,7 +28,7 @@ class TQStringList;
 
 class KPalmPlugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     
 public:
diff --git a/tdefile-plugins/rfc822/tdefile_rfc822.cpp b/tdefile-plugins/rfc822/tdefile_rfc822.cpp
index f1b4d6ff..68ff16fa 100644
--- a/tdefile-plugins/rfc822/tdefile_rfc822.cpp
+++ b/tdefile-plugins/rfc822/tdefile_rfc822.cpp
@@ -20,7 +20,7 @@
 #include <config.h>
 #include "tdefile_rfc822.h"
 
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kstringvalidator.h>
@@ -32,11 +32,7 @@
 #include <tqfile.h>
 #include <tqdatetime.h>
 
-#if !defined(__osf__)
 #include <inttypes.h>
-#else
-typedef unsigned short uint32_t;
-#endif
 
 typedef KGenericFactory<KRfc822Plugin> Rfc822Factory;
 
diff --git a/tdefile-plugins/rfc822/tdefile_rfc822.h b/tdefile-plugins/rfc822/tdefile_rfc822.h
index c8f3f2f8..cf33ade9 100644
--- a/tdefile-plugins/rfc822/tdefile_rfc822.h
+++ b/tdefile-plugins/rfc822/tdefile_rfc822.h
@@ -26,7 +26,7 @@ class TQStringList;
 
 class KRfc822Plugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     
 public:
diff --git a/tdefile-plugins/vcf/Makefile.am b/tdefile-plugins/vcf/Makefile.am
index 5b210eed..54573423 100644
--- a/tdefile-plugins/vcf/Makefile.am
+++ b/tdefile-plugins/vcf/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS   = tdefile_vcf.h
 kde_module_LTLIBRARIES = tdefile_vcf.la
 
 tdefile_vcf_la_SOURCES = tdefile_vcf.cpp 
-tdefile_vcf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore
+tdefile_vcf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore
 tdefile_vcf_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEABC)
 
 # let automoc handle all of the meta source files (moc)
diff --git a/tdefile-plugins/vcf/tdefile_vcf.cpp b/tdefile-plugins/vcf/tdefile_vcf.cpp
index c7596279..07524695 100644
--- a/tdefile-plugins/vcf/tdefile_vcf.cpp
+++ b/tdefile-plugins/vcf/tdefile_vcf.cpp
@@ -21,7 +21,7 @@
 #include <config.h>
 #include "tdefile_vcf.h"
 
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <tdeabc/vcardconverter.h>
diff --git a/tdefile-plugins/vcf/tdefile_vcf.h b/tdefile-plugins/vcf/tdefile_vcf.h
index de5243e1..bc724b8f 100644
--- a/tdefile-plugins/vcf/tdefile_vcf.h
+++ b/tdefile-plugins/vcf/tdefile_vcf.h
@@ -26,7 +26,7 @@ class TQStringList;
 
 class KVcfPlugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     
 public: