summaryrefslogtreecommitdiffstats
path: root/tdewallet/client
diff options
context:
space:
mode:
Diffstat (limited to 'tdewallet/client')
-rw-r--r--tdewallet/client/tdewallet.cpp6
-rw-r--r--tdewallet/client/tdewallet.h6
2 files changed, 4 insertions, 8 deletions
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.