diff options
Diffstat (limited to 'kabc')
-rw-r--r-- | kabc/ldapclient.cpp | 4 | ||||
-rw-r--r-- | kabc/plugins/evolution/dbwrapper.cpp | 2 | ||||
-rw-r--r-- | kabc/plugins/evolution/resourceevo.cpp | 2 | ||||
-rw-r--r-- | kabc/tests/testaddressfmt.cpp | 16 | ||||
-rw-r--r-- | kabc/vcard/ClassValue.cpp | 6 | ||||
-rw-r--r-- | kabc/vcard/EmailParam.cpp | 4 | ||||
-rw-r--r-- | kabc/vcard/SourceParam.cpp | 6 | ||||
-rw-r--r-- | kabc/vcard/VCard.cpp | 8 | ||||
-rw-r--r-- | kabc/vcard21parser.cpp | 4 | ||||
-rw-r--r-- | kabc/vcardconverter.h | 2 | ||||
-rw-r--r-- | kabc/vcardparser/testread.cpp | 2 |
11 files changed, 28 insertions, 28 deletions
diff --git a/kabc/ldapclient.cpp b/kabc/ldapclient.cpp index 724f039ec..39e4c504f 100644 --- a/kabc/ldapclient.cpp +++ b/kabc/ldapclient.cpp @@ -167,7 +167,7 @@ void LdapClient::slotData( KIO::Job*, const TQByteArray& data ) void LdapClient::slotInfoMessage( KIO::Job*, const TQString & ) { - //qDebug("Job said \"%s\"", info.latin1()); + //tqDebug("Job said \"%s\"", info.latin1()); } void LdapClient::slotDone() @@ -176,7 +176,7 @@ void LdapClient::slotDone() mActive = false; #if 0 for ( TQValueList<LdapObject>::Iterator it = mObjects.begin(); it != mObjects.end(); ++it ) { - qDebug( (*it).toString().latin1() ); + tqDebug( (*it).toString().latin1() ); } #endif int err = mJob->error(); diff --git a/kabc/plugins/evolution/dbwrapper.cpp b/kabc/plugins/evolution/dbwrapper.cpp index bcc641191..fbdff165a 100644 --- a/kabc/plugins/evolution/dbwrapper.cpp +++ b/kabc/plugins/evolution/dbwrapper.cpp @@ -157,7 +157,7 @@ bool DBWrapper::find( const TQString& _key, TQString& _val ) { int ret = data->db->get(data->db, NULL, &key, &val, 0 ); if (!ret) { _val = TQString::fromUtf8( (char*)val.data, val.size ); - qWarning("key: %s val: %sXXX", (char*)key.data, (char*)val.data ); + tqWarning("key: %s val: %sXXX", (char*)key.data, (char*)val.data ); return true; } return false; diff --git a/kabc/plugins/evolution/resourceevo.cpp b/kabc/plugins/evolution/resourceevo.cpp index a93d7d2a1..9a44b2adb 100644 --- a/kabc/plugins/evolution/resourceevo.cpp +++ b/kabc/plugins/evolution/resourceevo.cpp @@ -86,7 +86,7 @@ bool ResourceEvolution::load() { if ( it.key().startsWith("PAS-DB-VERSION") ) continue; - qWarning( "val:%s", it.value().latin1() ); + tqWarning( "val:%s", it.value().latin1() ); VCardTool tool; TQString str = it.value().stripWhiteSpace(); Addressee::List list = tool.parseVCards( str ); diff --git a/kabc/tests/testaddressfmt.cpp b/kabc/tests/testaddressfmt.cpp index f422ab692..19b2e8306 100644 --- a/kabc/tests/testaddressfmt.cpp +++ b/kabc/tests/testaddressfmt.cpp @@ -50,14 +50,14 @@ int main(int argc,char **argv) d.setLocality("Lummerstadt"); d.setCountry (""); - qDebug( "-------------------------------------\nShould have german address formatting, local country formatting\n" ); - qDebug( a.formattedAddress("Jim Knopf").latin1() ); - qDebug( "-------------------------------------\nShould have US address formatting, local country formatting\n" ); - qDebug( b.formattedAddress("Huck Finn").latin1() ); - qDebug( "-------------------------------------\nShould have german address formatting, local country formatting\n" ); - qDebug( c.formattedAddress("Jim Knopf").latin1() ); - qDebug( "-------------------------------------\nShould have local address formatting, local country formatting\n" ); - qDebug( d.formattedAddress("Jim Knopf").latin1() ); + tqDebug( "-------------------------------------\nShould have german address formatting, local country formatting\n" ); + tqDebug( a.formattedAddress("Jim Knopf").latin1() ); + tqDebug( "-------------------------------------\nShould have US address formatting, local country formatting\n" ); + tqDebug( b.formattedAddress("Huck Finn").latin1() ); + tqDebug( "-------------------------------------\nShould have german address formatting, local country formatting\n" ); + tqDebug( c.formattedAddress("Jim Knopf").latin1() ); + tqDebug( "-------------------------------------\nShould have local address formatting, local country formatting\n" ); + tqDebug( d.formattedAddress("Jim Knopf").latin1() ); } diff --git a/kabc/vcard/ClassValue.cpp b/kabc/vcard/ClassValue.cpp index 3dd65aecd..21417f87b 100644 --- a/kabc/vcard/ClassValue.cpp +++ b/kabc/vcard/ClassValue.cpp @@ -84,13 +84,13 @@ ClassValue::clone() void ClassValue::_parse() { - if (qstricmp(strRep_, "PUBLIC") == 0) + if (tqstricmp(strRep_, "PUBLIC") == 0) classType_ = Public; - else if (qstricmp(strRep_, "PRIVATE") == 0) + else if (tqstricmp(strRep_, "PRIVATE") == 0) classType_ = Private; - else if (qstricmp(strRep_, "CONFIDENTIAL") == 0) + else if (tqstricmp(strRep_, "CONFIDENTIAL") == 0) classType_ = Confidential; else classType_ = Other; diff --git a/kabc/vcard/EmailParam.cpp b/kabc/vcard/EmailParam.cpp index 9027494ad..7daf19ccc 100644 --- a/kabc/vcard/EmailParam.cpp +++ b/kabc/vcard/EmailParam.cpp @@ -92,12 +92,12 @@ EmailParam::_parse() for (; it.current(); ++it) { - if (qstricmp(it.current()->name(), "TYPE") == 0) { + if (tqstricmp(it.current()->name(), "TYPE") == 0) { emailType_ = it.current()->value(); continue; } - if (qstricmp(it.current()->name(), "PREF") == 0) { + if (tqstricmp(it.current()->name(), "PREF") == 0) { pref_ = true; } } diff --git a/kabc/vcard/SourceParam.cpp b/kabc/vcard/SourceParam.cpp index d66d87498..6a0e772ac 100644 --- a/kabc/vcard/SourceParam.cpp +++ b/kabc/vcard/SourceParam.cpp @@ -87,11 +87,11 @@ SourceParam::_parse() par_ = strRep_.left(i); val_ = strRep_.right(strRep_.length() - i - 1); - if (qstricmp(par_, "VALUE") == 0 && qstricmp(val_, "uri") == 0) + if (tqstricmp(par_, "VALUE") == 0 && tqstricmp(val_, "uri") == 0) type_ = TypeValue; - else if (qstricmp(par_, "CONTEXT") == 0 && qstricmp(val_, "word") == 0) + else if (tqstricmp(par_, "CONTEXT") == 0 && tqstricmp(val_, "word") == 0) type_ = TypeContext; - else if (qstrnicmp(par_, "X-", 2) == 0) { + else if (tqstrnicmp(par_, "X-", 2) == 0) { type_ = TypeX; } else type_ = TypeUnknown; diff --git a/kabc/vcard/VCard.cpp b/kabc/vcard/VCard.cpp index 50c25da59..eb3f57f6e 100644 --- a/kabc/vcard/VCard.cpp +++ b/kabc/vcard/VCard.cpp @@ -130,12 +130,12 @@ VCard::_parse() firstPart = firstPart.right(firstPart.length() - split - 1); } - if (qstrnicmp(firstPart, "BEGIN", 5) != 0) { // No BEGIN ! + if (tqstrnicmp(firstPart, "BEGIN", 5) != 0) { // No BEGIN ! vDebug("No BEGIN"); return; } - if (qstrnicmp(valuePart, "VCARD", 5) != 0) { // Not a vcard ! + if (tqstrnicmp(valuePart, "VCARD", 5) != 0) { // Not a vcard ! vDebug("No VCARD"); return; } @@ -203,10 +203,10 @@ VCard::_parse() firstPart = firstPart.right(firstPart.length() - split - 1); } - if (qstricmp(firstPart, "END") != 0) // No END ! + if (tqstricmp(firstPart, "END") != 0) // No END ! return; - if (qstricmp(valuePart, "VCARD") != 0) // Not a vcard ! + if (tqstricmp(valuePart, "VCARD") != 0) // Not a vcard ! return; } diff --git a/kabc/vcard21parser.cpp b/kabc/vcard21parser.cpp index 566553261..8a3bfcaea 100644 --- a/kabc/vcard21parser.cpp +++ b/kabc/vcard21parser.cpp @@ -416,7 +416,7 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const TQString& vc, int *err ) // first token: // verify state, update if necessary if ( _state & VC_STATE_BEGIN) { - if ( !qstricmp( (*j).latin1(), VCARD_BEGIN ) ) { + if ( !tqstricmp( (*j).latin1(), VCARD_BEGIN ) ) { _state = VC_STATE_BODY; continue; } else { @@ -424,7 +424,7 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const TQString& vc, int *err ) break; } } else if ( _state & VC_STATE_BODY ) { - if ( !qstricmp( (*j).latin1(), VCARD_END ) ) { + if ( !tqstricmp( (*j).latin1(), VCARD_END ) ) { _state |= VC_STATE_END; break; } diff --git a/kabc/vcardconverter.h b/kabc/vcardconverter.h index dbc45f27a..ab09279f2 100644 --- a/kabc/vcardconverter.h +++ b/kabc/vcardconverter.h @@ -46,7 +46,7 @@ namespace KABC { Addressee::List list = converter.parseVCards( data ); // print formatted name of first contact - qDebug( "name=%s", list[ 0 ].formattedName().latin1() ); + tqDebug( "name=%s", list[ 0 ].formattedName().latin1() ); \endcode */ diff --git a/kabc/vcardparser/testread.cpp b/kabc/vcardparser/testread.cpp index bad2ceb78..7dd8692fc 100644 --- a/kabc/vcardparser/testread.cpp +++ b/kabc/vcardparser/testread.cpp @@ -63,7 +63,7 @@ int main( int argc, char **argv ) TQFile file( inputFile ); if ( !file.open( IO_ReadOnly ) ) { - qDebug( "Unable to open file '%s' for reading!", file.name().latin1() ); + tqDebug( "Unable to open file '%s' for reading!", file.name().latin1() ); return 1; } |