7 files changed, 15 insertions, 13 deletions
diff --git a/libkdepim/tests/testdateedit.cpp b/libkdepim/tests/testdateedit.cpp
index e0d1d732d..6b4ef3392 100644
--- a/libkdepim/tests/testdateedit.cpp
+++ b/libkdepim/tests/testdateedit.cpp
@@ -31,8 +31,8 @@
 
 #include "testdateedit.h"
 
-DateEdit::DateEdit( TQWidget *parent, const char *name )
-  : TQWidget( parent, name )
+DateEdit::DateEdit( TQWidget *tqparent, const char *name )
+  : TQWidget( tqparent, name )
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
   
diff --git a/libkdepim/tests/testdateedit.h b/libkdepim/tests/testdateedit.h
index 86a9ea4e8..44cb214a4 100644
--- a/libkdepim/tests/testdateedit.h
+++ b/libkdepim/tests/testdateedit.h
@@ -24,12 +24,13 @@
 
 #include <tqwidget.h>
 
-class DateEdit : public QWidget
+class DateEdit : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    DateEdit( TQWidget *parent = 0, const char *name = 0 );
+    DateEdit( TQWidget *tqparent = 0, const char *name = 0 );
 
   public slots:
     void dateChanged( const TQDate& );
diff --git a/libkdepim/tests/testdistrlist.cpp b/libkdepim/tests/testdistrlist.cpp
index b446a5a39..f588f9a93 100644
--- a/libkdepim/tests/testdistrlist.cpp
+++ b/libkdepim/tests/testdistrlist.cpp
@@ -97,9 +97,9 @@ void TestDistrList::runAll()
 bool TestDistrList::check(const TQString& txt, TQString a, TQString b)
 {
     if (a.isEmpty())
-        a = TQString::null;
+        a = TQString();
     if (b.isEmpty())
-        b = TQString::null;
+        b = TQString();
     if (a == b) {
         kdDebug() << txt << " : checking '" << a << "' against expected value '" << b << "'... " << "ok" << endl;
     }
@@ -123,8 +123,8 @@ static bool removeDirAndContentsRecursively( const TQString & path )
   d.setPath( path );
   d.setFilter( TQDir::Files | TQDir::Dirs | TQDir::Hidden );
 
-  const QFileInfoList *list = d.entryInfoList();
-  QFileInfoListIterator it( *list );
+  const TQFileInfoList *list = d.entryInfoList();
+  TQFileInfoListIterator it( *list );
   TQFileInfo *fi;
 
   while ( (fi = it.current()) != 0 ) {
@@ -227,7 +227,7 @@ void TestDistrList::testInsertEntry()
     DistributionList::Entry::List entries = dl.entries( ab );
     check( "entries count", TQString::number( entries.count() ), "3" );
     check( "first entry", entries[0].addressee.name(), "addr1" );
-    check( "first entry", entries[0].email, TQString::null );
+    check( "first entry", entries[0].email, TQString() );
     check( "second entry", entries[1].addressee.name(), "addr2" );
     check( "second entry", entries[1].email, "addr2-alternate@kde.org" );
     check( "third entry", entries[2].addressee.name(), "addr2" );
diff --git a/libkdepim/tests/testdistrlist.h b/libkdepim/tests/testdistrlist.h
index 782c3ec5f..3f64527e6 100644
--- a/libkdepim/tests/testdistrlist.h
+++ b/libkdepim/tests/testdistrlist.h
@@ -21,9 +21,10 @@
 
 #include <tqobject.h>
 
-class TestDistrList : public QObject
+class TestDistrList : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     TestDistrList() {}
diff --git a/libkdepim/tests/testutf7decoder.cpp b/libkdepim/tests/testutf7decoder.cpp
index f6b8f4ada..b13fb30c3 100644
--- a/libkdepim/tests/testutf7decoder.cpp
+++ b/libkdepim/tests/testutf7decoder.cpp
@@ -6,7 +6,7 @@
 
 int main( int argc, char * argv[] ) {
   if ( argc == 1 ) {
-    (void)new QUtf7Codec;
+    (void)new TQUtf7Codec;
 
     TQTextCodec * codec = TQTextCodec::codecForName("utf-7");
     assert(codec);
diff --git a/libkdepim/tests/testutf7encoder.cpp b/libkdepim/tests/testutf7encoder.cpp
index 04ed8f702..2938cd660 100644
--- a/libkdepim/tests/testutf7encoder.cpp
+++ b/libkdepim/tests/testutf7encoder.cpp
@@ -5,7 +5,7 @@
 
 void main( int argc, char * argv[] ) {
   if ( argc == 2 ) {
-    QUtf7Codec * codec = new QUtf7Codec;
+    TQUtf7Codec * codec = new TQUtf7Codec;
 
     TQTextEncoder * enc;
 
diff --git a/libkdepim/tests/testutf7encoder2.cpp b/libkdepim/tests/testutf7encoder2.cpp
index 6d67bae0a..65cf8b461 100644
--- a/libkdepim/tests/testutf7encoder2.cpp
+++ b/libkdepim/tests/testutf7encoder2.cpp
@@ -7,7 +7,7 @@
 
 int main( int argc, char * argv[] ) {
   if ( argc == 1 ) {
-    (void)new QUtf7Codec;
+    (void)new TQUtf7Codec;
 
     TQTextCodec * codec = TQTextCodec::codecForName("utf-7");
     assert(codec);