summaryrefslogtreecommitdiffstats
path: root/tdewallet
diff options
context:
space:
mode:
Diffstat (limited to 'tdewallet')
-rw-r--r--tdewallet/backend/blowfish.h3
-rw-r--r--tdewallet/backend/sha1.cpp6
-rw-r--r--tdewallet/backend/tdewalletbackend.cpp2
-rw-r--r--tdewallet/backend/tdewalletbackend.h2
-rw-r--r--tdewallet/backend/tdewalletentry.h2
-rw-r--r--tdewallet/client/tdewallet.cpp6
-rw-r--r--tdewallet/client/tdewallet.h6
-rw-r--r--tdewallet/tests/CMakeLists.txt1
-rw-r--r--tdewallet/tests/Makefile.am2
-rw-r--r--tdewallet/tests/tdewalletasync.cpp6
-rw-r--r--tdewallet/tests/tdewalletboth.cpp6
-rw-r--r--tdewallet/tests/tdewalletsync.cpp2
-rw-r--r--tdewallet/tests/tdewallettest.h2
13 files changed, 16 insertions, 30 deletions
diff --git a/tdewallet/backend/blowfish.h b/tdewallet/backend/blowfish.h
index 581ac31c0..33c0c6ee1 100644
--- a/tdewallet/backend/blowfish.h
+++ b/tdewallet/backend/blowfish.h
@@ -28,9 +28,6 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h> /* For uintXX_t on Tru64 */
-#endif
#include "blockcipher.h"
diff --git a/tdewallet/backend/sha1.cpp b/tdewallet/backend/sha1.cpp
index 7420b5f16..c2bb4339b 100644
--- a/tdewallet/backend/sha1.cpp
+++ b/tdewallet/backend/sha1.cpp
@@ -24,12 +24,6 @@
#include <sys/types.h>
#endif
#ifdef HAVE_STDINT_H
-#include <stdint.h> /* For uintXX_t on OSX */
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h> /* For uintXX_t on Tru64 */
-#endif
-#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
diff --git a/tdewallet/backend/tdewalletbackend.cpp b/tdewallet/backend/tdewalletbackend.cpp
index 83e37a49a..978335e67 100644
--- a/tdewallet/backend/tdewalletbackend.cpp
+++ b/tdewallet/backend/tdewalletbackend.cpp
@@ -27,7 +27,7 @@
#include <tdelocale.h>
#include <kmdcodec.h>
#include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqfile.h>
#include <tqfileinfo.h>
diff --git a/tdewallet/backend/tdewalletbackend.h b/tdewallet/backend/tdewalletbackend.h
index 71c1da120..f469a9d60 100644
--- a/tdewallet/backend/tdewalletbackend.h
+++ b/tdewallet/backend/tdewalletbackend.h
@@ -36,7 +36,7 @@ class MD5Digest;
/* @internal
*/
-class KDE_EXPORT Backend {
+class TDE_EXPORT Backend {
public:
Backend(const TQString& name = "kdewallet", bool isPath = false);
~Backend();
diff --git a/tdewallet/backend/tdewalletentry.h b/tdewallet/backend/tdewalletentry.h
index 4261fc439..9a9836208 100644
--- a/tdewallet/backend/tdewalletentry.h
+++ b/tdewallet/backend/tdewalletentry.h
@@ -31,7 +31,7 @@ namespace TDEWallet {
/* @internal
*/
-class KDE_EXPORT Entry {
+class TDE_EXPORT Entry {
public:
Entry();
~Entry();
diff --git a/tdewallet/client/tdewallet.cpp b/tdewallet/client/tdewallet.cpp
index c730f10d4..9785472ed 100644
--- a/tdewallet/client/tdewallet.cpp
+++ b/tdewallet/client/tdewallet.cpp
@@ -79,9 +79,9 @@ Wallet::Wallet(int handle, const TQString& name)
_dcopRef->dcopClient()->setNotifications(true);
connect(_dcopRef->dcopClient(),
- TQT_SIGNAL(applicationRemoved(const TQCString&)),
+ TQ_SIGNAL(applicationRemoved(const TQCString&)),
this,
- TQT_SLOT(slotAppUnregistered(const TQCString&)));
+ TQ_SLOT(slotAppUnregistered(const TQCString&)));
connectDCOPSignal(_dcopRef->app(), _dcopRef->obj(), "walletClosed(int)", "slotWalletClosed(int)", false);
connectDCOPSignal(_dcopRef->app(), _dcopRef->obj(), "folderListUpdated(TQString)", "slotFolderListUpdated(TQString)", false);
@@ -179,7 +179,7 @@ Wallet *Wallet::openWallet(const TQString& name, WId w, OpenType ot) {
}
// avoid deadlock if the app has some popup open (#65978/#71048)
- while( TQWidget* widget = TQT_TQWIDGET(tqApp->activePopupWidget()))
+ while( TQWidget* widget = tqApp->activePopupWidget())
widget->close();
bool isPath = ot == Path;
diff --git a/tdewallet/client/tdewallet.h b/tdewallet/client/tdewallet.h
index 613231908..d1dddba20 100644
--- a/tdewallet/client/tdewallet.h
+++ b/tdewallet/client/tdewallet.h
@@ -24,10 +24,6 @@
#include <tqglobal.h>
-#ifdef Q_MOC_RUN
-#define Q_OS_UNIX
-#endif // Q_MOC_RUN
-
#ifdef Q_OS_UNIX
#include <tqstring.h>
@@ -52,7 +48,7 @@ namespace TDEWallet {
*/
class TDEIO_EXPORT Wallet : public TQObject, public DCOPObject {
K_DCOP
- Q_OBJECT
+ TQ_OBJECT
protected:
/**
* Construct a TDEWallet object.
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..09c91ac8c 100644
--- a/tdewallet/tests/tdewalletasync.cpp
+++ b/tdewallet/tests/tdewalletasync.cpp
@@ -6,7 +6,7 @@
#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <dcopclient.h>
#include <tdewallet.h>
@@ -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..692db372e 100644
--- a/tdewallet/tests/tdewalletboth.cpp
+++ b/tdewallet/tests/tdewalletboth.cpp
@@ -6,7 +6,7 @@
#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <dcopclient.h>
#include <tdewallet.h>
@@ -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/tdewalletsync.cpp b/tdewallet/tests/tdewalletsync.cpp
index 307a4e846..235730b57 100644
--- a/tdewallet/tests/tdewalletsync.cpp
+++ b/tdewallet/tests/tdewalletsync.cpp
@@ -6,7 +6,7 @@
#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <dcopclient.h>
#include <tdewallet.h>
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 );
};
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-18 15:22:01 +0000