From 17e2ed52dbf8fac39a04331da02b9572e9e2e304 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:35:40 -0600 Subject: Rename additional global TQt functions --- certmanager/certificateinfowidgetimpl.cpp | 2 +- certmanager/certificatewizardimpl.cpp | 2 +- certmanager/certmanager.cpp | 10 ++++----- .../lib/backends/chiasmus/chiasmusbackend.cpp | 12 +++++----- certmanager/lib/backends/qgpgme/qgpgmebackend.cpp | 10 ++++----- certmanager/lib/kleo/cryptobackendfactory.cpp | 6 ++--- certmanager/lib/kleo/cryptobackendfactory.h | 2 +- certmanager/lib/tests/test.data | 26 +++++++++++----------- certmanager/lib/ui/backendconfigwidget.cpp | 8 +++---- certmanager/lib/ui/kdhorizontalline.cpp | 2 +- 10 files changed, 40 insertions(+), 40 deletions(-) (limited to 'certmanager') diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp index 3a6c3200..74b476c8 100644 --- a/certmanager/certificateinfowidgetimpl.cpp +++ b/certmanager/certificateinfowidgetimpl.cpp @@ -207,7 +207,7 @@ void CertificateInfoWidgetImpl::startCertificateChainListing() { return; } const char * fpr = mChain.front().primaryFingerprint(); - if ( qstricmp( fpr, chainID ) == 0 ) { + if ( tqstricmp( fpr, chainID ) == 0 ) { kdDebug() << "CertificateInfoWidgetImpl::startCertificateChainListing(): chain_id equals fingerprint -> found root" << endl; return; } diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index d0545159..c8aab315 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -182,7 +182,7 @@ CertificateWizardImpl::~CertificateWizardImpl() static const char * oidForAttributeName( const TQString & attr ) { TQCString attrUtf8 = attr.utf8(); for ( unsigned int i = 0 ; i < numOidMaps ; ++i ) - if ( qstricmp( attrUtf8, oidmap[i].name ) == 0 ) + if ( tqstricmp( attrUtf8, oidmap[i].name ) == 0 ) return oidmap[i].oid; return 0; } diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index fdf33f3a..2fd144d4 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -641,7 +641,7 @@ void CertManager::newCertificate() */ void CertManager::revokeCertificate() { - qDebug("Not Yet Implemented"); + tqDebug("Not Yet Implemented"); } /** @@ -650,7 +650,7 @@ void CertManager::revokeCertificate() */ void CertManager::extendCertificate() { - qDebug("Not Yet Implemented"); + tqDebug("Not Yet Implemented"); } @@ -971,7 +971,7 @@ void CertManager::slotStderr( KProcess*, char* buf, int len ) { */ void CertManager::importCRLFromLDAP() { - qDebug("Not Yet Implemented"); + tqDebug("Not Yet Implemented"); } void CertManager::slotViewCRLs() { @@ -1008,11 +1008,11 @@ static void showDeleteError( TQWidget * parent, const GpgME::Error & err ) { } static bool ByFingerprint( const GpgME::Key & left, const GpgME::Key & right ) { - return qstricmp( left.primaryFingerprint(), right.primaryFingerprint() ) < 0 ; + return tqstricmp( left.primaryFingerprint(), right.primaryFingerprint() ) < 0 ; } static bool WithRespectToFingerprints( const GpgME::Key & left, const GpgME::Key & right ) { - return qstricmp( left.primaryFingerprint(), right.primaryFingerprint() ) == 0; + return tqstricmp( left.primaryFingerprint(), right.primaryFingerprint() ) == 0; } void CertManager::slotDeleteCertificate() { diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index e47909e2..b3e75140 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp @@ -378,11 +378,11 @@ public: RefreshKeysJob * refreshKeysJob() const { return 0; } SpecialJob * specialJob( const char * type, const TQMap & args ) const { - if ( qstricmp( type, "x-obtain-keys" ) == 0 && args.size() == 0 ) + if ( tqstricmp( type, "x-obtain-keys" ) == 0 && args.size() == 0 ) return new ObtainKeysJob(); - if ( qstricmp( type, "x-encrypt" ) == 0 && args.size() == 0 ) + if ( tqstricmp( type, "x-encrypt" ) == 0 && args.size() == 0 ) return new ChiasmusJob( ChiasmusJob::Encrypt ); - if ( qstricmp( type, "x-decrypt" ) == 0 && args.size() == 0 ) + if ( tqstricmp( type, "x-decrypt" ) == 0 && args.size() == 0 ) return new ChiasmusJob( ChiasmusJob::Decrypt ); kdDebug(5150) << "ChiasmusBackend::Protocol: tried to instantiate unknown job type \"" << type << "\"" << endl; @@ -422,7 +422,7 @@ Kleo::CryptoConfig * Kleo::ChiasmusBackend::config() const { } Kleo::CryptoBackend::Protocol * Kleo::ChiasmusBackend::protocol( const char * name ) const { - if ( qstricmp( name, "Chiasmus" ) != 0 ) + if ( tqstricmp( name, "Chiasmus" ) != 0 ) return 0; if ( !mProtocol ) if ( checkForChiasmus() ) @@ -464,7 +464,7 @@ bool Kleo::ChiasmusBackend::checkForChiasmus( TQString * reason ) const { } bool Kleo::ChiasmusBackend::checkForProtocol( const char * name, TQString * reason ) const { - if ( qstricmp( name, "Chiasmus" ) == 0 ) + if ( tqstricmp( name, "Chiasmus" ) == 0 ) return checkForChiasmus( reason ); if ( reason ) *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name ); @@ -472,7 +472,7 @@ bool Kleo::ChiasmusBackend::checkForProtocol( const char * name, TQString * reas } bool Kleo::ChiasmusBackend::supportsProtocol( const char * name ) const { - return qstricmp( name, "Chiasmus" ) == 0; + return tqstricmp( name, "Chiasmus" ) == 0; } const char * Kleo::ChiasmusBackend::enumerateProtocols( int i ) const { diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp index 27680585..3cd30c63 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp @@ -109,9 +109,9 @@ bool Kleo::QGpgMEBackend::checkForSMIME( TQString * reason ) const { } bool Kleo::QGpgMEBackend::checkForProtocol( const char * name, TQString * reason ) const { - if ( qstricmp( name, OpenPGP ) == 0 ) + if ( tqstricmp( name, OpenPGP ) == 0 ) return check( GpgME::Context::OpenPGP, reason ); - if ( qstricmp( name, SMIME ) == 0 ) + if ( tqstricmp( name, SMIME ) == 0 ) return check( GpgME::Context::CMS, reason ); if ( reason ) *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name ); @@ -133,15 +133,15 @@ Kleo::CryptoBackend::Protocol * Kleo::QGpgMEBackend::smime() const { } Kleo::CryptoBackend::Protocol * Kleo::QGpgMEBackend::protocol( const char * name ) const { - if ( qstricmp( name, OpenPGP ) == 0 ) + if ( tqstricmp( name, OpenPGP ) == 0 ) return openpgp(); - if ( qstricmp( name, SMIME ) == 0 ) + if ( tqstricmp( name, SMIME ) == 0 ) return smime(); return 0; } bool Kleo::QGpgMEBackend::supportsProtocol( const char * name ) const { - return qstricmp( name, OpenPGP ) == 0 || qstricmp( name, SMIME ) == 0; + return tqstricmp( name, OpenPGP ) == 0 || tqstricmp( name, SMIME ) == 0; } const char * Kleo::QGpgMEBackend::enumerateProtocols( int i ) const { diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp index 0d3cb1e9..295c05c6 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.cpp +++ b/certmanager/lib/kleo/cryptobackendfactory.cpp @@ -211,7 +211,7 @@ static const char * defaultBackend( const char * proto ) { { "Chiasmus", "chiasmus" }, }; for ( unsigned int i = 0 ; i < sizeof defaults / sizeof *defaults ; ++i ) - if ( qstricmp( proto, defaults[i].proto ) == 0 ) + if ( tqstricmp( proto, defaults[i].proto ) == 0 ) return defaults[i].backend; return 0; } @@ -238,10 +238,10 @@ namespace { CaseInsensitiveString( const char * s ) : m( s ) {} #define make_operator( op ) \ bool operator op( const CaseInsensitiveString & other ) const { \ - return qstricmp( m, other.m ) op 0; \ + return tqstricmp( m, other.m ) op 0; \ } \ bool operator op( const char * other ) const { \ - return qstricmp( m, other ) op 0; \ + return tqstricmp( m, other ) op 0; \ } make_operator( == ) make_operator( != ) diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h index e674de11..da1743f9 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.h +++ b/certmanager/lib/kleo/cryptobackendfactory.h @@ -52,7 +52,7 @@ namespace Kleo { struct lt_i_str { bool operator()( const char * one, const char * two ) const { - return qstricmp( one, two ) < 0; + return tqstricmp( one, two ) < 0; } }; diff --git a/certmanager/lib/tests/test.data b/certmanager/lib/tests/test.data index b4bce1a9..a4109fbd 100644 --- a/certmanager/lib/tests/test.data +++ b/certmanager/lib/tests/test.data @@ -124,7 +124,7 @@ static int inquire( void * void_ctx, const char * keyword ) { return gpg_error( GPG_ERR_NOT_IMPLEMENTED ); if ( const gpg_error_t err = assuan_send_data( ctx, it->second.c_str(), it->second.size() ) ) { - qDebug( "assuan_write_data: %s", gpg_strerror( err ) ); + tqDebug( "assuan_write_data: %s", gpg_strerror( err ) ); return err; } @@ -196,7 +196,7 @@ int main( int argc, char * argv[] ) { assuan_context_t ctx = 0; if ( const gpg_error_t err = assuan_socket_connect_ext( &ctx, socket, -1, 1 ) ) { - qDebug( "%s", assuan_exception( err, "assuan_socket_connect_ext" ).what() ); + tqDebug( "%s", assuan_exception( err, "assuan_socket_connect_ext" ).what() ); return 1; } @@ -204,12 +204,12 @@ int main( int argc, char * argv[] ) { for ( std::vector::const_iterator it = inFDs.begin(), end = inFDs.end() ; it != end ; ++it ) { if ( const gpg_error_t err = assuan_sendfd( ctx, *it ) ) { - qDebug( "%s", assuan_exception( err, "assuan_sendfd( inFD )" ).what() ); + tqDebug( "%s", assuan_exception( err, "assuan_sendfd( inFD )" ).what() ); return 1; } if ( const gpg_error_t err = assuan_transact( ctx, "INPUT FD", 0, 0, 0, 0, 0, 0 ) ) { - qDebug( "%s", assuan_exception( err, "INPUT FD" ).what() ); + tqDebug( "%s", assuan_exception( err, "INPUT FD" ).what() ); return 1; } } @@ -220,7 +220,7 @@ int main( int argc, char * argv[] ) { sprintf( buffer, "INPUT FILE=%s", hexencode( *it ).c_str() ); if ( const gpg_error_t err = assuan_transact( ctx, buffer, 0, 0, 0, 0, 0, 0 ) ) { - qDebug( "%s", assuan_exception( err, buffer ).what() ); + tqDebug( "%s", assuan_exception( err, buffer ).what() ); return 1; } } @@ -228,12 +228,12 @@ int main( int argc, char * argv[] ) { for ( std::vector::const_iterator it = msgFDs.begin(), end = msgFDs.end() ; it != end ; ++it ) { if ( const gpg_error_t err = assuan_sendfd( ctx, *it ) ) { - qDebug( "%s", assuan_exception( err, "assuan_sendfd( msgFD )" ).what() ); + tqDebug( "%s", assuan_exception( err, "assuan_sendfd( msgFD )" ).what() ); return 1; } if ( const gpg_error_t err = assuan_transact( ctx, "MESSAGE FD", 0, 0, 0, 0, 0, 0 ) ) { - qDebug( "%s", assuan_exception( err, "MESSAGE FD" ).what() ); + tqDebug( "%s", assuan_exception( err, "MESSAGE FD" ).what() ); return 1; } } @@ -244,7 +244,7 @@ int main( int argc, char * argv[] ) { sprintf( buffer, "MESSAGE FILE=%s", hexencode( *it ).c_str() ); if ( const gpg_error_t err = assuan_transact( ctx, buffer, 0, 0, 0, 0, 0, 0 ) ) { - qDebug( "%s", assuan_exception( err, buffer ).what() ); + tqDebug( "%s", assuan_exception( err, buffer ).what() ); return 1; } } @@ -252,12 +252,12 @@ int main( int argc, char * argv[] ) { for ( std::vector::const_iterator it = outFDs.begin(), end = outFDs.end() ; it != end ; ++it ) { if ( const gpg_error_t err = assuan_sendfd( ctx, *it ) ) { - qDebug( "%s", assuan_exception( err, "assuan_sendfd( outFD )" ).what() ); + tqDebug( "%s", assuan_exception( err, "assuan_sendfd( outFD )" ).what() ); return 1; } if ( const gpg_error_t err = assuan_transact( ctx, "OUTPUT FD", 0, 0, 0, 0, 0, 0 ) ) { - qDebug( "%s", assuan_exception( err, "OUTPUT FD" ).what() ); + tqDebug( "%s", assuan_exception( err, "OUTPUT FD" ).what() ); return 1; } } @@ -268,7 +268,7 @@ int main( int argc, char * argv[] ) { sprintf( buffer, "OUTPUT FILE=%s", hexencode( *it ).c_str() ); if ( const gpg_error_t err = assuan_transact( ctx, buffer, 0, 0, 0, 0, 0, 0 ) ) { - qDebug( "%s", assuan_exception( err, buffer ).what() ); + tqDebug( "%s", assuan_exception( err, buffer ).what() ); return 1; } } @@ -279,13 +279,13 @@ int main( int argc, char * argv[] ) { std::string line = "OPTION "; line += opt; if ( const gpg_error_t err = assuan_transact( ctx, line.c_str(), 0, 0, 0, 0, 0, 0 ) ) { - qDebug( "%s", assuan_exception( err, line ).what() ); + tqDebug( "%s", assuan_exception( err, line ).what() ); return 1; } } if ( const gpg_error_t err = assuan_transact( ctx, command.c_str(), data, ctx, inquire, ctx, status, ctx ) ) { - qDebug( "%s", assuan_exception( err, command ).what() ); + tqDebug( "%s", assuan_exception( err, command ).what() ); return 1; } diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index 33582e29..47ca25d4 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -142,8 +142,8 @@ private: // Helper for the constructor. static TQString itemText( const char * protocolName, const CryptoBackend::Protocol* protocol ) { // First one is the generic name (find a nice one for OpenPGP, SMIME) - const TQString protoName = qstricmp( protocolName, "openpgp" ) != 0 - ? qstricmp( protocolName, "smime" ) != 0 + const TQString protoName = tqstricmp( protocolName, "openpgp" ) != 0 + ? tqstricmp( protocolName, "smime" ) != 0 ? TQString::fromLatin1( protocolName ) : i18n( "S/MIME" ) : i18n( "OpenPGP" ); @@ -174,7 +174,7 @@ const Kleo::CryptoBackend* Kleo::BackendListView::chosenBackend( const char * pr for ( TQListViewItemIterator it( this /*, TQListViewItemIterator::Checked doesn't work*/ ) ; it.current() ; ++it ) if ( ProtocolCheckListItem * p = lvi_cast( it.current() ) ) - if ( p->isOn() && qstricmp( p->protocolName(), protocolName ) == 0 ) { + if ( p->isOn() && tqstricmp( p->protocolName(), protocolName ) == 0 ) { // OK that's the one. Now go up to the parent backend // (need to do that in the listview since Protocol doesn't know it) if ( const BackendListViewItem * parItem = lvi_cast( it.current()->parent() ) ) @@ -189,7 +189,7 @@ void Kleo::BackendListView::deselectAll( const char * protocolName, TQCheckListI it.current() ; ++it ) { if ( it.current() == except ) continue; if ( ProtocolCheckListItem * p = lvi_cast( it.current() ) ) - if ( p->isOn() && qstricmp( p->protocolName(), protocolName ) == 0 ) + if ( p->isOn() && tqstricmp( p->protocolName(), protocolName ) == 0 ) p->setOn( false ); } } diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp index a053c992..118b6b10 100644 --- a/certmanager/lib/ui/kdhorizontalline.cpp +++ b/certmanager/lib/ui/kdhorizontalline.cpp @@ -94,7 +94,7 @@ void KDHorizontalLine::calculateFrame() { break; mLenVisible--; } - qDebug( "mLenVisible = %d (of %d)", mLenVisible, mTitle.length() ); + tqDebug( "mLenVisible = %d (of %d)", mLenVisible, mTitle.length() ); if ( mLenVisible ) { // but do we also have a visible label? TQRect r = rect(); const int va = style().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); -- cgit v1.2.3