diff options
Diffstat (limited to 'kabc')
50 files changed, 184 insertions, 184 deletions
diff --git a/kabc/address.cpp b/kabc/address.cpp index 0787bcc4e..b653d168f 100644 --- a/kabc/address.cpp +++ b/kabc/address.cpp @@ -399,7 +399,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection, bool ret = false; // first check for brackets that have to be evaluated first - int fpos = result.find( KABC_FMTTAG_purgeempty, stpos ); + int fpos = result.tqfind( KABC_FMTTAG_purgeempty, stpos ); while ( -1 != fpos ) { int bpos1 = fpos + KABC_FMTTAG_purgeempty.length(); int bpos2; @@ -430,7 +430,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection, stpos = bpos1; } } - fpos = result.find( KABC_FMTTAG_purgeempty, stpos ); + fpos = result.tqfind( KABC_FMTTAG_purgeempty, stpos ); } // after sorting out all purge tags, we just search'n'replace the rest, @@ -438,7 +438,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection, // The following macro needs TQString for R_FIELD // It substitutes !_P_! for empty fields so conditional tags work later #define REPLTAG(R_TAG,R_FIELD) \ - if ( result.find(R_TAG, false) != -1 ) { \ + if ( result.tqfind(R_TAG, false) != -1 ) { \ TQString rpl = R_FIELD.isEmpty() ? TQString("!_P_!") : R_FIELD; \ result.replace( R_TAG, rpl ); \ if ( !R_FIELD.isEmpty() ) { \ @@ -461,7 +461,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection, #undef REPLTAG // conditional comma - fpos = result.find( KABC_FMTTAG_condcomma, 0 ); + fpos = result.tqfind( KABC_FMTTAG_condcomma, 0 ); while ( -1 != fpos ) { TQString str1 = result.mid( fpos - 5, 5 ); TQString str2 = result.mid( fpos + 2, 5 ); @@ -470,10 +470,10 @@ bool Address::parseAddressTemplateSection( const TQString &tsection, } else { result.remove( fpos, 2 ); } - fpos = result.find( KABC_FMTTAG_condcomma, fpos ); + fpos = result.tqfind( KABC_FMTTAG_condcomma, fpos ); } // conditional whitespace - fpos = result.find( KABC_FMTTAG_condwhite, 0 ); + fpos = result.tqfind( KABC_FMTTAG_condwhite, 0 ); while ( -1 != fpos ) { TQString str1 = result.mid( fpos - 5, 5 ); TQString str2 = result.mid( fpos + 2, 5 ); @@ -482,7 +482,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection, } else { result.remove( fpos, 2 ); } - fpos = result.find( KABC_FMTTAG_condwhite, fpos ); + fpos = result.tqfind( KABC_FMTTAG_condwhite, fpos ); } // remove purged: @@ -521,7 +521,7 @@ TQString Address::countryToISO( const TQString &cname ) return it.data(); TQString mapfile = KGlobal::dirs()->findResource( "data", - TQString::fromLatin1( "kabc/countrytransl.map" ) ); + TQString::tqfromLatin1( "kabc/countrytransl.map" ) ); TQFile file( mapfile ); if ( file.open( IO_ReadOnly ) ) { @@ -551,7 +551,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname ) return TQString::null; TQString mapfile = KGlobal::dirs()->findResource( "data", - TQString::fromLatin1( "kabc/countrytransl.map" ) ); + TQString::tqfromLatin1( "kabc/countrytransl.map" ) ); TQFile file( mapfile ); if ( file.open( IO_ReadOnly ) ) { @@ -560,7 +560,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname ) TQString strbuf = s.readLine(); int pos; while ( !strbuf.isEmpty() ) { - if ( (pos = strbuf.find( searchStr )) != -1 ) { + if ( (pos = strbuf.tqfind( searchStr )) != -1 ) { file.close(); return i18n( strbuf.left( pos ).utf8() ); } diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index bf6d0d17a..29bbd0f1f 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -527,7 +527,7 @@ void AddressBook::insertAddressee( const Addressee &a ) Addressee addr( a ); if ( !fAddr.isEmpty() ) { if ( fAddr != a ) - addr.setRevision( TQDateTime::currentDateTime() ); + addr.setRevision( TQDateTime::tqcurrentDateTime() ); else { if ( fAddr.resource() == 0 ) { fAddr.setResource( resource ); diff --git a/kabc/addressbook.h b/kabc/addressbook.h index 0da25b30e..7b973be28 100644 --- a/kabc/addressbook.h +++ b/kabc/addressbook.h @@ -40,7 +40,7 @@ class Ticket; This class provides access to a collection of address book entries. */ -class KABC_EXPORT AddressBook : public QObject +class KABC_EXPORT AddressBook : public TQObject { Q_OBJECT diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp index 829664179..fa15f4317 100644 --- a/kabc/addresseedialog.cpp +++ b/kabc/addresseedialog.cpp @@ -152,7 +152,7 @@ void AddresseeDialog::selectItem( const TQString &str ) { if ( str.isEmpty() ) return; - TQListViewItem *item = mItemDict.find( str ); + TQListViewItem *item = mItemDict.tqfind( str ); if ( item ) { mAddresseeList->blockSignals( true ); mAddresseeList->setSelected( item, true ); @@ -174,7 +174,7 @@ void AddresseeDialog::addSelected( TQListViewItem *item ) Addressee a = addrItem->addressee(); - TQListViewItem *selectedItem = mSelectedDict.find( a.uid() ); + TQListViewItem *selectedItem = mSelectedDict.tqfind( a.uid() ); if ( !selectedItem ) { selectedItem = new AddresseeItem( mSelectedList, a ); mSelectedDict.insert( a.uid(), selectedItem ); diff --git a/kabc/addresseedialog.h b/kabc/addresseedialog.h index 51dbc98b6..ebb4bbfcd 100644 --- a/kabc/addresseedialog.h +++ b/kabc/addresseedialog.h @@ -34,7 +34,7 @@ namespace KABC { /** @short Special ListViewItem, that is used by the AddresseeDialog. */ -class KABC_EXPORT AddresseeItem : public QListViewItem +class KABC_EXPORT AddresseeItem : public TQListViewItem { public: diff --git a/kabc/addresseehelper.cpp b/kabc/addresseehelper.cpp index df4085a02..2ca4a1b10 100644 --- a/kabc/addresseehelper.cpp +++ b/kabc/addresseehelper.cpp @@ -38,7 +38,7 @@ AddresseeHelper *AddresseeHelper::self() } AddresseeHelper::AddresseeHelper() - : TQObject( qApp ), + : TQObject( tqApp ), DCOPObject( "KABC::AddresseeHelper" ) { initSettings(); @@ -92,17 +92,17 @@ void AddresseeHelper::initSettings() bool AddresseeHelper::containsTitle( const TQString& title ) const { - return mTitles.find( title ) != mTitles.end(); + return mTitles.tqfind( title ) != mTitles.end(); } bool AddresseeHelper::containsPrefix( const TQString& prefix ) const { - return mPrefixes.find( prefix ) != mPrefixes.end(); + return mPrefixes.tqfind( prefix ) != mPrefixes.end(); } bool AddresseeHelper::containsSuffix( const TQString& suffix ) const { - return mSuffixes.find( suffix ) != mSuffixes.end(); + return mSuffixes.tqfind( suffix ) != mSuffixes.end(); } bool AddresseeHelper::tradeAsFamilyName() const diff --git a/kabc/addresseelist.cpp b/kabc/addresseelist.cpp index cb9446927..47324001c 100644 --- a/kabc/addresseelist.cpp +++ b/kabc/addresseelist.cpp @@ -208,7 +208,7 @@ void AddresseeList::sortByTrait() while( j1 != i2 ) { if ( !mReverseSorting && Trait::lt( *j2, *j1 ) || mReverseSorting && Trait::lt( *j1, *j2 ) ) { - qSwap( *j1, *j2 ); + tqSwap( *j1, *j2 ); } ++j1; ++j2; diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp index b048d9f96..9fb2e423a 100644 --- a/kabc/addresslineedit.cpp +++ b/kabc/addresslineedit.cpp @@ -219,13 +219,13 @@ void AddressLineEdit::insert(const TQString &t) KURL u(newText); newText = u.path(); } - else if (newText.find(" at ") != -1) + else if (newText.tqfind(" at ") != -1) { // Anti-spam stuff newText.replace( " at ", "@" ); newText.replace( " dot ", "." ); } - else if (newText.find("(at)") != -1) + else if (newText.tqfind("(at)") != -1) { newText.replace( TQRegExp("\\s*\\(at\\)\\s*"), "@" ); } @@ -343,7 +343,7 @@ void AddressLineEdit::doCompletion(bool ctrlT) items += s_completion->substringCompletion( '<' + s ); uint beforeDollarCompletionCount = items.count(); - if( s.find( ' ' ) == -1 ) // one word, possibly given name + if( s.tqfind( ' ' ) == -1 ) // one word, possibly given name items += s_completion->allMatches( "$$" + s ); if ( !items.isEmpty() ) @@ -355,7 +355,7 @@ void AddressLineEdit::doCompletion(bool ctrlT) it != items.end(); ++it ) { - int pos = (*it).find( '$', 2 ); + int pos = (*it).tqfind( '$', 2 ); if( pos < 0 ) // ??? continue; (*it)=(*it).mid( pos + 1 ); @@ -373,7 +373,7 @@ void AddressLineEdit::doCompletion(bool ctrlT) if (!autoSuggest) { - int index = items.first().find( s ); + int index = items.first().tqfind( s ); TQString newText = prevAddr + items.first().mid( index ); //kdDebug() << "OLD TEXT: " << text() << endl; //kdDebug() << "NEW TEXT: " << newText << endl; @@ -437,11 +437,11 @@ void AddressLineEdit::loadAddresses() void AddressLineEdit::addAddress( const TQString& adr ) { s_completion->addItem( adr ); - int pos = adr.find( '<' ); + int pos = adr.tqfind( '<' ); if( pos >= 0 ) { ++pos; - int pos2 = adr.find( pos, '>' ); + int pos2 = adr.tqfind( pos, '>' ); if( pos2 >= 0 ) s_completion->addItem( adr.mid( pos, pos2 - pos )); } @@ -484,8 +484,8 @@ void AddressLineEdit::slotLDAPSearchData( const TQStringList& adrs ) return; for( TQStringList::ConstIterator it = adrs.begin(); it != adrs.end(); ++it ) { TQString name(*it); - int pos = name.find( " <" ); - int pos_comma = name.find( ',' ); + int pos = name.tqfind( " <" ); + int pos_comma = name.tqfind( ',' ); // put name in quotes, if we have a comma in the name if (pos>0 && pos_comma>0 && pos_comma<pos) { name.insert(pos, '\"'); @@ -577,18 +577,18 @@ TQStringList AddressLineEdit::addresses() for ( mit = emails.begin(); mit != emails.end(); ++mit ) { email = *mit; if (!email.isEmpty()) { - if (n.isEmpty() || (email.find( '<' ) != -1)) + if (n.isEmpty() || (email.tqfind( '<' ) != -1)) addr = TQString::null; else { /* do we really need quotes around this name ? */ - if (n.find(needQuotes) != -1) + if (n.tqfind(needQuotes) != -1) addr = '"' + n + endQuote; else addr = n + space; } - if (!addr.isEmpty() && (email.find( '<' ) == -1) - && (email.find( '>' ) == -1) - && (email.find( ',' ) == -1)) + if (!addr.isEmpty() && (email.tqfind( '<' ) == -1) + && (email.tqfind( '>' ) == -1) + && (email.tqfind( ',' ) == -1)) addr += '<' + email + '>'; else addr += email; diff --git a/kabc/agent.cpp b/kabc/agent.cpp index d21fa2998..571b7803e 100644 --- a/kabc/agent.cpp +++ b/kabc/agent.cpp @@ -124,7 +124,7 @@ TQString Agent::asString() const TQDataStream &KABC::operator<<( TQDataStream &s, const Agent &agent ) { - Q_UINT32 hasAddressee = ( agent.mAddressee != 0 ); + TQ_UINT32 hasAddressee = ( agent.mAddressee != 0 ); s << agent.mIntern << agent.mUrl << hasAddressee; if ( hasAddressee ) @@ -135,7 +135,7 @@ TQDataStream &KABC::operator<<( TQDataStream &s, const Agent &agent ) TQDataStream &KABC::operator>>( TQDataStream &s, Agent &agent ) { - Q_UINT32 hasAddressee; + TQ_UINT32 hasAddressee; s >> agent.mIntern >> agent.mUrl >> hasAddressee; diff --git a/kabc/distributionlist.cpp b/kabc/distributionlist.cpp index ee2f2e30a..1802cb0a1 100644 --- a/kabc/distributionlist.cpp +++ b/kabc/distributionlist.cpp @@ -250,7 +250,7 @@ bool DistributionListManager::save() value.append( (*it).email ); } - if ( d->mMissingEntries.find( list->name() ) != d->mMissingEntries.end() ) { + if ( d->mMissingEntries.tqfind( list->name() ) != d->mMissingEntries.end() ) { const MissingEntryList missList = d->mMissingEntries[ list->name() ]; MissingEntryList::ConstIterator missIt; for ( missIt = missList.begin(); missIt != missList.end(); ++missIt ) { @@ -270,7 +270,7 @@ bool DistributionListManager::save() DistributionListWatcher* DistributionListWatcher::mSelf = 0; DistributionListWatcher::DistributionListWatcher() - : TQObject( qApp, "DistributionListWatcher" ) + : TQObject( tqApp, "DistributionListWatcher" ) { mDirWatch = new KDirWatch; mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) ); @@ -287,7 +287,7 @@ DistributionListWatcher::~DistributionListWatcher() DistributionListWatcher *DistributionListWatcher::self() { - kdWarning( !qApp ) << "No TQApplication object available, you'll get a memleak!" << endl; + kdWarning( !tqApp ) << "No TQApplication object available, you'll get a memleak!" << endl; if ( !mSelf ) mSelf = new DistributionListWatcher(); diff --git a/kabc/distributionlist.h b/kabc/distributionlist.h index 7ad8dff81..78d182467 100644 --- a/kabc/distributionlist.h +++ b/kabc/distributionlist.h @@ -186,7 +186,7 @@ class KABC_EXPORT DistributionListManager \endcode */ -class KABC_EXPORT DistributionListWatcher : public QObject +class KABC_EXPORT DistributionListWatcher : public TQObject { Q_OBJECT diff --git a/kabc/distributionlistdialog.h b/kabc/distributionlistdialog.h index f4cc143b5..1bd6fc788 100644 --- a/kabc/distributionlistdialog.h +++ b/kabc/distributionlistdialog.h @@ -98,7 +98,7 @@ class KABC_EXPORT EmailSelector : public KDialogBase /** @short Helper class */ -class KABC_EXPORT DistributionListEditorWidget : public QWidget +class KABC_EXPORT DistributionListEditorWidget : public TQWidget { Q_OBJECT diff --git a/kabc/distributionlisteditor.h b/kabc/distributionlisteditor.h index 310d83741..faec280e6 100644 --- a/kabc/distributionlisteditor.h +++ b/kabc/distributionlisteditor.h @@ -51,7 +51,7 @@ class KABC_EXPORT EmailSelectDialog : public KDialogBase /** @obsolete */ -class DistributionListEditor : public QWidget +class DistributionListEditor : public TQWidget { Q_OBJECT public: diff --git a/kabc/errorhandler.cpp b/kabc/errorhandler.cpp index 55b0f459d..d8ab650c7 100644 --- a/kabc/errorhandler.cpp +++ b/kabc/errorhandler.cpp @@ -50,6 +50,6 @@ GuiErrorHandler::GuiErrorHandler( TQWidget *parent ) void GuiErrorHandler::error( const TQString &msg ) { - if (qApp) + if (tqApp) KMessageBox::error( mParent, msg ); } 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; diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp index 9d8ea75ee..c83c29c38 100644 --- a/kabc/kab2kabc.cpp +++ b/kabc/kab2kabc.cpp @@ -180,7 +180,7 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a ) TQStringList::ConstIterator it; for ( it = entries.begin(); it != entries.end(); ++it ) { - int pos = (*it).find( "\n" ); + int pos = (*it).tqfind( "\n" ); TQString fieldName = (*it).left( pos ); TQString fieldValue = (*it).mid( pos + 2 ); @@ -325,7 +325,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet ) TQStringList::ConstIterator customIt; for ( customIt = entry.custom.begin(); customIt != entry.custom.end(); ++customIt ) { if ( (*customIt).startsWith( "X-KABC-UID:" ) ) { - a.setUid( (*customIt).mid( (*customIt).find( ":" ) + 1 ) ); + a.setUid( (*customIt).mid( (*customIt).tqfind( ":" ) + 1 ) ); idFound = true; } else if ( (*customIt).startsWith( "KMail:1.0\n" ) ) { readKAddressBookEntries( *customIt, a ); diff --git a/kabc/ldapclient.cpp b/kabc/ldapclient.cpp index 724f039ec..4f60dfa78 100644 --- a/kabc/ldapclient.cpp +++ b/kabc/ldapclient.cpp @@ -50,7 +50,7 @@ public: TQString LdapObject::toString() const { - TQString result = TQString::fromLatin1( "\ndn: %1\n" ).arg( dn ); + TQString result = TQString::tqfromLatin1( "\ndn: %1\n" ).arg( dn ); for ( LdapAttrMap::ConstIterator it = attrs.begin(); it != attrs.end(); ++it ) { TQString attr = it.key(); for ( LdapAttrValue::ConstIterator it2 = (*it).begin(); it2 != (*it).end(); ++it2 ) { @@ -306,11 +306,11 @@ void LdapSearch::startSearch( const TQString& txt ) cancelSearch(); - int pos = txt.find( '\"' ); + int pos = txt.tqfind( '\"' ); if( pos >= 0 ) { ++pos; - int pos2 = txt.find( '\"', pos ); + int pos2 = txt.tqfind( '\"', pos ); if( pos2 >= 0 ) mSearchText = txt.mid( pos , pos2 - pos ); else diff --git a/kabc/ldapclient.h b/kabc/ldapclient.h index b4ee9d749..2054b1302 100644 --- a/kabc/ldapclient.h +++ b/kabc/ldapclient.h @@ -82,7 +82,7 @@ class KABC_EXPORT LdapObject * We mean it! * */ -class KABC_EXPORT LdapClient : public QObject +class KABC_EXPORT LdapClient : public TQObject { Q_OBJECT @@ -204,7 +204,7 @@ typedef TQValueList<LdapResult> LdapResultList; * We mean it! * */ -class KABC_EXPORT LdapSearch : public QObject +class KABC_EXPORT LdapSearch : public TQObject { Q_OBJECT diff --git a/kabc/ldapconfigwidget.cpp b/kabc/ldapconfigwidget.cpp index a4b7fc571..671cac98f 100644 --- a/kabc/ldapconfigwidget.cpp +++ b/kabc/ldapconfigwidget.cpp @@ -129,7 +129,7 @@ void LdapConfigWidget::initWidget() if ( mFlags & W_PORT ) { label = new TQLabel( i18n( "Port:" ), this ); mPort = new TQSpinBox( 0, 65535, 1, this, "kcfg_ldapport" ); - mPort->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); + mPort->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); mPort->setValue( 389 ); mainLayout->addWidget( label, row, col ); @@ -140,7 +140,7 @@ void LdapConfigWidget::initWidget() if ( mFlags & W_VER ) { label = new TQLabel( i18n( "LDAP version:" ), this ); mVer = new TQSpinBox( 2, 3, 1, this, "kcfg_ldapver" ); - mVer->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); + mVer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); mVer->setValue( 3 ); mainLayout->addWidget( label, row, col ); mainLayout->addWidget( mVer, row, col+1 ); @@ -151,7 +151,7 @@ void LdapConfigWidget::initWidget() if ( mFlags & W_SIZELIMIT ) { label = new TQLabel( i18n( "Size limit:" ), this ); mSizeLimit = new TQSpinBox( 0, 9999999, 1, this, "kcfg_ldapsizelimit" ); - mSizeLimit->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); + mSizeLimit->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); mSizeLimit->setValue( 0 ); mSizeLimit->setSpecialValueText( i18n("Default") ); mainLayout->addWidget( label, row, col ); @@ -162,7 +162,7 @@ void LdapConfigWidget::initWidget() if ( mFlags & W_TIMELIMIT ) { label = new TQLabel( i18n( "Time limit:" ), this ); mTimeLimit = new TQSpinBox( 0, 9999999, 1, this, "kcfg_ldaptimelimit" ); - mTimeLimit->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); + mTimeLimit->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); mTimeLimit->setValue( 0 ); mTimeLimit->setSuffix( i18n(" sec") ); mTimeLimit->setSpecialValueText( i18n("Default") ); diff --git a/kabc/ldapconfigwidget.h b/kabc/ldapconfigwidget.h index 9f383b40f..aeba6572b 100644 --- a/kabc/ldapconfigwidget.h +++ b/kabc/ldapconfigwidget.h @@ -47,7 +47,7 @@ namespace KABC { It's KConfigXT compatible, using widget names starting with kcfg_ */ - class KABC_EXPORT LdapConfigWidget : public QWidget + class KABC_EXPORT LdapConfigWidget : public TQWidget { Q_OBJECT Q_PROPERTY( LCW_Flags flags READ flags WRITE setFlags ) diff --git a/kabc/ldapurl.cpp b/kabc/ldapurl.cpp index 9032c16d3..8315b1cfe 100644 --- a/kabc/ldapurl.cpp +++ b/kabc/ldapurl.cpp @@ -65,7 +65,7 @@ LDAPUrl::Extension LDAPUrl::extension( const TQString &key ) const { TQMap<TQString, Extension>::const_iterator it; - it = m_extensions.find( key ); + it = m_extensions.tqfind( key ); if ( it != m_extensions.constEnd() ) return (*it); else { diff --git a/kabc/ldif.cpp b/kabc/ldif.cpp index 19895fce5..27cf16cf1 100644 --- a/kabc/ldif.cpp +++ b/kabc/ldif.cpp @@ -112,7 +112,7 @@ bool LDIF::splitLine( const TQCString &line, TQString &fieldname, TQByteArray &v // kdDebug(5700) << "splitLine line: " << TQString::fromUtf8(line) << endl; - position = line.find( ":" ); + position = line.tqfind( ":" ); if ( position == -1 ) { // strange: we did not find a fieldname fieldname = ""; diff --git a/kabc/ldifconverter.cpp b/kabc/ldifconverter.cpp index 6f875cffb..a05076db3 100644 --- a/kabc/ldifconverter.cpp +++ b/kabc/ldifconverter.cpp @@ -175,7 +175,7 @@ bool LDIFConverter::LDIFToAddressee( const TQString &str, AddresseeList &addrLis LDIF ldif; LDIF::ParseVal ret; const char *latinstr = str.latin1(); - int latinstrlen = qstrlen( latinstr ); + int latinstrlen = tqstrlen( latinstr ); TQByteArray data; Addressee a; Address homeAddr, workAddr; @@ -183,7 +183,7 @@ bool LDIFConverter::LDIFToAddressee( const TQString &str, AddresseeList &addrLis data.setRawData( latinstr, latinstrlen ); ldif.setLDIF( data ); if (!dt.isValid()) - dt = TQDateTime::currentDateTime(); + dt = TQDateTime::tqcurrentDateTime(); a.setRevision(dt); homeAddr = Address( Address::Home ); workAddr = Address( Address::Work ); @@ -235,7 +235,7 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr, Address &workAddr, TQString &fieldname, TQString &value ) { - if ( fieldname == TQString::fromLatin1( "dn" ) ) // ignore & return false! + if ( fieldname == TQString::tqfromLatin1( "dn" ) ) // ignore & return false! return false; if ( fieldname.startsWith("#") ) { @@ -249,56 +249,56 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr, return true; } - if ( fieldname == TQString::fromLatin1( "givenname" ) ) { + if ( fieldname == TQString::tqfromLatin1( "givenname" ) ) { a.setGivenName( value ); return true; } - if ( fieldname == TQString::fromLatin1( "xmozillanickname") || - fieldname == TQString::fromLatin1( "nickname") ) { + if ( fieldname == TQString::tqfromLatin1( "xmozillanickname") || + fieldname == TQString::tqfromLatin1( "nickname") ) { a.setNickName( value ); return true; } - if ( fieldname == TQString::fromLatin1( "sn" ) ) { + if ( fieldname == TQString::tqfromLatin1( "sn" ) ) { a.setFamilyName( value ); return true; } - if ( fieldname == TQString::fromLatin1( "uid" ) ) { + if ( fieldname == TQString::tqfromLatin1( "uid" ) ) { a.setUid( value ); return true; } - if ( fieldname == TQString::fromLatin1( "mail" ) || - fieldname == TQString::fromLatin1( "mozillasecondemail" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "mail" ) || + fieldname == TQString::tqfromLatin1( "mozillasecondemail" ) ) { // mozilla if ( a.emails().findIndex( value ) == -1 ) a.insertEmail( value ); return true; } - if ( fieldname == TQString::fromLatin1( "title" ) ) { + if ( fieldname == TQString::tqfromLatin1( "title" ) ) { a.setTitle( value ); return true; } - if ( fieldname == TQString::fromLatin1( "vocation" ) ) { + if ( fieldname == TQString::tqfromLatin1( "vocation" ) ) { a.setPrefix( value ); return true; } - if ( fieldname == TQString::fromLatin1( "cn" ) ) { + if ( fieldname == TQString::tqfromLatin1( "cn" ) ) { a.setFormattedName( value ); return true; } - if ( fieldname == TQString::fromLatin1( "o" ) || - fieldname == TQString::fromLatin1( "organization" ) || // Exchange - fieldname == TQString::fromLatin1( "organizationname" ) ) { // Exchange + if ( fieldname == TQString::tqfromLatin1( "o" ) || + fieldname == TQString::tqfromLatin1( "organization" ) || // Exchange + fieldname == TQString::tqfromLatin1( "organizationname" ) ) { // Exchange a.setOrganization( value ); return true; } - if ( fieldname == TQString::fromLatin1( "description" ) ) { + if ( fieldname == TQString::tqfromLatin1( "description" ) ) { addComment: if ( !a.note().isEmpty() ) a.setNote( a.note() + "\n" ); @@ -306,15 +306,15 @@ addComment: return true; } - if ( fieldname == TQString::fromLatin1( "custom1" ) || - fieldname == TQString::fromLatin1( "custom2" ) || - fieldname == TQString::fromLatin1( "custom3" ) || - fieldname == TQString::fromLatin1( "custom4" ) ) { + if ( fieldname == TQString::tqfromLatin1( "custom1" ) || + fieldname == TQString::tqfromLatin1( "custom2" ) || + fieldname == TQString::tqfromLatin1( "custom3" ) || + fieldname == TQString::tqfromLatin1( "custom4" ) ) { goto addComment; } - if ( fieldname == TQString::fromLatin1( "homeurl" ) || - fieldname == TQString::fromLatin1( "workurl" ) ) { + if ( fieldname == TQString::tqfromLatin1( "homeurl" ) || + fieldname == TQString::tqfromLatin1( "workurl" ) ) { if (a.url().isEmpty()) { a.setUrl( KURL( value ) ); return true; @@ -325,139 +325,139 @@ addComment: // TODO: change this with KDE 4 } - if ( fieldname == TQString::fromLatin1( "homephone" ) ) { + if ( fieldname == TQString::tqfromLatin1( "homephone" ) ) { a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Home ) ); return true; } - if ( fieldname == TQString::fromLatin1( "telephonenumber" ) ) { + if ( fieldname == TQString::tqfromLatin1( "telephonenumber" ) ) { a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) ); return true; } - if ( fieldname == TQString::fromLatin1( "mobile" ) ) { // mozilla/Netscape 7 + if ( fieldname == TQString::tqfromLatin1( "mobile" ) ) { // mozilla/Netscape 7 a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) ); return true; } - if ( fieldname == TQString::fromLatin1( "cellphone" ) ) { + if ( fieldname == TQString::tqfromLatin1( "cellphone" ) ) { a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) ); return true; } - if ( fieldname == TQString::fromLatin1( "pager" ) || // mozilla - fieldname == TQString::fromLatin1( "pagerphone" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "pager" ) || // mozilla + fieldname == TQString::tqfromLatin1( "pagerphone" ) ) { // mozilla a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Pager ) ); return true; } - if ( fieldname == TQString::fromLatin1( "facsimiletelephonenumber" ) ) { + if ( fieldname == TQString::tqfromLatin1( "facsimiletelephonenumber" ) ) { a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Fax ) ); return true; } - if ( fieldname == TQString::fromLatin1( "xmozillaanyphone" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "xmozillaanyphone" ) ) { // mozilla a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) ); return true; } - if ( fieldname == TQString::fromLatin1( "street" ) || - fieldname == TQString::fromLatin1( "streethomeaddress" ) ) { + if ( fieldname == TQString::tqfromLatin1( "street" ) || + fieldname == TQString::tqfromLatin1( "streethomeaddress" ) ) { homeAddr.setStreet( value ); return true; } - if ( fieldname == TQString::fromLatin1( "postaladdress" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "postaladdress" ) ) { // mozilla workAddr.setStreet( value ); return true; } - if ( fieldname == TQString::fromLatin1( "mozillapostaladdress2" ) ) { // mozilla - workAddr.setStreet( workAddr.street() + TQString::fromLatin1( "\n" ) + value ); + if ( fieldname == TQString::tqfromLatin1( "mozillapostaladdress2" ) ) { // mozilla + workAddr.setStreet( workAddr.street() + TQString::tqfromLatin1( "\n" ) + value ); return true; } - if ( fieldname == TQString::fromLatin1( "postalcode" ) ) { + if ( fieldname == TQString::tqfromLatin1( "postalcode" ) ) { workAddr.setPostalCode( value ); return true; } - if ( fieldname == TQString::fromLatin1( "postofficebox" ) ) { + if ( fieldname == TQString::tqfromLatin1( "postofficebox" ) ) { workAddr.setPostOfficeBox( value ); return true; } - if ( fieldname == TQString::fromLatin1( "homepostaladdress" ) ) { // Netscape 7 + if ( fieldname == TQString::tqfromLatin1( "homepostaladdress" ) ) { // Netscape 7 homeAddr.setStreet( value ); return true; } - if ( fieldname == TQString::fromLatin1( "mozillahomepostaladdress2" ) ) { // mozilla - homeAddr.setStreet( homeAddr.street() + TQString::fromLatin1( "\n" ) + value ); + if ( fieldname == TQString::tqfromLatin1( "mozillahomepostaladdress2" ) ) { // mozilla + homeAddr.setStreet( homeAddr.street() + TQString::tqfromLatin1( "\n" ) + value ); return true; } - if ( fieldname == TQString::fromLatin1( "mozillahomelocalityname" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "mozillahomelocalityname" ) ) { // mozilla homeAddr.setLocality( value ); return true; } - if ( fieldname == TQString::fromLatin1( "mozillahomestate" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "mozillahomestate" ) ) { // mozilla homeAddr.setRegion( value ); return true; } - if ( fieldname == TQString::fromLatin1( "mozillahomepostalcode" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "mozillahomepostalcode" ) ) { // mozilla homeAddr.setPostalCode( value ); return true; } - if ( fieldname == TQString::fromLatin1( "mozillahomecountryname" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "mozillahomecountryname" ) ) { // mozilla if ( value.length() <= 2 ) value = Address::ISOtoCountry(value); homeAddr.setCountry( value ); return true; } - if ( fieldname == TQString::fromLatin1( "locality" ) ) { + if ( fieldname == TQString::tqfromLatin1( "locality" ) ) { workAddr.setLocality( value ); return true; } - if ( fieldname == TQString::fromLatin1( "streetaddress" ) ) { // Netscape 4.x + if ( fieldname == TQString::tqfromLatin1( "streetaddress" ) ) { // Netscape 4.x workAddr.setStreet( value ); return true; } - if ( fieldname == TQString::fromLatin1( "countryname" ) || - fieldname == TQString::fromLatin1( "c" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "countryname" ) || + fieldname == TQString::tqfromLatin1( "c" ) ) { // mozilla if ( value.length() <= 2 ) value = Address::ISOtoCountry(value); workAddr.setCountry( value ); return true; } - if ( fieldname == TQString::fromLatin1( "l" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "l" ) ) { // mozilla workAddr.setLocality( value ); return true; } - if ( fieldname == TQString::fromLatin1( "st" ) ) { + if ( fieldname == TQString::tqfromLatin1( "st" ) ) { workAddr.setRegion( value ); return true; } - if ( fieldname == TQString::fromLatin1( "ou" ) ) { + if ( fieldname == TQString::tqfromLatin1( "ou" ) ) { a.setRole( value ); return true; } - if ( fieldname == TQString::fromLatin1( "department" ) ) { + if ( fieldname == TQString::tqfromLatin1( "department" ) ) { a.setDepartment( value ); return true; } - if ( fieldname == TQString::fromLatin1( "member" ) ) { + if ( fieldname == TQString::tqfromLatin1( "member" ) ) { // this is a mozilla list member (cn=xxx, mail=yyy) TQStringList list( TQStringList::split( ',', value ) ); TQString name, email; @@ -476,8 +476,8 @@ addComment: return true; } - if ( fieldname == TQString::fromLatin1( "modifytimestamp" ) ) { - if (value == TQString::fromLatin1("0Z")) // ignore + if ( fieldname == TQString::tqfromLatin1( "modifytimestamp" ) ) { + if (value == TQString::tqfromLatin1("0Z")) // ignore return true; TQDateTime dt = VCardStringToDate( value ); if ( dt.isValid() ) { @@ -486,7 +486,7 @@ addComment: } } - if ( fieldname == TQString::fromLatin1( "objectclass" ) ) // ignore + if ( fieldname == TQString::tqfromLatin1( "objectclass" ) ) // ignore return true; kdWarning() << TQString("LDIFConverter: Unknown field for '%1': '%2=%3'\n") @@ -528,7 +528,7 @@ TQString LDIFConverter::makeLDIFfieldString( TQString formatStr, TQString value, return TQString(); // append format if not given - if (formatStr.find(':') == -1) + if (formatStr.tqfind(':') == -1) formatStr.append(": %1\n"); // check if base64-encoding is needed @@ -543,12 +543,12 @@ TQString LDIFConverter::makeLDIFfieldString( TQString formatStr, TQString value, } if (printable) // always encode if we find special chars... - printable = (value.find('\n') == -1); + printable = (value.tqfind('\n') == -1); if (!printable && allowEncode) { // encode to base64 value = KCodecs::base64Encode( value.utf8() ); - int p = formatStr.find(':'); + int p = formatStr.tqfind(':'); if (p>=0) formatStr.insert(p, ':'); } diff --git a/kabc/ldifconverter.h b/kabc/ldifconverter.h index a8052a65f..a2225ad2d 100644 --- a/kabc/ldifconverter.h +++ b/kabc/ldifconverter.h @@ -44,7 +44,7 @@ namespace KABC { * @param dt The date & time value of the last modification (e.g. file modification time). * @since 3.2 */ - KABC_EXPORT bool LDIFToAddressee( const TQString &str, AddresseeList &addrList, TQDateTime dt = TQDateTime::currentDateTime() ); + KABC_EXPORT bool LDIFToAddressee( const TQString &str, AddresseeList &addrList, TQDateTime dt = TQDateTime::tqcurrentDateTime() ); /** * Converts a list of addressees to a LDIF string. diff --git a/kabc/lock.h b/kabc/lock.h index 95f5c87a3..b682ea9e2 100644 --- a/kabc/lock.h +++ b/kabc/lock.h @@ -32,7 +32,7 @@ namespace KABC { This class provides locking functionality for a file, directory or an arbitrary string-represented resource. */ -class KABC_EXPORT Lock : public QObject +class KABC_EXPORT Lock : public TQObject { Q_OBJECT public: diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/kabc/plugins/ldapkio/resourceldapkio.cpp index df0baf455..0a12ea34f 100644 --- a/kabc/plugins/ldapkio/resourceldapkio.cpp +++ b/kabc/plugins/ldapkio/resourceldapkio.cpp @@ -125,7 +125,7 @@ void ResourceLDAPKIO::enter_loop() TQWidget dummy(0,0,WType_Dialog | WShowModal); dummy.setFocusPolicy( TQWidget::NoFocus ); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); } @@ -154,7 +154,7 @@ void ResourceLDAPKIO::listResult( KIO::Job *job) mErrorMsg = job->errorString(); else mErrorMsg = ""; - qApp->exit_loop(); + tqApp->exit_loop(); } TQString ResourceLDAPKIO::findUid( const TQString &uid ) @@ -766,7 +766,7 @@ void ResourceLDAPKIO::syncLoadSaveResult( KIO::Job *job ) mErrorMsg = ""; activateCache(); - qApp->exit_loop(); + tqApp->exit_loop(); } void ResourceLDAPKIO::saveResult( KIO::Job *job ) diff --git a/kabc/plugins/sql/resourcesql.cpp b/kabc/plugins/sql/resourcesql.cpp index 55f02bae7..7dae03d22 100644 --- a/kabc/plugins/sql/resourcesql.cpp +++ b/kabc/plugins/sql/resourcesql.cpp @@ -317,8 +317,8 @@ bool ResourceSql::save( Ticket * ) TQStringList list = (*it).customs(); TQStringList::ConstIterator it; for( it = list.begin(); it != list.end(); ++it ) { - int dashPos = (*it).find( '-' ); - int colonPos = (*it).find( ':' ); + int dashPos = (*it).tqfind( '-' ); + int colonPos = (*it).tqfind( ':' ); TQString app = (*it).left( dashPos ); TQString name = (*it).mid( dashPos + 1, colonPos - dashPos - 1 ); TQString value = (*it).right( (*it).length() - colonPos - 1 ); diff --git a/kabc/plugins/sql/resourcesqlconfig.cpp b/kabc/plugins/sql/resourcesqlconfig.cpp index ef1651cde..403f8a6d0 100644 --- a/kabc/plugins/sql/resourcesqlconfig.cpp +++ b/kabc/plugins/sql/resourcesqlconfig.cpp @@ -60,7 +60,7 @@ ResourceSqlConfig::ResourceSqlConfig( TQWidget* parent, const char* name ) label = new TQLabel( i18n( "Port:" ), this ); TQVBox *box = new TQVBox(this); mPort = new TQSpinBox(0, 65535, 1, box ); - mPort->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); + mPort->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); mPort->setValue(389); new TQWidget(box, "dummy"); diff --git a/kabc/resource.cpp b/kabc/resource.cpp index d43c68320..9807d53a3 100644 --- a/kabc/resource.cpp +++ b/kabc/resource.cpp @@ -268,7 +268,7 @@ void Resource::removeAddressee( const Addressee &addr ) Addressee Resource::findByUid( const TQString &uid ) { - Addressee::Map::ConstIterator it = mAddrMap.find( uid ); + Addressee::Map::ConstIterator it = mAddrMap.tqfind( uid ); if ( it != mAddrMap.end() ) return it.data(); diff --git a/kabc/scripts/addressee.src.cpp b/kabc/scripts/addressee.src.cpp index 36c449f19..11384e456 100644 --- a/kabc/scripts/addressee.src.cpp +++ b/kabc/scripts/addressee.src.cpp @@ -225,7 +225,7 @@ void Addressee::setNameFromString( const TQString &s ) TQString emptyStr = ""; AddresseeHelper *helper = AddresseeHelper::self(); - int i = str.find( ',' ); + int i = str.tqfind( ',' ); if( i < 0 ) { TQStringList parts = TQStringList::split( spaceStr, str ); int leftOffset = 0; @@ -398,7 +398,7 @@ TQString Addressee::fullEmail( const TQString &email ) const text = e; else { TQRegExp needQuotes( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" ); - if ( realName().find( needQuotes ) != -1 ) { + if ( realName().tqfind( needQuotes ) != -1 ) { TQString name = realName(); name.replace( "\"", "\\\"" ); text = "\"" + name + "\" <" + e + ">"; @@ -417,7 +417,7 @@ void Addressee::insertEmail( const TQString &email, bool preferred ) detach(); mData->empty = false; - TQStringList::Iterator it = mData->emails.find( email ); + TQStringList::Iterator it = mData->emails.tqfind( email ); if ( it != mData->emails.end() ) { if ( !preferred || it == mData->emails.begin() ) return; @@ -436,7 +436,7 @@ void Addressee::removeEmail( const TQString &email ) { detach(); - TQStringList::Iterator it = mData->emails.find( email ); + TQStringList::Iterator it = mData->emails.tqfind( email ); if ( it == mData->emails.end() ) return; mData->emails.remove( it ); @@ -764,7 +764,7 @@ void Addressee::removeCategory( const TQString &c ) { detach(); - TQStringList::Iterator it = mData->categories.find( c ); + TQStringList::Iterator it = mData->categories.tqfind( c ); if ( it == mData->categories.end() ) return; mData->categories.remove( it ); @@ -832,7 +832,7 @@ TQString Addressee::custom( const TQString &app, const TQString &name ) const TQStringList::ConstIterator it; for( it = mData->custom.constBegin(); it != mData->custom.constEnd(); ++it ) { if ( (*it).startsWith( qualifiedName ) ) { - value = (*it).mid( (*it).find( ":" ) + 1 ); + value = (*it).mid( (*it).tqfind( ":" ) + 1 ); break; } } @@ -1104,7 +1104,7 @@ bool listEquals( const TQValueList<L> &list, const TQValueList<L> &pattern ) return false; for ( uint i = 0; i < list.count(); ++i ) - if ( pattern.find( list[ i ] ) == pattern.end() ) + if ( pattern.tqfind( list[ i ] ) == pattern.end() ) return false; return true; @@ -1120,7 +1120,7 @@ bool emailsEquals( const TQStringList &list, const TQStringList &pattern ) TQStringList::ConstIterator it; for ( it = list.begin(); it != list.end(); ++it ) - if ( pattern.find( *it ) == pattern.end() ) + if ( pattern.tqfind( *it ) == pattern.end() ) return false; return true; diff --git a/kabc/tests/testldapclient.h b/kabc/tests/testldapclient.h index ea1293b51..1995914c3 100644 --- a/kabc/tests/testldapclient.h +++ b/kabc/tests/testldapclient.h @@ -24,7 +24,7 @@ #include "../ldapclient.h" typedef KABC::LdapClient LdapClient; -class TestLDAPClient : public QObject +class TestLDAPClient : public TQObject { Q_OBJECT diff --git a/kabc/tests/testlock.h b/kabc/tests/testlock.h index 92244cd30..a94d4e8c6 100644 --- a/kabc/tests/testlock.h +++ b/kabc/tests/testlock.h @@ -28,7 +28,7 @@ class TQLabel; class TQListView; -class KABC_EXPORT LockWidget : public QWidget +class KABC_EXPORT LockWidget : public TQWidget { Q_OBJECT public: diff --git a/kabc/vcard/AdrParam.cpp b/kabc/vcard/AdrParam.cpp index 5ad56f4fb..899912553 100644 --- a/kabc/vcard/AdrParam.cpp +++ b/kabc/vcard/AdrParam.cpp @@ -80,7 +80,7 @@ AdrParam::operator == (AdrParam & x) TQStrListIterator it(x.adrTypeList_); for (; it.current(); ++it) - if (!adrTypeList_.find(it.current())) + if (!adrTypeList_.tqfind(it.current())) return false; return true; diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp index 52bcdf4f5..31151be9f 100644 --- a/kabc/vcard/ContentLine.cpp +++ b/kabc/vcard/ContentLine.cpp @@ -122,7 +122,7 @@ ContentLine::operator == (ContentLine & x) TQPtrListIterator<Param> it(x.paramList()); - if (!paramList_.find(it.current())) + if (!paramList_.tqfind(it.current())) return false; return true; @@ -142,7 +142,7 @@ ContentLine::_parse() // Unqote newlines strRep_ = strRep_.replace( TQRegExp( "\\\\n" ), "\n" ); - int split = strRep_.find(':'); + int split = strRep_.tqfind(':'); if (split == -1) { // invalid content line vDebug("No ':'"); @@ -152,7 +152,7 @@ ContentLine::_parse() TQCString firstPart(strRep_.left(split)); TQCString valuePart(strRep_.mid(split + 1)); - split = firstPart.find('.'); + split = firstPart.tqfind('.'); if (split != -1) { group_ = firstPart.left(split); @@ -193,7 +193,7 @@ ContentLine::_parse() TQCString str = *it; - split = str.find("="); + split = str.tqfind("="); if (split < 0 ) { vDebug("No '=' in parameter."); continue; diff --git a/kabc/vcard/DateValue.cpp b/kabc/vcard/DateValue.cpp index aedfe5eba..0311ac2e2 100644 --- a/kabc/vcard/DateValue.cpp +++ b/kabc/vcard/DateValue.cpp @@ -152,7 +152,7 @@ DateValue::_parse() // time = time-hour [":"] time-minute [":"] time-second [":"] // [time-secfrac] [time-zone] - int timeSep = strRep_.find('T'); + int timeSep = strRep_.tqfind('T'); TQCString dateStr; TQCString timeStr; @@ -192,7 +192,7 @@ DateValue::_parse() /////////////////////////////////////////////////////////////// ZONE - int zoneSep = timeStr.find('Z'); + int zoneSep = timeStr.tqfind('Z'); if (zoneSep != -1 && timeStr.length() - zoneSep > 3) { diff --git a/kabc/vcard/GeoValue.cpp b/kabc/vcard/GeoValue.cpp index 2bac28c1e..3021bbdb1 100644 --- a/kabc/vcard/GeoValue.cpp +++ b/kabc/vcard/GeoValue.cpp @@ -84,7 +84,7 @@ GeoValue::clone() void GeoValue::_parse() { - int semiColon = strRep_.find( ";" ); + int semiColon = strRep_.tqfind( ";" ); if ( semiColon == -1 ) // invalid return; diff --git a/kabc/vcard/RToken.cpp b/kabc/vcard/RToken.cpp index b0e251a87..582a9e1c7 100644 --- a/kabc/vcard/RToken.cpp +++ b/kabc/vcard/RToken.cpp @@ -30,7 +30,7 @@ namespace VCARD { - Q_UINT32 + TQ_UINT32 RTokenise(const char * str, const char * delim, TQStrList & l) { // FIXME no stderr ! diff --git a/kabc/vcard/SourceParam.cpp b/kabc/vcard/SourceParam.cpp index d66d87498..7041acd9e 100644 --- a/kabc/vcard/SourceParam.cpp +++ b/kabc/vcard/SourceParam.cpp @@ -80,7 +80,7 @@ SourceParam::~SourceParam() void SourceParam::_parse() { - int i = strRep_.find('='); + int i = strRep_.tqfind('='); if (i == -1) // Invalid return; diff --git a/kabc/vcard/URIValue.cpp b/kabc/vcard/URIValue.cpp index 98f75cb8e..ea598c5f5 100644 --- a/kabc/vcard/URIValue.cpp +++ b/kabc/vcard/URIValue.cpp @@ -89,7 +89,7 @@ URIValue::~URIValue() void URIValue::_parse() { - int split = strRep_.find(':'); + int split = strRep_.tqfind(':'); if (split == -1) return; diff --git a/kabc/vcard/UTCValue.cpp b/kabc/vcard/UTCValue.cpp index 30473661f..445af4fd7 100644 --- a/kabc/vcard/UTCValue.cpp +++ b/kabc/vcard/UTCValue.cpp @@ -93,7 +93,7 @@ UTCValue::_parse() positive_ = ( strRep_[0] == '+' ); - int colon = strRep_.find( ':' ); + int colon = strRep_.tqfind( ':' ); if ( colon == -1 ) // Not valid. return; diff --git a/kabc/vcard/VCard.cpp b/kabc/vcard/VCard.cpp index 50c25da59..c63e978d4 100644 --- a/kabc/vcard/VCard.cpp +++ b/kabc/vcard/VCard.cpp @@ -113,7 +113,7 @@ VCard::_parse() /////////////////////////////////////////////////////////////// // FIRST LINE - int split = beginLine.find(':'); + int split = beginLine.tqfind(':'); if (split == -1) { // invalid, no BEGIN vDebug("No split"); @@ -123,7 +123,7 @@ VCard::_parse() TQCString firstPart(beginLine.left(split)); TQCString valuePart(beginLine.mid(split + 1)); - split = firstPart.find('.'); + split = firstPart.tqfind('.'); if (split != -1) { group_ = firstPart.left(split); @@ -188,7 +188,7 @@ VCard::_parse() /////////////////////////////////////////////////////////////// // LAST LINE - split = endLine.find(':'); + split = endLine.tqfind(':'); if (split == -1) // invalid, no END return; @@ -196,7 +196,7 @@ VCard::_parse() firstPart = endLine.left(split); valuePart = endLine.right(firstPart.length() - split - 1); - split = firstPart.find('.'); + split = firstPart.tqfind('.'); if (split != -1) { group_ = firstPart.left(split); diff --git a/kabc/vcard/VCardEntity.cpp b/kabc/vcard/VCardEntity.cpp index 1f8cea5b1..4c987bffe 100644 --- a/kabc/vcard/VCardEntity.cpp +++ b/kabc/vcard/VCardEntity.cpp @@ -76,11 +76,11 @@ VCardEntity::_parse() vDebug("parse"); TQCString s(strRep_); - int i = s.find(TQRegExp("BEGIN:VCARD", false)); + int i = s.tqfind(TQRegExp("BEGIN:VCARD", false)); while (i != -1) { - i = s.find(TQRegExp("BEGIN:VCARD", false), 11); + i = s.tqfind(TQRegExp("BEGIN:VCARD", false), 11); TQCString cardStr(s.left(i)); diff --git a/kabc/vcard/include/VCardRToken.h b/kabc/vcard/include/VCardRToken.h index 0ea380267..5122ef55c 100644 --- a/kabc/vcard/include/VCardRToken.h +++ b/kabc/vcard/include/VCardRToken.h @@ -32,7 +32,7 @@ namespace VCARD { -KVCARD_EXPORT Q_UINT32 RTokenise(const char * str, const char * delim, TQStrList & l); +KVCARD_EXPORT TQ_UINT32 RTokenise(const char * str, const char * delim, TQStrList & l); } diff --git a/kabc/vcard21parser.cpp b/kabc/vcard21parser.cpp index d7354539b..94ad3b723 100644 --- a/kabc/vcard21parser.cpp +++ b/kabc/vcard21parser.cpp @@ -430,7 +430,7 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const TQString& vc, int *err ) } // split into two tokens - int colon = (*j).find( ':' ); + int colon = (*j).tqfind( ':' ); if ( colon < 0 ) { _err = VC_ERR_INVALID_LINE; break; diff --git a/kabc/vcardformatimpl.cpp b/kabc/vcardformatimpl.cpp index 38d95294c..ae70c434d 100644 --- a/kabc/vcardformatimpl.cpp +++ b/kabc/vcardformatimpl.cpp @@ -123,7 +123,7 @@ bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCARD::VCard &v ) TQCString n = cl->name(); if ( n.left( 2 ) == "X-" ) { n = n.mid( 2 ); - int posDash = n.find( "-" ); + int posDash = n.tqfind( "-" ); addressee.insertCustom( TQString::fromUtf8( n.left( posDash ) ), TQString::fromUtf8( n.mid( posDash + 1 ) ), TQString::fromUtf8( cl->value()->asString() ) ); @@ -351,8 +351,8 @@ void VCardFormatImpl::addCustomValue( VCARD::VCard *v, const TQString &txt ) if ( txt.isEmpty() ) return; ContentLine cl; - cl.setName( "X-" + txt.left( txt.find( ":" ) ).utf8() ); - TQString value = txt.mid( txt.find( ":" ) + 1 ); + cl.setName( "X-" + txt.left( txt.tqfind( ":" ) ).utf8() ); + TQString value = txt.mid( txt.tqfind( ":" ) + 1 ); if ( value.isEmpty() ) return; cl.setValue( new TextValue( value.utf8() ) ); diff --git a/kabc/vcardparser/testwrite.cpp b/kabc/vcardparser/testwrite.cpp index f6e894f4b..f24f1ad25 100644 --- a/kabc/vcardparser/testwrite.cpp +++ b/kabc/vcardparser/testwrite.cpp @@ -60,7 +60,7 @@ int main( int argc, char **argv ) addressee.setOrganization( "KDE" ); addressee.setNote( "nerver\ntouch a running system" ); addressee.setProductId( "testId" ); - addressee.setRevision( TQDateTime::currentDateTime() ); + addressee.setRevision( TQDateTime::tqcurrentDateTime() ); addressee.setSortString( "koenig" ); addressee.setUrl( KURL( "http://wgess16.dyndns.org") ); addressee.setSecrecy( KABC::Secrecy( KABC::Secrecy::Confidential ) ); diff --git a/kabc/vcardparser/vcard.cpp b/kabc/vcardparser/vcard.cpp index 30a8e1c49..8b6c9570a 100644 --- a/kabc/vcardparser/vcard.cpp +++ b/kabc/vcardparser/vcard.cpp @@ -62,7 +62,7 @@ void VCard::addLine( const VCardLine& line ) VCardLine::List VCard::lines( const TQString& identifier ) const { - LineMap::ConstIterator it = mLineMap.find( identifier ); + LineMap::ConstIterator it = mLineMap.tqfind( identifier ); if ( it == mLineMap.end() ) return VCardLine::List(); @@ -71,7 +71,7 @@ VCardLine::List VCard::lines( const TQString& identifier ) const VCardLine VCard::line( const TQString& identifier ) const { - LineMap::ConstIterator it = mLineMap.find( identifier ); + LineMap::ConstIterator it = mLineMap.tqfind( identifier ); if ( it == mLineMap.end() ) return VCardLine(); @@ -97,7 +97,7 @@ void VCard::setVersion( Version version ) VCard::Version VCard::version() const { - LineMap::ConstIterator versionEntry = mLineMap.find( "VERSION" ); + LineMap::ConstIterator versionEntry = mLineMap.tqfind( "VERSION" ); if ( versionEntry == mLineMap.end() ) return v3_0; diff --git a/kabc/vcardparser/vcardline.cpp b/kabc/vcardparser/vcardline.cpp index 6680cf7d0..dc43056cd 100644 --- a/kabc/vcardparser/vcardline.cpp +++ b/kabc/vcardparser/vcardline.cpp @@ -130,7 +130,7 @@ void VCardLine::addParameter( const TQString& param, const TQString& value ) TQStringList VCardLine::parameters( const TQString& param ) const { - ParamMap::ConstIterator it = mParamMap.find( param ); + ParamMap::ConstIterator it = mParamMap.tqfind( param ); if ( it == mParamMap.end() ) return TQStringList(); else @@ -139,7 +139,7 @@ TQStringList VCardLine::parameters( const TQString& param ) const TQString VCardLine::parameter( const TQString& param ) const { - ParamMap::ConstIterator it = mParamMap.find( param ); + ParamMap::ConstIterator it = mParamMap.tqfind( param ); if ( it == mParamMap.end() ) return TQString::null; else { diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp index 67b1bc306..5fe6b3154 100644 --- a/kabc/vcardparser/vcardparser.cpp +++ b/kabc/vcardparser/vcardparser.cpp @@ -81,7 +81,7 @@ VCard::List VCardParser::parseVCards( const TQString& text ) continue; } else { if ( inVCard && !currentLine.isEmpty() ) { // now parse the line - int colon = currentLine.find( ':' ); + int colon = currentLine.tqfind( ':' ); if ( colon == -1 ) { // invalid line currentLine = (*it); continue; @@ -94,7 +94,7 @@ VCard::List VCardParser::parseVCards( const TQString& text ) TQStringList params = TQStringList::split( ';', key ); // check for group - if ( params[0].find( '.' ) != -1 ) { + if ( params[0].tqfind( '.' ) != -1 ) { const TQStringList groupList = TQStringList::split( '.', params[0] ); vCardLine.setGroup( groupList[0] ); vCardLine.setIdentifier( groupList[1] ); @@ -118,7 +118,7 @@ VCard::List VCardParser::parseVCards( const TQString& text ) } } // This is pretty much a faster pair[1].contains( ',' )... - if ( pair[1].find( ',' ) != -1 ) { // parameter in type=x,y,z format + if ( pair[1].tqfind( ',' ) != -1 ) { // parameter in type=x,y,z format const TQStringList args = TQStringList::split( ',', pair[ 1 ] ); TQStringList::ConstIterator argIt; for ( argIt = args.begin(); argIt != args.end(); ++argIt ) diff --git a/kabc/vcardtool.cpp b/kabc/vcardtool.cpp index 6e8dc9acc..4e08915d7 100644 --- a/kabc/vcardtool.cpp +++ b/kabc/vcardtool.cpp @@ -335,8 +335,8 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version ) // X- const TQStringList customs = (*addrIt).customs(); for ( strIt = customs.begin(); strIt != customs.end(); ++strIt ) { - TQString identifier = "X-" + (*strIt).left( (*strIt).find( ":" ) ); - TQString value = (*strIt).mid( (*strIt).find( ":" ) + 1 ); + TQString identifier = "X-" + (*strIt).left( (*strIt).tqfind( ":" ) ); + TQString value = (*strIt).mid( (*strIt).tqfind( ":" ) + 1 ); if ( value.isEmpty() ) continue; @@ -594,7 +594,7 @@ Addressee::List VCardTool::parseVCards( const TQString& vcard ) // X- else if ( identifier.startsWith( "x-" ) ) { const TQString key = (*lineIt).identifier().mid( 2 ); - int dash = key.find( "-" ); + int dash = key.tqfind( "-" ); addr.insertCustom( key.left( dash ), key.mid( dash + 1 ), (*lineIt).value().asString() ); } } @@ -610,11 +610,11 @@ TQDateTime VCardTool::parseDateTime( const TQString &str ) { TQDateTime dateTime; - if ( str.find( '-' ) == -1 ) { // is base format (yyyymmdd) + if ( str.tqfind( '-' ) == -1 ) { // is base format (yyyymmdd) dateTime.setDate( TQDate( str.left( 4 ).toInt(), str.mid( 4, 2 ).toInt(), str.mid( 6, 2 ).toInt() ) ); - if ( str.find( 'T' ) ) // has time information yyyymmddThh:mm:ss + if ( str.tqfind( 'T' ) ) // has time information yyyymmddThh:mm:ss dateTime.setTime( TQTime( str.mid( 11, 2 ).toInt(), str.mid( 14, 2 ).toInt(), str.mid( 17, 2 ).toInt() ) ); @@ -622,7 +622,7 @@ TQDateTime VCardTool::parseDateTime( const TQString &str ) dateTime.setDate( TQDate( str.left( 4 ).toInt(), str.mid( 5, 2 ).toInt(), str.mid( 8, 2 ).toInt() ) ); - if ( str.find( 'T' ) ) // has time information yyyy-mm-ddThh:mm:ss + if ( str.tqfind( 'T' ) ) // has time information yyyy-mm-ddThh:mm:ss dateTime.setTime( TQTime( str.mid( 11, 2 ).toInt(), str.mid( 14, 2 ).toInt(), str.mid( 17, 2 ).toInt() ) ); } @@ -866,7 +866,7 @@ TQStringList VCardTool::splitString( const TQChar &sep, const TQString &str ) TQString value( str ); int start = 0; - int pos = value.find( sep, start ); + int pos = value.tqfind( sep, start ); while ( pos != -1 ) { if ( value[ pos - 1 ] != '\\' ) { @@ -876,13 +876,13 @@ TQStringList VCardTool::splitString( const TQChar &sep, const TQString &str ) list << TQString::null; start = pos + 1; - pos = value.find( sep, start ); + pos = value.tqfind( sep, start ); } else { if ( pos != 0 ) { value.replace( pos - 1, 2, sep ); - pos = value.find( sep, pos ); + pos = value.tqfind( sep, pos ); } else - pos = value.find( sep, pos + 1 ); + pos = value.tqfind( sep, pos + 1 ); } } |