summaryrefslogtreecommitdiffstats
path: root/tdewallet/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tdewallet/tests')
-rw-r--r--tdewallet/tests/CMakeLists.txt1
-rw-r--r--tdewallet/tests/Makefile.am2
-rw-r--r--tdewallet/tests/tdewalletasync.cpp4
-rw-r--r--tdewallet/tests/tdewalletboth.cpp4
-rw-r--r--tdewallet/tests/tdewallettest.h2
5 files changed, 6 insertions, 7 deletions
diff --git a/tdewallet/tests/CMakeLists.txt b/tdewallet/tests/CMakeLists.txt
index 9c64ac9af..5d75f8d70 100644
--- a/tdewallet/tests/CMakeLists.txt
+++ b/tdewallet/tests/CMakeLists.txt
@@ -26,7 +26,6 @@ link_directories(
add_definitions (
-DKDE_NO_COMPAT
- -DTQT_NO_COMPAT
-DTQT_NO_ASCII_CAST
)
diff --git a/tdewallet/tests/Makefile.am b/tdewallet/tests/Makefile.am
index 085c0630e..0f8ad9946 100644
--- a/tdewallet/tests/Makefile.am
+++ b/tdewallet/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -DTQT_NO_ASCII_CAST $(all_includes)
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_ASCII_CAST $(all_includes)
METASOURCES = AUTO
check_PROGRAMS = tdewalletasync tdewalletsync tdewalletboth
diff --git a/tdewallet/tests/tdewalletasync.cpp b/tdewallet/tests/tdewalletasync.cpp
index 57571bebb..54e618b70 100644
--- a/tdewallet/tests/tdewalletasync.cpp
+++ b/tdewallet/tests/tdewalletasync.cpp
@@ -22,11 +22,11 @@ void openWallet()
TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0, TDEWallet::Wallet::Asynchronous );
WalletReceiver r;
- r.connect( wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( walletOpened(bool) ) );
+ r.connect( wallet, TQ_SIGNAL( walletOpened(bool) ), TQ_SLOT( walletOpened(bool) ) );
_out << "About to start 30 second event loop" << endl;
- TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) );
+ TQTimer::singleShot( 30000, tqApp, TQ_SLOT( quit() ) );
int ret = tqApp->exec();
if ( ret == 0 )
diff --git a/tdewallet/tests/tdewalletboth.cpp b/tdewallet/tests/tdewalletboth.cpp
index cc2819e0b..bdfc73f8f 100644
--- a/tdewallet/tests/tdewalletboth.cpp
+++ b/tdewallet/tests/tdewalletboth.cpp
@@ -22,7 +22,7 @@ void openWallet()
TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0, TDEWallet::Wallet::Asynchronous );
WalletReceiver r;
- r.connect( wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( walletOpened(bool) ) );
+ r.connect( wallet, TQ_SIGNAL( walletOpened(bool) ), TQ_SLOT( walletOpened(bool) ) );
_out << "About to ask for wallet sync" << endl;
@@ -31,7 +31,7 @@ void openWallet()
_out << "Got sync wallet: " << (wallet != 0) << endl;
_out << "About to start 30 second event loop" << endl;
- TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) );
+ TQTimer::singleShot( 30000, tqApp, TQ_SLOT( quit() ) );
int ret = tqApp->exec();
diff --git a/tdewallet/tests/tdewallettest.h b/tdewallet/tests/tdewallettest.h
index a3ce51e48..426412864 100644
--- a/tdewallet/tests/tdewallettest.h
+++ b/tdewallet/tests/tdewallettest.h
@@ -7,7 +7,7 @@ namespace TDEWallet { class Wallet; }
class WalletReceiver : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public slots:
void walletOpened( bool );
};