From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- korn/account_input.cpp | 2 +- korn/account_input.h | 2 +- korn/boxcontaineritem.cpp | 24 ++--- korn/boxcontaineritem.h | 2 +- korn/dcopdrop.cpp | 8 +- korn/dcopdrop.h | 2 +- korn/dockeditem.h | 2 +- korn/imap_proto.cpp | 10 +- korn/imap_proto.h | 2 +- korn/kconf_update/korn-3-4-config_change.cpp | 4 +- korn/kio.cpp | 12 +-- korn/kio_count.cpp | 4 +- korn/kio_count.h | 2 +- korn/kio_proto.cpp | 2 +- korn/kornaccountcfg.ui | 12 +-- korn/kornaccountcfgimpl.cpp | 18 ++-- korn/kornaccountcfgimpl.h | 2 +- korn/kornboxcfg.ui | 134 +++++++++++++-------------- korn/korncfg.ui | 4 +- korn/korncfgimpl.cpp | 12 +-- korn/kornshell.cpp | 10 +- korn/maildir_proto.h | 2 +- korn/maildlg.cpp | 4 +- korn/maildrop.h | 2 +- korn/mailsubject.h | 8 +- korn/password.cpp | 2 +- korn/pop3_proto.cpp | 10 +- korn/pop3_proto.h | 4 +- korn/progress_dialog.ui | 10 +- korn/subjectsdlg.cpp | 6 +- korn/systemtray.h | 2 +- 31 files changed, 160 insertions(+), 160 deletions(-) (limited to 'korn') diff --git a/korn/account_input.cpp b/korn/account_input.cpp index d7584805..feafbe86 100644 --- a/korn/account_input.cpp +++ b/korn/account_input.cpp @@ -136,7 +136,7 @@ TQString ComboInput::value() const void ComboInput::setValue( const TQString& value ) { - if( _list->contains( value ) ) + if( _list->tqcontains( value ) ) _right->setCurrentItem( _list->keys().findIndex( value ) ); else _right->setCurrentItem( -1 ); diff --git a/korn/account_input.h b/korn/account_input.h index 548db498..43e68047 100644 --- a/korn/account_input.h +++ b/korn/account_input.h @@ -33,7 +33,7 @@ class TQCheckBox; #include /** - * This classe contains methods to use in the creation of the protocol configuration box. + * This classe tqcontains methods to use in the creation of the protocol configuration box. * The subclasses of this classes define the methods. */ class AccountInput diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index 4dec0190..c4976f23 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -216,23 +216,23 @@ void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSu { KPassivePopup *popup = new KPassivePopup( parent, "Passive popup" ); - TQVBox *mainvlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( objId() ).arg( accountName ) + TQVBox *mainvtqlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( objId() ).arg( accountName ) .arg( total ), "", TQPixmap(), 0 ); - TQGrid *mainglayout = new TQGrid( date ? 3 : 2 ,mainvlayout, "Grid-Layout" ); + TQGrid *maingtqlayout = new TQGrid( date ? 3 : 2 ,mainvtqlayout, "Grid-Layout" ); - TQLabel *title = new TQLabel( i18n("From"), mainglayout, "from_label" ); + TQLabel *title = new TQLabel( i18n("From"), maingtqlayout, "from_label" ); TQFont font = title->font(); font.setBold( true ); title->setFont( font ); - title = new TQLabel( i18n("Subject"), mainglayout, "subject_label" ); + title = new TQLabel( i18n("Subject"), maingtqlayout, "subject_label" ); font = title->font(); font.setBold( true ); title->setFont( font ); if( date ) { - title = new TQLabel( i18n("Date"), mainglayout, "date_label" ); + title = new TQLabel( i18n("Date"), maingtqlayout, "date_label" ); font = title->font(); font.setBold( true ); title->setFont( font ); @@ -240,19 +240,19 @@ void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSu for( KornMailSubject* subject = list->first(); subject; subject = list->next() ) { - new TQLabel( subject->getSender(), mainglayout, "from-value" ); - new TQLabel( subject->getSubject(), mainglayout, "subject-value" ); + new TQLabel( subject->getSender(), maingtqlayout, "from-value" ); + new TQLabel( subject->getSubject(), maingtqlayout, "subject-value" ); if( date ) { TQDateTime tijd; tijd.setTime_t( subject->getDate() ); - new TQLabel( tijd.toString(), mainglayout, "date-value" ); + new TQLabel( tijd.toString(), maingtqlayout, "date-value" ); } } popup->setAutoDelete( true ); //Now, now care for deleting these pointers. - popup->setView( mainvlayout ); + popup->setView( mainvtqlayout ); popup->show(); //Display it } @@ -316,7 +316,7 @@ void BoxContainerItem::drawLabel( TQLabel *label, const int count, const bool ne if( _fonts[ index ] ) label->setFont( *_fonts[ index ] ); label->setPaletteForegroundColor( *_fgColour[ index ] ); - label->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); + label->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); label->setText( TQString::number( count ) ); } @@ -358,7 +358,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo for( int yy = 0; yy < numberImage.width(); ++yy ) { //Set colour and alpha channel - rgbline[ yy ] = qRgba( fgColour.red(), fgColour.green(), fgColour.blue(), qRed( rgbline[ yy ] ) ); + rgbline[ yy ] = tqRgba( fgColour.red(), fgColour.green(), fgColour.blue(), tqRed( rgbline[ yy ] ) ); } } @@ -371,7 +371,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo void BoxContainerItem::setAnimIcon( TQLabel* label, const TQString& anim ) { - label->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); + label->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); label->setMovie( TQMovie( anim ) ); label->show(); } diff --git a/korn/boxcontaineritem.h b/korn/boxcontaineritem.h index 86a4efc9..06c02993 100644 --- a/korn/boxcontaineritem.h +++ b/korn/boxcontaineritem.h @@ -68,7 +68,7 @@ public: /** * This function reads the config. It stores the readed values in the class. * It also sets the DCOPObject-name. - * @param config The KConfigGroup-object which contains the configuration of this box. + * @param config The KConfigGroup-object which tqcontains the configuration of this box. * @param index The index of the box used in the config-file */ virtual void readConfig( KConfig* config, const int index ); diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp index 407a6ff0..7eb8d2a0 100644 --- a/korn/dcopdrop.cpp +++ b/korn/dcopdrop.cpp @@ -74,7 +74,7 @@ bool DCOPDrop::readConfigGroup( const KConfigGroup &cfg ) bool DCOPDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Protocol * ) { - if( !map.contains( "dcopname" ) ) + if( !map.tqcontains( "dcopname" ) ) //The mapping MUST contain dcopname. kdDebug() << "mapping is niet compleet" << endl; @@ -125,7 +125,7 @@ bool DCOPDrop::deleteMails( TQPtrList * ids, bool * ) for( const KornMailId *it = ids->first(); it; it = ids->next() ) { const KornIntId* id = dynamic_cast< const KornIntId* >( it ); - if( _msgList->contains( id->getId() ) ) + if( _msgList->tqcontains( id->getId() ) ) _msgList->erase( id->getId() ); } @@ -162,7 +162,7 @@ int DCOPDrop::addMessage( const TQString& subject, const TQString& message ) mailsubject->setSender( TQString( "DCOP: %1" ).arg( *_name ) ); mailsubject->setHeader( message, true ); mailsubject->setSize( message.length() ); - mailsubject->setDate( TQDateTime::currentDateTime().toTime_t() ); + mailsubject->setDate( TQDateTime::tqcurrentDateTime().toTime_t() ); _msgList->insert( id->getId(), mailsubject ); @@ -173,7 +173,7 @@ int DCOPDrop::addMessage( const TQString& subject, const TQString& message ) bool DCOPDrop::removeMessage( int id ) { - if( ! _msgList->contains( id ) ) + if( ! _msgList->tqcontains( id ) ) return false; delete (*_msgList)[ id ]; diff --git a/korn/dcopdrop.h b/korn/dcopdrop.h index 124d197e..c14953f0 100644 --- a/korn/dcopdrop.h +++ b/korn/dcopdrop.h @@ -93,7 +93,7 @@ public: /** * This function reeds the config which are shipped which the group. * - * @param config The configuration group which contains the info for this account. + * @param config The configuration group which tqcontains the info for this account. * @return The same value as KMailDrop::readConfigGroup( config ) returns. */ virtual bool readConfigGroup( const KConfigGroup& config ); diff --git a/korn/dockeditem.h b/korn/dockeditem.h index ae6689f8..13cce3af 100644 --- a/korn/dockeditem.h +++ b/korn/dockeditem.h @@ -57,7 +57,7 @@ public: * This functions reads the config. It used the parent * version for the main things, but it is possible to * add some configurations over here. - * @param config The KConfig-instance which contains the settings of this tray-item. + * @param config The KConfig-instance which tqcontains the settings of this tray-item. * @param index The index of the box in the configuration file */ virtual void readConfig( KConfig* config, const int index ); diff --git a/korn/imap_proto.cpp b/korn/imap_proto.cpp index caedb459..735f5de6 100644 --- a/korn/imap_proto.cpp +++ b/korn/imap_proto.cpp @@ -65,18 +65,18 @@ void Imap_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec void Imap_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQString, TQString > *metadata ) const { - if( map->contains( "ssl" ) && *map->find( "ssl" ) == "true" ) + if( map->tqcontains( "ssl" ) && *map->find( "ssl" ) == "true" ) map->insert( "encryption", "ssl" ); - if( metadata->contains( "tls" ) ) + if( metadata->tqcontains( "tls" ) ) map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->find( "tls" ) ) ); - if( metadata->contains( "auth" ) ) + if( metadata->tqcontains( "auth" ) ) map->insert( "auth", TQString( "auth=%1" ).arg( *metadata->find( "auth" ) ) ); } void Imap_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const { TQString metadata; - if( map->contains( "encryption" ) ) + if( map->tqcontains( "encryption" ) ) { if( *map->find( "encryption" ) == "ssl" ) map->insert( "ssl", "true" ); @@ -88,7 +88,7 @@ void Imap_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const map->erase( "encryption" ); } - if( map->contains( "auth" ) ) + if( map->tqcontains( "auth" ) ) { if( !metadata.isEmpty() ) metadata += ","; diff --git a/korn/imap_proto.h b/korn/imap_proto.h index 97fb209a..451742eb 100644 --- a/korn/imap_proto.h +++ b/korn/imap_proto.h @@ -134,7 +134,7 @@ public: * This function edits writeEntry. It merge things back to a metadata-key and adds this * key to the configuration. * - * @param map The mapping which contains the information to be written to a configuarion file. + * @param map The mapping which tqcontains the information to be written to a configuarion file. * the contents of this mapping can change in this function. */ virtual void writeEntries( TQMap< TQString, TQString >* map ) const; diff --git a/korn/kconf_update/korn-3-4-config_change.cpp b/korn/kconf_update/korn-3-4-config_change.cpp index 08ca732b..9f275181 100644 --- a/korn/kconf_update/korn-3-4-config_change.cpp +++ b/korn/kconf_update/korn-3-4-config_change.cpp @@ -188,7 +188,7 @@ int main( int, char** ) } else if( currentGroup1.isNull() || !isKey ) continue; - if( mapping1.contains( key_value.cap( 1 ) ) ) + if( mapping1.tqcontains( key_value.cap( 1 ) ) ) { out << currentGroup1 << endl; out << mapping1[ key_value.cap( 1 ) ] << "=" << key_value.cap( 2 ) << endl; @@ -198,7 +198,7 @@ int main( int, char** ) out << "name=" << key_value.cap( 2 ) << endl; } } - else if( mapping2.contains( key_value.cap( 1 ) ) ) + else if( mapping2.tqcontains( key_value.cap( 1 ) ) ) { to_printed.insert( key_value.cap( 1 ), key_value.cap( 2 ) ); } diff --git a/korn/kio.cpp b/korn/kio.cpp index 8015595c..6fdacdcd 100644 --- a/korn/kio.cpp +++ b/korn/kio.cpp @@ -180,11 +180,11 @@ void KKioDrop::setKioServer(const TQString & proto, const TQString & server, int _ssl = ssl; //Checking for authentication-settings. - //if( _metadata->contains("auth") ) + //if( _metadata->tqcontains("auth") ) //{ // auth = (*_metadata)["auth"]; // *_metadata = metadata; - // if( ! _metadata->contains("auth") ) + // if( ! _metadata->tqcontains("auth") ) // (*_metadata)["auth"] = auth; //} else *_metadata = metadata; @@ -201,7 +201,7 @@ void KKioDrop::setUser(const TQString & user, const TQString & password, _kurl->setPath( mailbox ); if( ! auth.isEmpty() && auth != "Plain" ) (*_metadata)["auth"] = auth; - else if( _metadata->contains( "auth" ) ) + else if( _metadata->tqcontains( "auth" ) ) _metadata->erase( "auth" ); _valid = _kurl->isValid(); @@ -241,7 +241,7 @@ TQString KKioDrop::mailbox() const } TQString KKioDrop::auth() const { - return ( _metadata->contains("auth")?(*_metadata)["auth"]:"" ); + return ( _metadata->tqcontains("auth")?(*_metadata)["auth"]:"" ); } void KKioDrop::recheck() @@ -337,8 +337,8 @@ bool KKioDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Pr { TQString val, val2; - if( !map.contains( "server" ) || !map.contains( "port" ) || !map.contains( "ssl" ) || !map.contains( "username" ) || - !map.contains( "mailbox" ) || !map.contains( "password" ) || !map.contains( "metadata" ) || !map.contains( "name" ) ) + if( !map.tqcontains( "server" ) || !map.tqcontains( "port" ) || !map.tqcontains( "ssl" ) || !map.tqcontains( "username" ) || + !map.tqcontains( "mailbox" ) || !map.tqcontains( "password" ) || !map.tqcontains( "metadata" ) || !map.tqcontains( "name" ) ) { kdWarning() << "Bug: map niet compleet" << endl; return false; diff --git a/korn/kio_count.cpp b/korn/kio_count.cpp index d97fa1e9..71da3080 100644 --- a/korn/kio_count.cpp +++ b/korn/kio_count.cpp @@ -259,7 +259,7 @@ void KIO_Count::entries( KIO::Job* job, const KIO::UDSEntryList &list ) for ( it1 = list.begin() ; it1 != list.end() ; it1++ ) { /* - * The list contains multiple objects. Each object could be a file. + * The list tqcontains multiple objects. Each object could be a file. * Settings about it are saved in this scope until it is added to the list. */ isFile=false; @@ -292,7 +292,7 @@ void KIO_Count::entries( KIO::Job* job, const KIO::UDSEntryList &list ) if( ! fileinfo.name.isNull() && isFile ) { _new_mailurls->append( fileinfo ); - if( ! old_list.contains( fileinfo.name ) && _kio->passivePopup() ) + if( ! old_list.tqcontains( fileinfo.name ) && _kio->passivePopup() ) showPassive( fileinfo.name ); } } diff --git a/korn/kio_count.h b/korn/kio_count.h index d8df7dc0..a881d410 100644 --- a/korn/kio_count.h +++ b/korn/kio_count.h @@ -25,7 +25,7 @@ #include "kio.h" //Alsewise, no access to KKioDrop::FileInfo (needed in template) -#include //FIXME: without this, moc-compiler fails. +#include //FIXME: without this, tqmoc-compiler fails. class KIO_Protocol; class KIO_Single_Subject; diff --git a/korn/kio_proto.cpp b/korn/kio_proto.cpp index 8434fe44..5177a2f3 100644 --- a/korn/kio_proto.cpp +++ b/korn/kio_proto.cpp @@ -63,7 +63,7 @@ void KIO_Protocol::readEntries( TQMap< TQString, TQString >* map ) const { TQMap< TQString, TQString> *metadata = new TQMap< TQString, TQString >; - if( map->contains( "metadata" ) ) + if( map->tqcontains( "metadata" ) ) { TQStringList list = TQStringList::split( ",", *map->find( "metadata" ) ); TQStringList::Iterator it; diff --git a/korn/kornaccountcfg.ui b/korn/kornaccountcfg.ui index 18b06829..15afffef 100644 --- a/korn/kornaccountcfg.ui +++ b/korn/kornaccountcfg.ui @@ -4,7 +4,7 @@ KornAccountCfg - + 0 0 @@ -31,7 +31,7 @@ lbProtocol - + 11 41 @@ -50,7 +50,7 @@ cbProtocol - + 223 41 @@ -73,7 +73,7 @@ - layout35 + tqlayout35 @@ -137,7 +137,7 @@ - layout33 + tqlayout33 @@ -237,7 +237,7 @@ slotProtocolChanged( const QString& ) - + kurlrequester.h klineedit.h diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp index 4a8af84e..5b7706e1 100644 --- a/korn/kornaccountcfgimpl.cpp +++ b/korn/kornaccountcfgimpl.cpp @@ -44,7 +44,7 @@ KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * parent, const char * name ) _urlfields( 0 ), _boxnr( 0 ), _accountnr( 0 ), - _vlayout( 0 ), + _vtqlayout( 0 ), _protocolLayout( 0 ), _groupBoxes( 0 ), _accountinput( new TQPtrList< AccountInput >() ) @@ -80,7 +80,7 @@ void KornAccountCfgImpl::readConfig( KConfigGroup *config, TQMap< TQString, TQSt (*entries)[ "password" ] = KOrnPassword::readKOrnPassword( boxnr, accountnr, *config ); for( input = _accountinput->first(); input; input = _accountinput->next() ) - if( entries->contains( input->configName() ) ) + if( entries->tqcontains( input->configName() ) ) input->setValue( *(entries->find( input->configName() ) ) ); this->edInterval->setText( _config->readEntry( "interval", "300" ) ); @@ -115,7 +115,7 @@ void KornAccountCfgImpl::writeConfig() protocol->writeEntries( map ); - if( map->contains( "password" ) ) + if( map->tqcontains( "password" ) ) { KOrnPassword::writeKOrnPassword( _boxnr, _accountnr, *_config, *map->find( "password" ) ); map->erase( "password" ); @@ -173,12 +173,12 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto ) _accountinput->clear(); delete _groupBoxes; delete _protocolLayout; - delete _vlayout; - _vlayout = new TQVBoxLayout( this->server_tab, groupBoxes->count() + 1 ); - _vlayout->setSpacing( 10 ); - _vlayout->setMargin( 10 ); + delete _vtqlayout; + _vtqlayout = new TQVBoxLayout( this->server_tab, groupBoxes->count() + 1 ); + _vtqlayout->setSpacing( 10 ); + _vtqlayout->setMargin( 10 ); - _protocolLayout = new TQHBoxLayout( _vlayout ); + _protocolLayout = new TQHBoxLayout( _vtqlayout ); _protocolLayout->addWidget( this->lbProtocol ); _protocolLayout->addWidget( this->cbProtocol ); @@ -189,7 +189,7 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto ) for( it = groupBoxes->begin(); it != groupBoxes->end(); ++it ) { _groupBoxes->insert( counter, new TQGroupBox( (*it), this->server_tab, "groupbox" ) ); - _vlayout->addWidget( _groupBoxes->at( counter ) ); + _vtqlayout->addWidget( _groupBoxes->at( counter ) ); ++counter; } delete groupBoxes; diff --git a/korn/kornaccountcfgimpl.h b/korn/kornaccountcfgimpl.h index 27464f8b..9be27bc6 100644 --- a/korn/kornaccountcfgimpl.h +++ b/korn/kornaccountcfgimpl.h @@ -59,7 +59,7 @@ private: int _urlfields; int _boxnr, _accountnr; - TQVBoxLayout *_vlayout; + TQVBoxLayout *_vtqlayout; TQHBoxLayout *_protocolLayout; TQPtrVector< TQWidget > *_groupBoxes; diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui index 4b61ee06..3f69aabf 100644 --- a/korn/kornboxcfg.ui +++ b/korn/kornboxcfg.ui @@ -4,7 +4,7 @@ KornBoxCfg - + 0 0 @@ -33,7 +33,7 @@ - layout32 + tqlayout32 @@ -69,7 +69,7 @@ - layout34 + tqlayout34 @@ -124,7 +124,7 @@ - layout33 + tqlayout33 @@ -161,13 +161,13 @@ Normal - + AlignCenter - layout36 + tqlayout36 @@ -201,7 +201,7 @@ New Mail - + AlignCenter @@ -215,7 +215,7 @@ - layout31 + tqlayout31 @@ -251,7 +251,7 @@ - layout35 + tqlayout35 @@ -288,7 +288,7 @@ Expanding - + 41 160 @@ -297,7 +297,7 @@ - layout29 + tqlayout29 @@ -326,7 +326,7 @@ - layout28 + tqlayout28 @@ -371,7 +371,7 @@ - layout28_2 + tqlayout28_2 @@ -400,7 +400,7 @@ - layout29_2 + tqlayout29_2 @@ -442,7 +442,7 @@ - layout31 + tqlayout31 @@ -455,13 +455,13 @@ Left - + AlignCenter - layout52_7 + tqlayout52_7 @@ -477,7 +477,7 @@ Expanding - + 21 20 @@ -502,7 +502,7 @@ Expanding - + 21 21 @@ -518,13 +518,13 @@ Right - + AlignCenter - layout52 + tqlayout52 @@ -540,7 +540,7 @@ Expanding - + 21 20 @@ -565,7 +565,7 @@ Expanding - + 21 21 @@ -576,7 +576,7 @@ - layout52_4 + tqlayout52_4 @@ -592,7 +592,7 @@ Expanding - + 21 20 @@ -617,7 +617,7 @@ Expanding - + 21 21 @@ -628,7 +628,7 @@ - layout52_9 + tqlayout52_9 @@ -644,7 +644,7 @@ Expanding - + 21 20 @@ -669,7 +669,7 @@ Expanding - + 21 21 @@ -680,7 +680,7 @@ - layout52 + tqlayout52 @@ -696,7 +696,7 @@ Expanding - + 21 20 @@ -721,7 +721,7 @@ Expanding - + 21 21 @@ -745,13 +745,13 @@ Mousebutton - + AlignCenter - layout52_9 + tqlayout52_9 @@ -767,7 +767,7 @@ Expanding - + 21 20 @@ -792,7 +792,7 @@ Expanding - + 21 21 @@ -803,7 +803,7 @@ - layout52_5 + tqlayout52_5 @@ -819,7 +819,7 @@ Expanding - + 21 20 @@ -844,7 +844,7 @@ Expanding - + 21 21 @@ -860,13 +860,13 @@ Middle - + AlignCenter - layout52_5 + tqlayout52_5 @@ -882,7 +882,7 @@ Expanding - + 21 20 @@ -907,7 +907,7 @@ Expanding - + 21 21 @@ -926,7 +926,7 @@ - layout52_8 + tqlayout52_8 @@ -942,7 +942,7 @@ Expanding - + 21 20 @@ -967,7 +967,7 @@ Expanding - + 21 21 @@ -986,7 +986,7 @@ - layout52_7 + tqlayout52_7 @@ -1002,7 +1002,7 @@ Expanding - + 21 20 @@ -1027,7 +1027,7 @@ Expanding - + 21 21 @@ -1046,7 +1046,7 @@ - layout52_5 + tqlayout52_5 @@ -1062,7 +1062,7 @@ Expanding - + 21 20 @@ -1087,7 +1087,7 @@ Expanding - + 21 21 @@ -1098,7 +1098,7 @@ - layout52_3 + tqlayout52_3 @@ -1114,7 +1114,7 @@ Expanding - + 21 20 @@ -1139,7 +1139,7 @@ Expanding - + 21 21 @@ -1150,7 +1150,7 @@ - layout52_6 + tqlayout52_6 @@ -1166,7 +1166,7 @@ Expanding - + 21 20 @@ -1191,7 +1191,7 @@ Expanding - + 21 21 @@ -1202,7 +1202,7 @@ - layout52_7 + tqlayout52_7 @@ -1218,7 +1218,7 @@ Expanding - + 21 20 @@ -1243,7 +1243,7 @@ Expanding - + 21 21 @@ -1262,7 +1262,7 @@ - layout52_9 + tqlayout52_9 @@ -1278,7 +1278,7 @@ Expanding - + 21 20 @@ -1303,7 +1303,7 @@ Expanding - + 21 21 @@ -1316,7 +1316,7 @@ - layout31_3 + tqlayout31_3 @@ -1356,7 +1356,7 @@ - layout33 + tqlayout33 @@ -1677,7 +1677,7 @@ slotNormalAnimToggled( bool ) slotNewAnimToggled( bool ) - + kcolorbutton.h kcolorbutton.h diff --git a/korn/korncfg.ui b/korn/korncfg.ui index 46a812a5..b1b55307 100644 --- a/korn/korncfg.ui +++ b/korn/korncfg.ui @@ -4,7 +4,7 @@ KornCfgWidget - + 0 0 @@ -172,5 +172,5 @@ slotSetDefaults( const QString&, const int, KConfig* ) slotEditBox() - + diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp index ae49765c..df426464 100644 --- a/korn/korncfgimpl.cpp +++ b/korn/korncfgimpl.cpp @@ -198,10 +198,10 @@ void KornCfgImpl::readConfig() { _config->setGroup( "korn" ); - TQChar layout = _config->readEntry( "layout" ).stripWhiteSpace()[0].upper(); - if( layout == TQChar( 'H' ) ) + TQChar tqlayout = _config->readEntry( "tqlayout" ).stripWhiteSpace()[0].upper(); + if( tqlayout == TQChar( 'H' ) ) rbHorizontal->setChecked( true ); - else if( layout == TQChar( 'V' ) ) + else if( tqlayout == TQChar( 'V' ) ) rbVertical->setChecked( true ); else rbDocked->setChecked( true ); @@ -214,11 +214,11 @@ void KornCfgImpl::writeConfig() _config->setGroup( "korn" ); if( rbHorizontal->isChecked() ) - _config->writeEntry( "layout", "Horizontal" ); + _config->writeEntry( "tqlayout", "Horizontal" ); if( rbVertical->isChecked() ) - _config->writeEntry( "layout", "Vertical" ); + _config->writeEntry( "tqlayout", "Vertical" ); if( rbDocked->isChecked() ) - _config->writeEntry( "layout", "Docked" ); + _config->writeEntry( "tqlayout", "Docked" ); //Default is 'false' here, because if no option is set, KWallet isn't used. if( _config->readBoolEntry( "usewallet", false ) != chUseWallet->isChecked() ) diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp index 4fccd075..553cac42 100644 --- a/korn/kornshell.cpp +++ b/korn/kornshell.cpp @@ -95,12 +95,12 @@ void KornShell::readConfig() static bool shownConfig = false; _config->setGroup( "korn" ); - TQChar layout = _config->readEntry( "layout", "Docked" )[0].upper(); + TQChar tqlayout = _config->readEntry( "tqlayout", "Docked" )[0].upper(); KOrnPassword::setUseWallet( _config->readBoolEntry( "usewallet", false ) ); - if( layout == 'H' ) + if( tqlayout == 'H' ) _box = new HVContainer( Qt::Horizontal, this, "horizontal container" ); - else if( layout == 'V' ) + else if( tqlayout == 'V' ) _box = new HVContainer( Qt::Vertical, this, "vertical container" ); else _box = new DockedContainer( this, "docked container" ); @@ -135,14 +135,14 @@ void KornShell::slotDialogClosed() _configDialog->deleteLater(); _configDialog = 0; //At this time, just delete all widgets and make a new one. - //Maybe, this should replaces later by a better variant. + //Maybe, this should tqreplaces later by a better variant. slotApply(); } void KornShell::slotApply() { //At this time, just delete all widgets and make a new one. - //Maybe, this should replaces later by a better variant. + //Maybe, this should tqreplaces later by a better variant. delete _box; _box = 0; diff --git a/korn/maildir_proto.h b/korn/maildir_proto.h index 2ce5e9db..0023cfdc 100644 --- a/korn/maildir_proto.h +++ b/korn/maildir_proto.h @@ -47,7 +47,7 @@ public: virtual TQString serverName() const { return i18n( "Path:" ); } virtual void recheckKURL( KURL &kurl, KIO::MetaData & ) - { kurl.setPath( kurl.host() + "/." + kurl.path().replace( '/' , '.' ) + "/new" ); kurl.setHost( "" ); } + { kurl.setPath( kurl.host() + "/." + kurl.path().tqreplace( '/' , '.' ) + "/new" ); kurl.setHost( "" ); } virtual void readSubjectKURL( KURL &, KIO::MetaData & ) { } virtual void deleteMailKURL( KURL &, KIO::MetaData & ) { } virtual void readMailKURL( KURL &, KIO::MetaData & ) { } diff --git a/korn/maildlg.cpp b/korn/maildlg.cpp index 086796c8..3424e19e 100644 --- a/korn/maildlg.cpp +++ b/korn/maildlg.cpp @@ -43,12 +43,12 @@ void KornMailDlg::showFullMessage() // this should show it even if the mailbox does not support progress bars _progress->setTotalSteps(1000); _progress->setProgress(1); - qApp->processEvents(); + tqApp->processEvents(); // connect the mailbox with the progress dialog in case it supports progress bars connect(_mailDrop, TQT_SIGNAL(readMailTotalSteps(int)), _progress, TQT_SLOT(setTotalSteps(int))); connect(_mailDrop, TQT_SIGNAL(readMailProgress(int)), _progress, TQT_SLOT(setProgress(int))); - qApp->processEvents(); + tqApp->processEvents(); // connect the mailbox's cancel button connect(_progress, TQT_SIGNAL(canceled()), this, TQT_SLOT(loadMailCanceled())); diff --git a/korn/maildrop.h b/korn/maildrop.h index 4052c8c3..b15ec973 100644 --- a/korn/maildrop.h +++ b/korn/maildrop.h @@ -358,7 +358,7 @@ signals: /** * The next signal is emitted when a passive popup could be displayed. - * As argument, there is a KornSubject, which contains a subject and + * As argument, there is a KornSubject, which tqcontains a subject and * some more info that could be used with the popup. */ void showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& realname ); diff --git a/korn/mailsubject.h b/korn/mailsubject.h index 75f0571f..3e85b69e 100644 --- a/korn/mailsubject.h +++ b/korn/mailsubject.h @@ -47,7 +47,7 @@ public: KornMailSubject(const KornMailSubject & src); /** - * replaces the contents of this by the contents of another + * tqreplaces the contents of this by the contents of another * KornMailSubject instance. All data of the source * KornMailSubject instance are cloned. * @param src KornMailSubject to copy from @@ -92,7 +92,7 @@ public: /** * Set the mails header and (if possible) body. * @param header the mails header with or without body (see fullMessage parameter). - * @param fullMessage true, if header contains the message body as well, false otherwise. + * @param fullMessage true, if header tqcontains the message body as well, false otherwise. */ void setHeader(const TQString & header, bool fullMessage) {_header = header; _fullMessage = fullMessage;} @@ -103,8 +103,8 @@ public: const TQString & getHeader() const {return _header;} /** - * Return true, if the header contains the header and the full message. - * Return false if the header just contains the header. + * Return true, if the header tqcontains the header and the full message. + * Return false if the header just tqcontains the header. * @return see above. */ bool isHeaderFullMessage() const {return _fullMessage;} diff --git a/korn/password.cpp b/korn/password.cpp index 764b90f9..f0ae5d8f 100644 --- a/korn/password.cpp +++ b/korn/password.cpp @@ -241,7 +241,7 @@ TQString KOrnPassword::KMailDecrypt( const TQString& enc ) { TQString result; for (uint i = 0; i < enc.length(); i++) - result += (enc[i].unicode() <= 0x21) ? enc[i] : TQChar(0x1001F - enc[i].unicode()); + result += (enc[i].tqunicode() <= 0x21) ? enc[i] : TQChar(0x1001F - enc[i].tqunicode()); return result; } diff --git a/korn/pop3_proto.cpp b/korn/pop3_proto.cpp index b42a63ec..6f904614 100644 --- a/korn/pop3_proto.cpp +++ b/korn/pop3_proto.cpp @@ -64,18 +64,18 @@ void Pop3_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec void Pop3_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQString, TQString > *metadata ) const { - if( map->contains( "ssl" ) && *map->find( "ssl" ) == "true" ) + if( map->tqcontains( "ssl" ) && *map->find( "ssl" ) == "true" ) map->insert( "encryption", "ssl" ); - if( metadata->contains( "tls" ) ) + if( metadata->tqcontains( "tls" ) ) map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->find( "tls" ) ) ); - if( metadata->contains( "auth" ) ) + if( metadata->tqcontains( "auth" ) ) map->insert( "auth", TQString( "auth=APOP" ) ); } void Pop3_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const { TQString metadata; - if( map->contains( "encryption" ) ) + if( map->tqcontains( "encryption" ) ) { if( *map->find( "encryption" ) == "ssl" ) map->insert( "ssl", "true" ); @@ -87,7 +87,7 @@ void Pop3_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const map->erase( "encryption" ); } - if( map->contains( "auth" ) ) + if( map->tqcontains( "auth" ) ) { if( !metadata.isEmpty() && ! (*map->find( "auth" )).isEmpty() ) metadata += ","; diff --git a/korn/pop3_proto.h b/korn/pop3_proto.h index c828e595..feaed812 100644 --- a/korn/pop3_proto.h +++ b/korn/pop3_proto.h @@ -44,8 +44,8 @@ public: virtual TQStringList authList() const { return TQStringList::split( '|', "Plain|APOP", false ); } - virtual void readSubjectKURL( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().replace( "/download/", "/headers/" ) ); } - virtual void deleteMailKURL ( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().replace( "/download/", "/remove/" ) ); } + virtual void readSubjectKURL( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().tqreplace( "/download/", "/headers/" ) ); } + virtual void deleteMailKURL ( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().tqreplace( "/download/", "/remove/" ) ); } virtual bool commitDelete () const { return true; } virtual void deleteCommitKURL(KURL & kurl, KIO::MetaData & ) const { kurl.setPath( "commit" ); } diff --git a/korn/progress_dialog.ui b/korn/progress_dialog.ui index 6e6b53fa..d21ecee2 100644 --- a/korn/progress_dialog.ui +++ b/korn/progress_dialog.ui @@ -4,7 +4,7 @@ DoubleProgressDialog - + 0 0 @@ -39,7 +39,7 @@ - layout1 + tqlayout1 @@ -55,7 +55,7 @@ Expanding - + 41 20 @@ -80,7 +80,7 @@ Expanding - + 41 31 @@ -116,5 +116,5 @@ setProgress( int number ) cancelbutton() - + diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp index f16d3a91..b001f776 100644 --- a/korn/subjectsdlg.cpp +++ b/korn/subjectsdlg.cpp @@ -60,8 +60,8 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent ) _loadSubjectsCanceled = false; setModal( true ); - // The dialog contains a list view and several buttons. - // Two box layouts hol dthem. + // The dialog tqcontains a list view and several buttons. + // Two box tqlayouts hol dthem. TQWidget * page = new TQWidget( this ); setMainWidget(page); invertSelButton = new KPushButton(i18n("&Invert Selection"), page); @@ -88,7 +88,7 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent ) _list->addColumn(i18n("Date")); _list->addColumn(i18n("Size (Bytes)")); - // column 3 contains a number (change alignment) + // column 3 tqcontains a number (change tqalignment) _list->setColumnAlignment(3, Qt::AlignRight); _list->setItemMargin(3); diff --git a/korn/systemtray.h b/korn/systemtray.h index 2387ea7c..83daaeb3 100644 --- a/korn/systemtray.h +++ b/korn/systemtray.h @@ -47,7 +47,7 @@ protected: /** * Reimplementation because in the reimplementation of KSystray it popup's of restores. * In this implemention, the action depends on the settings. - * @param me An object which contains the mousebutton which is pressed. + * @param me An object which tqcontains the mousebutton which is pressed. */ virtual void mousePressEvent( TQMouseEvent* me ); -- cgit v1.2.3