diff options
Diffstat (limited to 'kaddressbook')
46 files changed, 182 insertions, 182 deletions
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index 32ecdc9a7..09047fa64 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -273,7 +273,7 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list, mTypeCombo = new AddressTypeCombo( mAddressList, page ); topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 ); - TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).tqarg( KABC::Address::streetLabel() ), page ); + TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).arg( KABC::Address::streetLabel() ), page ); label->setAlignment( TQt::AlignTop | TQt::AlignLeft ); topLayout->addWidget( label, 1, 0 ); mStreetTextEdit = new TQTextEdit( page ); @@ -284,31 +284,31 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list, TabPressEater *eater = new TabPressEater( TQT_TQOBJECT(this) ); mStreetTextEdit->installEventFilter( eater ); - label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).tqarg( KABC::Address::postOfficeBoxLabel() ), page ); + label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( KABC::Address::postOfficeBoxLabel() ), page ); topLayout->addWidget( label, 2 , 0 ); mPOBoxEdit = new KLineEdit( page ); label->setBuddy( mPOBoxEdit ); topLayout->addWidget( mPOBoxEdit, 2, 1 ); - label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).tqarg( KABC::Address::localityLabel() ), page ); + label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).arg( KABC::Address::localityLabel() ), page ); topLayout->addWidget( label, 3, 0 ); mLocalityEdit = new KLineEdit( page ); label->setBuddy( mLocalityEdit ); topLayout->addWidget( mLocalityEdit, 3, 1 ); - label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).tqarg( KABC::Address::regionLabel() ), page ); + label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).arg( KABC::Address::regionLabel() ), page ); topLayout->addWidget( label, 4, 0 ); mRegionEdit = new KLineEdit( page ); label->setBuddy( mRegionEdit ); topLayout->addWidget( mRegionEdit, 4, 1 ); - label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).tqarg( KABC::Address::postalCodeLabel() ), page ); + label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).arg( KABC::Address::postalCodeLabel() ), page ); topLayout->addWidget( label, 5, 0 ); mPostalCodeEdit = new KLineEdit( page ); label->setBuddy( mPostalCodeEdit ); topLayout->addWidget( mPostalCodeEdit, 5, 1 ); - label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).tqarg( KABC::Address::countryLabel() ), page ); + label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).arg( KABC::Address::countryLabel() ), page ); topLayout->addWidget( label, 6, 0 ); mCountryCombo = new KComboBox( page ); mCountryCombo->setEditable( true ); diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp index a742c3f76..5ac80b065 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp @@ -147,7 +147,7 @@ void AddresseeEditorDialog::slotCancel() void AddresseeEditorDialog::setTitle( const KABC::Addressee &addr ) { if ( !addr.realName().isEmpty() ) - setCaption( i18n( "Edit Contact '%1'" ).tqarg( addr.realName() ) ); + setCaption( i18n( "Edit Contact '%1'" ).arg( addr.realName() ) ); } #include "addresseeeditordialog.moc" diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index 658f90e0e..49013aa68 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -181,7 +181,7 @@ void AddresseeEditorWidget::setupTab1() tqlayout->addWidget( button, 0, 1 ); tqlayout->addWidget( mNameEdit, 0, 2 ); tqlayout->addWidget( mNameLabel, 0, 2 ); - label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).tqarg( KABC::Addressee::roleLabel() ), tab1 ); + label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 ); mRoleEdit = new KLineEdit( tab1 ); connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); @@ -190,7 +190,7 @@ void AddresseeEditorWidget::setupTab1() tqlayout->addWidget( mRoleEdit, 1, 2 ); // Organization - label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).tqarg( KABC::Addressee::organizationLabel() ), tab1 ); + label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 ); mOrgEdit = new KLineEdit( tab1 ); label->setBuddy( mOrgEdit ); connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ), @@ -256,7 +256,7 @@ void AddresseeEditorWidget::setupTab1() KIcon::SizeMedium ) ); homePageLayout->addWidget( label ); - label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).tqarg( KABC::Addressee::urlLabel() ), tab1 ); + label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( KABC::Addressee::urlLabel() ), tab1 ); mURLEdit = new KLineEdit( tab1 ); connect( mURLEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); @@ -369,7 +369,7 @@ void AddresseeEditorWidget::setupTab2() label->setBuddy( mAssistantEdit ); tqlayout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 ); - label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).tqarg( KABC::Addressee::titleLabel() ), tab2 ); + label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 ); tqlayout->addWidget( label, 2, 3 ); mTitleEdit = new KLineEdit( tab2 ); connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp index 910fc151e..932f6f108 100644 --- a/kaddressbook/common/filter.cpp +++ b/kaddressbook/common/filter.cpp @@ -147,7 +147,7 @@ void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &lis // remove the old filters uint count = config->readNumEntry( "Count" ); for ( uint i = 0; i < count; ++i ) - config->deleteGroup( TQString( "%1_%2" ).tqarg( baseGroup ).tqarg( i ) ); + config->deleteGroup( TQString( "%1_%2" ).arg( baseGroup ).arg( i ) ); } @@ -155,8 +155,8 @@ void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &lis Filter::List::Iterator iter; for ( iter = list.begin(); iter != list.end(); ++iter ) { if ( !(*iter).mInternal ) { - KConfigGroupSaver s( config, TQString( "%1_%2" ).tqarg( baseGroup ) - .tqarg( index ) ); + KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ) + .arg( index ) ); (*iter).save( config ); index++; } @@ -179,7 +179,7 @@ Filter::List Filter::restore( KConfig *config, const TQString &baseGroup ) for ( int i = 0; i < count; i++ ) { { - KConfigGroupSaver s( config, TQString( "%1_%2" ).tqarg( baseGroup ).tqarg( i ) ); + KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) ); f.restore( config ); } diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp index 0e1d4e9cf..2fbda71cb 100644 --- a/kaddressbook/common/locationmap.cpp +++ b/kaddressbook/common/locationmap.cpp @@ -72,7 +72,7 @@ TQString LocationMap::createUrl( const KABC::Address &addr ) %c country (in ISO format) */ - TQString urlTemplate = KABPrefs::instance()->locationMapURL().tqarg( KGlobal::locale()->country() ); + TQString urlTemplate = KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ); if ( urlTemplate.isEmpty() ) { KMessageBox::error( 0, i18n( "No service provider available for map lookup!\nPlease add one in the configuration dialog." ) ); return TQString(); diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp index 1e3677c55..7efea76f6 100644 --- a/kaddressbook/contacteditorwidgetmanager.cpp +++ b/kaddressbook/contacteditorwidgetmanager.cpp @@ -76,7 +76,7 @@ void ContactEditorWidgetManager::reload() mFactories.clear(); kdDebug(5720) << "ContactEditorWidgetManager::reload()" << endl; const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/ContactEditorWidget", - TQString( "[X-KDE-KAddressBook-CEWPluginVersion] == %1" ).tqarg( KAB_CEW_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KAddressBook-CEWPluginVersion] == %1" ).arg( KAB_CEW_PLUGIN_VERSION ) ); KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp index 6d1f65650..c9ac1254b 100644 --- a/kaddressbook/distributionlisteditor.cpp +++ b/kaddressbook/distributionlisteditor.cpp @@ -261,7 +261,7 @@ void KPIM::DistributionListEditor::EditorWidget::slotOk() const KPIM::DistributionList existing = KPIM::DistributionList::findByName( d->addressBook, name ); if ( !existing.isEmpty() && existing.uid() != d->distListUid ) { - KMessageBox::error( this, i18n( "A distribution list with the name %1 already exists. Please choose another name." ).tqarg( name ), i18n( "Name in Use" ) ); + KMessageBox::error( this, i18n( "A distribution list with the name %1 already exists. Please choose another name." ).arg( name ), i18n( "Name in Use" ) ); return; } diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp index f87ff133a..9d927a5d4 100644 --- a/kaddressbook/distributionlistentryview.cpp +++ b/kaddressbook/distributionlistentryview.cpp @@ -106,10 +106,10 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis TQPixmap pixmap; pixmap.convertFromImage( m_entry.addressee.photo().data() ); m_imageLabel->setPixmap( pixmap.isNull() ? KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) : pixmap ); - m_addresseeLabel->setText( i18n( "Formatted name, role, organization", "<qt><h2>%1</h2><p>%2<br/>%3</p></qt>" ).tqarg( m_entry.addressee.formattedName(), m_entry.addressee.role(), m_entry.addressee.organization() ) ); + m_addresseeLabel->setText( i18n( "Formatted name, role, organization", "<qt><h2>%1</h2><p>%2<br/>%3</p></qt>" ).arg( m_entry.addressee.formattedName(), m_entry.addressee.role(), m_entry.addressee.organization() ) ); m_distListLabel->setURL( m_list.name() ); m_distListLabel->setText( m_list.name() ); - m_resourceLabel->setText( i18n( "<b>Address book:</b> %1" ).tqarg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) ); + m_resourceLabel->setText( i18n( "<b>Address book:</b> %1" ).arg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) ); m_resourceLabel->setAlignment( TQt::SingleLine ); m_emailGroup = new TQVButtonGroup( this ); @@ -133,7 +133,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis this, TQT_SLOT( emailButtonClicked( int ) ) ); m_radioLayout->addWidget( m_emailGroup, 0, 0 ); m_emailGroup->setShown( true ); - m_mainLayout->tqinvalidate(); + m_mainLayout->invalidate(); } diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp index 9f8626fb9..aa59fe217 100644 --- a/kaddressbook/distributionlistpicker.cpp +++ b/kaddressbook/distributionlistpicker.cpp @@ -112,7 +112,7 @@ void KPIM::DistributionListPickerDialog::slotUser1() } else { - KMessageBox::error( this, i18n( "A distribution list with the the name %1 already exists. Please choose another name" ).tqarg( name ), i18n( "Name Exists" ) ); + KMessageBox::error( this, i18n( "A distribution list with the the name %1 already exists. Please choose another name" ).arg( name ), i18n( "Name Exists" ) ); } } while ( !validName ); diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp index 9f468bfd6..d878454ac 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -64,7 +64,7 @@ bool IMAddressLVI::preferred() const } void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment ) + int column, int width, int alignment ) { if ( mPreferred ) { TQFont font = p->font(); @@ -72,7 +72,7 @@ void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg, p->setFont( font ); } - KListViewItem::paintCell( p, cg, column, width, tqalignment ); + KListViewItem::paintCell( p, cg, column, width, alignment ); } void IMAddressLVI::setAddress( const TQString &address ) @@ -85,7 +85,7 @@ void IMAddressLVI::setAddress( const TQString &address ) else { TQString nickname = address.section( TQChar( 0xE120 ), 0, 0 ); setText( 1, i18n( "<nickname> on <server>","%1 on %2" ) - .tqarg( nickname ).tqarg( serverOrGroup ) ); + .arg( nickname ).arg( serverOrGroup ) ); } mAddress = address; diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h index 3c9b85cee..417e62f4d 100644 --- a/kaddressbook/editors/imeditorwidget.h +++ b/kaddressbook/editors/imeditorwidget.h @@ -116,7 +116,7 @@ class IMAddressLVI : public KListViewItem bool preferred() const; protected: - virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ); + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ); private: KPluginInfo * mProtocol; diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp index 3ed79f49d..3d94d3b7e 100644 --- a/kaddressbook/emaileditwidget.cpp +++ b/kaddressbook/emaileditwidget.cpp @@ -302,7 +302,7 @@ void EmailEditDialog::remove() { TQString address = mEmailListBox->currentText(); - TQString text = i18n( "<qt>Are you sure that you want to remove the email address <b>%1</b>?</qt>" ).tqarg( address ); + TQString text = i18n( "<qt>Are you sure that you want to remove the email address <b>%1</b>?</qt>" ).arg( address ); TQString caption = i18n( "Confirm Remove" ); if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Continue) { diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index 6e854ebca..39727ecd6 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -217,7 +217,7 @@ void ExtensionManager::createExtensionWidgets() // load the other extensions const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/Extension", - TQString( "[X-KDE-KAddressBook-ExtensionPluginVersion] == %1" ).tqarg( KAB_EXTENSIONWIDGET_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KAddressBook-ExtensionPluginVersion] == %1" ).arg( KAB_EXTENSIONWIDGET_PLUGIN_VERSION ) ); KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index 035eba6ce..d279cc01f 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -343,7 +343,7 @@ void DistributionListWidget::editList() void DistributionListWidget::removeList() { int result = KMessageBox::warningContinueCancel( this, - i18n( "<qt>Delete distribution list <b>%1</b>?</qt>" ) .tqarg( mNameCombo->currentText() ), + i18n( "<qt>Delete distribution list <b>%1</b>?</qt>" ) .arg( mNameCombo->currentText() ), TQString(), KGuiItem( i18n("Delete"), "editdelete") ); if ( result != KMessageBox::Continue ) diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index a7f0d36dd..4972fd45d 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -247,7 +247,7 @@ void ResourceSelection::add() KABC::Resource *resource = mManager->createResource( type ); if ( !resource ) { KMessageBox::error( this, i18n("<qt>Unable to create an address book of type <b>%1</b>.</qt>") - .tqarg( type ) ); + .arg( type ) ); return; } @@ -298,7 +298,7 @@ void ResourceSelection::remove() int result = KMessageBox::warningContinueCancel( this, i18n( "<qt>Do you really want to remove the address book <b>%1</b>?</qt>" ) - .tqarg( item->resource()->resourceName() ), "", + .arg( item->resource()->resourceName() ), "", KGuiItem( i18n( "&Remove" ), "editdelete" ) ); if ( result == KMessageBox::Cancel ) return; diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 427e33bd9..3f5a2972b 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -537,7 +537,7 @@ void GeoMapWidget::paintEvent( TQPaintEvent* ) TQPixmap pm( w, h ); TQPainter p; - p.tqbegin( &pm, this ); + p.begin( &pm, this ); p.setPen( TQColor( 255, 0, 0 ) ); p.setBrush( TQColor( 255, 0, 0 ) ); diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index 73710d82b..377263fce 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -95,7 +95,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient /** Processes outstanding KApplication events. It should be called occasionally when the import/export filter is busy performing - a long operation (e.g. reading from slow external tqdevices). + a long operation (e.g. reading from slow external devices). @see: TQApplication::processEvents() */ void processEvents() const; diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index 11c9a9d1a..07bc98093 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -57,7 +57,7 @@ JumpButton::JumpButton( const TQString &firstChar, const TQString &lastChar, { setToggleButton( true ); if ( !lastChar.isEmpty() ) - setText( TQString( "%1 - %2" ).tqarg( firstChar.upper() ).tqarg( lastChar.upper() ) ); + setText( TQString( "%1 - %2" ).arg( firstChar.upper() ).arg( lastChar.upper() ) ); else setText( firstChar.upper() ); } diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index bc9ee1b6f..3c8a10d21 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -114,7 +114,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, mAddressBook = new KABC::AddressBook; mAddressBook->addResource( new KABC::ResourceFile( file ) ); if ( !mAddressBook->load() ) { - KMessageBox::error( parent, i18n("Unable to load '%1'.").tqarg( file ) ); + KMessageBox::error( parent, i18n("Unable to load '%1'.").arg( file ) ); } } mAddressBook->setErrorHandler( new KABC::GuiErrorHandler( mWidget ) ); @@ -334,7 +334,7 @@ KAboutData *KABCore::createAboutData() return about; } -void KABCore::seStatusBar( KStatusBar *statusBar ) +void KABCore::setStatusBar( KStatusBar *statusBar ) { mStatusBar = statusBar; } @@ -640,7 +640,7 @@ void KABCore::setWhoAmI() } TQString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) ); - if ( KMessageBox::questionYesNo( mWidget, text.tqarg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes ) + if ( KMessageBox::questionYesNo( mWidget, text.arg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes ) static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self( true ) )->setWhoAmI( addrList[ 0 ] ); } @@ -720,7 +720,7 @@ void KABCore::newDistributionList() bool foundUnused = false; int i = 1; while ( !foundUnused ) { - name = i18n( "New Distribution List (%1)" ).tqarg( i++ ); + name = i18n( "New Distribution List (%1)" ).arg( i++ ); foundUnused = KPIM::DistributionList::findByName( addressBook(), name ).isEmpty(); } } @@ -897,7 +897,7 @@ void KABCore::save() if ( ticket ) { if ( !mAddressBook->save( ticket ) ) { KMessageBox::error( mWidget, - i18n( "<qt>Unable to save address book <b>%1</b>.</qt>" ).tqarg( it.current()->resourceName() ) ); + i18n( "<qt>Unable to save address book <b>%1</b>.</qt>" ).arg( it.current()->resourceName() ) ); mAddressBook->releaseSaveTicket( ticket ); } else { setModified( false ); @@ -905,7 +905,7 @@ void KABCore::save() } else { KMessageBox::error( mWidget, i18n( "<qt>Unable to get access for saving the address book <b>%1</b>.</qt>" ) - .tqarg( it.current()->resourceName() ) ); + .arg( it.current()->resourceName() ) ); } ++it; @@ -1634,7 +1634,7 @@ void KABCore::removeSelectedContactsFromDistList() "<b>Note:</b>The contacts will be not be removed from your addressbook nor from " "any other distribution list." "</qt>", - uids.count() ).tqarg( mSelectedDistributionList ), + uids.count() ).arg( mSelectedDistributionList ), names, TQString(), KStdGuiItem::del() ) == KMessageBox::Cancel ) { return; } @@ -1729,7 +1729,7 @@ void KABCore::setSelectedDistributionList( const TQString &name ) mSearchManager->setSelectedDistributionList( name ); mViewHeaderLabel->setText( name.isNull() ? i18n( "Contacts" ) : - i18n( "Distribution List: %1" ).tqarg( name ) ); + i18n( "Distribution List: %1" ).arg( name ) ); mDistListButtonWidget->setShown( !mSelectedDistributionList.isNull() ); if ( !name.isNull() ) { mDetailsStack->raiseWidget( mDistListEntryView ); diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 39f229a59..fb5d47331 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -140,7 +140,7 @@ class KDE_EXPORT KABCore : public KAB::Core static KAboutData *createAboutData(); - void seStatusBar( KStatusBar *statusBar ); + void setStatusBar( KStatusBar *statusBar ); KStatusBar *statusBar() const; diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp index 3efa42772..db623dbad 100644 --- a/kaddressbook/kabtools.cpp +++ b/kaddressbook/kabtools.cpp @@ -43,7 +43,7 @@ static TQString uniqueFileName( const KABC::Addressee &addressee, TQStringList & name.replace( '/', '_' ); ++number; - uniquePart = TQString( "_%1" ).tqarg( number ); + uniquePart = TQString( "_%1" ).arg( number ); } while ( existingFiles.contains( name ) ); existingFiles.append( name ); diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp index 5f978b4d1..063c6e60a 100644 --- a/kaddressbook/kaddressbook_part.cpp +++ b/kaddressbook/kaddressbook_part.cpp @@ -63,7 +63,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetNa topLayout->addWidget( mCore->widget() ); KParts::StatusBarExtension *statusBar = new KParts::StatusBarExtension( this ); - mCore->seStatusBar( statusBar->statusBar() ); + mCore->setStatusBar( statusBar->statusBar() ); setXMLFile( "kaddressbook_part.rc" ); } diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp index ae6a4b841..a3dc9d990 100644 --- a/kaddressbook/kaddressbookmain.cpp +++ b/kaddressbook/kaddressbookmain.cpp @@ -64,7 +64,7 @@ KAddressBookMain::KAddressBookMain( const TQString &file ) statusBar()->addWidget( progressWidget, 0, true ); - mCore->seStatusBar( statusBar() ); + mCore->setStatusBar( statusBar() ); setStandardToolBarMenuEnabled( true ); diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index c418f15ed..f97749e22 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -171,7 +171,7 @@ void KABConfigWidget::restoreSettings() mFaxHook->setText( KABPrefs::instance()->faxHookApplication() ); mAddresseeWidget->restoreSettings(); mEditorCombo->setCurrentItem( KABPrefs::instance()->editorType() ); - mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().tqarg( KGlobal::locale()->country() ) ); + mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ) ); mLocationMapURL->lineEdit()->setCursorPosition( 0 ); KConfig config( "kabcrc", false, false ); diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp index 739672fc7..8aceceecf 100644 --- a/kaddressbook/keywidget.cpp +++ b/kaddressbook/keywidget.cpp @@ -122,7 +122,7 @@ void KeyWidget::addKey() TQFile file( tmpFile ); if ( !file.open( IO_ReadOnly ) ) { TQString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) ); - KMessageBox::error( this, text.tqarg( url.url() ) ); + KMessageBox::error( this, text.arg( url.url() ) ); return; } @@ -154,7 +154,7 @@ void KeyWidget::removeKey() TQString type = mKeyCombo->currentText(); TQString text = i18n( "<qt>Do you really want to remove the key <b>%1</b>?</qt>" ); - if ( KMessageBox::warningContinueCancel( this, text.tqarg( type ), "", KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Cancel ) + if ( KMessageBox::warningContinueCancel( this, text.arg( type ), "", KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Cancel ) return; mKeyList.remove( mKeyList.at( pos ) ); diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 7893477f6..be7f899ea 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -361,15 +361,15 @@ TQString LDAPSearchDialog::makeFilter( const TQString& query, const TQString& at if ( attr == i18n( "Name" ) ) { result += startsWith ? "|(cn=%1*)(sn=%2*)" : "|(cn=*%1*)(sn=*%2*)"; - result = result.tqarg( query ).tqarg( query ); + result = result.arg( query ).arg( query ); } else { result += (startsWith ? "%1=%2*" : "%1=*%2*"); if ( attr == i18n( "Email" ) ) { - result = result.tqarg( "mail" ).tqarg( query ); + result = result.arg( "mail" ).arg( query ); } else if ( attr == i18n( "Home Number" ) ) { - result = result.tqarg( "homePhone" ).tqarg( query ); + result = result.arg( "homePhone" ).arg( query ); } else if ( attr == i18n( "Work Number" ) ) { - result = result.tqarg( "telephoneNumber" ).tqarg( query ); + result = result.arg( "telephoneNumber" ).arg( query ); } else { // Error? result = TQString(); @@ -573,7 +573,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV if ( existing.isEmpty() ) { addr.setUid( KApplication::randomString( 10 ) ); - addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).tqarg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) ); + addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).arg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) ); addr.setResource( resource ); mCore->addressBook()->insertAddressee( addr ); TQString displayString; diff --git a/kaddressbook/printing/ds_appearance.ui b/kaddressbook/printing/ds_appearance.ui index 989b360d8..9dc64b9e6 100644 --- a/kaddressbook/printing/ds_appearance.ui +++ b/kaddressbook/printing/ds_appearance.ui @@ -68,7 +68,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -138,7 +138,7 @@ <property name="text"> <string>Details font:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -149,7 +149,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -160,7 +160,7 @@ <property name="text"> <string>Body font:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -171,7 +171,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -182,7 +182,7 @@ <property name="text"> <string>Fixed font:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -203,7 +203,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -245,7 +245,7 @@ <property name="text"> <string>Contact header font:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -274,7 +274,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -285,7 +285,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -301,7 +301,7 @@ <property name="text"> <string>Headlines:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -400,7 +400,7 @@ <property name="text"> <string>Headline background color:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -411,7 +411,7 @@ <property name="text"> <string>Headline text color:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp index a3fea0f67..62f89d558 100644 --- a/kaddressbook/printing/mikesstyle.cpp +++ b/kaddressbook/printing/mikesstyle.cpp @@ -68,7 +68,7 @@ void MikesStyle::print( const KABC::Addressee::List &contacts, PrintProgress *pr mBoldFont = p.font(); mBoldFont.setBold( true ); TQFontMetrics fm( mFont ); - TQPaintDeviceMetrics metrics( p.tqdevice() ); + TQPaintDeviceMetrics metrics( p.device() ); int height = 0; KABC::Addressee::List::ConstIterator it; @@ -141,7 +141,7 @@ void MikesStyle::doPaint( TQPainter &painter, const KABC::Addressee &addr, { TQFontMetrics fm( font ); TQFontMetrics bfm( bFont ); - TQPaintDeviceMetrics metrics( painter.tqdevice() ); + TQPaintDeviceMetrics metrics( painter.device() ); int margin = 10; int width = metrics.width() - 10; int xPos = 5; @@ -205,7 +205,7 @@ void MikesStyle::paintTagLine( TQPainter &p, const TQFont &font ) TQFontMetrics fm( font ); TQString text = i18n( "Printed on %1 by KAddressBook (http://www.kde.org)" ) - .tqarg( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); + .arg( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); p.setPen( TQt::black ); p.drawText( 0, fm.height(), text ); diff --git a/kaddressbook/typecombo.h b/kaddressbook/typecombo.h index 2ff6591c7..e5cf64296 100644 --- a/kaddressbook/typecombo.h +++ b/kaddressbook/typecombo.h @@ -91,8 +91,8 @@ void TypeCombo<T>::updateTypes() } labelCount[ type ] = count; if ( count > 1 ) { - label = i18n("label (number)", "%1 (%2)").tqarg( label ) - .tqarg( TQString::number( count ) ); + label = i18n("label (number)", "%1 (%2)").arg( label ) + .arg( TQString::number( count ) ); } insertItem( label ); } diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index b6ab807ba..c1f9da03d 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -307,7 +307,7 @@ void ViewManager::editView() void ViewManager::deleteView() { TQString text = i18n( "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>" ) - .tqarg( mActiveView->caption() ); + .arg( mActiveView->caption() ); TQString caption = i18n( "Confirm Delete" ); if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Continue ) { @@ -348,7 +348,7 @@ void ViewManager::addView() firstConflict = false; } - newName = TQString( "%1 <%2>" ).tqarg( newName ).tqarg( numTries ); + newName = TQString( "%1 <%2>" ).arg( newName ).arg( numTries ); numTries++; } @@ -387,7 +387,7 @@ void ViewManager::scrollDown() void ViewManager::createViewFactories() { const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/View", - TQString( "[X-KDE-KAddressBook-ViewPluginVersion] == %1" ).tqarg( KAB_VIEW_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KAddressBook-ViewPluginVersion] == %1" ).arg( KAB_VIEW_PLUGIN_VERSION ) ); KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { if ( !(*it)->hasServiceType( "KAddressBook/View" ) ) diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index 66ec75d16..44632e906 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -1392,7 +1392,7 @@ void CardView::setLayoutDirty( bool dirty ) { if ( d->mLayoutDirty != dirty ) { d->mLayoutDirty = dirty; - tqrepaint(); + repaint(); } } @@ -1400,7 +1400,7 @@ void CardView::setDrawCardBorder( bool enabled ) { if ( enabled != d->mDrawCardBorder ) { d->mDrawCardBorder = enabled; - tqrepaint(); + repaint(); } } @@ -1426,7 +1426,7 @@ void CardView::setDrawFieldLabels( bool enabled ) { if ( enabled != d->mDrawFieldLabels ) { d->mDrawFieldLabels = enabled; - tqrepaint(); + repaint(); } } diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h index 4b6bbe7e1..7a007d956 100644 --- a/kaddressbook/views/cardview.h +++ b/kaddressbook/views/cardview.h @@ -87,7 +87,7 @@ class CardViewItem virtual void paintCard( TQPainter *p, TQColorGroup &cg ); /** - Repaints the card. This is done by sending a tqrepaint event to the + Repaints the card. This is done by sending a repaint event to the view with the clip rect defined as this card. */ virtual void repaintCard(); @@ -526,7 +526,7 @@ class CardView : public TQScrollView void contentsWheelEvent( TQWheelEvent* ); /** - Sets the tqlayout to dirty and calls for a tqrepaint. + Sets the tqlayout to dirty and calls for a repaint. */ void setLayoutDirty( bool dirty ); diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index de28c5d17..a8d4537fd 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -313,7 +313,7 @@ void CardViewLookNFeelPage::initGUI() void CardViewLookNFeelPage::updateFontLabel( TQFont fnt, TQLabel *l ) { l->setFont( fnt ); - l->setText( TQString( fnt.family() + " %1" ).tqarg( fnt.pointSize() ) ); + l->setText( TQString( fnt.family() + " %1" ).arg( fnt.pointSize() ) ); } #include "configurecardviewdialog.moc" diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index c2b527945..c59c47eee 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -82,17 +82,17 @@ void DynamicTip::maybeTip( const TQPoint &pos ) if (a.isEmpty()) return; - s += i18n("label: value", "%1: %2").tqarg(a.formattedNameLabel()) - .tqarg(a.formattedName()); + s += i18n("label: value", "%1: %2").arg(a.formattedNameLabel()) + .arg(a.formattedName()); s += '\n'; - s += i18n("label: value", "%1: %2").tqarg(a.organizationLabel()) - .tqarg(a.organization()); + s += i18n("label: value", "%1: %2").arg(a.organizationLabel()) + .arg(a.organization()); TQString notes = a.note().stripWhiteSpace(); if ( !notes.isEmpty() ) { notes += '\n'; - s += '\n' + i18n("label: value", "%1: \n").tqarg(a.noteLabel()); + s += '\n' + i18n("label: value", "%1: \n").arg(a.noteLabel()); TQFontMetrics fm( font() ); // Begin word wrap code based on TQMultiLineEdit code diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 211b62dd4..7d95c043e 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -96,7 +96,7 @@ class AddresseeCardViewItem : public CardViewItem const KABC::Field::List::ConstIterator endIt( mFields.end() ); for ( ; it != endIt; ++it ) { // insert empty fields or not? not doing so saves a bit of memory and CPU - // (during tqgeometry calculations), but prevents having equally + // (during geometry calculations), but prevents having equally // wide label columns in all cards, unless CardViewItem/CardView search // globally for the widest label. (anders) diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 19364d597..6fa731308 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -244,7 +244,7 @@ void KAddressBookTableView::refresh( const TQString &uid ) // Sometimes the background pixmap gets messed up when we add lots // of items. - mListView->tqrepaint(); + mListView->repaint(); if ( currentItem ) { mListView->setCurrentItem( currentItem ); diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp index 22f6afadb..9c270a2e3 100644 --- a/kaddressbook/xxport/csv_xxport.cpp +++ b/kaddressbook/xxport/csv_xxport.cpp @@ -50,7 +50,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& return true; if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } @@ -58,8 +58,8 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& KTempFile tmpFile; if ( tmpFile.status() != 0 ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" ); - KMessageBox::error( parentWidget(), txt.tqarg( url.url() ) - .tqarg( strerror( tmpFile.status() ) ) ); + KMessageBox::error( parentWidget(), txt.arg( url.url() ) + .arg( strerror( tmpFile.status() ) ) ); return false; } @@ -71,7 +71,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& TQFile file( url.path() ); if ( !file.open( IO_WriteOnly ) ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); - KMessageBox::error( parentWidget(), txt.tqarg( url.path() ) ); + KMessageBox::error( parentWidget(), txt.arg( url.path() ) ); return false; } diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 14a40c611..72ae7e782 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -503,7 +503,7 @@ void CSVImportDialog::fillTable() else if ( code == Guess ) { TQTextCodec* codec = TQTextCodec::codecForContent( mFileArray.data(), mFileArray.size() ); if ( codec ) { - KMessageBox::information( this, i18n( "Using codec '%1'" ).tqarg( codec->name() ), i18n( "Encoding" ) ); + KMessageBox::information( this, i18n( "Using codec '%1'" ).arg( codec->name() ), i18n( "Encoding" ) ); inputStream.setCodec( codec ); } } @@ -663,7 +663,7 @@ void CSVImportDialog::reloadCodecs() for ( int i = 0; ( codec = TQTextCodec::codecForIndex( i ) ); i++ ) mCodecs.append( codec ); - mCodecCombo->insertItem( i18n( "Local (%1)" ).tqarg( TQTextCodec::codecForLocale()->name() ), Local ); + mCodecCombo->insertItem( i18n( "Local (%1)" ).arg( TQTextCodec::codecForLocale()->name() ), Local ); mCodecCombo->insertItem( i18n( "[guess]" ), Guess ); mCodecCombo->insertItem( i18n( "Latin1" ), Latin1 ); mCodecCombo->insertItem( i18n( "Unicode" ), Uni ); @@ -858,7 +858,7 @@ void CSVImportDialog::saveTemplate() fileName += ".desktop"; if( TQFileInfo(fileName).exists() ) { - if(KMessageBox::questionYesNo( this, i18n("Do you want to overwrite file \"%1\"").tqarg(fileName) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( this, i18n("Do you want to overwrite file \"%1\"").arg(fileName) ) == KMessageBox::No) return; } TQString name = KInputDialog::getText( i18n( "Template Name" ), i18n( "Please enter a name for the template:" ) ); diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp index f4d1e9dbd..9f7b628f4 100644 --- a/kaddressbook/xxport/gnokii_xxport.cpp +++ b/kaddressbook/xxport/gnokii_xxport.cpp @@ -63,7 +63,7 @@ extern "C" { #define GNOKII_CHECK_ERROR(error) \ do { \ if (error) \ - kdError() << TQString("ERROR %1: %2\n").tqarg(error).tqarg(gn_error_print(error));\ + kdError() << TQString("ERROR %1: %2\n").arg(error).arg(gn_error_print(error));\ } while (0) // Locale conversion routines: @@ -126,8 +126,8 @@ static TQString businit(void) { GNOKII_DEBUG( "Using new gnokii version." ); - GNOKII_DEBUG( TQString("Compiled with libgnokii version 0x%1\n").tqarg(TQString::number(LIBGNOKII_VERSION,16)) ); - GNOKII_DEBUG( TQString("Using libgnokii runtime version 0x%1\n").tqarg(TQString::number(gn_lib_version(),16)) ); + GNOKII_DEBUG( TQString("Compiled with libgnokii version 0x%1\n").arg(TQString::number(LIBGNOKII_VERSION,16)) ); + GNOKII_DEBUG( TQString("Using libgnokii runtime version 0x%1\n").arg(TQString::number(gn_lib_version(),16)) ); gn_error error = gn_lib_phoneprofile_load(NULL, &state); if (error) @@ -142,7 +142,7 @@ static TQString businit(void) "You might try to run \"gnokii --identify\" on the command line to " "check any cable/transport issues and to verify if your gnokii " "configuration is correct.</center></qt>") - .tqarg(gn_error_print(error)); + .arg(gn_error_print(error)); } // identify phone @@ -152,7 +152,7 @@ static TQString businit(void) imei = gn_lib_get_phone_imei(state); GNOKII_DEBUG( TQString("Found mobile phone: %1 %2, Revision: %3, IMEI: %4\n") - .tqarg(manufacturer, model, revision, imei) ); + .arg(manufacturer, model, revision, imei) ); return TQString(); } @@ -166,7 +166,7 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat error = gn_lib_addressbook_memstat(state, memtype, &memstat->used, &memstat->free); GNOKII_DEBUG( TQString("\n\nMobile phone memory status: Type: %1, used=%2, free=%3, total=%4\n\n") - .tqarg(memtype).tqarg(memstat->used).tqarg(memstat->free).tqarg(memstat->used+memstat->free) ); + .arg(memtype).arg(memstat->used).arg(memstat->free).arg(memstat->used+memstat->free) ); return error; } @@ -176,13 +176,13 @@ static TQString buildPhoneInfoString( const gn_memory_status &memstat ) TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); return TQString::fromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") - .tqarg(i18n("Mobile Phone information:")) - .tqarg(format.tqarg(i18n("Manufacturer")).tqarg(GN_FROM(manufacturer))) - .tqarg(format.tqarg(i18n("Phone model")).tqarg(GN_FROM(model))) - .tqarg(format.tqarg(i18n("Revision")).tqarg(GN_FROM(revision))) - .tqarg(format.tqarg(i18n("IMEI")).tqarg(GN_FROM(imei))) - .tqarg(format.tqarg(i18n("Phonebook status")) - .tqarg(i18n("%1 out of %2 contacts used").tqarg(memstat.used).tqarg(memstat.used+memstat.free))); + .arg(i18n("Mobile Phone information:")) + .arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer))) + .arg(format.arg(i18n("Phone model")).arg(GN_FROM(model))) + .arg(format.arg(i18n("Revision")).arg(GN_FROM(revision))) + .arg(format.arg(i18n("IMEI")).arg(GN_FROM(imei))) + .arg(format.arg(i18n("Phonebook status")) + .arg(i18n("%1 out of %2 contacts used").arg(memstat.used).arg(memstat.used+memstat.free))); } // read and evaluate all phone entries @@ -209,9 +209,9 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty progress->setTotalSteps(memstat.used); m_progressDlg->setLabel(i18n("<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone.<br><br>%3</qt>") - .tqarg(memstat.used) - .tqarg(gn_memory_type2str(memtype)) - .tqarg(buildPhoneInfoString(memstat)) ); + .arg(memstat.used) + .arg(gn_memory_type2str(memtype)) + .arg(buildPhoneInfoString(memstat)) ); int num_read = 0; @@ -233,10 +233,10 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty const char *name = gn_lib_get_pb_name(state); const char *number = gn_lib_get_pb_number(state); - GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").tqarg(i) - .tqarg(GN_FROM(name)).tqarg(GN_FROM(number)) - .tqarg(gn_lib_get_pb_location(state)).tqarg(gn_lib_get_pb_caller_group(state)) - .tqarg(subentries_count)); + GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(i) + .arg(GN_FROM(name)).arg(GN_FROM(number)) + .arg(gn_lib_get_pb_location(state)).arg(gn_lib_get_pb_caller_group(state)) + .arg(subentries_count)); KABC::Addressee *a = new KABC::Addressee(); // try to split Name into FamilyName and GivenName @@ -263,10 +263,10 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty } a->insertCustom(APP, "X_GSM_CALLERGROUP", s.setNum(gn_lib_get_pb_caller_group(state))); - a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").tqarg(memtypestr).tqarg(gn_lib_get_pb_location(state))); + a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").arg(memtypestr).arg(gn_lib_get_pb_location(state))); // set ProductId - a->setProductId(TQString("%1-%2-%3-%4").tqarg(APP).tqarg(model).tqarg(revision).tqarg(imei)); + a->setProductId(TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei)); // evaluate timestamp (ignore timezone) TQDateTime datetime; @@ -276,7 +276,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty else datetime = TQDateTime( TQDate(ts.year, ts.month, ts.day), TQTime(ts.hour, ts.minute, ts.second) ); - GNOKII_DEBUG(TQString(" date=%1\n").tqarg(datetime.toString())); + GNOKII_DEBUG(TQString(" date=%1\n").arg(datetime.toString())); a->setRevision(datetime); if (!subentries_count) @@ -295,7 +295,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty TQString s = GN_FROM(number).simplifyWhiteSpace(); GNOKII_DEBUG(TQString(" Subentry#%1, entry_type=%2, number_type=%3, number=%4\n") - .tqarg(n).tqarg(entry_type).tqarg(number_type).tqarg(s)); + .arg(n).arg(entry_type).arg(number_type).arg(s)); if (s.isEmpty()) continue; switch(entry_type) { @@ -362,7 +362,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty break; default: GNOKII_DEBUG(TQString(" Not handled id=%1, entry=%2\n") - .tqarg(entry_type).tqarg(s)); + .arg(entry_type).arg(s)); break; } // switch() } // if(subentry) @@ -425,8 +425,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem time.hour(), time.minute(), time.second(), 0 ); gn_lib_set_pb_date(state, ts); - GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").tqarg(phone_location) - .tqarg(GN_FROM(gn_lib_get_pb_name(state))).tqarg(GN_FROM(gn_lib_get_pb_number(state)))); + GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location) + .arg(GN_FROM(gn_lib_get_pb_name(state))).arg(GN_FROM(gn_lib_get_pb_number(state)))); const KABC::Address homeAddr = addr->address(KABC::Address::Home); const KABC::Address workAddr = addr->address(KABC::Address::Work); @@ -467,7 +467,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem // only one email allowed if we have URLS, notes, addresses (to avoid phone limitations) if (n && !addr->url().isEmpty() && !addr->note().isEmpty() && addr->addresses().count()) { GNOKII_DEBUG(TQString(" DROPPED email %1 in favor of URLs, notes and addresses.\n") - .tqarg(s)); + .arg(s)); continue; } gn_lib_set_pb_subentry(state, -1 /* index to append entry */, @@ -507,8 +507,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem const char *number; gn_lib_get_pb_subentry(state, st, &entry_type, &number_type, &number); GNOKII_DEBUG(TQString(" SubTel #%1: entry_type=%2, number_type=%3, number=%4\n") - .tqarg(st).tqarg(entry_type) - .tqarg(number_type).tqarg(GN_FROM(number))); + .arg(st).arg(entry_type) + .arg(number_type).arg(GN_FROM(number))); } gn_error error = gn_lib_phonebook_write_entry(state, memtype, phone_location); @@ -656,9 +656,9 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri m_progressDlg->setButtonText(i18n("&Stop Export")); m_progressDlg->setLabel(i18n("<qt>Exporting <b>%1</b> contacts to the <b>%2</b> " "of the Mobile Phone.<br><br>%3</qt>") - .tqarg(list.count()) - .tqarg(gn_memory_type2str(memtype)) - .tqarg(buildPhoneInfoString(memstat)) ); + .arg(list.count()) + .arg(gn_memory_type2str(memtype)) + .arg(buildPhoneInfoString(memstat)) ); // Now run the loop... phone_entry_no = 1; @@ -682,7 +682,7 @@ try_next_phone_entry: break; GNOKII_DEBUG(TQString("Try to write entry '%1' at phone_entry_no=%2, phone_count=%3\n") - .tqarg(addr->realName()).tqarg(phone_entry_no).tqarg(phone_count)); + .arg(addr->realName()).arg(phone_entry_no).arg(phone_count)); error = GN_ERR_NONE; @@ -755,7 +755,7 @@ finish: delete m_progressDlg; if (!failedList.isEmpty()) { - GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", "))); + GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", "))); KMessageBox::informationList(parentWidget(), i18n("<qt>The following contacts could not be exported to the Mobile Phone. " "Possible Reasons for this problem could be:<br><ul>" @@ -801,7 +801,7 @@ static gn_data data; static void busterminate(void) { gn_sm_functions(GN_OP_Terminate, NULL, &state); - if (lockfile) gn_tqdevice_unlock(lockfile); + if (lockfile) gn_device_unlock(lockfile); } static TQString businit(void) @@ -830,7 +830,7 @@ static TQString businit(void) aux = gn_cfg_get(gn_cfg_info, "global", "use_locking"); // Defaults to 'no' if (aux && !strcmp(aux, "yes")) { - lockfile = gn_tqdevice_lock(state.config.port_tqdevice); + lockfile = gn_device_lock(state.config.port_device); if (lockfile == NULL) { return i18n("Gnokii reports a 'Lock File Error'.\n " "Please exit all other running instances of gnokii, check if you have " @@ -851,7 +851,7 @@ static TQString businit(void) "You might try to run \"gnokii --identify\" on the command line to " "check any cable/transport issues and to verify if your gnokii " "configuration is correct.</center></qt>") - .tqarg(gn_error_print(error)); + .arg(gn_error_print(error)); } // identify phone @@ -874,9 +874,9 @@ static TQString businit(void) GNOKII_CHECK_ERROR(error); GNOKII_DEBUG( TQString("Found mobile phone: %1 %2, Revision: %3, IMEI: %4\n") - .tqarg(manufacturer, model, revision, imei) ); + .arg(manufacturer, model, revision, imei) ); - PhoneProductId = TQString("%1-%2-%3-%4").tqarg(APP).tqarg(model).tqarg(revision).tqarg(imei); + PhoneProductId = TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei); return TQString(); } @@ -908,7 +908,7 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat } } GNOKII_DEBUG( TQString("\n\nMobile phone memory status: Type: %1, used=%2, free=%3, total=%4\n\n") - .tqarg(memtype).tqarg(memstat->used).tqarg(memstat->free).tqarg(memstat->used+memstat->free) ); + .arg(memtype).arg(memstat->used).arg(memstat->free).arg(memstat->used+memstat->free) ); return error; } @@ -946,13 +946,13 @@ static TQString buildPhoneInfoString( const gn_memory_status &memstat ) TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); return TQString::fromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") - .tqarg(i18n("Mobile Phone information:")) - .tqarg(format.tqarg(i18n("Manufacturer")).tqarg(GN_FROM(manufacturer))) - .tqarg(format.tqarg(i18n("Phone model")).tqarg(GN_FROM(model))) - .tqarg(format.tqarg(i18n("Revision")).tqarg(GN_FROM(revision))) - .tqarg(format.tqarg(i18n("IMEI")).tqarg(GN_FROM(imei))) - .tqarg(format.tqarg(i18n("Phonebook status")) - .tqarg(i18n("%1 out of %2 contacts used").tqarg(memstat.used).tqarg(memstat.used+memstat.free))); + .arg(i18n("Mobile Phone information:")) + .arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer))) + .arg(format.arg(i18n("Phone model")).arg(GN_FROM(model))) + .arg(format.arg(i18n("Revision")).arg(GN_FROM(revision))) + .arg(format.arg(i18n("IMEI")).arg(GN_FROM(imei))) + .arg(format.arg(i18n("Phonebook status")) + .arg(i18n("%1 out of %2 contacts used").arg(memstat.used).arg(memstat.used+memstat.free))); } static TQString buildMemoryTypeString( gn_memory_type memtype ) @@ -989,9 +989,9 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty progress->setTotalSteps(memstat.used); m_progressDlg->setLabel(i18n("<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone.<br><br>%3</qt>") - .tqarg(memstat.used) - .tqarg(buildMemoryTypeString(memtype)) - .tqarg(buildPhoneInfoString(memstat)) ); + .arg(memstat.used) + .arg(buildMemoryTypeString(memtype)) + .arg(buildPhoneInfoString(memstat)) ); int num_read = 0; @@ -1008,8 +1008,8 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty if (error == GN_ERR_INVALIDMEMORYTYPE) break; if (error == GN_ERR_NONE) { - GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").tqarg(i).tqarg(GN_FROM(entry.name)) - .tqarg(GN_FROM(entry.number)).tqarg(entry.location).tqarg(entry.caller_group).tqarg(entry.subentries_count)); + GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(i).arg(GN_FROM(entry.name)) + .arg(GN_FROM(entry.number)).arg(entry.location).arg(entry.caller_group).arg(entry.subentries_count)); KABC::Addressee *a = new KABC::Addressee(); // try to split Name into FamilyName and GivenName @@ -1036,7 +1036,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty } a->insertCustom(APP, "X_GSM_CALLERGROUP", s.setNum(entry.caller_group)); - a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").tqarg(memtypestr).tqarg(entry.location)); + a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").arg(memtypestr).arg(entry.location)); // set ProductId a->setProductId(PhoneProductId); @@ -1048,7 +1048,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty else datetime = TQDateTime( TQDate(entry.date.year, entry.date.month, entry.date.day), TQTime(entry.date.hour, entry.date.minute, entry.date.second) ); - GNOKII_DEBUG(TQString(" date=%1\n").tqarg(datetime.toString())); + GNOKII_DEBUG(TQString(" date=%1\n").arg(datetime.toString())); a->setRevision(datetime); if (!entry.subentries_count) @@ -1059,8 +1059,8 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty for (int n=0; n<entry.subentries_count; n++) { TQString s = GN_FROM(entry.subentries[n].data.number).simplifyWhiteSpace(); GNOKII_DEBUG(TQString(" Subentry#%1, entry_type=%2, number_type=%3, number=%4\n") - .tqarg(n).tqarg(entry.subentries[n].entry_type) - .tqarg(entry.subentries[n].number_type).tqarg(s)); + .arg(n).arg(entry.subentries[n].entry_type) + .arg(entry.subentries[n].number_type).arg(s)); if (s.isEmpty()) continue; switch(entry.subentries[n].entry_type) { @@ -1127,7 +1127,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty break; default: GNOKII_DEBUG(TQString(" Not handled id=%1, entry=%2\n") - .tqarg(entry.subentries[n].entry_type).tqarg(s)); + .arg(entry.subentries[n].entry_type).arg(s)); break; } // switch() } // if(subentry) @@ -1191,8 +1191,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem entry.date.minute = time.minute(); entry.date.second = time.second(); - GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").tqarg(phone_location) - .tqarg(GN_FROM(entry.name)).tqarg(GN_FROM(entry.number))); + GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location) + .arg(GN_FROM(entry.name)).arg(GN_FROM(entry.number))); const KABC::Address homeAddr = addr->address(KABC::Address::Home); const KABC::Address workAddr = addr->address(KABC::Address::Work); @@ -1244,7 +1244,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem // only one email allowed if we have URLS, notes, addresses (to avoid phone limitations) if (n && !addr->url().isEmpty() && !addr->note().isEmpty() && addr->addresses().count()) { GNOKII_DEBUG(TQString(" DROPPED email %1 in favor of URLs, notes and addresses.\n") - .tqarg(s)); + .arg(s)); continue; } subentry->entry_type = GN_PHONEBOOK_ENTRY_Email; @@ -1289,8 +1289,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem for (int st=0; st<entry.subentries_count; st++) { gn_phonebook_subentry *subentry = &entry.subentries[st]; GNOKII_DEBUG(TQString(" SubTel #%1: entry_type=%2, number_type=%3, number=%4\n") - .tqarg(st).tqarg(subentry->entry_type) - .tqarg(subentry->number_type).tqarg(GN_FROM(subentry->data.number))); + .arg(st).arg(subentry->entry_type) + .arg(subentry->number_type).arg(GN_FROM(subentry->data.number))); } data.phonebook_entry = &entry; @@ -1309,7 +1309,7 @@ static gn_error xxport_phone_delete_entry( int phone_location, gn_memory_type me entry.memory_type = memtype; entry.location = phone_location; data.phonebook_entry = &entry; - GNOKII_DEBUG(TQString("Deleting entry %1\n").tqarg(phone_location)); + GNOKII_DEBUG(TQString("Deleting entry %1\n").arg(phone_location)); gn_error error = gn_sm_functions(GN_OP_WritePhonebook, &data, &state); GNOKII_CHECK_ERROR(error); return error; @@ -1447,9 +1447,9 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri m_progressDlg->setButtonText(i18n("&Stop Export")); m_progressDlg->setLabel(i18n("<qt>Exporting <b>%1</b> contacts to the <b>%2</b> " "of the Mobile Phone.<br><br>%3</qt>") - .tqarg(list.count()) - .tqarg(buildMemoryTypeString(memtype)) - .tqarg(buildPhoneInfoString(memstat)) ); + .arg(list.count()) + .arg(buildMemoryTypeString(memtype)) + .arg(buildPhoneInfoString(memstat)) ); // Now run the loop... phone_entry_no = 1; @@ -1473,7 +1473,7 @@ try_next_phone_entry: break; GNOKII_DEBUG(TQString("Try to write entry '%1' at phone_entry_no=%2, phone_count=%3\n") - .tqarg(addr->realName()).tqarg(phone_entry_no).tqarg(phone_count)); + .arg(addr->realName()).arg(phone_entry_no).arg(phone_count)); error = GN_ERR_NONE; @@ -1546,7 +1546,7 @@ finish: delete m_progressDlg; if (!failedList.isEmpty()) { - GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", "))); + GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", "))); KMessageBox::informationList(parentWidget(), i18n("<qt>The following contacts could not be exported to the Mobile Phone. " "Possible Reasons for this problem could be:<br><ul>" diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp index 3b60ca5e1..309bb9b5b 100644 --- a/kaddressbook/xxport/kde2_xxport.cpp +++ b/kaddressbook/xxport/kde2_xxport.cpp @@ -49,7 +49,7 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const { TQString fileName = locateLocal( "data", "kabc/std.vcf" ); if ( !TQFile::exists( fileName ) ) { - KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).tqarg( fileName ) ); + KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).arg( fileName ) ); return KABC::AddresseeList(); } diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp index a51169e7d..30718a9f0 100644 --- a/kaddressbook/xxport/ldif_xxport.cpp +++ b/kaddressbook/xxport/ldif_xxport.cpp @@ -71,7 +71,7 @@ KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" ); - KMessageBox::error( parentWidget(), msg.tqarg( fileName ) ); + KMessageBox::error( parentWidget(), msg.arg( fileName ) ); return addrList; } @@ -97,7 +97,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString return true; if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } @@ -106,8 +106,8 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString KTempFile tmpFile; if ( tmpFile.status() != 0 ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" ); - KMessageBox::error( parentWidget(), txt.tqarg( url.url() ) - .tqarg( strerror( tmpFile.status() ) ) ); + KMessageBox::error( parentWidget(), txt.arg( url.url() ) + .arg( strerror( tmpFile.status() ) ) ); return false; } @@ -121,7 +121,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString if ( !file.open( IO_WriteOnly ) ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); - KMessageBox::error( parentWidget(), txt.tqarg( filename ) ); + KMessageBox::error( parentWidget(), txt.arg( filename ) ); return false; } diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp index a115d8dfd..800f11fa6 100644 --- a/kaddressbook/xxport/opera_xxport.cpp +++ b/kaddressbook/xxport/opera_xxport.cpp @@ -55,7 +55,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" ); - KMessageBox::error( parentWidget(), msg.tqarg( fileName ) ); + KMessageBox::error( parentWidget(), msg.arg( fileName ) ); return addrList; } diff --git a/kaddressbook/xxport/pab_pablib.cpp b/kaddressbook/xxport/pab_pablib.cpp index 198e683fd..344647f6f 100644 --- a/kaddressbook/xxport/pab_pablib.cpp +++ b/kaddressbook/xxport/pab_pablib.cpp @@ -46,7 +46,7 @@ adr_t A; bool ret; if (!in.isOpen()) {TQString msg; - msg=i18n("Cannot open %1 for reading").tqarg(pabfile); + msg=i18n("Cannot open %1 for reading").arg(pabfile); // info->alert(msg); return false; } @@ -243,7 +243,7 @@ bool pab::knownPAB(void) content_t id; id=go(0); if (id!=PAB_FILE_ID) {TQString msg; - msg=i18n("%1 has no PAB id that I know of, cannot convert this").tqarg(pabfile); + msg=i18n("%1 has no PAB id that I know of, cannot convert this").arg(pabfile); // info->alert(msg); return false; } diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp index 021f671c8..911e92ded 100644 --- a/kaddressbook/xxport/pab_xxport.cpp +++ b/kaddressbook/xxport/pab_xxport.cpp @@ -55,7 +55,7 @@ KABC::AddresseeList PABXXPort::importContacts( const TQString& ) const if ( fileName.isEmpty() ) return addrList; if ( !TQFile::exists( fileName ) ) { - KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).tqarg( fileName ) ); + KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).arg( fileName ) ); return addrList; } diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 849b24407..022f6c5f2 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -250,15 +250,15 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const KIO::NetAccess::removeTempFile( fileName ); } else { TQString text = i18n( "<qt>When trying to read the vCard, there was an error opening the file '%1': %2</qt>" ); - text = text.tqarg( (*it).url() ); - text = text.tqarg( kapp->translate( "TQFile", + text = text.arg( (*it).url() ); + text = text.arg( kapp->translate( "TQFile", TQString(file.errorString()).latin1() ) ); KMessageBox::error( parentWidget(), text, caption ); anyFailures = true; } } else { TQString text = i18n( "<qt>Unable to access vCard: %1</qt>" ); - text = text.tqarg( KIO::NetAccess::lastErrorString() ); + text = text.arg( KIO::NetAccess::lastErrorString() ); KMessageBox::error( parentWidget(), text, caption ); anyFailures = true; } @@ -293,7 +293,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQByteArray &data ) const bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data ) { if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } KTempFile tmpFile; @@ -315,7 +315,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const bool VCardXXPort::doExport( const KURL &url, const TQString &data ) { if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } KTempFile tmpFile; diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp index 642f8bfe3..38a9a89a1 100644 --- a/kaddressbook/xxportmanager.cpp +++ b/kaddressbook/xxportmanager.cpp @@ -77,7 +77,7 @@ void XXPortManager::slotImport( const TQString &identifier, const TQString &data { KAB::XXPort *obj = mXXPortObjects[ identifier ]; if ( !obj ) { - KMessageBox::error( mCore->widget(), i18n( "<qt>No import plugin available for <b>%1</b>.</qt>" ).tqarg( identifier ) ); + KMessageBox::error( mCore->widget(), i18n( "<qt>No import plugin available for <b>%1</b>.</qt>" ).arg( identifier ) ); return; } @@ -101,7 +101,7 @@ void XXPortManager::slotExport( const TQString &identifier, const TQString &data { KAB::XXPort *obj = mXXPortObjects[ identifier ]; if ( !obj ) { - KMessageBox::error( mCore->widget(), i18n( "<qt>No export plugin available for <b>%1</b>.</qt>" ).tqarg( identifier ) ); + KMessageBox::error( mCore->widget(), i18n( "<qt>No export plugin available for <b>%1</b>.</qt>" ).arg( identifier ) ); return; } @@ -121,7 +121,7 @@ void XXPortManager::loadPlugins() mXXPortObjects.clear(); const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/XXPort", - TQString( "[X-KDE-KAddressBook-XXPortPluginVersion] == %1" ).tqarg( KAB_XXPORT_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KAddressBook-XXPortPluginVersion] == %1" ).arg( KAB_XXPORT_PLUGIN_VERSION ) ); KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { if ( !(*it)->hasServiceType( "KAddressBook/XXPort" ) ) |