diff options
Diffstat (limited to 'tdewallet/client')
| -rw-r--r-- | tdewallet/client/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tdewallet/client/Makefile.am | 2 | ||||
| -rw-r--r-- | tdewallet/client/tdewallet.cpp (renamed from tdewallet/client/tdewallet.cc) | 6 | ||||
| -rw-r--r-- | tdewallet/client/tdewallet.h | 6 |
4 files changed, 6 insertions, 11 deletions
diff --git a/tdewallet/client/CMakeLists.txt b/tdewallet/client/CMakeLists.txt index 531733ac8..87c77132b 100644 --- a/tdewallet/client/CMakeLists.txt +++ b/tdewallet/client/CMakeLists.txt @@ -34,13 +34,12 @@ install( FILES set( target tdewalletclient ) set( ${target}_SRCS - tdewallet.skel tdewallet.cc + tdewallet.skel tdewallet.cpp ) tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.0.1 LINK tdecore-shared - DEPENDENCIES dcopidl DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/tdewallet/client/Makefile.am b/tdewallet/client/Makefile.am index 4fe262f76..51fdd4161 100644 --- a/tdewallet/client/Makefile.am +++ b/tdewallet/client/Makefile.am @@ -6,7 +6,7 @@ lib_LTLIBRARIES = libtdewalletclient.la libtdewalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:1 -no-undefined libtdewalletclient_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la libtdewalletclient_la_SOURCES = tdewallet.skel \ - tdewallet.cc + tdewallet.cpp libtdewalletclient_la_METASOURCES = AUTO diff --git a/tdewallet/client/tdewallet.cc b/tdewallet/client/tdewallet.cpp index c730f10d4..9785472ed 100644 --- a/tdewallet/client/tdewallet.cc +++ 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. |