diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
| commit | f7e71d47719ab6094cf4a9fafffa5ea351973522 (patch) | |
| tree | 30834aa632d442019e14f88685001d94657d060b /kwallet/client | |
| parent | b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff) | |
| download | tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip | |
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase. If it does then it needs to be fixed!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kwallet/client')
| -rw-r--r-- | kwallet/client/kwallet.cc | 2 | ||||
| -rw-r--r-- | kwallet/client/kwallet.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/kwallet/client/kwallet.cc b/kwallet/client/kwallet.cc index 0575050e5..9fb476411 100644 --- a/kwallet/client/kwallet.cc +++ b/kwallet/client/kwallet.cc @@ -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 = qApp->activePopupWidget()) + while( TQWidget* widget = TQT_TQWIDGET(tqApp->activePopupWidget())) widget->close(); bool isPath = ot == Path; diff --git a/kwallet/client/kwallet.h b/kwallet/client/kwallet.h index b7b3bce31..cbe8188a5 100644 --- a/kwallet/client/kwallet.h +++ b/kwallet/client/kwallet.h @@ -23,6 +23,11 @@ #define _KWALLET_H #include <tqglobal.h> + +#ifdef Q_MOC_RUN +#define Q_OS_UNIX +#endif // Q_MOC_RUN + #ifdef Q_OS_UNIX #include <tqstring.h> |