summaryrefslogtreecommitdiffstats
path: root/kaddressbook
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
commit1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch)
treef2defe163a805a9e34a2142dfde4cdb5e49241e7 /kaddressbook
parent67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff)
downloadtdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz
tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kaddressbook')
-rw-r--r--kaddressbook/addresseditwidget.cpp16
-rw-r--r--kaddressbook/addresseeeditordialog.cpp2
-rw-r--r--kaddressbook/addresseeeditorwidget.cpp14
-rw-r--r--kaddressbook/addviewdialog.cpp2
-rw-r--r--kaddressbook/common/filter.cpp8
-rw-r--r--kaddressbook/common/locationmap.cpp2
-rw-r--r--kaddressbook/contacteditorwidgetmanager.cpp2
-rw-r--r--kaddressbook/customfieldswidget.cpp14
-rw-r--r--kaddressbook/distributionlisteditor.cpp6
-rw-r--r--kaddressbook/distributionlistentryview.cpp4
-rw-r--r--kaddressbook/distributionlistpicker.cpp4
-rw-r--r--kaddressbook/editors/imaddresswidget.cpp2
-rw-r--r--kaddressbook/editors/imeditorwidget.cpp2
-rw-r--r--kaddressbook/emaileditwidget.cpp2
-rw-r--r--kaddressbook/extensionmanager.cpp4
-rw-r--r--kaddressbook/features/distributionlistwidget.cpp2
-rw-r--r--kaddressbook/features/resourceselection.cpp8
-rw-r--r--kaddressbook/filtereditdialog.cpp8
-rw-r--r--kaddressbook/geowidget.cpp12
-rw-r--r--kaddressbook/imagewidget.cpp4
-rw-r--r--kaddressbook/jumpbuttonbar.cpp6
-rw-r--r--kaddressbook/kabcore.cpp36
-rw-r--r--kaddressbook/kabtools.cpp2
-rw-r--r--kaddressbook/kaddressbook_part.cpp2
-rw-r--r--kaddressbook/kaddressbook_part.h4
-rw-r--r--kaddressbook/kaddressbookmain.cpp6
-rw-r--r--kaddressbook/kaddressbookmain.h4
-rw-r--r--kaddressbook/kcmconfigs/addresseewidget.cpp10
-rw-r--r--kaddressbook/kcmconfigs/kabconfigwidget.cpp8
-rw-r--r--kaddressbook/kcmconfigs/ldapoptionswidget.cpp6
-rw-r--r--kaddressbook/keywidget.cpp4
-rw-r--r--kaddressbook/ldapsearchdialog.cpp20
-rw-r--r--kaddressbook/phoneeditwidget.cpp8
-rw-r--r--kaddressbook/printing/mikesstyle.cpp2
-rw-r--r--kaddressbook/printing/selectionpage.cpp2
-rw-r--r--kaddressbook/printing/stylepage.cpp4
-rw-r--r--kaddressbook/searchmanager.cpp8
-rw-r--r--kaddressbook/typecombo.h4
-rw-r--r--kaddressbook/undocmds.cpp6
-rw-r--r--kaddressbook/viewmanager.cpp18
-rw-r--r--kaddressbook/views/cardview.cpp32
-rw-r--r--kaddressbook/views/configurecardviewdialog.cpp6
-rw-r--r--kaddressbook/views/configuretableviewdialog.cpp2
-rw-r--r--kaddressbook/views/contactlistview.cpp12
-rw-r--r--kaddressbook/xxport/csv_xxport.cpp8
-rw-r--r--kaddressbook/xxport/csvimportdialog.cpp8
-rw-r--r--kaddressbook/xxport/eudora_xxport.cpp8
-rw-r--r--kaddressbook/xxport/gnokii_xxport.cpp134
-rw-r--r--kaddressbook/xxport/kde2_xxport.cpp2
-rw-r--r--kaddressbook/xxport/ldif_xxport.cpp10
-rw-r--r--kaddressbook/xxport/opera_xxport.cpp2
-rw-r--r--kaddressbook/xxport/pab_pablib.cpp4
-rw-r--r--kaddressbook/xxport/pab_xxport.cpp2
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp12
-rw-r--r--kaddressbook/xxportmanager.cpp6
-rw-r--r--kaddressbook/xxportselectdialog.cpp4
56 files changed, 269 insertions, 261 deletions
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index 4f616844..60c1f2a6 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:" ).arg( KABC::Address::streetLabel() ), page );
+ TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).tqarg( KABC::Address::streetLabel() ), page );
label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft );
topLayout->addWidget( label, 1, 0 );
mStreetTextEdit = new TQTextEdit( page );
@@ -281,34 +281,34 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
label->setBuddy( mStreetTextEdit );
topLayout->addWidget( mStreetTextEdit, 1, 1 );
- TabPressEater *eater = new TabPressEater( this );
+ TabPressEater *eater = new TabPressEater( TQT_TQOBJECT(this) );
mStreetTextEdit->installEventFilter( eater );
- label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( KABC::Address::postOfficeBoxLabel() ), page );
+ label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).tqarg( 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:" ).arg( KABC::Address::localityLabel() ), page );
+ label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).tqarg( 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:" ).arg( KABC::Address::regionLabel() ), page );
+ label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).tqarg( 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:" ).arg( KABC::Address::postalCodeLabel() ), page );
+ label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).tqarg( 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:" ).arg( KABC::Address::countryLabel() ), page );
+ label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).tqarg( KABC::Address::countryLabel() ), page );
topLayout->addWidget( label, 6, 0 );
mCountryCombo = new KComboBox( page );
mCountryCombo->setEditable( true );
@@ -606,7 +606,7 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *tqparent )
TQWidget *page = plainPage();
TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
- mGroup = new TQButtonGroup( 2, Horizontal, i18n( "street/postal", "Address Types" ), page );
+ mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "street/postal", "Address Types" ), page );
tqlayout->addWidget( mGroup );
mTypeList = KABC::Address::typeList();
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index 9fe48731..7b1276c8 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'" ).arg( addr.realName() ) );
+ setCaption( i18n( "Edit Contact '%1'" ).tqarg( addr.realName() ) );
}
#include "addresseeeditordialog.moc"
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 097f513b..1ea2e77f 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:" ).arg( KABC::Addressee::roleLabel() ), tab1 );
+ label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).tqarg( 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:" ).arg( KABC::Addressee::organizationLabel() ), tab1 );
+ label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).tqarg( 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:" ).arg( KABC::Addressee::urlLabel() ), tab1 );
+ label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).tqarg( 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:" ).arg( KABC::Addressee::titleLabel() ), tab2 );
+ label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).tqarg( KABC::Addressee::titleLabel() ), tab2 );
tqlayout->addWidget( label, 2, 3 );
mTitleEdit = new KLineEdit( tab2 );
connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
@@ -486,7 +486,7 @@ void AddresseeEditorWidget::setupCustomFieldsTabs()
const TQStringList list = KGlobal::dirs()->findAllResources( "data", "kaddressbook/contacteditorpages/*.ui", true, true );
for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
- if ( activePages.tqfind( (*it).mid( (*it).findRev('/') + 1 ) ) == activePages.end() )
+ if ( activePages.tqfind( (*it).mid( (*it).tqfindRev('/') + 1 ) ) == activePages.end() )
continue;
ContactEditorTabPage *page = new ContactEditorTabPage( mTabWidget );
@@ -558,7 +558,7 @@ void AddresseeEditorWidget::load()
mBirthdayPicker->setDate( mAddressee.birthday().date() );
TQString anniversaryStr = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" );
- TQDate anniversary = (anniversaryStr.isEmpty() ? TQDate() : TQDate::fromString( anniversaryStr, TQt::ISODate ));
+ TQDate anniversary = (anniversaryStr.isEmpty() ? TQDate() : TQDate::fromString( anniversaryStr, Qt::ISODate ));
mAnniversaryPicker->setDate( anniversary );
mNicknameEdit->setText( mAddressee.nickName() );
mCategoryEdit->setText( mAddressee.categories().join( "," ) );
@@ -652,7 +652,7 @@ void AddresseeEditorWidget::save()
if ( mAnniversaryPicker->date().isValid() )
mAddressee.insertCustom( "KADDRESSBOOK", "X-Anniversary",
- mAnniversaryPicker->date().toString( TQt::ISODate ) );
+ mAnniversaryPicker->date().toString( Qt::ISODate ) );
else
mAddressee.removeCustom( "KADDRESSBOOK", "X-Anniversary" );
diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp
index 4f3a5807..548990d1 100644
--- a/kaddressbook/addviewdialog.cpp
+++ b/kaddressbook/addviewdialog.cpp
@@ -57,7 +57,7 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict,
TQT_SLOT( textChanged( const TQString& ) ) );
tqlayout->addWidget( mViewNameEdit, 0, 1 );
- mTypeGroup = new TQButtonGroup( 0, TQt::Horizontal, i18n( "View Type" ), page );
+ mTypeGroup = new TQButtonGroup( 0, Qt::Horizontal, i18n( "View Type" ), page );
connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( clicked( int ) ) );
tqlayout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 );
TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->tqlayout(), 3, 2 );
diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp
index 932f6f10..910fc151 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" ).arg( baseGroup ).arg( i ) );
+ config->deleteGroup( TQString( "%1_%2" ).tqarg( baseGroup ).tqarg( 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" ).arg( baseGroup )
- .arg( index ) );
+ KConfigGroupSaver s( config, TQString( "%1_%2" ).tqarg( baseGroup )
+ .tqarg( 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" ).arg( baseGroup ).arg( i ) );
+ KConfigGroupSaver s( config, TQString( "%1_%2" ).tqarg( baseGroup ).tqarg( i ) );
f.restore( config );
}
diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp
index 716e1764..c5de16ad 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().arg( KGlobal::locale()->country() );
+ TQString urlTemplate = KABPrefs::instance()->locationMapURL().tqarg( 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 8cee7a9b..e0afc9d6 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" ).arg( KAB_CEW_PLUGIN_VERSION ) );
+ TQString( "[X-KDE-KAddressBook-CEWPluginVersion] == %1" ).tqarg( KAB_CEW_PLUGIN_VERSION ) );
KTrader::OfferList::ConstIterator it;
for ( it = plugins.begin(); it != plugins.end(); ++it ) {
diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp
index 5ceac5db..f22160d7 100644
--- a/kaddressbook/customfieldswidget.cpp
+++ b/kaddressbook/customfieldswidget.cpp
@@ -54,7 +54,7 @@ AddFieldDialog::AddFieldDialog( TQWidget *tqparent, const char *name )
tqlayout->addWidget( label, 0, 0 );
mTitle = new KLineEdit( page );
- mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), mTitle ) );
+ mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), TQT_TQOBJECT(mTitle) ) );
label->setBuddy( mTitle );
tqlayout->addWidget( mTitle, 0, 1 );
@@ -276,13 +276,13 @@ void FieldWidget::loadContact( KABC::Addressee *addr )
wdg->setChecked( value == "true" || value == "1" );
} else if ( (*fieldIt).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) {
TQDateEdit *wdg = static_cast<TQDateEdit*>( (*fieldIt).mWidget );
- wdg->setDate( TQDate::fromString( value, TQt::ISODate ) );
+ wdg->setDate( TQDate::fromString( value, Qt::ISODate ) );
} else if ( (*fieldIt).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) {
TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*fieldIt).mWidget );
- wdg->setTime( TQTime::fromString( value, TQt::ISODate ) );
+ wdg->setTime( TQTime::fromString( value, Qt::ISODate ) );
} else if ( (*fieldIt).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*fieldIt).mWidget );
- wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) );
+ wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) );
}
}
}
@@ -332,13 +332,13 @@ void FieldWidget::storeContact( KABC::Addressee *addr )
value = ( wdg->isChecked() ? "true" : "false" );
} else if ( (*it).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) {
TQDateEdit *wdg = static_cast<TQDateEdit*>( (*it).mWidget );
- value = wdg->date().toString( TQt::ISODate );
+ value = wdg->date().toString( Qt::ISODate );
} else if ( (*it).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) {
TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*it).mWidget );
- value = wdg->time().toString( TQt::ISODate );
+ value = wdg->time().toString( Qt::ISODate );
} else if ( (*it).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*it).mWidget );
- value = wdg->dateTime().toString( TQt::ISODate );
+ value = wdg->dateTime().toString( Qt::ISODate );
}
if ( value.isEmpty() )
diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp
index 485b7797..2c6d39c9 100644
--- a/kaddressbook/distributionlisteditor.cpp
+++ b/kaddressbook/distributionlisteditor.cpp
@@ -159,7 +159,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* boo
d->addressBook = book;
Q_ASSERT( d->addressBook );
d->lastLineId = 0;
- d->mapper = new TQSignalMapper( this );
+ d->mapper = new TQSignalMapper( TQT_TQOBJECT(this) );
connect( d->mapper, TQT_SIGNAL( mapped( int ) ),
this, TQT_SLOT( lineTextChanged( int ) ) );
setCaption( i18n( "Edit Distribution List" ) );
@@ -250,7 +250,7 @@ KPIM::DistributionListEditor::Line* KPIM::DistributionListEditor::EditorWidgetPr
addressees.append( line );
TQObject::connect( line, TQT_SIGNAL( textChanged() ),
mapper, TQT_SLOT( map() ) );
- mapper->setMapping( line, ++lastLineId );
+ mapper->setMapping( TQT_TQOBJECT(line), ++lastLineId );
line->setShown( true );
return line;
}
@@ -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." ).arg( name ), i18n( "Name in Use" ) );
+ KMessageBox::error( this, i18n( "A distribution list with the name %1 already exists. Please choose another name." ).tqarg( name ), i18n( "Name in Use" ) );
return;
}
diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp
index 9ea49c3a..7b515782 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>" ).arg( 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>" ).tqarg( 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" ).arg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) );
+ m_resourceLabel->setText( i18n( "<b>Address book:</b> %1" ).tqarg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) );
m_resourceLabel->tqsetAlignment( TQt::SingleLine );
m_emailGroup = new TQVButtonGroup( this );
diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp
index fab91bc4..5810276e 100644
--- a/kaddressbook/distributionlistpicker.cpp
+++ b/kaddressbook/distributionlistpicker.cpp
@@ -107,12 +107,12 @@ void KPIM::DistributionListPickerDialog::slotUser1()
m_book->insertAddressee( list );
m_listBox->insertItem( name );
- TQListBoxItem* item = m_listBox->findItem( name );
+ TQListBoxItem* item = m_listBox->tqfindItem( name );
m_listBox->setSelected( item, true );
}
else
{
- KMessageBox::error( this, i18n( "A distribution list with the the name %1 already exists. Please choose another name" ).arg( name ), i18n( "Name Exists" ) );
+ KMessageBox::error( this, i18n( "A distribution list with the the name %1 already exists. Please choose another name" ).tqarg( name ), i18n( "Name Exists" ) );
}
}
while ( !validName );
diff --git a/kaddressbook/editors/imaddresswidget.cpp b/kaddressbook/editors/imaddresswidget.cpp
index 1d64c5b9..aa3a9a48 100644
--- a/kaddressbook/editors/imaddresswidget.cpp
+++ b/kaddressbook/editors/imaddresswidget.cpp
@@ -50,7 +50,7 @@ IMAddressWidget::IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *>
mProtocols = protocols;
populateProtocols();
- cmbProtocol->setCurrentItem( mProtocols.findIndex( protocol ) );
+ cmbProtocol->setCurrentItem( mProtocols.tqfindIndex( protocol ) );
edtAddress->setText( address.section( TQChar( 0xE120 ), 0, 0 ) );
edtNetwork->setText( address.section( TQChar( 0xE120 ), 1 ) );
diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp
index 3e306a03..aba21b65 100644
--- a/kaddressbook/editors/imeditorwidget.cpp
+++ b/kaddressbook/editors/imeditorwidget.cpp
@@ -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" )
- .arg( nickname ).arg( serverOrGroup ) );
+ .tqarg( nickname ).tqarg( serverOrGroup ) );
}
mAddress = address;
diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp
index 21d21e52..75677a69 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>" ).arg( address );
+ TQString text = i18n( "<qt>Are you sure that you want to remove the email address <b>%1</b>?</qt>" ).tqarg( 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 0f8100db..1496be51 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -52,7 +52,7 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai
Q_ASSERT( mExtensionBar );
TQVBoxLayout* tqlayout = new TQVBoxLayout( mExtensionBar );
mSplitter = new TQSplitter( mExtensionBar );
- mSplitter->setOrientation( TQSplitter::Vertical );
+ mSplitter->setOrientation( Qt::Vertical );
tqlayout->addWidget( mSplitter );
createExtensionWidgets();
@@ -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" ).arg( KAB_EXTENSIONWIDGET_PLUGIN_VERSION ) );
+ TQString( "[X-KDE-KAddressBook-ExtensionPluginVersion] == %1" ).tqarg( 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 16277784..7ce25beb 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>" ) .arg( mNameCombo->currentText() ),
+ i18n( "<qt>Delete distribution list <b>%1</b>?</qt>" ) .tqarg( mNameCombo->currentText() ),
TQString(), KGuiItem( i18n("Delete"), "editdelete") );
if ( result != KMessageBox::Continue )
diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp
index 049f879b..5fe18f5d 100644
--- a/kaddressbook/features/resourceselection.cpp
+++ b/kaddressbook/features/resourceselection.cpp
@@ -241,13 +241,13 @@ void ResourceSelection::add()
if ( !ok )
return;
- TQString type = types[ descs.findIndex( desc ) ];
+ TQString type = types[ descs.tqfindIndex( desc ) ];
// Create new resource
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>")
- .arg( type ) );
+ .tqarg( 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>" )
- .arg( item->resource()->resourceName() ), "",
+ .tqarg( item->resource()->resourceName() ), "",
KGuiItem( i18n( "&Remove" ), "editdelete" ) );
if ( result == KMessageBox::Cancel )
return;
@@ -410,7 +410,7 @@ void ResourceSelection::slotSubresourceAdded( KPIM::ResourceABC *resource,
const TQString& subResource )
{
kdDebug(5720) << k_funcinfo << resource->resourceName() << " " << subResource << endl;
- TQListViewItem *i = mListView->findItem( resource->resourceName(), 0 );
+ TQListViewItem *i = mListView->tqfindItem( resource->resourceName(), 0 );
if ( !i )
// Not found
return;
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index 60a67014..7428b363 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -265,11 +265,11 @@ void FilterDialog::initGUI()
connect( mFilterListBox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ),
TQT_SLOT( edit() ) );
- KButtonBox *buttonBox = new KButtonBox( page, Vertical );
- buttonBox->addButton( i18n( "&Add..." ), this, TQT_SLOT( add() ) );
- mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, TQT_SLOT( edit() ) );
+ KButtonBox *buttonBox = new KButtonBox( page, Qt::Vertical );
+ buttonBox->addButton( i18n( "&Add..." ), TQT_TQOBJECT(this), TQT_SLOT( add() ) );
+ mEditButton = buttonBox->addButton( i18n( "&Edit..." ), TQT_TQOBJECT(this), TQT_SLOT( edit() ) );
mEditButton->setEnabled( false );
- mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQT_SLOT( remove() ) );
+ mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) );
mRemoveButton->setEnabled( false );
buttonBox->tqlayout();
diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp
index 4837a1ef..5dc43286 100644
--- a/kaddressbook/geowidget.cpp
+++ b/kaddressbook/geowidget.cpp
@@ -67,7 +67,7 @@ GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *nam
mLatitudeBox = new KDoubleSpinBox( -90, 90, 1, 0, 6, this );
mLatitudeBox->setEnabled( false );
- mLatitudeBox->setSuffix( "" );
+ mLatitudeBox->setSuffix( "�" );
topLayout->addWidget( mLatitudeBox, 1, 2 );
label->setBuddy( mLatitudeBox );
@@ -76,7 +76,7 @@ GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *nam
mLongitudeBox = new KDoubleSpinBox( -180, 180, 1, 0, 6, this );
mLongitudeBox->setEnabled( false );
- mLongitudeBox->setSuffix( "" );
+ mLongitudeBox->setSuffix( "�" );
topLayout->addWidget( mLongitudeBox, 2, 2 );
label->setBuddy( mLongitudeBox );
@@ -174,7 +174,7 @@ GeoDialog::GeoDialog( TQWidget *tqparent, const char *name )
mCityCombo = new KComboBox( page );
topLayout->addWidget( mCityCombo, 0, 1 );
- TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, Vertical, i18n( "Sexagesimal" ), page );
+ TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, Qt::Vertical, i18n( "Sexagesimal" ), page );
TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->tqlayout(),
2, 5, spacingHint() );
@@ -182,7 +182,7 @@ GeoDialog::GeoDialog( TQWidget *tqparent, const char *name )
sexagesimalLayout->addWidget( label, 0, 0 );
mLatDegrees = new TQSpinBox( 0, 90, 1, sexagesimalGroup );
- mLatDegrees->setSuffix( "" );
+ mLatDegrees->setSuffix( "�" );
mLatDegrees->setWrapping( false );
label->setBuddy( mLatDegrees );
sexagesimalLayout->addWidget( mLatDegrees, 0, 1 );
@@ -204,7 +204,7 @@ GeoDialog::GeoDialog( TQWidget *tqparent, const char *name )
sexagesimalLayout->addWidget( label, 1, 0 );
mLongDegrees = new TQSpinBox( 0, 180, 1, sexagesimalGroup );
- mLongDegrees->setSuffix( "" );
+ mLongDegrees->setSuffix( "�" );
label->setBuddy( mLongDegrees );
sexagesimalLayout->addWidget( mLongDegrees, 1, 1 );
@@ -537,7 +537,7 @@ void GeoMapWidget::paintEvent( TQPaintEvent* )
TQPixmap pm( w, h );
TQPainter p;
- p.begin( &pm, this );
+ p.tqbegin( &pm, this );
p.setPen( TQColor( 255, 0, 0 ) );
p.setBrush( TQColor( 255, 0, 0 ) );
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index 0dc83ae4..b4219322 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -206,7 +206,7 @@ void ImageButton::mousePressEvent( TQMouseEvent *event )
void ImageButton::mouseMoveEvent( TQMouseEvent *event )
{
- if ( (event->state() & LeftButton) &&
+ if ( (event->state() & Qt::LeftButton) &&
(event->pos() - mDragStartPos).manhattanLength() >
KGlobalSettings::dndEventDelay() ) {
startDrag();
@@ -254,7 +254,7 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title,
TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
- TQGroupBox *box = new TQGroupBox( 0, TQt::Vertical, title, this );
+ TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, title, this );
TQVBoxLayout *tqlayout = new TQVBoxLayout( box->tqlayout(), KDialog::spacingHint() );
mImageButton = new ImageButton( i18n( "Picture" ), box );
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index 4ef22bc5..1af942b2 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" ).arg( firstChar.upper() ).arg( lastChar.upper() ) );
+ setText( TQString( "%1 - %2" ).tqarg( firstChar.upper() ).tqarg( lastChar.upper() ) );
else
setText( firstChar.upper() );
}
@@ -72,7 +72,7 @@ JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *tqparent, const char *n
tqlayout->setAutoAdd( true );
tqlayout->setResizeMode( TQLayout::FreeResize );
- mGroupBox = new TQButtonGroup( 1, TQt::Horizontal, this );
+ mGroupBox = new TQButtonGroup( 1, Qt::Horizontal, this );
mGroupBox->setExclusive( true );
mGroupBox->tqlayout()->setSpacing( 0 );
mGroupBox->tqlayout()->setMargin( 0 );
@@ -98,7 +98,7 @@ void JumpButtonBar::updateButtons()
TQFontMetrics fm = fontMetrics();
TQPushButton *btn = new TQPushButton( "", this );
btn->hide();
- TQSize buttonSize = style().sizeFromContents( TQStyle::CT_PushButton, btn,
+ TQSize buttonSize = tqstyle().tqsizeFromContents( TQStyle::CT_PushButton, btn,
fm.size( ShowPrefix, "X - X") ).
expandedTo( TQApplication::globalStrut() );
delete btn;
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 14f9577a..23ebc277 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -94,7 +94,7 @@
KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent,
const TQString &file, const char *name )
- : KAB::Core( client, tqparent, name ), mStatusBar( 0 ), mViewManager( 0 ),
+ : KAB::Core( client, TQT_TQOBJECT(tqparent), name ), mStatusBar( 0 ), mViewManager( 0 ),
mExtensionManager( 0 ), mJumpButtonBar( 0 ), mCategorySelectDialog( 0 ),
mCategoryEditDialog( 0 ), mLdapSearchDialog( 0 ), mReadWrite( readWrite ),
mModified( false )
@@ -114,7 +114,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent,
mAddressBook = new KABC::AddressBook;
mAddressBook->addResource( new KABC::ResourceFile( file ) );
if ( !mAddressBook->load() ) {
- KMessageBox::error( tqparent, i18n("Unable to load '%1'.").arg( file ) );
+ KMessageBox::error( tqparent, i18n("Unable to load '%1'.").tqarg( file ) );
}
}
mAddressBook->setErrorHandler( new KABC::GuiErrorHandler( mWidget ) );
@@ -140,7 +140,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent,
mAddressBook->addCustomField( i18n( "Blog" ), KABC::Field::Personal,
"BlogFeed", "KADDRESSBOOK" );
- mSearchManager = new KAB::SearchManager( mAddressBook, tqparent );
+ mSearchManager = new KAB::SearchManager( mAddressBook, TQT_TQOBJECT(tqparent) );
connect( mSearchManager, TQT_SIGNAL( contactsUpdated() ),
this, TQT_SLOT( slotContactsUpdated() ) );
@@ -430,7 +430,7 @@ void KABCore::setContactSelected( const TQString &uid )
mActionMerge->setEnabled( ( list.size() == 2 ) && writable );
if ( mReadWrite ) {
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
#if defined(KABC_VCARD_ENCODING_FIX)
const TQMimeSource *data = cb->data( TQClipboard::Clipboard );
list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) );
@@ -552,11 +552,11 @@ void KABCore::copyContacts()
#if defined(KABC_VCARD_ENCODING_FIX)
TQByteArray clipText = AddresseeUtil::addresseesToClipboard( addrList );
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
cb->setText( TQString::fromUtf8( clipText.data() ) );
#else
TQString clipText = AddresseeUtil::addresseesToClipboard( addrList );
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
cb->setText( clipText );
#endif
}
@@ -575,7 +575,7 @@ void KABCore::cutContacts()
void KABCore::pasteContacts()
{
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
#if defined(KABC_VCARD_ENCODING_FIX)
const TQMimeSource *data = cb->data( TQClipboard::Clipboard );
KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) );
@@ -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.arg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes )
+ if ( KMessageBox::questionYesNo( mWidget, text.tqarg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes )
static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self( true ) )->setWhoAmI( addrList[ 0 ] );
}
@@ -661,7 +661,7 @@ void KABCore::incrementalJumpButtonSearch( const TQString& character )
KABC::AddresseeList::ConstIterator it;
const KABC::AddresseeList::ConstIterator endIt( list.end() );
for ( it = list.begin(); it != endIt; ++it ) {
- if ( field->value( *it ).startsWith( character, false ) ) {
+ if ( field->value( *it ).tqstartsWith( character, false ) ) {
mViewManager->setSelected( (*it).uid(), true );
return;
}
@@ -720,7 +720,7 @@ void KABCore::newDistributionList()
bool foundUnused = false;
int i = 1;
while ( !foundUnused ) {
- name = i18n( "New Distribution List (%1)" ).arg( i++ );
+ name = i18n( "New Distribution List (%1)" ).tqarg( 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>" ).arg( it.current()->resourceName() ) );
+ i18n( "<qt>Unable to save address book <b>%1</b>.</qt>" ).tqarg( 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>" )
- .arg( it.current()->resourceName() ) );
+ .tqarg( it.current()->resourceName() ) );
}
++it;
@@ -1205,7 +1205,7 @@ void KABCore::initGUI()
mDetailsSplitter = new TQSplitter( mWidget );
mLeftSplitter = new TQSplitter( mDetailsSplitter );
- mLeftSplitter->setOrientation( KABPrefs::instance()->contactListAboveExtensions() ? TQt::Vertical : TQt::Horizontal );
+ mLeftSplitter->setOrientation( KABPrefs::instance()->contactListAboveExtensions() ? Qt::Vertical : Qt::Horizontal );
topLayout->addWidget( searchTB );
topLayout->addWidget( mDetailsSplitter );
@@ -1292,7 +1292,7 @@ void KABCore::initGUI()
topLayout->setStretchFactor( mDetailsSplitter, 1 );
- mXXPortManager = new XXPortManager( this, mWidget );
+ mXXPortManager = new XXPortManager( this, TQT_TQOBJECT(mWidget) );
initActions();
}
@@ -1311,7 +1311,7 @@ void KABCore::createJumpButtonBar()
void KABCore::initActions()
{
- connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
+ connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
TQT_SLOT( clipboardDataChanged() ) );
KAction *action;
@@ -1432,7 +1432,7 @@ void KABCore::initActions()
void KABCore::clipboardDataChanged()
{
if ( mReadWrite )
- mActionPaste->setEnabled( !TQApplication::clipboard()->text().isEmpty() );
+ mActionPaste->setEnabled( !TQApplication::tqclipboard()->text().isEmpty() );
}
void KABCore::updateIncSearchWidget()
@@ -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() ).arg( mSelectedDistributionList ),
+ uids.count() ).tqarg( 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" ).arg( name ) );
+ i18n( "Distribution List: %1" ).tqarg( name ) );
mDistListButtonWidget->setShown( !mSelectedDistributionList.isNull() );
if ( !name.isNull() ) {
mDetailsStack->raiseWidget( mDistListEntryView );
diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp
index 0b98eab3..31d7f368 100644
--- a/kaddressbook/kabtools.cpp
+++ b/kaddressbook/kabtools.cpp
@@ -43,7 +43,7 @@ static TQString uniqueFileName( const KABC::Addressee &addressee, TQStringList &
name.tqreplace( '/', '_' );
++number;
- uniquePart = TQString( "_%1" ).arg( number );
+ uniquePart = TQString( "_%1" ).tqarg( number );
} while ( existingFiles.tqcontains( name ) );
existingFiles.append( name );
diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp
index a29380ad..6f0904b4 100644
--- a/kaddressbook/kaddressbook_part.cpp
+++ b/kaddressbook/kaddressbook_part.cpp
@@ -51,7 +51,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *tqparentWidget, const char *widget
// create a canvas to insert our widget
TQWidget *canvas = new TQWidget( tqparentWidget, widgetName );
- canvas->setFocusPolicy( TQWidget::ClickFocus );
+ canvas->setFocusPolicy( Qt::ClickFocus );
setWidget( canvas );
TQVBoxLayout *topLayout = new TQVBoxLayout( canvas );
diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h
index 05e099d2..3991e740 100644
--- a/kaddressbook/kaddressbook_part.h
+++ b/kaddressbook/kaddressbook_part.h
@@ -52,7 +52,11 @@ class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBook
virtual void addEmail( TQString addr );
virtual void importVCard( const KURL& url );
virtual void importVCardFromData( const TQString& vCard );
+#ifndef Q_MOC_RUN
virtual ASYNC showContactEditor( TQString uid );
+#else // Q_MOC_RUN
+ virtual void showContactEditor( TQString uid );
+#endif // Q_MOC_RUN
virtual void newContact();
virtual void newDistributionList();
virtual TQString getNameByPhone( TQString phone );
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index 55f664a6..ee9de2f5 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -150,13 +150,13 @@ bool KAddressBookMain::queryClose()
void KAddressBookMain::initActions()
{
- KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
+ KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
KAction *action;
- action = KStdAction::keyBindings( this, TQT_SLOT( configureKeyBindings() ), actionCollection() );
+ action = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( configureKeyBindings() ), actionCollection() );
action->setWhatsThis( i18n( "You will be presented with a dialog, where you can configure the application wide shortcuts." ) );
- KStdAction::configureToolbars( this, TQT_SLOT( configureToolbars() ), actionCollection() );
+ KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( configureToolbars() ), actionCollection() );
}
void KAddressBookMain::configureKeyBindings()
diff --git a/kaddressbook/kaddressbookmain.h b/kaddressbook/kaddressbookmain.h
index 0047f534..7867634d 100644
--- a/kaddressbook/kaddressbookmain.h
+++ b/kaddressbook/kaddressbookmain.h
@@ -55,7 +55,11 @@ class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface
virtual void addEmail( TQString addr );
virtual void importVCard( const KURL& url );
virtual void importVCardFromData( const TQString& vCard );
+#ifndef Q_MOC_RUN
virtual ASYNC showContactEditor( TQString uid );
+#else // QT_MOC_RUN
+ virtual void showContactEditor( TQString uid );
+#endif // QT_MOC_RUN
virtual void newContact();
virtual void newDistributionList();
virtual TQString getNameByPhone( TQString phone );
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index b68e96c6..f1a3f525 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -46,7 +46,7 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
{
TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
- TQGroupBox *group = new TQGroupBox( 0, TQt::Vertical, title, this );
+ TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this );
TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 2, 2,
KDialog::spacingHint() );
@@ -55,11 +55,11 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
TQT_SLOT( selectionChanged( TQListBoxItem* ) ) );
groupLayout->addWidget( mBox, 0, 0 );
- KButtonBox *bbox = new KButtonBox( group, TQt::Vertical );
- mAddButton = bbox->addButton( i18n( "Add..." ), this, TQT_SLOT( add() ) );
- mEditButton = bbox->addButton( i18n( "Edit..." ), this, TQT_SLOT( edit() ) );
+ KButtonBox *bbox = new KButtonBox( group, Qt::Vertical );
+ mAddButton = bbox->addButton( i18n( "Add..." ), TQT_TQOBJECT(this), TQT_SLOT( add() ) );
+ mEditButton = bbox->addButton( i18n( "Edit..." ), TQT_TQOBJECT(this), TQT_SLOT( edit() ) );
mEditButton->setEnabled( false );
- mRemoveButton = bbox->addButton( i18n( "Remove" ), this, TQT_SLOT( remove() ) );
+ mRemoveButton = bbox->addButton( i18n( "Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) );
mRemoveButton->setEnabled( false );
bbox->tqlayout();
groupLayout->addWidget( bbox, 0, 1 );
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index c65255db..f2899ba3 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -59,7 +59,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *tqparent, const char *name )
TQVBoxLayout *tqlayout = new TQVBoxLayout( generalPage, KDialog::marginHint(),
KDialog::spacingHint() );
- TQGroupBox *groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "General" ), generalPage );
+ TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage );
TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->tqlayout() );
boxLayout->tqsetAlignment( TQt::AlignTop );
@@ -96,7 +96,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *tqparent, const char *name )
tqlayout->addWidget( groupBox );
- groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Script-Hooks" ), generalPage );
+ groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage );
TQGridLayout *grid = new TQGridLayout( groupBox->tqlayout(), 3, 2,
KDialog::spacingHint() );
label = new TQLabel( i18n( "Phone:" ), groupBox );
@@ -126,7 +126,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *tqparent, const char *name )
tqlayout->addWidget( groupBox );
- groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Location Map" ), generalPage );
+ groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage );
boxLayout = new TQVBoxLayout( groupBox->tqlayout(), KDialog::spacingHint() );
boxLayout->tqsetAlignment( TQt::AlignTop );
@@ -171,7 +171,7 @@ void KABConfigWidget::restoreSettings()
mFaxHook->setText( KABPrefs::instance()->faxHookApplication() );
mAddresseeWidget->restoreSettings();
mEditorCombo->setCurrentItem( KABPrefs::instance()->editorType() );
- mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ) );
+ mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().tqarg( KGlobal::locale()->country() ) );
mLocationMapURL->lineEdit()->setCursorPosition( 0 );
KConfig config( "kabcrc", false, false );
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index e0bbca23..996da428 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -288,10 +288,10 @@ void LDAPOptionsWidget::initGUI()
tqlayout->addWidget( groupBox );
KButtonBox *buttons = new KButtonBox( this );
- buttons->addButton( i18n( "&Add Host..." ), this, TQT_SLOT( slotAddHost() ) );
- mEditButton = buttons->addButton( i18n( "&Edit Host..." ), this, TQT_SLOT( slotEditHost() ) );
+ buttons->addButton( i18n( "&Add Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotAddHost() ) );
+ mEditButton = buttons->addButton( i18n( "&Edit Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotEditHost() ) );
mEditButton->setEnabled( false );
- mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), this, TQT_SLOT( slotRemoveHost() ) );
+ mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), TQT_TQOBJECT(this), TQT_SLOT( slotRemoveHost() ) );
mRemoveButton->setEnabled( false );
buttons->tqlayout();
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index 3949cd14..3541ddf1 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.arg( url.url() ) );
+ KMessageBox::error( this, text.tqarg( 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.arg( type ), "", KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Cancel )
+ if ( KMessageBox::warningContinueCancel( this, text.tqarg( type ), "", KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Cancel )
return;
mKeyList.remove( mKeyList.at( pos ) );
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index f2304990..19b5dd6c 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -152,7 +152,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
page );
groupBox->setFrameShape( TQGroupBox::Box );
groupBox->setFrameShadow( TQGroupBox::Sunken );
- groupBox->setColumnLayout( 0, TQt::Vertical );
+ groupBox->setColumnLayout( 0, Qt::Vertical );
TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2,
5, spacingHint() );
boxLayout->setColStretch( 1, 1 );
@@ -202,9 +202,9 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
mResultListView->setShowSortIndicator( true );
topLayout->addWidget( mResultListView );
- KButtonBox *buttons = new KButtonBox( page, TQt::Horizontal );
- buttons->addButton( i18n( "Select All" ), this, TQT_SLOT( slotSelectAll() ) );
- buttons->addButton( i18n( "Unselect All" ), this, TQT_SLOT( slotUnselectAll() ) );
+ KButtonBox *buttons = new KButtonBox( page, Qt::Horizontal );
+ buttons->addButton( i18n( "Select All" ), TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ) );
+ buttons->addButton( i18n( "Unselect All" ), TQT_TQOBJECT(this), TQT_SLOT( slotUnselectAll() ) );
topLayout->addWidget( buttons );
@@ -264,7 +264,7 @@ void LDAPSearchDialog::restoreSettings()
} else {
mIsOK = true;
for ( int j = 0; j < mNumHosts; ++j ) {
- KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, this, "ldapclient" );
+ KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, TQT_TQOBJECT(this), "ldapclient" );
KPIM::LdapServer ldapServer;
KPIM::LdapSearch::readConfig( ldapServer, config, j, true );
ldapClient->setServer( ldapServer );
@@ -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.arg( query ).arg( query );
+ result = result.tqarg( query ).tqarg( query );
} else {
result += (startsWith ? "%1=%2*" : "%1=*%2*");
if ( attr == i18n( "Email" ) ) {
- result = result.arg( "mail" ).arg( query );
+ result = result.tqarg( "mail" ).tqarg( query );
} else if ( attr == i18n( "Home Number" ) ) {
- result = result.arg( "homePhone" ).arg( query );
+ result = result.tqarg( "homePhone" ).tqarg( query );
} else if ( attr == i18n( "Work Number" ) ) {
- result = result.arg( "telephoneNumber" ).arg( query );
+ result = result.tqarg( "telephoneNumber" ).tqarg( 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" ).arg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) );
+ addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).tqarg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) );
addr.setResource( resource );
mCore->addressBook()->insertAddressee( addr );
TQString displayString;
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 2587ad3e..fc05df18 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -97,7 +97,7 @@ void PhoneTypeCombo::update()
}
}
- setCurrentItem( mLastSelected = mTypeList.findIndex( mType ) );
+ setCurrentItem( mLastSelected = mTypeList.tqfindIndex( mType ) );
blockSignals( blocked );
}
@@ -183,7 +183,7 @@ PhoneEditWidget::PhoneEditWidget( TQWidget *tqparent, const char *name )
mRemoveButton->setMaximumSize( mRemoveButton->tqsizeHint() );
tqlayout->addWidget( mRemoveButton, 1, 1 );
- mMapper = new TQSignalMapper( this );
+ mMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) );
connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) );
@@ -271,7 +271,7 @@ void PhoneEditWidget::recreateNumberWidgets()
PhoneNumberWidget *wdg = new PhoneNumberWidget( this );
wdg->setNumber( *it );
- mMapper->setMapping( wdg, counter );
+ mMapper->setMapping( TQT_TQOBJECT(wdg), counter );
connect( wdg, TQT_SIGNAL( modified() ), mMapper, TQT_SLOT( map() ) );
mWidgetLayout->addWidget( wdg );
@@ -303,7 +303,7 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *tqparent )
mPreferredBox = new TQCheckBox( i18n( "This is the preferred phone number" ), page );
tqlayout->addWidget( mPreferredBox );
- mGroup = new TQButtonGroup( 2, Horizontal, i18n( "Types" ), page );
+ mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "Types" ), page );
tqlayout->addWidget( mGroup );
// fill widgets
diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp
index d7fb26b8..63cfdcfd 100644
--- a/kaddressbook/printing/mikesstyle.cpp
+++ b/kaddressbook/printing/mikesstyle.cpp
@@ -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)" )
- .arg( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) );
+ .tqarg( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) );
p.setPen( TQt::black );
p.drawText( 0, fm.height(), text );
diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp
index bf0a49a0..516431a5 100644
--- a/kaddressbook/printing/selectionpage.cpp
+++ b/kaddressbook/printing/selectionpage.cpp
@@ -51,7 +51,7 @@ SelectionPage::SelectionPage( TQWidget* tqparent, const char* name )
mButtonGroup = new TQButtonGroup( this );
mButtonGroup->setFrameShape( TQButtonGroup::NoFrame );
- mButtonGroup->setColumnLayout( 0, TQt::Vertical );
+ mButtonGroup->setColumnLayout( 0, Qt::Vertical );
mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() );
diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp
index 721cffaa..760f71d6 100644
--- a/kaddressbook/printing/stylepage.cpp
+++ b/kaddressbook/printing/stylepage.cpp
@@ -121,7 +121,7 @@ void StylePage::initGUI()
topLayout->addMultiCellWidget( label, 0, 0, 0, 1 );
TQButtonGroup *group = new TQButtonGroup( i18n( "Sorting" ), this );
- group->setColumnLayout( 0, TQt::Vertical );
+ group->setColumnLayout( 0, Qt::Vertical );
TQGridLayout *sortLayout = new TQGridLayout( group->tqlayout(), 2, 2,
KDialog::spacingHint() );
sortLayout->tqsetAlignment( TQt::AlignTop );
@@ -141,7 +141,7 @@ void StylePage::initGUI()
topLayout->addWidget( group, 1, 0 );
group = new TQButtonGroup( i18n( "Print Style" ), this );
- group->setColumnLayout( 0, TQt::Vertical );
+ group->setColumnLayout( 0, Qt::Vertical );
TQVBoxLayout *styleLayout = new TQVBoxLayout( group->tqlayout(),
KDialog::spacingHint() );
diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp
index 462451f3..32b898cd 100644
--- a/kaddressbook/searchmanager.cpp
+++ b/kaddressbook/searchmanager.cpp
@@ -109,11 +109,11 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
const KABC::Field::List::ConstIterator fieldEndIt( fieldList.end() );
for ( ; fieldIt != fieldEndIt; ++fieldIt ) {
- if ( type == StartsWith && (*fieldIt)->value( *it ).startsWith( pattern, false ) ) {
+ if ( type == StartsWith && (*fieldIt)->value( *it ).tqstartsWith( pattern, false ) ) {
mContacts.append( *it );
found = true;
break;
- } else if ( type == EndsWith && (*fieldIt)->value( *it ).endsWith( pattern, false ) ) {
+ } else if ( type == EndsWith && (*fieldIt)->value( *it ).tqendsWith( pattern, false ) ) {
mContacts.append( *it );
found = true;
break;
@@ -138,10 +138,10 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
int pos = (*customIt).tqfind( ':' );
if ( pos != -1 ) {
const TQString value = (*customIt).mid( pos + 1 );
- if ( type == StartsWith && value.startsWith( pattern, false ) ) {
+ if ( type == StartsWith && value.tqstartsWith( pattern, false ) ) {
mContacts.append( *it );
break;
- } else if ( type == EndsWith && value.endsWith( pattern, false ) ) {
+ } else if ( type == EndsWith && value.tqendsWith( pattern, false ) ) {
mContacts.append( *it );
break;
} else if ( type == Contains && value.tqfind( pattern, 0, false ) != -1 ) {
diff --git a/kaddressbook/typecombo.h b/kaddressbook/typecombo.h
index 0648bf42..7280b5c7 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)").arg( label )
- .arg( TQString::number( count ) );
+ label = i18n("label (number)", "%1 (%2)").tqarg( label )
+ .tqarg( TQString::number( count ) );
}
insertItem( label );
}
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index c0cd5a8a..e05024bd 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -261,7 +261,7 @@ void CutCommand::unexecute()
mAddresseeList.clear();
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
kapp->processEvents();
cb->setText( mOldText );
}
@@ -289,7 +289,7 @@ void CutCommand::execute()
// Convert to clipboard
mClipText = AddresseeUtil::addresseesToClipboard( mAddresseeList );
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
mOldText = cb->text();
kapp->processEvents();
#if defined(KABC_VCARD_ENCODING_FIX)
@@ -391,7 +391,7 @@ void MoveToCommand::moveContactTo( KABC::Resource *resource )
addressBook()->insertAddressee( newAddr );
mAddresseeList.append( newAddr );
mUIDList.append( uid );
- const bool inserted = addressBook()->tqfind( newAddr ) != addressBook()->end();
+ const bool inserted = addressBook()->find( newAddr ) != addressBook()->end();
if ( inserted ) {
if ( resourceExist( addr.resource() ) ) {
KABLock::self( addressBook() )->lock( addr.resource() );
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index e6d04645..23b1a4cc 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>" )
- .arg( mActiveView->caption() );
+ .tqarg( 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>" ).arg( newName ).arg( numTries );
+ newName = TQString( "%1 <%2>" ).tqarg( newName ).tqarg( numTries );
numTries++;
}
@@ -363,7 +363,7 @@ void ViewManager::addView()
// try to set the active view
mActionSelectView->setItems( mViewNameList );
- mActionSelectView->setCurrentItem( mViewNameList.findIndex( newName ) );
+ mActionSelectView->setCurrentItem( mViewNameList.tqfindIndex( newName ) );
setActiveView( newName );
editView();
@@ -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" ).arg( KAB_VIEW_PLUGIN_VERSION ) );
+ TQString( "[X-KDE-KAddressBook-ViewPluginVersion] == %1" ).tqarg( KAB_VIEW_PLUGIN_VERSION ) );
KTrader::OfferList::ConstIterator it;
for ( it = plugins.begin(); it != plugins.end(); ++it ) {
if ( !(*it)->hasServiceType( "KAddressBook/View" ) )
@@ -573,27 +573,27 @@ void ViewManager::initActions()
KAction *action;
- action = new KAction( i18n( "Modify View..." ), "configure", 0, this,
+ action = new KAction( i18n( "Modify View..." ), "configure", 0, TQT_TQOBJECT(this),
TQT_SLOT( editView() ), mCore->actionCollection(),
"view_modify" );
action->setWhatsThis( i18n( "By pressing this button a dialog opens that allows you to modify the view of the addressbook. There you can add or remove fields that you want to be shown or hidden in the addressbook like the name for example." ) );
- action = new KAction( i18n( "Add View..." ), "window_new", 0, this,
+ action = new KAction( i18n( "Add View..." ), "window_new", 0, TQT_TQOBJECT(this),
TQT_SLOT( addView() ), mCore->actionCollection(),
"view_add" );
action->setWhatsThis( i18n( "You can add a new view by choosing one from the dialog that appears after pressing the button. You have to give the view a name, so that you can distinguish between the different views." ) );
mActionDeleteView = new KAction( i18n( "Delete View" ), "view_remove", 0,
- this, TQT_SLOT( deleteView() ),
+ TQT_TQOBJECT(this), TQT_SLOT( deleteView() ),
mCore->actionCollection(), "view_delete" );
mActionDeleteView->setWhatsThis( i18n( "By pressing this button you can delete the actual view, which you have added before." ) );
- action = new KAction( i18n( "Refresh View" ), "reload", 0, this,
+ action = new KAction( i18n( "Refresh View" ), "reload", 0, TQT_TQOBJECT(this),
TQT_SLOT( refreshView() ), mCore->actionCollection(),
"view_refresh" );
action->setWhatsThis( i18n( "The view will be refreshed by pressing this button." ) );
- action = new KAction( i18n( "Edit &Filters..." ), "filter", 0, this,
+ action = new KAction( i18n( "Edit &Filters..." ), "filter", 0, TQT_TQOBJECT(this),
TQT_SLOT( configureFilters() ), mCore->actionCollection(),
"options_edit_filters" );
action->setWhatsThis( i18n( "Edit the contact filters<p>You will be presented with a dialog, where you can add, remove and edit filters." ) );
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 9149c653..110d3be8 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -61,7 +61,7 @@ class CardViewTip : public TQLabel
};
//
-// Warning: make sure you use findRef() instead of tqfind() to find an
+// Warning: make sure you use tqfindRef() instead of tqfind() to find an
// item! Only the pointer value is unique in the list.
//
class CardViewItemList : public TQPtrList<CardViewItem>
@@ -316,7 +316,7 @@ void CardViewItem::paintCard( TQPainter *p, TQColorGroup &cg )
// if we are the current item and the view has focus, draw focus rect
if ( mView->currentItem() == this && mView->hasFocus() ) {
- mView->style().drawPrimitive( TQStyle::PE_FocusRect, p,
+ mView->tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p,
TQRect( 0, 0, mView->itemWidth(), h + (2 * mg) ), cg,
TQStyle::Style_FocusAtBorder,
TQStyleOption( isSelected() ? cg.highlight() : cg.base() ) );
@@ -587,7 +587,7 @@ CardView::CardView( TQWidget *tqparent, const char *name )
viewport()->setMouseTracking( true );
viewport()->setFocusProxy( this );
- viewport()->setFocusPolicy( WheelFocus );
+ viewport()->setFocusPolicy(Qt::WheelFocus );
viewport()->setBackgroundMode( PaletteBase );
connect( d->mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( tryShowFullText() ) );
@@ -616,7 +616,7 @@ void CardView::takeItem( CardViewItem *item )
{
if ( d->mCurrentItem == item )
d->mCurrentItem = item->nextItem();
- d->mItemList.take( d->mItemList.findRef( item ) );
+ d->mItemList.take( d->mItemList.tqfindRef( item ) );
setLayoutDirty( true );
}
@@ -843,7 +843,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy,
calcLayout();
// allow setting costum colors in the viewport pale
- TQColorGroup cg = viewport()->palette().active();
+ TQColorGroup cg = viewport()->tqpalette().active();
TQRect clipRect( clipx, clipy, clipw, cliph );
TQRect cardRect;
@@ -953,7 +953,7 @@ void CardView::calcLayout()
CardViewItem *CardView::itemAfter( const CardViewItem *item ) const
{
- d->mItemList.findRef( item );
+ d->mItemList.tqfindRef( item );
return d->mItemList.next();
}
@@ -1022,7 +1022,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
emit clicked( item );
// The RMB click
- if ( e->button() & TQt::RightButton ) {
+ if ( e->button() & Qt::RightButton ) {
// clear previous selection
bool blocked = signalsBlocked();
blockSignals( true );
@@ -1056,7 +1056,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
item->tqrepaintCard();
emit selectionChanged();
} else if ( d->mSelectionMode == CardView::Extended ) {
- if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ShiftButton) ) {
+ if ( (e->button() & Qt::LeftButton) && (e->state() & TQt::ShiftButton) ) {
if ( item == other )
return;
@@ -1070,8 +1070,8 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
}
int from, to, a, b;
- a = d->mItemList.findRef( item );
- b = d->mItemList.findRef( other );
+ a = d->mItemList.tqfindRef( item );
+ b = d->mItemList.tqfindRef( other );
from = a < b ? a : b;
to = a > b ? a : b;
@@ -1083,11 +1083,11 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
}
emit selectionChanged();
- } else if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ControlButton) ) {
+ } else if ( (e->button() & Qt::LeftButton) && (e->state() & TQt::ControlButton) ) {
item->setSelected( !item->isSelected() );
item->tqrepaintCard();
emit selectionChanged();
- } else if ( e->button() & TQt::LeftButton ) {
+ } else if ( e->button() & Qt::LeftButton ) {
bool b = signalsBlocked();
blockSignals( true );
selectAll( false );
@@ -1158,7 +1158,7 @@ void CardView::contentsMouseMoveEvent( TQMouseEvent *e )
return;
}
- if ( d->mLastClickOnItem && (e->state() & TQt::LeftButton) &&
+ if ( d->mLastClickOnItem && (e->state() & Qt::LeftButton) &&
((e->pos() - d->mLastClickPos).manhattanLength() > 4)) {
startDrag();
@@ -1218,7 +1218,7 @@ void CardView::keyPressEvent( TQKeyEvent *e )
return;
}
- uint pos = d->mItemList.findRef( d->mCurrentItem );
+ uint pos = d->mItemList.tqfindRef( d->mCurrentItem );
CardViewItem *aItem = 0;
CardViewItem *old = d->mCurrentItem;
@@ -1347,8 +1347,8 @@ void CardView::keyPressEvent( TQKeyEvent *e )
// otherwise, ??????
bool s = ! aItem->isSelected();
int from, to, a, b;
- a = d->mItemList.findRef( aItem );
- b = d->mItemList.findRef( old );
+ a = d->mItemList.tqfindRef( aItem );
+ b = d->mItemList.tqfindRef( old );
from = a < b ? a : b;
to = a > b ? a : b;
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index fdccd52f..834431af 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -201,7 +201,7 @@ void CardViewLookNFeelPage::initGUI()
loTab->setSpacing( spacing );
loTab->setMargin( margin );
- TQGroupBox *gbGeneral = new TQGroupBox( 1, TQt::Horizontal, i18n("General"), loTab );
+ TQGroupBox *gbGeneral = new TQGroupBox( 1, Qt::Horizontal, i18n("General"), loTab );
cbDrawSeps = new TQCheckBox( i18n("Draw &separators"), gbGeneral );
@@ -215,7 +215,7 @@ void CardViewLookNFeelPage::initGUI()
sbSpacing = new TQSpinBox( 0, 100, 1, hbPadding );
lSpacing->setBuddy( sbSpacing );
- TQGroupBox *gbCards = new TQGroupBox( 1, TQt::Horizontal, i18n("Cards"), loTab );
+ TQGroupBox *gbCards = new TQGroupBox( 1, Qt::Horizontal, i18n("Cards"), loTab );
TQHBox *hbMargin = new TQHBox( gbCards );
TQLabel *lMargin = new TQLabel( i18n("&Margin:"), hbMargin );
@@ -313,7 +313,7 @@ void CardViewLookNFeelPage::initGUI()
void CardViewLookNFeelPage::updateFontLabel( TQFont fnt, TQLabel *l )
{
l->setFont( fnt );
- l->setText( TQString( fnt.family() + " %1" ).arg( fnt.pointSize() ) );
+ l->setText( TQString( fnt.family() + " %1" ).tqarg( fnt.pointSize() ) );
}
#include "configurecardviewdialog.moc"
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index 309244e5..179a819a 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -113,7 +113,7 @@ void LookAndFeelPage::initGUI()
{
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
- TQButtonGroup *group = new TQButtonGroup(1, TQt::Horizontal,
+ TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal,
i18n("Row Separator"), this);
tqlayout->addWidget(group);
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 548ad5f9..31f0ac6c 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").arg(a.formattedNameLabel())
- .arg(a.formattedName());
+ s += i18n("label: value", "%1: %2").tqarg(a.formattedNameLabel())
+ .tqarg(a.formattedName());
s += '\n';
- s += i18n("label: value", "%1: %2").arg(a.organizationLabel())
- .arg(a.organization());
+ s += i18n("label: value", "%1: %2").tqarg(a.organizationLabel())
+ .tqarg(a.organization());
TQString notes = a.note().stripWhiteSpace();
if ( !notes.isEmpty() ) {
notes += '\n';
- s += '\n' + i18n("label: value", "%1: \n").arg(a.noteLabel());
+ s += '\n' + i18n("label: value", "%1: \n").tqarg(a.noteLabel());
TQFontMetrics fm( font() );
// Begin word wrap code based on TQMultiLineEdit code
@@ -314,7 +314,7 @@ void ContactListView::contentsMousePressEvent(TQMouseEvent* e)
// To initiate a drag operation
void ContactListView::contentsMouseMoveEvent( TQMouseEvent *e )
{
- if ((e->state() & LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) {
+ if ((e->state() & Qt::LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) {
emit startAddresseeDrag();
}
else
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index 5fdc89a5..fc9ac247 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( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)
+ if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( 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( tqparentWidget(), txt.arg( url.url() )
- .arg( strerror( tmpFile.status() ) ) );
+ KMessageBox::error( tqparentWidget(), txt.tqarg( url.url() )
+ .tqarg( 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( tqparentWidget(), txt.arg( url.path() ) );
+ KMessageBox::error( tqparentWidget(), txt.tqarg( url.path() ) );
return false;
}
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 4356a599..1120e4f0 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -383,7 +383,7 @@ void CSVImportDialog::initGUI()
// Delimiter: comma, semicolon, tab, space, other
mDelimiterBox = new TQButtonGroup( i18n( "Delimiter" ), mPage );
- mDelimiterBox->setColumnLayout( 0, TQt::Vertical );
+ mDelimiterBox->setColumnLayout( 0, Qt::Vertical );
mDelimiterBox->tqlayout()->setSpacing( spacingHint() );
mDelimiterBox->tqlayout()->setMargin( marginHint() );
TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->tqlayout() );
@@ -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'" ).arg( codec->name() ), i18n( "Encoding" ) );
+ KMessageBox::information( this, i18n( "Using codec '%1'" ).tqarg( 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)" ).arg( TQTextCodec::codecForLocale()->name() ), Local );
+ mCodecCombo->insertItem( i18n( "Local (%1)" ).tqarg( 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\"").arg(fileName) ) == KMessageBox::No)
+ if(KMessageBox::questionYesNo( this, i18n("Do you want to overwrite file \"%1\"").tqarg(fileName) ) == KMessageBox::No)
return;
}
TQString name = KInputDialog::getText( i18n( "Template Name" ), i18n( "Please enter a name for the template:" ) );
diff --git a/kaddressbook/xxport/eudora_xxport.cpp b/kaddressbook/xxport/eudora_xxport.cpp
index ca804fe3..9844b550 100644
--- a/kaddressbook/xxport/eudora_xxport.cpp
+++ b/kaddressbook/xxport/eudora_xxport.cpp
@@ -152,9 +152,9 @@ TQString EudoraXXPort::email( const TQString& line ) const
{
int b;
TQString result;
- b = line.findRev( '\"' );
+ b = line.tqfindRev( '\"' );
if ( b == -1 ) {
- b = line.findRev( ' ' );
+ b = line.tqfindRev( ' ' );
if ( b == -1 )
return result;
}
@@ -168,9 +168,9 @@ TQString EudoraXXPort::comment( const TQString& line ) const
int b;
TQString result;
uint i;
- b = line.findRev( '>' );
+ b = line.tqfindRev( '>' );
if ( b == -1 ) {
- b = line.findRev( '\"' );
+ b = line.tqfindRev( '\"' );
if ( b == -1 )
return result;
}
diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp
index 343831a9..053a850e 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").arg(error).arg(gn_error_print(error));\
+ kdError() << TQString("ERROR %1: %2\n").tqarg(error).tqarg(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").arg(TQString::number(LIBGNOKII_VERSION,16)) );
- GNOKII_DEBUG( TQString("Using libgnokii runtime version 0x%1\n").arg(TQString::number(gn_lib_version(),16)) );
+ 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)) );
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>")
- .arg(gn_error_print(error));
+ .tqarg(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")
- .arg(manufacturer, model, revision, imei) );
+ .tqarg(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")
- .arg(memtype).arg(memstat->used).arg(memstat->free).arg(memstat->used+memstat->free) );
+ .tqarg(memtype).tqarg(memstat->used).tqarg(memstat->free).tqarg(memstat->used+memstat->free) );
return error;
}
@@ -176,13 +176,13 @@ static TQString buildPhoneInfoString( const gn_memory_status &memstat )
TQString format = TQString::tqfromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>");
return TQString::tqfromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>")
- .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)));
+ .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)));
}
// 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>")
- .arg(memstat.used)
- .arg(gn_memory_type2str(memtype))
- .arg(buildPhoneInfoString(memstat)) );
+ .tqarg(memstat.used)
+ .tqarg(gn_memory_type2str(memtype))
+ .tqarg(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").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));
+ 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));
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").arg(memtypestr).arg(gn_lib_get_pb_location(state)));
+ a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").tqarg(memtypestr).tqarg(gn_lib_get_pb_location(state)));
// set ProductId
- a->setProductId(TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei));
+ a->setProductId(TQString("%1-%2-%3-%4").tqarg(APP).tqarg(model).tqarg(revision).tqarg(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").arg(datetime.toString()));
+ GNOKII_DEBUG(TQString(" date=%1\n").tqarg(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")
- .arg(n).arg(entry_type).arg(number_type).arg(s));
+ .tqarg(n).tqarg(entry_type).tqarg(number_type).tqarg(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")
- .arg(entry_type).arg(s));
+ .tqarg(entry_type).tqarg(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").arg(phone_location)
- .arg(GN_FROM(gn_lib_get_pb_name(state))).arg(GN_FROM(gn_lib_get_pb_number(state))));
+ 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))));
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")
- .arg(s));
+ .tqarg(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")
- .arg(st).arg(entry_type)
- .arg(number_type).arg(GN_FROM(number)));
+ .tqarg(st).tqarg(entry_type)
+ .tqarg(number_type).tqarg(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>")
- .arg(list.count())
- .arg(gn_memory_type2str(memtype))
- .arg(buildPhoneInfoString(memstat)) );
+ .tqarg(list.count())
+ .tqarg(gn_memory_type2str(memtype))
+ .tqarg(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")
- .arg(addr->realName()).arg(phone_entry_no).arg(phone_count));
+ .tqarg(addr->realName()).tqarg(phone_entry_no).tqarg(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").arg(failedList.join(", ")));
+ GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", ")));
KMessageBox::informationList(tqparentWidget(),
i18n("<qt>The following contacts could not be exported to the Mobile Phone. "
"Possible Reasons for this problem could be:<br><ul>"
@@ -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>")
- .arg(gn_error_print(error));
+ .tqarg(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")
- .arg(manufacturer, model, revision, imei) );
+ .tqarg(manufacturer, model, revision, imei) );
- PhoneProductId = TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei);
+ PhoneProductId = TQString("%1-%2-%3-%4").tqarg(APP).tqarg(model).tqarg(revision).tqarg(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")
- .arg(memtype).arg(memstat->used).arg(memstat->free).arg(memstat->used+memstat->free) );
+ .tqarg(memtype).tqarg(memstat->used).tqarg(memstat->free).tqarg(memstat->used+memstat->free) );
return error;
}
@@ -946,13 +946,13 @@ static TQString buildPhoneInfoString( const gn_memory_status &memstat )
TQString format = TQString::tqfromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>");
return TQString::tqfromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>")
- .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)));
+ .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)));
}
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>")
- .arg(memstat.used)
- .arg(buildMemoryTypeString(memtype))
- .arg(buildPhoneInfoString(memstat)) );
+ .tqarg(memstat.used)
+ .tqarg(buildMemoryTypeString(memtype))
+ .tqarg(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").arg(i).arg(GN_FROM(entry.name))
- .arg(GN_FROM(entry.number)).arg(entry.location).arg(entry.caller_group).arg(entry.subentries_count));
+ 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));
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").arg(memtypestr).arg(entry.location));
+ a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").tqarg(memtypestr).tqarg(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").arg(datetime.toString()));
+ GNOKII_DEBUG(TQString(" date=%1\n").tqarg(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")
- .arg(n).arg(entry.subentries[n].entry_type)
- .arg(entry.subentries[n].number_type).arg(s));
+ .tqarg(n).tqarg(entry.subentries[n].entry_type)
+ .tqarg(entry.subentries[n].number_type).tqarg(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")
- .arg(entry.subentries[n].entry_type).arg(s));
+ .tqarg(entry.subentries[n].entry_type).tqarg(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").arg(phone_location)
- .arg(GN_FROM(entry.name)).arg(GN_FROM(entry.number)));
+ GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").tqarg(phone_location)
+ .tqarg(GN_FROM(entry.name)).tqarg(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")
- .arg(s));
+ .tqarg(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")
- .arg(st).arg(subentry->entry_type)
- .arg(subentry->number_type).arg(GN_FROM(subentry->data.number)));
+ .tqarg(st).tqarg(subentry->entry_type)
+ .tqarg(subentry->number_type).tqarg(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").arg(phone_location));
+ GNOKII_DEBUG(TQString("Deleting entry %1\n").tqarg(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>")
- .arg(list.count())
- .arg(buildMemoryTypeString(memtype))
- .arg(buildPhoneInfoString(memstat)) );
+ .tqarg(list.count())
+ .tqarg(buildMemoryTypeString(memtype))
+ .tqarg(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")
- .arg(addr->realName()).arg(phone_entry_no).arg(phone_count));
+ .tqarg(addr->realName()).tqarg(phone_entry_no).tqarg(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").arg(failedList.join(", ")));
+ GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", ")));
KMessageBox::informationList(tqparentWidget(),
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 b0e44c3d..f5848d1c 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( tqparentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).arg( fileName ) );
+ KMessageBox::sorry( tqparentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).tqarg( fileName ) );
return KABC::AddresseeList();
}
diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp
index 307fb682..53ec7d99 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( tqparentWidget(), msg.arg( fileName ) );
+ KMessageBox::error( tqparentWidget(), msg.tqarg( 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( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)
+ if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( 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( tqparentWidget(), txt.arg( url.url() )
- .arg( strerror( tmpFile.status() ) ) );
+ KMessageBox::error( tqparentWidget(), txt.tqarg( url.url() )
+ .tqarg( 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( tqparentWidget(), txt.arg( filename ) );
+ KMessageBox::error( tqparentWidget(), txt.tqarg( filename ) );
return false;
}
diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp
index 9ddbcb39..71b01e6e 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( tqparentWidget(), msg.arg( fileName ) );
+ KMessageBox::error( tqparentWidget(), msg.tqarg( fileName ) );
return addrList;
}
diff --git a/kaddressbook/xxport/pab_pablib.cpp b/kaddressbook/xxport/pab_pablib.cpp
index 344647f6..198e683f 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").arg(pabfile);
+ msg=i18n("Cannot open %1 for reading").tqarg(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").arg(pabfile);
+ msg=i18n("%1 has no PAB id that I know of, cannot convert this").tqarg(pabfile);
// info->alert(msg);
return false;
}
diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp
index 1b5b3c6f..7894e9c5 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( tqparentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).arg( fileName ) );
+ KMessageBox::sorry( tqparentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).tqarg( fileName ) );
return addrList;
}
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index e66016a1..74b1e9dc 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.arg( (*it).url() );
- text = text.arg( kapp->translate( "TQFile",
- file.errorString().latin1() ) );
+ text = text.tqarg( (*it).url() );
+ text = text.tqarg( kapp->translate( "TQFile",
+ TQString(file.errorString()).latin1() ) );
KMessageBox::error( tqparentWidget(), text, caption );
anyFailures = true;
}
} else {
TQString text = i18n( "<qt>Unable to access vCard: %1</qt>" );
- text = text.arg( KIO::NetAccess::lastErrorString() );
+ text = text.tqarg( KIO::NetAccess::lastErrorString() );
KMessageBox::error( tqparentWidget(), 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( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)
+ if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( 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( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)
+ if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No)
return false;
}
KTempFile tmpFile;
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 0f8332ed..8eabc81c 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>" ).arg( identifier ) );
+ KMessageBox::error( mCore->widget(), i18n( "<qt>No import plugin available for <b>%1</b>.</qt>" ).tqarg( 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>" ).arg( identifier ) );
+ KMessageBox::error( mCore->widget(), i18n( "<qt>No export plugin available for <b>%1</b>.</qt>" ).tqarg( 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" ).arg( KAB_XXPORT_PLUGIN_VERSION ) );
+ TQString( "[X-KDE-KAddressBook-XXPortPluginVersion] == %1" ).tqarg( KAB_XXPORT_PLUGIN_VERSION ) );
KTrader::OfferList::ConstIterator it;
for ( it = plugins.begin(); it != plugins.end(); ++it ) {
if ( !(*it)->hasServiceType( "KAddressBook/XXPort" ) )
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index f7badeaa..f65348cf 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -186,7 +186,7 @@ void XXPortSelectDialog::initGUI()
topLayout->addWidget( label );
mButtonGroup = new TQButtonGroup( i18n( "Selection" ), page );
- mButtonGroup->setColumnLayout( 0, TQt::Vertical );
+ mButtonGroup->setColumnLayout( 0, Qt::Vertical );
mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() );
@@ -225,7 +225,7 @@ void XXPortSelectDialog::initGUI()
topLayout->addWidget( mButtonGroup );
TQButtonGroup *sortingGroup = new TQButtonGroup( i18n( "Sorting" ), page );
- sortingGroup->setColumnLayout( 0, TQt::Vertical );
+ sortingGroup->setColumnLayout( 0, Qt::Vertical );
TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->tqlayout(), 2, 2,
KDialog::spacingHint() );
sortLayout->tqsetAlignment( TQt::AlignTop );