diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
| commit | 560378aaca1784ba19806a0414a32b20c744de39 (patch) | |
| tree | ce0dfd7c3febf2a1adc7603d1019a8be2083c415 /kabc/formats | |
| parent | d4d5af1cdbd3cc65d095e0afc5b1f4260091cf5d (diff) | |
| download | tdelibs-560378aaca1784ba19806a0414a32b20c744de39.tar.gz tdelibs-560378aaca1784ba19806a0414a32b20c744de39.zip | |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kabc/formats')
| -rw-r--r-- | kabc/formats/Makefile.am | 2 | ||||
| -rw-r--r-- | kabc/formats/binaryformat.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kabc/formats/Makefile.am b/kabc/formats/Makefile.am index 0b5978b20..2443cef24 100644 --- a/kabc/formats/Makefile.am +++ b/kabc/formats/Makefile.am @@ -11,7 +11,7 @@ kabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h # these are the headers for your project noinst_HEADERS = binaryformat.h -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO messages: rc.cpp diff --git a/kabc/formats/binaryformat.cpp b/kabc/formats/binaryformat.cpp index d5e3cf499..d09be306b 100644 --- a/kabc/formats/binaryformat.cpp +++ b/kabc/formats/binaryformat.cpp @@ -66,7 +66,7 @@ bool BinaryFormat::loadAll( AddressBook*, Resource *resource, TQFile *file ) if ( !checkHeader( stream ) ) return false; - Q_UINT32 entries; + TQ_UINT32 entries; stream >> entries; @@ -89,7 +89,7 @@ void BinaryFormat::save( const Addressee &addressee, TQFile *file ) writeHeader( stream ); - Q_UINT32 entries = 1; + TQ_UINT32 entries = 1; stream << entries; saveAddressee( addressee, stream ); } @@ -98,7 +98,7 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file ) { kdDebug(5700) << "BinaryFormat::saveAll()" << endl; - Q_UINT32 counter = 0; + TQ_UINT32 counter = 0; TQDataStream stream( file ); writeHeader( stream ); @@ -113,7 +113,7 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file ) } // set real number of entries - stream.device()->at( 2 * sizeof( Q_UINT32 ) ); + stream.device()->at( 2 * sizeof( TQ_UINT32 ) ); stream << counter; } @@ -128,7 +128,7 @@ bool BinaryFormat::checkFormat( TQFile *file ) const bool BinaryFormat::checkHeader( TQDataStream &stream ) const { - Q_UINT32 magic, version; + TQ_UINT32 magic, version; stream >> magic >> version; @@ -154,7 +154,7 @@ bool BinaryFormat::checkHeader( TQDataStream &stream ) const void BinaryFormat::writeHeader( TQDataStream &stream ) { - Q_UINT32 magic, version; + TQ_UINT32 magic, version; magic = 0x2e93e; version = BINARY_FORMAT_VERSION; |