From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libkmime/tests/run_codec_tests | 2 +- libkmime/tests/test_charfreq.cpp | 2 +- libkmime/tests/test_kmime_codec.cpp | 14 ++++++------ libkmime/tests/test_kmime_header_parsing.cpp | 6 +++--- libkmime/tests/test_mdn.cpp | 32 ++++++++++++++-------------- 5 files changed, 28 insertions(+), 28 deletions(-) (limited to 'libkmime/tests') diff --git a/libkmime/tests/run_codec_tests b/libkmime/tests/run_codec_tests index 62908eeec..62f5f2d60 100755 --- a/libkmime/tests/run_codec_tests +++ b/libkmime/tests/run_codec_tests @@ -19,7 +19,7 @@ failedTests=0 # loop over all .expected files in the directory # specified by the single argument: -for i in $(find "$@" -type f -name '*.expected'); do +for i in $(tqfind "$@" -type f -name '*.expected'); do dirName="$(dirname "$i")" if [ "$dirName" != "$oldDirName" ]; then oldDirName="$dirName" diff --git a/libkmime/tests/test_charfreq.cpp b/libkmime/tests/test_charfreq.cpp index 50f2809d8..04f58bc01 100644 --- a/libkmime/tests/test_charfreq.cpp +++ b/libkmime/tests/test_charfreq.cpp @@ -1,5 +1,5 @@ // test program for KMime::CharFreq. -// compile with g++ -I$QTDIR/include -L$QTDIR/lib -lqt(-mt) \ +// compile with g++ -I$TQTDIR/include -L$TQTDIR/lib -lqt(-mt) \ // -o test_charfreq test_charfreq.cpp #include "../kmime_charfreq.cpp" diff --git a/libkmime/tests/test_kmime_codec.cpp b/libkmime/tests/test_kmime_codec.cpp index 68ab08ec7..f27bc5b9b 100644 --- a/libkmime/tests/test_kmime_codec.cpp +++ b/libkmime/tests/test_kmime_codec.cpp @@ -1,7 +1,7 @@ /* test program for KMime::Codec's: compile with: - g++ -I$QTDIR/include -I$KDEDIR/include -L$QTDIR/lib -L$KDEDIR/lib \ - -lqt-mt -lkdecore -lkdenetwork -O2 -pthread -DQT_THREAD_SUPPORT \ + g++ -I$TQTDIR/include -I$KDEDIR/include -L$TQTDIR/lib -L$KDEDIR/lib \ + -lqt-mt -lkdecore -lkdenetwork -O2 -pthread -DTQT_THREAD_SUPPORT \ -o test_kmime_codec{,.cpp} */ @@ -25,7 +25,7 @@ #include #include -#include // QByteArray +#include // TQByteArray using namespace KMime; using namespace std; @@ -72,7 +72,7 @@ void missingParameterTo( const char * option ) { usage(); } -static enum { Kio = 0, ChunkWise = 1, ConvenienceQBA = 3 } +static enum { Kio = 0, ChunkWise = 1, ConvenienceTQBA = 3 } pattern = ChunkWise; static int outbufsize = 4096; static int inbufsize = -1; // whole file @@ -143,7 +143,7 @@ int main( int argc, char * argv[] ) { else if ( !qstricmp( "chunkwise", optarg ) ) pattern = ChunkWise; else if ( !qstricmp( "convenience-qba", optarg ) ) - pattern = ConvenienceQBA; + pattern = ConvenienceTQBA; else { cerr << "Unknown usage pattern \"" << optarg << "\"" << endl; usage(); @@ -218,7 +218,7 @@ int main( int argc, char * argv[] ) { case Kio: encode_decode_kio( encode, codec, infile_buffer, outfile ); break; - case ConvenienceQBA: + case ConvenienceTQBA: encode_decode_convenience_qba( encode, codec, infile_buffer, outfile ); break; default: @@ -371,7 +371,7 @@ void encode_decode_chunkwise( bool encode, const Codec * codec, // uint offset = 0; while ( offset < infile_buffer.size() ) { - uint reallyRead = QMIN( indata.size(), infile_buffer.size() - offset ); + uint reallyRead = TQMIN( indata.size(), infile_buffer.size() - offset ); indata.duplicate( infile_buffer.begin() + offset, reallyRead ); offset += reallyRead; diff --git a/libkmime/tests/test_kmime_header_parsing.cpp b/libkmime/tests/test_kmime_header_parsing.cpp index 93c447ebd..7c93ec108 100644 --- a/libkmime/tests/test_kmime_header_parsing.cpp +++ b/libkmime/tests/test_kmime_header_parsing.cpp @@ -350,7 +350,7 @@ int main( int argc, char * argv[] ) { break; case 16: { // parameter - QPair result; + TQPair result; bool ok = parseParameter( iit, iend, result, withCRLF ); cout << ( ok ? "OK" : "BAD" ) << endl @@ -363,13 +363,13 @@ int main( int argc, char * argv[] ) { break; case 17: { // raw-parameter-list - TQMap result; + TQMap result; bool ok = parseRawParameterList( iit, iend, result, withCRLF ); cout << ( ok ? "OK" : "BAD" ) << endl << "result: " << result.count() << " raw parameters:" << endl; int i = 0; - for ( TQMap::ConstIterator + for ( TQMap::ConstIterator it = result.begin() ; it != result.end() ; ++it, ++i ) cout << "result[" << i << "].key() (attribute):\n" << it.key() << endl diff --git a/libkmime/tests/test_mdn.cpp b/libkmime/tests/test_mdn.cpp index fa9290f20..dd1702bb1 100644 --- a/libkmime/tests/test_mdn.cpp +++ b/libkmime/tests/test_mdn.cpp @@ -52,31 +52,31 @@ int main( int argc, char * argv[] ) { long_options, &option_index ); if ( c == -1 ) break; -#define EQUALS(x) !qstricmp( optarg, x ) +#define ETQUALS(x) !qstricmp( optarg, x ) switch ( c ) { case 'a': // --action-mode - if ( EQUALS( "manual-action" ) ) + if ( ETQUALS( "manual-action" ) ) actionMode = ManualAction; - else if ( EQUALS( "automatic-action" ) ) + else if ( ETQUALS( "automatic-action" ) ) actionMode = AutomaticAction; else usage( "unknown action mode!" ); break; case 'd': // --disposition-type - if ( EQUALS( "displayed" ) ) + if ( ETQUALS( "displayed" ) ) dispositionType = Displayed; - else if ( EQUALS( "deleted" ) ) + else if ( ETQUALS( "deleted" ) ) dispositionType = Deleted; - else if ( EQUALS( "dispatched" ) ) + else if ( ETQUALS( "dispatched" ) ) dispositionType = Dispatched; - else if ( EQUALS( "processed" ) ) + else if ( ETQUALS( "processed" ) ) dispositionType = Processed; - else if ( EQUALS( "denied" ) ) + else if ( ETQUALS( "denied" ) ) dispositionType = Denied; - else if ( EQUALS( "failed" ) ) + else if ( ETQUALS( "failed" ) ) dispositionType = Failed; else usage( "unknown disposition type!" ); @@ -97,15 +97,15 @@ int main( int argc, char * argv[] ) { break; case 'm': // --disposition-modifier - if ( EQUALS( "error" ) ) + if ( ETQUALS( "error" ) ) dispositionModifiers << Error; - else if ( EQUALS( "warning" ) ) + else if ( ETQUALS( "warning" ) ) dispositionModifiers << Warning; - else if ( EQUALS( "superseded" ) ) + else if ( ETQUALS( "superseded" ) ) dispositionModifiers << Superseded; - else if ( EQUALS( "expired" ) ) + else if ( ETQUALS( "expired" ) ) dispositionModifiers << Expired; - else if ( EQUALS( "mailbox-terminated" ) ) + else if ( ETQUALS( "mailbox-terminated" ) ) dispositionModifiers << MailboxTerminated; else usage( "unknwon disposition modifier!" ); @@ -119,9 +119,9 @@ int main( int argc, char * argv[] ) { break; case 's': // --sending-mode - if ( EQUALS( "MDN-sent-manually" ) ) + if ( ETQUALS( "MDN-sent-manually" ) ) sendingMode = SentManually; - else if ( EQUALS( "MDN-sent-automatically" ) ) + else if ( ETQUALS( "MDN-sent-automatically" ) ) sendingMode = SentAutomatically; else usage( "unknown sending mode" ); -- cgit v1.2.1