diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-05 21:54:32 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-05 21:54:32 +0000 |
| commit | 229a34d015564ecd61be45648f15044ea3e4ec8a (patch) | |
| tree | b58510cd03109802f5b2d1a7cd4ad429ea01ec88 /dcop | |
| parent | 6d1c49c8bd45ba0a096006fb2df45ce1e4ba901b (diff) | |
| download | tdelibs-229a34d015564ecd61be45648f15044ea3e4ec8a.tar.gz tdelibs-229a34d015564ecd61be45648f15044ea3e4ec8a.zip | |
Various compilation fixes.
Most are to specify types where ambiguity is present,
so for example 'T' becomes (QChar)'T'
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1159657 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'dcop')
| -rw-r--r-- | dcop/client/dcop.cpp | 4 | ||||
| -rw-r--r-- | dcop/kdatastream.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp index a78c8e016..1d167ce70 100644 --- a/dcop/client/dcop.cpp +++ b/dcop/client/dcop.cpp @@ -410,11 +410,11 @@ TQStringList dcopSessionList( const TQString &user, const TQString &home ) d.setFilter( TQDir::Files | TQDir::Hidden | TQDir::NoSymLinks ); d.setNameFilter( ".DCOPserver*" ); - const QFileInfoList *list = d.entryInfoList(); + const TQFileInfoList *list = d.entryInfoList(); if( !list ) return result; - QFileInfoListIterator it( *list ); + TQFileInfoListIterator it( *list ); TQFileInfo *fi; while ( ( fi = it.current() ) != 0 ) diff --git a/dcop/kdatastream.h b/dcop/kdatastream.h index f8502aaab..de85ebb47 100644 --- a/dcop/kdatastream.h +++ b/dcop/kdatastream.h @@ -3,6 +3,7 @@ #include <tqdatastream.h> +#ifdef USE_QT3 inline TQDataStream & operator << (TQDataStream & str, bool b) { str << Q_INT8(b); @@ -16,6 +17,7 @@ inline TQDataStream & operator >> (TQDataStream & str, bool & b) b = bool(l); return str; } +#endif // USE_QT3 #if QT_VERSION < 0x030200 && !defined(Q_WS_WIN) && !defined(Q_WS_MAC) inline TQDataStream & operator << (TQDataStream & str, long long int ll) |