summaryrefslogtreecommitdiffstats
path: root/tdeabc/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tdeabc/tests')
-rw-r--r--tdeabc/tests/kabcargl.cpp2
-rw-r--r--tdeabc/tests/testaddressee.cpp2
-rw-r--r--tdeabc/tests/testaddresseelist.cpp2
-rw-r--r--tdeabc/tests/testaddressfmt.cpp2
-rw-r--r--tdeabc/tests/testaddresslineedit.cpp2
-rw-r--r--tdeabc/tests/testdistlist.cpp2
-rw-r--r--tdeabc/tests/testkabc.cpp2
-rw-r--r--tdeabc/tests/testldapclient.cpp18
-rw-r--r--tdeabc/tests/testldapclient.h2
-rw-r--r--tdeabc/tests/testlock.cpp20
-rw-r--r--tdeabc/tests/testlock.h2
11 files changed, 28 insertions, 28 deletions
diff --git a/tdeabc/tests/kabcargl.cpp b/tdeabc/tests/kabcargl.cpp
index add322b75..a348d3b02 100644
--- a/tdeabc/tests/kabcargl.cpp
+++ b/tdeabc/tests/kabcargl.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <tdecmdlineargs.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "stdaddressbook.h"
diff --git a/tdeabc/tests/testaddressee.cpp b/tdeabc/tests/testaddressee.cpp
index 96989a06d..e7b38dd6e 100644
--- a/tdeabc/tests/testaddressee.cpp
+++ b/tdeabc/tests/testaddressee.cpp
@@ -3,7 +3,7 @@
#include <kdebug.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "addressbook.h"
#include "plugins/file/resourcefile.h"
diff --git a/tdeabc/tests/testaddresseelist.cpp b/tdeabc/tests/testaddresseelist.cpp
index e65d4379c..e422f8cde 100644
--- a/tdeabc/tests/testaddresseelist.cpp
+++ b/tdeabc/tests/testaddresseelist.cpp
@@ -3,7 +3,7 @@
#include <kdebug.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "addressbook.h"
#include "addresseelist.h"
diff --git a/tdeabc/tests/testaddressfmt.cpp b/tdeabc/tests/testaddressfmt.cpp
index bf5347f4e..ee883f7ab 100644
--- a/tdeabc/tests/testaddressfmt.cpp
+++ b/tdeabc/tests/testaddressfmt.cpp
@@ -3,7 +3,7 @@
#include <kdebug.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "addressbook.h"
#include "address.h"
diff --git a/tdeabc/tests/testaddresslineedit.cpp b/tdeabc/tests/testaddresslineedit.cpp
index 80bd311da..ee4513d98 100644
--- a/tdeabc/tests/testaddresslineedit.cpp
+++ b/tdeabc/tests/testaddresslineedit.cpp
@@ -21,7 +21,7 @@ int main( int argc,char **argv )
lineEdit->show();
app.setMainWidget( lineEdit );
- TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) );
+ TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) );
app.exec();
diff --git a/tdeabc/tests/testdistlist.cpp b/tdeabc/tests/testdistlist.cpp
index 833dca84e..4a46f8e83 100644
--- a/tdeabc/tests/testdistlist.cpp
+++ b/tdeabc/tests/testdistlist.cpp
@@ -51,7 +51,7 @@ int main(int argc,char **argv)
editor->show();
app.setMainWidget(editor);
- TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) );
+ TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) );
app.exec();
diff --git a/tdeabc/tests/testkabc.cpp b/tdeabc/tests/testkabc.cpp
index 2cc7effb4..33adc671f 100644
--- a/tdeabc/tests/testkabc.cpp
+++ b/tdeabc/tests/testkabc.cpp
@@ -3,7 +3,7 @@
#include <kdebug.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqfile.h>
#include <tqimage.h>
diff --git a/tdeabc/tests/testldapclient.cpp b/tdeabc/tests/testldapclient.cpp
index a48ce043f..d8879273b 100644
--- a/tdeabc/tests/testldapclient.cpp
+++ b/tdeabc/tests/testldapclient.cpp
@@ -97,14 +97,14 @@ void TestLDAPClient::testIntevation()
// But this certainly looks fishy, it might break on non-utf8 systems.
TQString filter = "&(|(objectclass=person)(objectclass=groupofnames)(mail=*))(|(cn=*Ägypten MDK*)(sn=*Ägypten MDK*))";
- connect( mClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ),
- this, TQT_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) );
- connect( mClient, TQT_SIGNAL( done() ),
- this, TQT_SLOT( slotLDAPDone() ) );
- connect( mClient, TQT_SIGNAL( error( const TQString& ) ),
- this, TQT_SLOT( slotLDAPError( const TQString& ) ) );
+ connect( mClient, TQ_SIGNAL( result( const TDEABC::LdapObject& ) ),
+ this, TQ_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) );
+ connect( mClient, TQ_SIGNAL( done() ),
+ this, TQ_SLOT( slotLDAPDone() ) );
+ connect( mClient, TQ_SIGNAL( error( const TQString& ) ),
+ this, TQ_SLOT( slotLDAPError( const TQString& ) ) );
mClient->startQuery( filter );
- kapp->eventLoop()->enterLoop();
+ tdeApp->eventLoop()->enterLoop();
delete mClient; mClient = 0;
}
@@ -130,7 +130,7 @@ static TQString join( const TDEABC::LdapAttrValue& lst, const TQString& sep )
for ( TDEABC::LdapAttrValue::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
if ( already )
res += sep;
- already = TRUE;
+ already = true;
res += asUtf8( *it );
}
return res;
@@ -155,7 +155,7 @@ void TestLDAPClient::slotLDAPError( const TQString& err )
void TestLDAPClient::slotLDAPDone()
{
kdDebug() << k_funcinfo << endl;
- kapp->eventLoop()->exitLoop();
+ tdeApp->eventLoop()->exitLoop();
}
#include "testldapclient.moc"
diff --git a/tdeabc/tests/testldapclient.h b/tdeabc/tests/testldapclient.h
index 502115b07..8b1a9bda4 100644
--- a/tdeabc/tests/testldapclient.h
+++ b/tdeabc/tests/testldapclient.h
@@ -26,7 +26,7 @@ typedef TDEABC::LdapClient LdapClient;
class TestLDAPClient : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
TestLDAPClient() {}
diff --git a/tdeabc/tests/testlock.cpp b/tdeabc/tests/testlock.cpp
index f9d880753..24f34b79e 100644
--- a/tdeabc/tests/testlock.cpp
+++ b/tdeabc/tests/testlock.cpp
@@ -77,11 +77,11 @@ LockWidget::LockWidget( const TQString &identifier )
TQPushButton *button = new TQPushButton( "Lock", this );
topLayout->addWidget( button );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( lock() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( lock() ) );
button = new TQPushButton( "Unlock", this );
topLayout->addWidget( button );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( unlock() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( unlock() ) );
}
mLockView = new TQListView( this );
@@ -94,15 +94,15 @@ LockWidget::LockWidget( const TQString &identifier )
TQPushButton *quitButton = new TQPushButton( "Quit", this );
topLayout->addWidget( quitButton );
- connect( quitButton, TQT_SIGNAL( clicked() ), TQT_SLOT( close() ) );
+ connect( quitButton, TQ_SIGNAL( clicked() ), TQ_SLOT( close() ) );
KDirWatch *watch = KDirWatch::self();
- connect( watch, TQT_SIGNAL( dirty( const TQString & ) ),
- TQT_SLOT( updateLockView() ) );
- connect( watch, TQT_SIGNAL( created( const TQString & ) ),
- TQT_SLOT( updateLockView() ) );
- connect( watch, TQT_SIGNAL( deleted( const TQString & ) ),
- TQT_SLOT( updateLockView() ) );
+ connect( watch, TQ_SIGNAL( dirty( const TQString & ) ),
+ TQ_SLOT( updateLockView() ) );
+ connect( watch, TQ_SIGNAL( created( const TQString & ) ),
+ TQ_SLOT( updateLockView() ) );
+ connect( watch, TQ_SIGNAL( deleted( const TQString & ) ),
+ TQ_SLOT( updateLockView() ) );
watch->addDir( Lock::locksDir() );
watch->startScan();
}
@@ -197,7 +197,7 @@ int main(int argc,char **argv)
LockWidget mainWidget( identifier );
- kapp->setMainWidget( &mainWidget );
+ tdeApp->setMainWidget( &mainWidget );
mainWidget.show();
return app.exec();
diff --git a/tdeabc/tests/testlock.h b/tdeabc/tests/testlock.h
index 62466b89a..a093a9ecb 100644
--- a/tdeabc/tests/testlock.h
+++ b/tdeabc/tests/testlock.h
@@ -30,7 +30,7 @@ class TQListView;
class KABC_EXPORT LockWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
LockWidget( const TQString &identifier );
~LockWidget();