diff options
Diffstat (limited to 'kaddressbook')
86 files changed, 621 insertions, 621 deletions
diff --git a/kaddressbook/TODO b/kaddressbook/TODO index 83f33587..df0db82b 100644 --- a/kaddressbook/TODO +++ b/kaddressbook/TODO @@ -22,7 +22,7 @@ Improvements (things that just need to be improved/rewritten) file to get a list of views) - DONE - Redo and move the DCOP interface - 50% - Cleanup the tableview more - DONE -- Retqlayout the edit contact dialog - DONE +- Relayout the edit contact dialog - DONE - Remove ContactEntry*. Impelement supporting classes required for this. - DONE - Update the way the ConfigureView dialog gets the view config page - DONE diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index cc71bd4f..1008169e 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -26,13 +26,13 @@ #include <tqcheckbox.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqlistview.h> #include <tqpushbutton.h> #include <tqsignal.h> #include <tqstring.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqtoolbutton.h> #include <tqtooltip.h> @@ -82,25 +82,25 @@ class TabPressEater : public TQObject AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQBoxLayout *tqlayout = new TQVBoxLayout( this, 4, 2 ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQBoxLayout *layout = new TQVBoxLayout( this, 4, 2 ); + layout->setSpacing( KDialog::spacingHint() ); mTypeCombo = new AddressTypeCombo( mAddressList, this ); connect( mTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateAddressEdit() ) ); - tqlayout->addWidget( mTypeCombo ); + layout->addWidget( mTypeCombo ); mAddressField = new KActiveLabel( this ); mAddressField->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); mAddressField->setMinimumHeight( 20 ); - mAddressField->tqsetAlignment( TQt::AlignTop ); + mAddressField->setAlignment( TQt::AlignTop ); mAddressField->setTextFormat( TQt::PlainText ); - tqlayout->addWidget( mAddressField ); + layout->addWidget( mAddressField ); mEditButton = new TQPushButton( i18n( "street/postal", "&Edit Addresses..." ), this ); connect( mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) ); - tqlayout->addWidget( mEditButton ); + layout->addWidget( mEditButton ); } AddressEditWidget::~AddressEditWidget() @@ -273,8 +273,8 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list, mTypeCombo = new AddressTypeCombo( mAddressList, page ); topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 ); - TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).tqarg( KABC::Address::streetLabel() ), page ); - label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft ); + TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).arg( KABC::Address::streetLabel() ), page ); + label->setAlignment( TQt::AlignTop | TQt::AlignLeft ); topLayout->addWidget( label, 1, 0 ); mStreetTextEdit = new TQTextEdit( page ); mStreetTextEdit->setTextFormat( TQt::PlainText ); @@ -284,31 +284,31 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list, TabPressEater *eater = new TabPressEater( TQT_TQOBJECT(this) ); mStreetTextEdit->installEventFilter( eater ); - label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).tqarg( KABC::Address::postOfficeBoxLabel() ), page ); + label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( KABC::Address::postOfficeBoxLabel() ), page ); topLayout->addWidget( label, 2 , 0 ); mPOBoxEdit = new KLineEdit( page ); label->setBuddy( mPOBoxEdit ); topLayout->addWidget( mPOBoxEdit, 2, 1 ); - label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).tqarg( KABC::Address::localityLabel() ), page ); + label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).arg( KABC::Address::localityLabel() ), page ); topLayout->addWidget( label, 3, 0 ); mLocalityEdit = new KLineEdit( page ); label->setBuddy( mLocalityEdit ); topLayout->addWidget( mLocalityEdit, 3, 1 ); - label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).tqarg( KABC::Address::regionLabel() ), page ); + label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).arg( KABC::Address::regionLabel() ), page ); topLayout->addWidget( label, 4, 0 ); mRegionEdit = new KLineEdit( page ); label->setBuddy( mRegionEdit ); topLayout->addWidget( mRegionEdit, 4, 1 ); - label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).tqarg( KABC::Address::postalCodeLabel() ), page ); + label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).arg( KABC::Address::postalCodeLabel() ), page ); topLayout->addWidget( label, 5, 0 ); mPostalCodeEdit = new KLineEdit( page ); label->setBuddy( mPostalCodeEdit ); topLayout->addWidget( mPostalCodeEdit, 5, 1 ); - label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).tqarg( KABC::Address::countryLabel() ), page ); + label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).arg( KABC::Address::countryLabel() ), page ); topLayout->addWidget( label, 6, 0 ); mCountryCombo = new KComboBox( page ); mCountryCombo->setEditable( true ); @@ -604,10 +604,10 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent ) parent, "AddressTypeDialog" ) { TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page ); + TQVBoxLayout *layout = new TQVBoxLayout( page ); mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "street/postal", "Address Types" ), page ); - tqlayout->addWidget( mGroup ); + layout->addWidget( mGroup ); mTypeList = KABC::Address::typeList(); mTypeList.remove( KABC::Address::Pref ); diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp index a742c3f7..b2e9345d 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp @@ -22,7 +22,7 @@ */ #include <tqapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> #include <klocale.h> @@ -48,7 +48,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core, TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page ); + TQVBoxLayout *layout = new TQVBoxLayout( page ); if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor ) { mEditorWidget = new SimpleAddresseeEditor( page ); @@ -56,7 +56,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core, mEditorWidget = new AddresseeEditorWidget( page ); } connect( mEditorWidget, TQT_SIGNAL( modified() ), TQT_SLOT( widgetModified() ) ); - tqlayout->addWidget( mEditorWidget ); + layout->addWidget( mEditorWidget ); enableButton( KDialogBase::Apply, false ); @@ -147,7 +147,7 @@ void AddresseeEditorDialog::slotCancel() void AddresseeEditorDialog::setTitle( const KABC::Addressee &addr ) { if ( !addr.realName().isEmpty() ) - setCaption( i18n( "Edit Contact '%1'" ).tqarg( addr.realName() ) ); + setCaption( i18n( "Edit Contact '%1'" ).arg( addr.realName() ) ); } #include "addresseeeditordialog.moc" diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp index 72e119d9..f2719f5b 100644 --- a/kaddressbook/addresseeeditorextension.cpp +++ b/kaddressbook/addresseeeditorextension.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <klocale.h> @@ -36,14 +36,14 @@ AddresseeEditorExtension::AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor ) mAddresseeEditor = new SimpleAddresseeEditor( this ); else mAddresseeEditor = new AddresseeEditorWidget( this ); - tqlayout->addWidget( mAddresseeEditor ); + layout->addWidget( mAddresseeEditor ); } AddresseeEditorExtension::~AddresseeEditorExtension() diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index 6d2e2ea8..690f9fd5 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -24,11 +24,11 @@ #include <tqcheckbox.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqpushbutton.h> #include <tqtabwidget.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqtoolbutton.h> #include <tqtooltip.h> @@ -125,10 +125,10 @@ void AddresseeEditorWidget::textChanged( const TQString& ) void AddresseeEditorWidget::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); mTabWidget = new TQTabWidget( this ); - tqlayout->addWidget( mTabWidget ); + layout->addWidget( mTabWidget ); setupTab1(); setupTab2(); @@ -144,9 +144,9 @@ void AddresseeEditorWidget::setupTab1() // This is the General tab TQWidget *tab1 = new TQWidget( mTabWidget ); - TQGridLayout *tqlayout = new TQGridLayout( tab1, 11, 7 ); - tqlayout->setMargin( KDialogBase::marginHint() ); - tqlayout->setSpacing( KDialogBase::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( tab1, 11, 7 ); + layout->setMargin( KDialogBase::marginHint() ); + layout->setSpacing( KDialogBase::spacingHint() ); TQLabel *label; KSeparator* bar; @@ -159,7 +159,7 @@ void AddresseeEditorWidget::setupTab1() label = new TQLabel( tab1 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 ); + layout->addMultiCellWidget( label, 0, 1, 0, 0 ); // First name button = new TQPushButton( i18n( "Edit Name..." ), tab1 ); @@ -178,76 +178,76 @@ void AddresseeEditorWidget::setupTab1() mNameLabel->show(); } - tqlayout->addWidget( button, 0, 1 ); - tqlayout->addWidget( mNameEdit, 0, 2 ); - tqlayout->addWidget( mNameLabel, 0, 2 ); - label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).tqarg( KABC::Addressee::roleLabel() ), tab1 ); + layout->addWidget( button, 0, 1 ); + layout->addWidget( mNameEdit, 0, 2 ); + layout->addWidget( mNameLabel, 0, 2 ); + label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 ); mRoleEdit = new KLineEdit( tab1 ); connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mRoleEdit ); - tqlayout->addWidget( label, 1, 1 ); - tqlayout->addWidget( mRoleEdit, 1, 2 ); + layout->addWidget( label, 1, 1 ); + layout->addWidget( mRoleEdit, 1, 2 ); // Organization - label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).tqarg( KABC::Addressee::organizationLabel() ), tab1 ); + label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 ); mOrgEdit = new KLineEdit( tab1 ); label->setBuddy( mOrgEdit ); connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( organizationTextChanged( const TQString& ) ) ); - tqlayout->addWidget( label, 2, 1 ); - tqlayout->addWidget( mOrgEdit, 2, 2 ); + layout->addWidget( label, 2, 1 ); + layout->addWidget( mOrgEdit, 2, 2 ); // File as (formatted name) label = new TQLabel( i18n( "Formatted name:" ), tab1 ); mFormattedNameLabel = new KSqueezedTextLabel( tab1 ); - tqlayout->addWidget( label, 3, 1 ); - tqlayout->addWidget( mFormattedNameLabel, 3, 2 ); + layout->addWidget( label, 3, 1 ); + layout->addWidget( mFormattedNameLabel, 3, 2 ); // Left hand separator. This separator doesn't go all the way // across so the dialog still flows from top to bottom bar = new KSeparator( KSeparator::HLine, tab1 ); - tqlayout->addMultiCellWidget( bar, 4, 4, 0, 2 ); + layout->addMultiCellWidget( bar, 4, 4, 0, 2 ); ////////////////////////////////////// // Phone numbers (upper right) label = new TQLabel( tab1 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 0, 1, 3, 3 ); + layout->addMultiCellWidget( label, 0, 1, 3, 3 ); mPhoneEditWidget = new PhoneEditWidget( tab1 ); connect( mPhoneEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); - tqlayout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 ); + layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 ); bar = new KSeparator( KSeparator::HLine, tab1 ); - tqlayout->addMultiCellWidget( bar, 4, 4, 3, 6 ); + layout->addMultiCellWidget( bar, 4, 4, 3, 6 ); ////////////////////////////////////// // Addresses (lower left) label = new TQLabel( tab1 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "kfm_home", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 5, 6, 0, 0 ); + layout->addMultiCellWidget( label, 5, 6, 0, 0 ); mAddressEditWidget = new AddressEditWidget( tab1 ); connect( mAddressEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); - tqlayout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 ); + layout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 ); ////////////////////////////////////// // Email / Web (lower right) label = new TQLabel( tab1 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 5, 6, 3, 3 ); + layout->addMultiCellWidget( label, 5, 6, 3, 3 ); mEmailWidget = new EmailEditWidget( tab1 ); connect( mEmailWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); - tqlayout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 ); + layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 ); // add the separator bar = new KSeparator( KSeparator::HLine, tab1 ); - tqlayout->addMultiCellWidget( bar, 7, 7, 3, 6 ); + layout->addMultiCellWidget( bar, 7, 7, 3, 6 ); TQHBoxLayout *homePageLayout = new TQHBoxLayout( 0, 11, 7 ); @@ -256,14 +256,14 @@ void AddresseeEditorWidget::setupTab1() KIcon::SizeMedium ) ); homePageLayout->addWidget( label ); - label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).tqarg( KABC::Addressee::urlLabel() ), tab1 ); + label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( KABC::Addressee::urlLabel() ), tab1 ); mURLEdit = new KLineEdit( tab1 ); connect( mURLEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mURLEdit ); homePageLayout->addWidget( label ); homePageLayout->addWidget( mURLEdit ); - tqlayout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 ); + layout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 ); TQHBoxLayout *blogLayout = new TQHBoxLayout( 0, 11, 7 ); label = new TQLabel( i18n("Blog feed:"), tab1 ); @@ -273,16 +273,16 @@ void AddresseeEditorWidget::setupTab1() connect( mBlogEdit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( textChanged( const TQString & ) ) ); label->setBuddy( mBlogEdit ); - tqlayout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 ); + layout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 ); mIMWidget = new IMEditWidget( tab1, mAddressee ); connect( mIMWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); - tqlayout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 ); + layout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 ); - tqlayout->addColSpacing( 6, 50 ); + layout->addColSpacing( 6, 50 ); bar = new KSeparator( KSeparator::HLine, tab1 ); - tqlayout->addMultiCellWidget( bar, 11, 11, 0, 6 ); + layout->addMultiCellWidget( bar, 11, 11, 0, 6 ); /////////////////////////////////////// TQHBox *categoryBox = new TQHBox( tab1 ); @@ -300,10 +300,10 @@ void AddresseeEditorWidget::setupTab1() mSecrecyWidget = new SecrecyWidget( categoryBox ); connect( mSecrecyWidget, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) ); - tqlayout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 ); + layout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 ); - // Build the tqlayout and add to the tab widget - tqlayout->activate(); // required + // Build the layout and add to the tab widget + layout->activate(); // required mTabWidget->addTab( tab1, i18n( "&General" ) ); } @@ -313,9 +313,9 @@ void AddresseeEditorWidget::setupTab2() // This is the Details tab TQWidget *tab2 = new TQWidget( mTabWidget ); - TQGridLayout *tqlayout = new TQGridLayout( tab2, 6, 6 ); - tqlayout->setMargin( KDialogBase::marginHint() ); - tqlayout->setSpacing( KDialogBase::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( tab2, 6, 6 ); + layout->setMargin( KDialogBase::marginHint() ); + layout->setSpacing( KDialogBase::spacingHint() ); TQLabel *label; KSeparator* bar; @@ -327,58 +327,58 @@ void AddresseeEditorWidget::setupTab2() label = new TQLabel( tab2 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 ); + layout->addMultiCellWidget( label, 0, 1, 0, 0 ); label = new TQLabel( i18n( "Department:" ), tab2 ); - tqlayout->addWidget( label, 0, 1 ); + layout->addWidget( label, 0, 1 ); mDepartmentEdit = new KLineEdit( tab2 ); connect( mDepartmentEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mDepartmentEdit ); - tqlayout->addWidget( mDepartmentEdit, 0, 2 ); + layout->addWidget( mDepartmentEdit, 0, 2 ); label = new TQLabel( i18n( "Office:" ), tab2 ); - tqlayout->addWidget( label, 1, 1 ); + layout->addWidget( label, 1, 1 ); mOfficeEdit = new KLineEdit( tab2 ); connect( mOfficeEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mOfficeEdit ); - tqlayout->addWidget( mOfficeEdit, 1, 2 ); + layout->addWidget( mOfficeEdit, 1, 2 ); label = new TQLabel( i18n( "Profession:" ), tab2 ); - tqlayout->addWidget( label, 2, 1 ); + layout->addWidget( label, 2, 1 ); mProfessionEdit = new KLineEdit( tab2 ); connect( mProfessionEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mProfessionEdit ); - tqlayout->addWidget( mProfessionEdit, 2, 2 ); + layout->addWidget( mProfessionEdit, 2, 2 ); label = new TQLabel( i18n( "Manager\'s name:" ), tab2 ); - tqlayout->addWidget( label, 0, 3 ); + layout->addWidget( label, 0, 3 ); mManagerEdit = new KPIM::AddresseeLineEdit( tab2 ); connect( mManagerEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mManagerEdit ); - tqlayout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 ); + layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 ); label = new TQLabel( i18n( "Assistant's name:" ), tab2 ); - tqlayout->addWidget( label, 1, 3 ); + layout->addWidget( label, 1, 3 ); mAssistantEdit = new KPIM::AddresseeLineEdit( tab2 ); connect( mAssistantEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mAssistantEdit ); - tqlayout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 ); + layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 ); - label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).tqarg( KABC::Addressee::titleLabel() ), tab2 ); - tqlayout->addWidget( label, 2, 3 ); + label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 ); + layout->addWidget( label, 2, 3 ); mTitleEdit = new KLineEdit( tab2 ); connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mTitleEdit ); - tqlayout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 ); + layout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 ); bar = new KSeparator( KSeparator::HLine, tab2 ); - tqlayout->addMultiCellWidget( bar, 3, 3, 0, 5 ); + layout->addMultiCellWidget( bar, 3, 3, 0, 5 ); ///////////////////////////////////////////////// // Personal info @@ -386,61 +386,61 @@ void AddresseeEditorWidget::setupTab2() label = new TQLabel( tab2 ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, KIcon::SizeMedium ) ); - tqlayout->addMultiCellWidget( label, 4, 5, 0, 0 ); + layout->addMultiCellWidget( label, 4, 5, 0, 0 ); label = new TQLabel( i18n( "Nickname:" ), tab2 ); - tqlayout->addWidget( label, 4, 1 ); + layout->addWidget( label, 4, 1 ); mNicknameEdit = new KLineEdit( tab2 ); connect( mNicknameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mNicknameEdit ); - tqlayout->addWidget( mNicknameEdit, 4, 2 ); + layout->addWidget( mNicknameEdit, 4, 2 ); label = new TQLabel( i18n( "Partner's name:" ), tab2 ); - tqlayout->addWidget( label, 5, 1 ); + layout->addWidget( label, 5, 1 ); mSpouseEdit = new KPIM::AddresseeLineEdit( tab2 ); connect( mSpouseEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mSpouseEdit ); - tqlayout->addWidget( mSpouseEdit, 5, 2 ); + layout->addWidget( mSpouseEdit, 5, 2 ); label = new TQLabel( i18n( "Birthdate:" ), tab2 ); - tqlayout->addWidget( label, 4, 3 ); + layout->addWidget( label, 4, 3 ); mBirthdayPicker = new KDateEdit( tab2 ); connect( mBirthdayPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ), TQT_SLOT( dateChanged( const TQDate& ) ) ); connect( mBirthdayPicker, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( emitModified() ) ); label->setBuddy( mBirthdayPicker ); - tqlayout->addWidget( mBirthdayPicker, 4, 4 ); + layout->addWidget( mBirthdayPicker, 4, 4 ); label = new TQLabel( i18n( "Anniversary:" ), tab2 ); - tqlayout->addWidget( label, 5, 3 ); + layout->addWidget( label, 5, 3 ); mAnniversaryPicker = new KDateEdit( tab2 ); connect( mAnniversaryPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ), TQT_SLOT( dateChanged( const TQDate& ) ) ); connect( mAnniversaryPicker, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( emitModified() ) ); label->setBuddy( mAnniversaryPicker ); - tqlayout->addWidget( mAnniversaryPicker, 5, 4 ); + layout->addWidget( mAnniversaryPicker, 5, 4 ); bar = new KSeparator( KSeparator::HLine, tab2 ); - tqlayout->addMultiCellWidget( bar, 6, 6, 0, 5 ); + layout->addMultiCellWidget( bar, 6, 6, 0, 5 ); ////////////////////////////////////// // Notes label = new TQLabel( i18n( "Note:" ), tab2 ); - label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft ); - tqlayout->addWidget( label, 7, 0 ); + label->setAlignment( TQt::AlignTop | TQt::AlignLeft ); + layout->addWidget( label, 7, 0 ); mNoteEdit = new TQTextEdit( tab2 ); mNoteEdit->setWordWrap( TQTextEdit::WidgetWidth ); - mNoteEdit->setMinimumSize( mNoteEdit->tqsizeHint() ); + mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() ); connect( mNoteEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( emitModified() ) ); label->setBuddy( mNoteEdit ); - tqlayout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 ); + layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 ); - // Build the tqlayout and add to the tab widget - tqlayout->activate(); // required + // Build the layout and add to the tab widget + layout->activate(); // required mTabWidget->addTab( tab2, i18n( "&Details" ) ); } @@ -474,7 +474,7 @@ void AddresseeEditorWidget::setupAdditionalTabs() page->addWidget( widget ); } - // query the tqlayout update + // query the layout update TQDictIterator<ContactEditorTabPage> it( mTabPages ); for ( ; it.current(); ++it ) it.current()->updateLayout(); diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp index d63a33fa..d2ac4cf7 100644 --- a/kaddressbook/addviewdialog.cpp +++ b/kaddressbook/addviewdialog.cpp @@ -23,7 +23,7 @@ #include <tqbuttongroup.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqradiobutton.h> @@ -44,23 +44,23 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, TQWidget *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2 ); - tqlayout->setSpacing( spacingHint() ); - tqlayout->setRowStretch( 1, 1 ); - tqlayout->setColStretch( 1, 1 ); + TQGridLayout *layout = new TQGridLayout( page, 2, 2 ); + layout->setSpacing( spacingHint() ); + layout->setRowStretch( 1, 1 ); + layout->setColStretch( 1, 1 ); TQLabel *label = new TQLabel( i18n( "View name:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mViewNameEdit = new TQLineEdit( page ); connect( mViewNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); - tqlayout->addWidget( mViewNameEdit, 0, 1 ); + layout->addWidget( mViewNameEdit, 0, 1 ); 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 ); + layout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 ); + TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->layout(), 3, 2 ); groupLayout->setSpacing( spacingHint() ); int row = 0; @@ -69,7 +69,7 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, TQRadioButton *button = new TQRadioButton( i18n((*iter)->type().utf8()), mTypeGroup, (*iter)->type().latin1() ); label = new TQLabel( (*iter)->description(), mTypeGroup ); - label->tqsetAlignment( TQt::WordBreak ); + label->setAlignment( TQt::WordBreak ); groupLayout->addWidget( button, row, 0, TQt::AlignTop ); groupLayout->addWidget( label, row, 1, TQt::AlignTop ); diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp index 9ba59052..753c6cc9 100644 --- a/kaddressbook/advancedcustomfields.cpp +++ b/kaddressbook/advancedcustomfields.cpp @@ -26,11 +26,11 @@ #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqdatetimeedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqobjectlist.h> #include <tqspinbox.h> #include <tqregexp.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqwidgetfactory.h> #include <kdatepicker.h> @@ -126,11 +126,11 @@ void AdvancedCustomFields::setReadOnly( bool readOnly ) void AdvancedCustomFields::initGUI( const TQString &uiFile ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mFields = new KPIM::DesignerFields( uiFile, this ); - tqlayout->addWidget( mFields ); + layout->addWidget( mFields ); connect( mFields, TQT_SIGNAL( modified() ), TQT_SLOT( setModified() ) ); } diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp index 910fc151..932f6f10 100644 --- a/kaddressbook/common/filter.cpp +++ b/kaddressbook/common/filter.cpp @@ -147,7 +147,7 @@ void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &lis // remove the old filters uint count = config->readNumEntry( "Count" ); for ( uint i = 0; i < count; ++i ) - config->deleteGroup( TQString( "%1_%2" ).tqarg( baseGroup ).tqarg( i ) ); + config->deleteGroup( TQString( "%1_%2" ).arg( baseGroup ).arg( i ) ); } @@ -155,8 +155,8 @@ void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &lis Filter::List::Iterator iter; for ( iter = list.begin(); iter != list.end(); ++iter ) { if ( !(*iter).mInternal ) { - KConfigGroupSaver s( config, TQString( "%1_%2" ).tqarg( baseGroup ) - .tqarg( index ) ); + KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ) + .arg( index ) ); (*iter).save( config ); index++; } @@ -179,7 +179,7 @@ Filter::List Filter::restore( KConfig *config, const TQString &baseGroup ) for ( int i = 0; i < count; i++ ) { { - KConfigGroupSaver s( config, TQString( "%1_%2" ).tqarg( baseGroup ).tqarg( i ) ); + KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) ); f.restore( config ); } diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h index 35abdd04..c0c92bdc 100644 --- a/kaddressbook/common/kabprefs.h +++ b/kaddressbook/common/kabprefs.h @@ -42,7 +42,7 @@ class KDE_EXPORT KABPrefs : public KABPrefsBase void setLocationMapURL( const TQString &locationMapURL ) { - if ( !isImmutable( TQString::tqfromLatin1( "LocationMapURL" ) ) ) + if ( !isImmutable( TQString::fromLatin1( "LocationMapURL" ) ) ) mLocationMapURL = locationMapURL; } @@ -53,7 +53,7 @@ class KDE_EXPORT KABPrefs : public KABPrefsBase void setLocationMapURLs( const TQStringList &locationMapURLs ) { - if ( !isImmutable( TQString::tqfromLatin1( "LocationMapURLs" ) ) ) + if ( !isImmutable( TQString::fromLatin1( "LocationMapURLs" ) ) ) mLocationMapURLs = locationMapURLs; } diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp index 0e1d4e9c..2fbda71c 100644 --- a/kaddressbook/common/locationmap.cpp +++ b/kaddressbook/common/locationmap.cpp @@ -72,7 +72,7 @@ TQString LocationMap::createUrl( const KABC::Address &addr ) %c country (in ISO format) */ - TQString urlTemplate = KABPrefs::instance()->locationMapURL().tqarg( KGlobal::locale()->country() ); + TQString urlTemplate = KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ); if ( urlTemplate.isEmpty() ) { KMessageBox::error( 0, i18n( "No service provider available for map lookup!\nPlease add one in the configuration dialog." ) ); return TQString(); diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp index 1e3677c5..c4f65e6c 100644 --- a/kaddressbook/contacteditorwidgetmanager.cpp +++ b/kaddressbook/contacteditorwidgetmanager.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <kapplication.h> #include <kdialog.h> @@ -76,7 +76,7 @@ void ContactEditorWidgetManager::reload() mFactories.clear(); kdDebug(5720) << "ContactEditorWidgetManager::reload()" << endl; const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/ContactEditorWidget", - TQString( "[X-KDE-KAddressBook-CEWPluginVersion] == %1" ).tqarg( KAB_CEW_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KAddressBook-CEWPluginVersion] == %1" ).arg( KAB_CEW_PLUGIN_VERSION ) ); KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { diff --git a/kaddressbook/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h index 5c7ff9fb..6bc418eb 100644 --- a/kaddressbook/contacteditorwidgetmanager.h +++ b/kaddressbook/contacteditorwidgetmanager.h @@ -96,7 +96,7 @@ class ContactEditorTabPage : public TQWidget void setReadOnly( bool readOnly ); /** - Calculates the tqlayout of the widgets and moves them to the + Calculates the layout of the widgets and moves them to the correct position. */ void updateLayout(); diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp index 1466e990..54571a23 100644 --- a/kaddressbook/customfieldswidget.cpp +++ b/kaddressbook/customfieldswidget.cpp @@ -25,7 +25,7 @@ #include <tqdatetimeedit.h> #include <tqframe.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqvalidator.h> #include <tqspinbox.h> @@ -48,26 +48,26 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name ) { TQWidget *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() ); + TQGridLayout *layout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( i18n( "Title:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mTitle = new KLineEdit( page ); mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), TQT_TQOBJECT(mTitle) ) ); label->setBuddy( mTitle ); - tqlayout->addWidget( mTitle, 0, 1 ); + layout->addWidget( mTitle, 0, 1 ); label = new TQLabel( i18n( "Type:" ), page ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mType = new KComboBox( page ); label->setBuddy( mType ); - tqlayout->addWidget( mType, 1, 1 ); + layout->addWidget( mType, 1, 1 ); mGlobal = new TQCheckBox( i18n( "Is available for all contacts" ), page ); mGlobal->setChecked( true ); - tqlayout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 ); + layout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 ); connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( nameChanged( const TQString& ) ) ); @@ -124,19 +124,19 @@ void AddFieldDialog::nameChanged( const TQString &name ) FieldWidget::FieldWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - mGlobalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); - mGlobalLayout->tqsetAlignment( TQt::AlignTop ); + mGlobalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() ); + mGlobalLayout->setAlignment( TQt::AlignTop ); mSeparator = new TQFrame( this ); mSeparator->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); mSeparator->hide(); - tqlayout->addWidget( mSeparator ); + layout->addWidget( mSeparator ); - mLocalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); - mLocalLayout->tqsetAlignment( TQt::AlignTop ); + mLocalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() ); + mLocalLayout->setAlignment( TQt::AlignTop ); } void FieldWidget::addField( const TQString &identifier, const TQString &title, @@ -238,13 +238,13 @@ void FieldWidget::clearFields() wdg->setChecked( true ); } else if ( (*fieldIt).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) { TQDateEdit *wdg = static_cast<TQDateEdit*>( (*fieldIt).mWidget ); - wdg->setDate( TQDate::tqcurrentDate() ); + wdg->setDate( TQDate::currentDate() ); } else if ( (*fieldIt).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) { TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*fieldIt).mWidget ); wdg->setTime( TQTime::currentTime() ); } else if ( (*fieldIt).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*fieldIt).mWidget ); - wdg->setDateTime( TQDateTime::tqcurrentDateTime() ); + wdg->setDateTime( TQDateTime::currentDateTime() ); } } } @@ -370,7 +370,7 @@ void FieldWidget::recalculateLayout() FieldRecordList::ConstIterator it; for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) - maxWidth = TQMAX( maxWidth, (*it).mLabel->tqminimumSizeHint().width() ); + maxWidth = TQMAX( maxWidth, (*it).mLabel->minimumSizeHint().width() ); for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) (*it).mLabel->setMinimumWidth( maxWidth ); @@ -485,18 +485,18 @@ void CustomFieldsWidget::removeField() void CustomFieldsWidget::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), + TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); mFieldWidget = new FieldWidget( this ); - tqlayout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 ); + layout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 ); mAddButton = new TQPushButton( i18n( "Add Field..." ), this ); - tqlayout->addWidget( mAddButton, 1, 1, TQt::AlignRight ); + layout->addWidget( mAddButton, 1, 1, TQt::AlignRight ); mRemoveButton = new TQPushButton( i18n( "Remove Field..." ), this ); mRemoveButton->setEnabled( false ); - tqlayout->addWidget( mRemoveButton, 1, 2, TQt::AlignRight ); + layout->addWidget( mRemoveButton, 1, 2, TQt::AlignRight ); // load global fields TQStringList globalFields = KABPrefs::instance()->globalCustomFields(); diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp index 9a06fb39..9f18818b 100644 --- a/kaddressbook/distributionlisteditor.cpp +++ b/kaddressbook/distributionlisteditor.cpp @@ -39,7 +39,7 @@ #include <kmessagebox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqsignalmapper.h> #include <tqtoolbutton.h> #include <tqguardedptr.h> @@ -67,16 +67,16 @@ public: KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* parent ) : TQWidget( parent ), m_addressBook( book ) { Q_ASSERT( m_addressBook ); - TQBoxLayout* tqlayout = new TQHBoxLayout( this ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQBoxLayout* layout = new TQHBoxLayout( this ); + layout->setSpacing( KDialog::spacingHint() ); m_lineEdit = new KPIM::DistributionListEditor::LineEdit( this ); connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged( const TQString& ) ) ); - tqlayout->addWidget( m_lineEdit ); + layout->addWidget( m_lineEdit ); m_clearButton = new TQToolButton( this ); m_clearButton->setIconSet( KApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) ); m_clearButton->setEnabled( false ); - tqlayout->addWidget( m_clearButton ); + layout->addWidget( m_clearButton ); connect( m_clearButton, TQT_SIGNAL( clicked() ), m_lineEdit, TQT_SLOT( clear() ) ); } @@ -188,7 +188,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* boo d->scrollView->setFrameShape( TQFrame::NoFrame ); mainLayout->addWidget( d->scrollView ); d->memberListWidget = new TQWidget( d->scrollView->viewport() ); - d->memberListWidget->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); + d->memberListWidget->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); TQVBoxLayout* memberLayout = new TQVBoxLayout( d->memberListWidget ); d->addresseeLayout = new TQVBoxLayout; d->addresseeLayout->setSpacing( KDialog::spacingHint() ); @@ -200,7 +200,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* boo setMainWidget( main ); KPIM::DistributionListEditor::Line* const last = d->addLineForEntry( KPIM::DistributionList::Entry() ); - const TQSize hint = tqsizeHint(); + const TQSize hint = sizeHint(); resize( hint.width() * 3L/2, hint.height() ); } @@ -261,7 +261,7 @@ void KPIM::DistributionListEditor::EditorWidget::slotOk() const KPIM::DistributionList existing = KPIM::DistributionList::findByName( d->addressBook, name ); if ( !existing.isEmpty() && existing.uid() != d->distListUid ) { - KMessageBox::error( this, i18n( "A distribution list with the name %1 already exists. Please choose another name." ).tqarg( name ), i18n( "Name in Use" ) ); + KMessageBox::error( this, i18n( "A distribution list with the name %1 already exists. Please choose another name." ).arg( name ), i18n( "Name in Use" ) ); return; } diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp index ef0fe9bb..c6a8e1fa 100644 --- a/kaddressbook/distributionlistentryview.cpp +++ b/kaddressbook/distributionlistentryview.cpp @@ -15,7 +15,7 @@ #include <tqbuttongroup.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqstringlist.h> #include <tqvbuttongroup.h> @@ -44,7 +44,7 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi TQLabel* distLabel = new TQLabel( this ); distLabel->setText( i18n( "<b>Distribution list:</b>" ) ); - distLabel->tqsetAlignment( TQt::SingleLine ); + distLabel->setAlignment( TQt::SingleLine ); distLayout->addWidget( distLabel ); m_distListLabel = new KURLLabel( this ); @@ -57,7 +57,7 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi TQLabel* emailLabel = new TQLabel( this ); emailLabel->setText( i18n( "<b>Email address to use in this list:</b>" ) ); - emailLabel->tqsetAlignment( TQt::SingleLine ); + emailLabel->setAlignment( TQt::SingleLine ); m_mainLayout->addWidget( emailLabel ); TQBoxLayout* emailLayout = new TQHBoxLayout; @@ -106,11 +106,11 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis TQPixmap pixmap; pixmap.convertFromImage( m_entry.addressee.photo().data() ); m_imageLabel->setPixmap( pixmap.isNull() ? KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) : pixmap ); - m_addresseeLabel->setText( i18n( "Formatted name, role, organization", "<qt><h2>%1</h2><p>%2<br/>%3</p></qt>" ).tqarg( m_entry.addressee.formattedName(), m_entry.addressee.role(), m_entry.addressee.organization() ) ); + m_addresseeLabel->setText( i18n( "Formatted name, role, organization", "<qt><h2>%1</h2><p>%2<br/>%3</p></qt>" ).arg( m_entry.addressee.formattedName(), m_entry.addressee.role(), m_entry.addressee.organization() ) ); m_distListLabel->setURL( m_list.name() ); m_distListLabel->setText( m_list.name() ); - m_resourceLabel->setText( i18n( "<b>Address book:</b> %1" ).tqarg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) ); - m_resourceLabel->tqsetAlignment( TQt::SingleLine ); + m_resourceLabel->setText( i18n( "<b>Address book:</b> %1" ).arg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) ); + m_resourceLabel->setAlignment( TQt::SingleLine ); m_emailGroup = new TQVButtonGroup( this ); m_emailGroup->setFlat( true ); @@ -133,7 +133,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis this, TQT_SLOT( emailButtonClicked( int ) ) ); m_radioLayout->addWidget( m_emailGroup, 0, 0 ); m_emailGroup->setShown( true ); - m_mainLayout->tqinvalidate(); + m_mainLayout->invalidate(); } diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp index 9f8626fb..feacf243 100644 --- a/kaddressbook/distributionlistpicker.cpp +++ b/kaddressbook/distributionlistpicker.cpp @@ -36,7 +36,7 @@ #include <kmessagebox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqregexp.h> #include <tqvalidator.h> @@ -48,12 +48,12 @@ KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressB enableButton( Ok, false ); setButtonText( User1, i18n( "Add New Distribution List" ) ); TQWidget* main = new TQWidget( this ); - TQGridLayout* tqlayout = new TQGridLayout( main ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQGridLayout* layout = new TQGridLayout( main ); + layout->setSpacing( KDialog::spacingHint() ); m_label = new TQLabel( main ); - tqlayout->addWidget( m_label, 0, 0 ); + layout->addWidget( m_label, 0, 0 ); m_listBox = new KListBox( main ); - tqlayout->addWidget( m_listBox, 1, 0 ); + layout->addWidget( m_listBox, 1, 0 ); connect( m_listBox, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( entrySelected( const TQString& ) ) ); connect( m_listBox, TQT_SIGNAL( selected( const TQString& ) ), @@ -112,7 +112,7 @@ void KPIM::DistributionListPickerDialog::slotUser1() } else { - KMessageBox::error( this, i18n( "A distribution list with the the name %1 already exists. Please choose another name" ).tqarg( name ), i18n( "Name Exists" ) ); + KMessageBox::error( this, i18n( "A distribution list with the the name %1 already exists. Please choose another name" ).arg( name ), i18n( "Name Exists" ) ); } } while ( !validName ); diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp index 89d41ab3..954c8397 100644 --- a/kaddressbook/editors/cryptowidget.cpp +++ b/kaddressbook/editors/cryptowidget.cpp @@ -35,7 +35,7 @@ #include <kiconloader.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqcombobox.h> diff --git a/kaddressbook/editors/imeditorbase.ui b/kaddressbook/editors/imeditorbase.ui index 77d11794..40270b50 100644 --- a/kaddressbook/editors/imeditorbase.ui +++ b/kaddressbook/editors/imeditorbase.ui @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -116,7 +116,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>28</height> diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp index 533b7d4b..0e7357ea 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -25,7 +25,7 @@ #include <tqlistview.h> #include <tqstringlist.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqfont.h> #include <tqpainter.h> @@ -64,7 +64,7 @@ bool IMAddressLVI::preferred() const } void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment ) + int column, int width, int alignment ) { if ( mPreferred ) { TQFont font = p->font(); @@ -72,7 +72,7 @@ void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg, p->setFont( font ); } - KListViewItem::paintCell( p, cg, column, width, tqalignment ); + KListViewItem::paintCell( p, cg, column, width, alignment ); } void IMAddressLVI::setAddress( const TQString &address ) @@ -85,7 +85,7 @@ void IMAddressLVI::setAddress( const TQString &address ) else { TQString nickname = address.section( TQChar( 0xE120 ), 0, 0 ); setText( 1, i18n( "<nickname> on <server>","%1 on %2" ) - .tqarg( nickname ).tqarg( serverOrGroup ) ); + .arg( nickname ).arg( serverOrGroup ) ); } mAddress = address; @@ -167,7 +167,7 @@ IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, c //mWidget->btnDown->setEnabled( false ); mPreferred = preferredIM; mPreferred = mPreferred.replace( " on ", TQString( TQChar( 0xE120 ) ), true ); - mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "KABC/IMProtocol" ) ) ); + mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "KABC/IMProtocol" ) ) ); // order the protocols by putting them in a qmap, then sorting the set of keys and recreating the list TQMap<TQString, KPluginInfo *> protocolMap; @@ -204,8 +204,8 @@ void IMEditorWidget::loadContact( KABC::Addressee *addr ) TQString app, name, value; splitField( *it, app, name, value ); - if ( app.startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) { - if ( name == TQString::tqfromLatin1( "All" ) ) { + if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) ) { + if ( name == TQString::fromLatin1( "All" ) ) { KPluginInfo *protocol = protocolFromString( app ); if ( protocol ) { TQStringList addresses = TQStringList::split( TQChar( 0xE000 ), value ); @@ -244,9 +244,9 @@ void IMEditorWidget::storeContact( KABC::Addressee *addr ) TQString addrBookField = (*protocolIt)->property( "X-KDE-InstantMessagingKABCField" ).toString(); if ( !lst.isEmpty() ) - addr->insertCustom( addrBookField, TQString::tqfromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) ); + addr->insertCustom( addrBookField, TQString::fromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) ); else - addr->removeCustom( addrBookField, TQString::tqfromLatin1( "All" ) ); + addr->removeCustom( addrBookField, TQString::fromLatin1( "All" ) ); } } diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h index 3c9b85ce..417e62f4 100644 --- a/kaddressbook/editors/imeditorwidget.h +++ b/kaddressbook/editors/imeditorwidget.h @@ -116,7 +116,7 @@ class IMAddressLVI : public KListViewItem bool preferred() const; protected: - virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ); + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ); private: KPluginInfo * mProtocol; diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp index 4ecee68a..bc0d2173 100644 --- a/kaddressbook/emaileditwidget.cpp +++ b/kaddressbook/emaileditwidget.cpp @@ -23,7 +23,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqpushbutton.h> #include <tqvalidator.h> @@ -184,7 +184,7 @@ EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *parent, mEmailListBox = new TQListBox( page ); // Make sure there is room for the scrollbar - mEmailListBox->setMinimumHeight( mEmailListBox->tqsizeHint().height() + 30 ); + mEmailListBox->setMinimumHeight( mEmailListBox->sizeHint().height() + 30 ); connect( mEmailListBox, TQT_SIGNAL( highlighted( int ) ), TQT_SLOT( selectionChanged( int ) ) ); connect( mEmailListBox, TQT_SIGNAL( selected( int ) ), @@ -302,7 +302,7 @@ void EmailEditDialog::remove() { TQString address = mEmailListBox->currentText(); - TQString text = i18n( "<qt>Are you sure that you want to remove the email address <b>%1</b>?</qt>" ).tqarg( address ); + TQString text = i18n( "<qt>Are you sure that you want to remove the email address <b>%1</b>?</qt>" ).arg( address ); TQString caption = i18n( "Confirm Remove" ); if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Continue) { diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index 6e854ebc..e06b53f9 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -27,7 +27,7 @@ #include <klocale.h> #include <ktrader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqobjectlist.h> #include <tqsignalmapper.h> #include <tqsplitter.h> @@ -50,10 +50,10 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai mMapper( 0 ), mDetailsStack( detailsStack ), mActiveDetailsWidget( 0 ) { Q_ASSERT( mExtensionBar ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( mExtensionBar ); + TQVBoxLayout* layout = new TQVBoxLayout( mExtensionBar ); mSplitter = new TQSplitter( mExtensionBar ); mSplitter->setOrientation( Qt::Vertical ); - tqlayout->addWidget( mSplitter ); + layout->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" ).tqarg( KAB_EXTENSIONWIDGET_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KAddressBook-ExtensionPluginVersion] == %1" ).arg( KAB_EXTENSIONWIDGET_PLUGIN_VERSION ) ); KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp index 7e603488..5a786f76 100644 --- a/kaddressbook/features/distributionlistngwidget.cpp +++ b/kaddressbook/features/distributionlistngwidget.cpp @@ -38,7 +38,7 @@ #include <tqevent.h> #include <tqguardedptr.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpoint.h> #include <tqtimer.h> #include <tqpushbutton.h> @@ -56,7 +56,7 @@ void KAB::DistributionListNg::ListBox::dragMoveEvent( TQDragMoveEvent *event ) event->ignore(); } else { - event->accept( tqitemRect( item ) ); + event->accept( itemRect( item ) ); } } @@ -117,11 +117,11 @@ TQString KAB::DistributionListNg::MainWidget::identifier() const KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->setSpacing( KDialog::spacingHint() ); TQHBoxLayout *buttonLayout = new TQHBoxLayout(); - tqlayout->addLayout( buttonLayout ); + layout->addLayout( buttonLayout ); TQLabel *label = new TQLabel( this ); label->setText( i18n( "Distribution Lists" ) ); @@ -154,7 +154,7 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare connect( mListBox, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( itemSelected( int ) ) ); connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(editSelectedDistributionList()) ); - tqlayout->addWidget( mListBox ); + layout->addWidget( mListBox ); connect( core, TQT_SIGNAL( contactsUpdated() ), this, TQT_SLOT( updateEntries() ) ); diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index 035eba6c..48393ce4 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -25,7 +25,7 @@ #include <tqbuttongroup.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqpushbutton.h> #include <tqradiobutton.h> @@ -343,7 +343,7 @@ void DistributionListWidget::editList() void DistributionListWidget::removeList() { int result = KMessageBox::warningContinueCancel( this, - i18n( "<qt>Delete distribution list <b>%1</b>?</qt>" ) .tqarg( mNameCombo->currentText() ), + i18n( "<qt>Delete distribution list <b>%1</b>?</qt>" ) .arg( mNameCombo->currentText() ), TQString(), KGuiItem( i18n("Delete"), "editdelete") ); if ( result != KMessageBox::Continue ) diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index a7f0d36d..5c1c62b9 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqpopupmenu.h> #include <tqpushbutton.h> #include <tqtimer.h> @@ -247,7 +247,7 @@ void ResourceSelection::add() KABC::Resource *resource = mManager->createResource( type ); if ( !resource ) { KMessageBox::error( this, i18n("<qt>Unable to create an address book of type <b>%1</b>.</qt>") - .tqarg( type ) ); + .arg( type ) ); return; } @@ -298,7 +298,7 @@ void ResourceSelection::remove() int result = KMessageBox::warningContinueCancel( this, i18n( "<qt>Do you really want to remove the address book <b>%1</b>?</qt>" ) - .tqarg( item->resource()->resourceName() ), "", + .arg( item->resource()->resourceName() ), "", KGuiItem( i18n( "&Remove" ), "editdelete" ) ); if ( result == KMessageBox::Cancel ) return; diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp index 5e1586e1..ad0571d5 100644 --- a/kaddressbook/filtereditdialog.cpp +++ b/kaddressbook/filtereditdialog.cpp @@ -24,7 +24,7 @@ #include <tqbuttongroup.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqradiobutton.h> #include <tqregexp.h> @@ -272,7 +272,7 @@ void FilterDialog::initGUI() mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) ); mRemoveButton->setEnabled( false ); - buttonBox->tqlayout(); + buttonBox->layout(); topLayout->addWidget( buttonBox, 0, 1 ); } diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp index 7b81d9cc..ada62b16 100644 --- a/kaddressbook/freebusywidget.cpp +++ b/kaddressbook/freebusywidget.cpp @@ -22,7 +22,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kdialog.h> #include <klocale.h> @@ -35,15 +35,15 @@ FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::ContactEditorWidget( ab, parent, name ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(), + TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Location of Free/Busy information:" ), this ); - tqlayout->addWidget( label ); + layout->addWidget( label ); mURL = new KURLRequester( this ); label->setBuddy( mURL ); - tqlayout->addWidget( mURL ); + layout->addWidget( mURL ); connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( setModified() ) ); diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 725dde3d..304eb5a5 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -34,7 +34,7 @@ #include <tqfile.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqpainter.h> #include <tqpixmap.h> @@ -56,7 +56,7 @@ GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name label = new TQLabel( this ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "package_network", KIcon::Desktop, KIcon::SizeMedium ) ); - label->tqsetAlignment( TQt::AlignTop ); + label->setAlignment( TQt::AlignTop ); topLayout->addMultiCellWidget( label, 0, 3, 0, 0 ); mGeoIsValid = new TQCheckBox( i18n( "Use geo data" ), this ); @@ -175,7 +175,7 @@ GeoDialog::GeoDialog( TQWidget *parent, const char *name ) topLayout->addWidget( mCityCombo, 0, 1 ); TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, Qt::Vertical, i18n( "Sexagesimal" ), page ); - TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->tqlayout(), + TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->layout(), 2, 5, spacingHint() ); TQLabel *label = new TQLabel( i18n( "Latitude:" ), sexagesimalGroup ); @@ -537,7 +537,7 @@ void GeoMapWidget::paintEvent( TQPaintEvent* ) TQPixmap pm( w, h ); TQPainter p; - p.tqbegin( &pm, this ); + p.begin( &pm, this ); p.setPen( TQColor( 255, 0, 0 ) ); p.setBrush( TQColor( 255, 0, 0 ) ); diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index f0917eca..b148b756 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -39,7 +39,7 @@ #include <tqeventloop.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <tqpopupmenu.h> @@ -255,12 +255,12 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title, TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, title, this ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( box->tqlayout(), KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( box->layout(), KDialog::spacingHint() ); mImageButton = new ImageButton( i18n( "Picture" ), box ); mImageButton->setFixedSize( 100, 140 ); mImageButton->setImageLoader( mImageLoader ); - tqlayout->addWidget( mImageButton ); + layout->addWidget( mImageButton ); topLayout->addWidget( box ); @@ -293,14 +293,14 @@ KABC::Picture ImageBaseWidget::image() const ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::ContactEditorWidget( ab, parent, name ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(), + TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mPhotoWidget = new ImageBaseWidget( KABC::Addressee::photoLabel(), this ); - tqlayout->addWidget( mPhotoWidget ); + layout->addWidget( mPhotoWidget ); mLogoWidget = new ImageBaseWidget( KABC::Addressee::logoLabel(), this ); - tqlayout->addWidget( mLogoWidget ); + layout->addWidget( mLogoWidget ); connect( mPhotoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) ); connect( mLogoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) ); diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp index 2f40f5de..557cdcc9 100644 --- a/kaddressbook/imeditwidget.cpp +++ b/kaddressbook/imeditwidget.cpp @@ -23,7 +23,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqpushbutton.h> #include <tqstring.h> diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp index aaad464f..d21b849d 100644 --- a/kaddressbook/incsearchwidget.cpp +++ b/kaddressbook/incsearchwidget.cpp @@ -24,7 +24,7 @@ #include <tqapplication.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <tqtoolbutton.h> #include <tqtooltip.h> @@ -40,32 +40,32 @@ IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 2, KDialog::spacingHint() ); + TQHBoxLayout *layout = new TQHBoxLayout( this, 2, KDialog::spacingHint() ); TQToolButton *button = new TQToolButton( this ); - button->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + button->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); button->setPixmap( SmallIcon( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) ); button->setAccel( TQKeySequence( CTRL+ALT+Key_S ) ); button->setAutoRaise( true ); TQToolTip::add( button, i18n( "Reset" ) ); - tqlayout->addWidget( button ); + layout->addWidget( button ); TQLabel *label = new TQLabel( i18n( "Search:" ), this, "kde toolbar widget" ); - label->tqsetAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); - tqlayout->addWidget( label ); + label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); + layout->addWidget( label ); mSearchText = new KLineEdit( this ); - mSearchText->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); + mSearchText->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); TQWhatsThis::add( mSearchText, i18n( "The incremental search<p>Enter some text here will start the search for the contact, which matches the search pattern best. The part of the contact, which will be used for matching, depends on the field selection." ) ); label->setBuddy( mSearchText ); - tqlayout->addWidget( mSearchText ); + layout->addWidget( mSearchText ); label = new TQLabel( i18n( "as in 'Search in:'", "&in:" ), this, "kde toolbar widget" ); - label->tqsetAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); - tqlayout->addWidget( label ); + label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); + layout->addWidget( label ); mFieldCombo = new TQComboBox( false, this ); - tqlayout->addWidget( mFieldCombo ); + layout->addWidget( mFieldCombo ); label->setBuddy(mFieldCombo); TQToolTip::add( mFieldCombo, i18n( "Select incremental search field" ) ); diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index 73710d82..377263fc 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -95,7 +95,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient /** Processes outstanding KApplication events. It should be called occasionally when the import/export filter is busy performing - a long operation (e.g. reading from slow external tqdevices). + a long operation (e.g. reading from slow external devices). @see: TQApplication::processEvents() */ void processEvents() const; diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index 2b603fe2..090d854f 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -24,7 +24,7 @@ #include <tqapplication.h> #include <tqbuttongroup.h> #include <tqevent.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqstring.h> #include <tqstyle.h> @@ -57,7 +57,7 @@ JumpButton::JumpButton( const TQString &firstChar, const TQString &lastChar, { setToggleButton( true ); if ( !lastChar.isEmpty() ) - setText( TQString( "%1 - %2" ).tqarg( firstChar.upper() ).tqarg( lastChar.upper() ) ); + setText( TQString( "%1 - %2" ).arg( firstChar.upper() ).arg( lastChar.upper() ) ); else setText( firstChar.upper() ); } @@ -67,15 +67,15 @@ JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *nam { setMinimumSize( 1, 1 ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, 0 ); - tqlayout->tqsetAlignment( TQt::AlignTop ); - tqlayout->setAutoAdd( true ); - tqlayout->setResizeMode( TQLayout::FreeResize ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, 0 ); + layout->setAlignment( TQt::AlignTop ); + layout->setAutoAdd( true ); + layout->setResizeMode( TQLayout::FreeResize ); mGroupBox = new TQButtonGroup( 1, Qt::Horizontal, this ); mGroupBox->setExclusive( true ); - mGroupBox->tqlayout()->setSpacing( 0 ); - mGroupBox->tqlayout()->setMargin( 0 ); + mGroupBox->layout()->setSpacing( 0 ); + mGroupBox->layout()->setMargin( 0 ); mGroupBox->setFrameStyle( TQFrame::NoFrame ); } @@ -179,7 +179,7 @@ void JumpButtonBar::updateButtons() int maxWidth = 0; TQPushButton *button; for ( button = mButtons.first(); button; button = mButtons.next() ) - maxWidth = TQMAX( maxWidth, button->tqsizeHint().width() ); + maxWidth = TQMAX( maxWidth, button->sizeHint().width() ); setFixedWidth( maxWidth ); } diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index bb2408f7..f0b45f5b 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -25,11 +25,11 @@ #include <unistd.h> // for usleep #include <tqeventloop.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdir.h> #include <tqfile.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqptrlist.h> #include <tqwidgetstack.h> #include <tqregexp.h> @@ -114,7 +114,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, mAddressBook = new KABC::AddressBook; mAddressBook->addResource( new KABC::ResourceFile( file ) ); if ( !mAddressBook->load() ) { - KMessageBox::error( parent, i18n("Unable to load '%1'.").tqarg( file ) ); + KMessageBox::error( parent, i18n("Unable to load '%1'.").arg( file ) ); } } mAddressBook->setErrorHandler( new KABC::GuiErrorHandler( mWidget ) ); @@ -430,10 +430,10 @@ void KABCore::setContactSelected( const TQString &uid ) mActionMerge->setEnabled( ( list.size() == 2 ) && writable ); if ( mReadWrite ) { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); #if defined(KABC_VCARD_ENCODING_FIX) const TQMimeSource *data = cb->data( TQClipboard::Clipboard ); - list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) ); + list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) ); #else list = AddresseeUtil::clipboardToAddressees( cb->text() ); #endif @@ -552,11 +552,11 @@ void KABCore::copyContacts() #if defined(KABC_VCARD_ENCODING_FIX) TQByteArray clipText = AddresseeUtil::addresseesToClipboard( addrList ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText( TQString::fromUtf8( clipText.data() ) ); #else TQString clipText = AddresseeUtil::addresseesToClipboard( addrList ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText( clipText ); #endif } @@ -575,10 +575,10 @@ void KABCore::cutContacts() void KABCore::pasteContacts() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); #if defined(KABC_VCARD_ENCODING_FIX) const TQMimeSource *data = cb->data( TQClipboard::Clipboard ); - KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) ); + KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) ); #else KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() ); #endif @@ -640,7 +640,7 @@ void KABCore::setWhoAmI() } TQString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) ); - if ( KMessageBox::questionYesNo( mWidget, text.tqarg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes ) + if ( KMessageBox::questionYesNo( mWidget, text.arg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes ) static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self( true ) )->setWhoAmI( addrList[ 0 ] ); } @@ -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 ).tqstartsWith( character, false ) ) { + if ( field->value( *it ).startsWith( 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)" ).tqarg( i++ ); + name = i18n( "New Distribution List (%1)" ).arg( i++ ); foundUnused = KPIM::DistributionList::findByName( addressBook(), name ).isEmpty(); } } @@ -897,7 +897,7 @@ void KABCore::save() if ( ticket ) { if ( !mAddressBook->save( ticket ) ) { KMessageBox::error( mWidget, - i18n( "<qt>Unable to save address book <b>%1</b>.</qt>" ).tqarg( it.current()->resourceName() ) ); + i18n( "<qt>Unable to save address book <b>%1</b>.</qt>" ).arg( it.current()->resourceName() ) ); mAddressBook->releaseSaveTicket( ticket ); } else { setModified( false ); @@ -905,7 +905,7 @@ void KABCore::save() } else { KMessageBox::error( mWidget, i18n( "<qt>Unable to get access for saving the address book <b>%1</b>.</qt>" ) - .tqarg( it.current()->resourceName() ) ); + .arg( it.current()->resourceName() ) ); } ++it; @@ -1224,7 +1224,7 @@ void KABCore::initGUI() viewLayout->setSpacing( KDialog::spacingHint() ); mViewHeaderLabel = new TQLabel( viewWidget ); -// mViewHeaderLabel->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); +// mViewHeaderLabel->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); mViewHeaderLabel->setText( i18n( "Contacts" ) ); viewLayout->addWidget( mViewHeaderLabel ); mViewManager = new ViewManager( this, viewWidget ); @@ -1311,7 +1311,7 @@ void KABCore::createJumpButtonBar() void KABCore::initActions() { - connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( clipboardDataChanged() ) ); KAction *action; @@ -1432,7 +1432,7 @@ void KABCore::initActions() void KABCore::clipboardDataChanged() { if ( mReadWrite ) - mActionPaste->setEnabled( !TQApplication::tqclipboard()->text().isEmpty() ); + mActionPaste->setEnabled( !TQApplication::clipboard()->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() ).tqarg( mSelectedDistributionList ), + uids.count() ).arg( mSelectedDistributionList ), names, TQString(), KStdGuiItem::del() ) == KMessageBox::Cancel ) { return; } @@ -1729,7 +1729,7 @@ void KABCore::setSelectedDistributionList( const TQString &name ) mSearchManager->setSelectedDistributionList( name ); mViewHeaderLabel->setText( name.isNull() ? i18n( "Contacts" ) : - i18n( "Distribution List: %1" ).tqarg( name ) ); + i18n( "Distribution List: %1" ).arg( name ) ); mDistListButtonWidget->setShown( !mSelectedDistributionList.isNull() ); if ( !name.isNull() ) { mDetailsStack->raiseWidget( mDistListEntryView ); diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp index 3efa4277..db623dba 100644 --- a/kaddressbook/kabtools.cpp +++ b/kaddressbook/kabtools.cpp @@ -43,7 +43,7 @@ static TQString uniqueFileName( const KABC::Addressee &addressee, TQStringList & name.replace( '/', '_' ); ++number; - uniquePart = TQString( "_%1" ).tqarg( number ); + uniquePart = TQString( "_%1" ).arg( number ); } while ( existingFiles.contains( name ) ); existingFiles.append( name ); diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp index 5f978b4d..a2c079d9 100644 --- a/kaddressbook/kaddressbook_part.cpp +++ b/kaddressbook/kaddressbook_part.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <kaction.h> #include <kapplication.h> diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp index 43d709d2..00212a5f 100644 --- a/kaddressbook/kaddressbookview.cpp +++ b/kaddressbook/kaddressbookview.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqpopupmenu.h> #include <kabc/addressbook.h> @@ -121,12 +121,12 @@ KABC::Addressee::List KAddressBookView::addressees() void KAddressBookView::initGUI() { - // Create the tqlayout - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + // Create the layout + TQVBoxLayout *layout = new TQVBoxLayout( this ); // Add the view widget mViewWidget = new TQWidget( this ); - tqlayout->addWidget( mViewWidget ); + layout->addWidget( mViewWidget ); } KABC::Field::List KAddressBookView::fields() const diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp index 155f6f6b..51faef69 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.cpp +++ b/kaddressbook/kcmconfigs/addhostdialog.cpp @@ -22,7 +22,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqspinbox.h> #include <tqtooltip.h> @@ -39,7 +39,7 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const mServer = server; TQWidget *page = plainPage(); - TQHBoxLayout *tqlayout = new TQHBoxLayout( page, marginHint(), spacingHint() ); + TQHBoxLayout *layout = new TQHBoxLayout( page, marginHint(), spacingHint() ); mCfg = new KABC::LdapConfigWidget( KABC::LdapConfigWidget::W_USER | @@ -56,7 +56,7 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const KABC::LdapConfigWidget::W_AUTHBOX, page ); - tqlayout->addWidget( mCfg ); + layout->addWidget( mCfg ); mCfg->setHost( mServer->host() ); mCfg->setPort( mServer->port() ); mCfg->setDn( mServer->baseDN() ); diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp index 8c04002d..42f0eb6b 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.cpp +++ b/kaddressbook/kcmconfigs/addresseewidget.cpp @@ -24,7 +24,7 @@ #include <tqcstring.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqpushbutton.h> @@ -44,10 +44,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label, TQWidget *parent, const char *name ) : TQWidget( parent, name ), mTitle( title ), mLabel( label ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); + TQHBoxLayout *layout = new TQHBoxLayout( this ); TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this ); - TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 2, 2, + TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); mBox = new TQListBox( group ); @@ -61,10 +61,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label, mEditButton->setEnabled( false ); mRemoveButton = bbox->addButton( i18n( "Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) ); mRemoveButton->setEnabled( false ); - bbox->tqlayout(); + bbox->layout(); groupLayout->addWidget( bbox, 0, 1 ); - tqlayout->addWidget( group ); + layout->addWidget( group ); } NamePartWidget::~NamePartWidget() @@ -134,20 +134,20 @@ void NamePartWidget::selectionChanged( TQListBoxItem *item ) AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), + TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); mPrefix = new NamePartWidget( i18n( "Prefixes"), i18n( "Enter prefix:" ), this ); - tqlayout->addWidget( mPrefix, 0, 0 ); + layout->addWidget( mPrefix, 0, 0 ); mInclusion = new NamePartWidget( i18n( "Inclusions"), i18n( "Enter inclusion:" ), this ); - tqlayout->addWidget( mInclusion, 0, 1 ); + layout->addWidget( mInclusion, 0, 1 ); mSuffix = new NamePartWidget( i18n( "Suffixes" ), i18n( "Enter suffix:" ), this ); - tqlayout->addWidget( mSuffix, 0, 2 ); + layout->addWidget( mSuffix, 0, 2 ); TQLabel *label = new TQLabel( i18n( "Default formatted name:" ), this ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mFormattedNameCombo = new KComboBox( this ); mFormattedNameCombo->insertItem( i18n( "Empty" ) ); @@ -155,7 +155,7 @@ AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name ) mFormattedNameCombo->insertItem( i18n( "Full Name" ) ); mFormattedNameCombo->insertItem( i18n( "Reverse Name with Comma" ) ); mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) ); - tqlayout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 ); + layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 ); connect( mPrefix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); connect( mInclusion, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp index 68f4643a..e88f91c9 100644 --- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp +++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> @@ -35,10 +35,10 @@ ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, KC name, true, true ), mWidget( 0 ), mConfig( config ) { TQFrame *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() ); + TQGridLayout *layout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() ); mWidget = factory->configureWidget( page, "ExtensionConfigWidget" ); - tqlayout->addWidget( mWidget, 0, 0 ); + layout->addWidget( mWidget, 0, 0 ); mWidget->restoreSettings( mConfig ); } diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index 6f99bbcd..3d335e84 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -25,7 +25,7 @@ #include <tqframe.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqtabwidget.h> @@ -56,12 +56,12 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) // General page TQWidget *generalPage = new TQWidget( this ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( generalPage, KDialog::marginHint(), + TQVBoxLayout *layout = new TQVBoxLayout( generalPage, KDialog::marginHint(), KDialog::spacingHint() ); TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage ); - TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->tqlayout() ); - boxLayout->tqsetAlignment( TQt::AlignTop ); + TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->layout() ); + boxLayout->setAlignment( TQt::AlignTop ); mViewsSingleClickBox = new TQCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" ); boxLayout->addWidget( mViewsSingleClickBox ); @@ -94,10 +94,10 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) editorLayout->addStretch( 1 ); - tqlayout->addWidget( groupBox ); + layout->addWidget( groupBox ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage ); - TQGridLayout *grid = new TQGridLayout( groupBox->tqlayout(), 3, 2, + TQGridLayout *grid = new TQGridLayout( groupBox->layout(), 3, 2, KDialog::spacingHint() ); label = new TQLabel( i18n( "Phone:" ), groupBox ); grid->addWidget( label, 0, 0 ); @@ -124,14 +124,14 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) grid->setColStretch( 1, 1 ); - tqlayout->addWidget( groupBox ); + layout->addWidget( groupBox ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage ); - boxLayout = new TQVBoxLayout( groupBox->tqlayout(), KDialog::spacingHint() ); - boxLayout->tqsetAlignment( TQt::AlignTop ); + boxLayout = new TQVBoxLayout( groupBox->layout(), KDialog::spacingHint() ); + boxLayout->setAlignment( TQt::AlignTop ); mLocationMapURL = new TQComboBox( true, groupBox ); - mLocationMapURL->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + mLocationMapURL->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); TQToolTip::add( mLocationMapURL, i18n( "<ul> <li>%s: Street</li>" "<li>%r: Region</li>" "<li>%l: Location</li>" @@ -139,7 +139,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) "<li>%c: Country ISO Code</li> </ul>" ) ); mLocationMapURL->insertStringList( KABPrefs::instance()->locationMapURLs() ); boxLayout->addWidget( mLocationMapURL ); - tqlayout->addWidget( groupBox ); + layout->addWidget( groupBox ); connect( mNameParsing, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); connect( mViewsSingleClickBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); @@ -171,7 +171,7 @@ void KABConfigWidget::restoreSettings() mFaxHook->setText( KABPrefs::instance()->faxHookApplication() ); mAddresseeWidget->restoreSettings(); mEditorCombo->setCurrentItem( KABPrefs::instance()->editorType() ); - mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().tqarg( KGlobal::locale()->country() ) ); + mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ) ); mLocationMapURL->lineEdit()->setCursorPosition( 0 ); KConfig config( "kabcrc", false, false ); diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index 4217a0a8..1b3c76f9 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <kaboutdata.h> #include <kdebug.h> @@ -43,9 +43,9 @@ extern "C" KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name ) : KCModule( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); mConfigWidget = new KABConfigWidget( this, "mConfigWidget" ); - tqlayout->addWidget( mConfigWidget ); + layout->addWidget( mConfigWidget ); connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index e9541ea9..e5a85449 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -23,7 +23,7 @@ #include <tqcheckbox.h> #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include <kaboutdata.h> #include <klocale.h> @@ -44,9 +44,9 @@ extern "C" KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name ) : KCModule( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); mConfigWidget = new LDAPOptionsWidget( this ); - tqlayout->addWidget( mConfigWidget ); + layout->addWidget( mConfigWidget ); connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp index a091c0f0..3294dd96 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -24,7 +24,7 @@ #include <tqgroupbox.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqtoolbutton.h> #include <tqstring.h> @@ -258,7 +258,7 @@ void LDAPOptionsWidget::defaults() void LDAPOptionsWidget::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); TQVGroupBox *groupBox = new TQVGroupBox( i18n( "LDAP Servers" ), this ); groupBox->setInsideSpacing( KDialog::spacingHint() ); @@ -285,7 +285,7 @@ void LDAPOptionsWidget::initGUI() TQWidget* spacer = new TQWidget( upDownBox ); upDownBox->setStretchFactor( spacer, 100 ); - tqlayout->addWidget( groupBox ); + layout->addWidget( groupBox ); KButtonBox *buttons = new KButtonBox( this ); buttons->addButton( i18n( "&Add Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotAddHost() ) ); @@ -293,11 +293,11 @@ void LDAPOptionsWidget::initGUI() mEditButton->setEnabled( false ); mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), TQT_TQOBJECT(this), TQT_SLOT( slotRemoveHost() ) ); mRemoveButton->setEnabled( false ); - buttons->tqlayout(); + buttons->layout(); - tqlayout->addWidget( buttons ); + layout->addWidget( buttons ); - resize( TQSize( 460, 300 ).expandedTo( tqsizeHint() ) ); + resize( TQSize( 460, 300 ).expandedTo( sizeHint() ) ); } #include "ldapoptionswidget.moc" diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp index 739672fc..775401c7 100644 --- a/kaddressbook/keywidget.cpp +++ b/kaddressbook/keywidget.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <kapplication.h> @@ -41,25 +41,25 @@ KeyWidget::KeyWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, KDialog::marginHint(), + TQGridLayout *layout = new TQGridLayout( this, 4, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Keys:" ), this ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mKeyCombo = new KComboBox( this ); - tqlayout->addWidget( mKeyCombo, 0, 1 ); + layout->addWidget( mKeyCombo, 0, 1 ); mAddButton = new TQPushButton( i18n( "Add..." ), this ); - tqlayout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 ); + layout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 ); mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); mRemoveButton->setEnabled( false ); - tqlayout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 ); + layout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 ); mExportButton = new TQPushButton( i18n( "Export..." ), this ); mExportButton->setEnabled( false ); - tqlayout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 ); + layout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 ); connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addKey() ) ); connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeKey() ) ); @@ -122,7 +122,7 @@ void KeyWidget::addKey() TQFile file( tmpFile ); if ( !file.open( IO_ReadOnly ) ) { TQString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) ); - KMessageBox::error( this, text.tqarg( url.url() ) ); + KMessageBox::error( this, text.arg( url.url() ) ); return; } @@ -154,7 +154,7 @@ void KeyWidget::removeKey() TQString type = mKeyCombo->currentText(); TQString text = i18n( "<qt>Do you really want to remove the key <b>%1</b>?</qt>" ); - if ( KMessageBox::warningContinueCancel( this, text.tqarg( type ), "", KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Cancel ) + if ( KMessageBox::warningContinueCancel( this, text.arg( type ), "", KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Cancel ) return; mKeyList.remove( mKeyList.at( pos ) ); diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 4722feac..ceac59bb 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -24,7 +24,7 @@ #include <tqgroupbox.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqmap.h> #include <tqpushbutton.h> @@ -153,7 +153,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, groupBox->setFrameShape( TQGroupBox::Box ); groupBox->setFrameShadow( TQGroupBox::Sunken ); groupBox->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, + TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); @@ -176,10 +176,10 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, TQSize buttonSize; mSearchButton = new TQPushButton( i18n( "Stop" ), groupBox ); - buttonSize = mSearchButton->tqsizeHint(); + buttonSize = mSearchButton->sizeHint(); mSearchButton->setText( i18n( "&Search" ) ); - if ( buttonSize.width() < mSearchButton->tqsizeHint().width() ) - buttonSize = mSearchButton->tqsizeHint(); + if ( buttonSize.width() < mSearchButton->sizeHint().width() ) + buttonSize = mSearchButton->sizeHint(); mSearchButton->setFixedWidth( buttonSize.width() ); mSearchButton->setDefault( true ); @@ -208,7 +208,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, topLayout->addWidget( buttons ); - resize( TQSize( 600, 400).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize( 600, 400).expandedTo( minimumSizeHint() ) ); setButtonText( User1, i18n( "Add Selected" ) ); @@ -361,15 +361,15 @@ TQString LDAPSearchDialog::makeFilter( const TQString& query, const TQString& at if ( attr == i18n( "Name" ) ) { result += startsWith ? "|(cn=%1*)(sn=%2*)" : "|(cn=*%1*)(sn=*%2*)"; - result = result.tqarg( query ).tqarg( query ); + result = result.arg( query ).arg( query ); } else { result += (startsWith ? "%1=%2*" : "%1=*%2*"); if ( attr == i18n( "Email" ) ) { - result = result.tqarg( "mail" ).tqarg( query ); + result = result.arg( "mail" ).arg( query ); } else if ( attr == i18n( "Home Number" ) ) { - result = result.tqarg( "homePhone" ).tqarg( query ); + result = result.arg( "homePhone" ).arg( query ); } else if ( attr == i18n( "Work Number" ) ) { - result = result.tqarg( "telephoneNumber" ).tqarg( query ); + result = result.arg( "telephoneNumber" ).arg( query ); } else { // Error? result = TQString(); @@ -560,7 +560,7 @@ KPIM::DistributionList LDAPSearchDialog::selectDistributionList() KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQValueList<ContactListItem*>& selectedItems, KABC::Resource * const resource ) { - const TQDateTime now = TQDateTime::tqcurrentDateTime(); + const TQDateTime now = TQDateTime::currentDateTime(); TQStringList importedAddrs; KABC::Addressee::List localAddrs; @@ -573,7 +573,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV if ( existing.isEmpty() ) { addr.setUid( KApplication::randomString( 10 ) ); - addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).tqarg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) ); + addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).arg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) ); addr.setResource( resource ); mCore->addressBook()->insertAddressee( addr ); TQString displayString; diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp index 4bb6e370..64fbf2f2 100644 --- a/kaddressbook/nameeditdialog.cpp +++ b/kaddressbook/nameeditdialog.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqlistbox.h> #include <tqlistview.h> @@ -51,71 +51,71 @@ NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type, Ok, parent, name, true ), mAddressee( addr ) { TQWidget *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page ); - tqlayout->setSpacing( spacingHint() ); - tqlayout->addColSpacing( 2, 100 ); + TQGridLayout *layout = new TQGridLayout( page ); + layout->setSpacing( spacingHint() ); + layout->addColSpacing( 2, 100 ); TQLabel *label; label = new TQLabel( i18n( "Honorific prefixes:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mPrefixCombo = new KComboBox( page ); mPrefixCombo->setDuplicatesEnabled( false ); mPrefixCombo->setEditable( true ); mPrefixCombo->setEnabled( !readOnly ); label->setBuddy( mPrefixCombo ); - tqlayout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 ); + layout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 ); TQWhatsThis::add( mPrefixCombo, i18n( "The predefined honorific prefixes can be extended in the settings dialog." ) ); label = new TQLabel( i18n( "Given name:" ), page ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mGivenNameEdit = new KLineEdit( page ); mGivenNameEdit->setReadOnly( readOnly ); label->setBuddy( mGivenNameEdit ); - tqlayout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 ); + layout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 ); label = new TQLabel( i18n( "Additional names:" ), page ); - tqlayout->addWidget( label, 2, 0 ); + layout->addWidget( label, 2, 0 ); mAdditionalNameEdit = new KLineEdit( page ); mAdditionalNameEdit->setReadOnly( readOnly ); label->setBuddy( mAdditionalNameEdit ); - tqlayout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 ); + layout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 ); label = new TQLabel( i18n( "Family names:" ), page ); - tqlayout->addWidget( label, 3, 0 ); + layout->addWidget( label, 3, 0 ); mFamilyNameEdit = new KLineEdit( page ); mFamilyNameEdit->setReadOnly( readOnly ); label->setBuddy( mFamilyNameEdit ); - tqlayout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 ); + layout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 ); label = new TQLabel( i18n( "Honorific suffixes:" ), page ); - tqlayout->addWidget( label, 4, 0 ); + layout->addWidget( label, 4, 0 ); mSuffixCombo = new KComboBox( page ); mSuffixCombo->setDuplicatesEnabled( false ); mSuffixCombo->setEditable( true ); mSuffixCombo->setEnabled( !readOnly ); label->setBuddy( mSuffixCombo ); - tqlayout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 ); + layout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 ); TQWhatsThis::add( mSuffixCombo, i18n( "The predefined honorific suffixes can be extended in the settings dialog." ) ); label = new TQLabel( i18n( "Formatted name:" ), page ); - tqlayout->addWidget( label, 5, 0 ); + layout->addWidget( label, 5, 0 ); mFormattedNameCombo = new KComboBox( page ); mFormattedNameCombo->setEnabled( !readOnly ); - tqlayout->addWidget( mFormattedNameCombo, 5, 1 ); + layout->addWidget( mFormattedNameCombo, 5, 1 ); connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( typeChanged( int ) ) ); mFormattedNameEdit = new KLineEdit( page ); mFormattedNameEdit->setEnabled( type == CustomName && !readOnly ); - tqlayout->addWidget( mFormattedNameEdit, 5, 2 ); + layout->addWidget( mFormattedNameEdit, 5, 2 ); mParseBox = new TQCheckBox( i18n( "Parse name automatically" ), page ); mParseBox->setEnabled( !readOnly ); connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( parseBoxChanged(bool) ) ); connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( modified() ) ); - tqlayout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 ); + layout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 ); // Fill in the values mFamilyNameEdit->setText( addr.familyName() ); diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index 5c573314..16853ea2 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp @@ -24,7 +24,7 @@ #include <tqbuttongroup.h> #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqlistview.h> #include <tqpushbutton.h> @@ -129,13 +129,13 @@ void PhoneTypeCombo::otherSelected() PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent ) : TQWidget( parent ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 6, 11 ); + TQHBoxLayout *layout = new TQHBoxLayout( this, 6, 11 ); mTypeCombo = new PhoneTypeCombo( this ); mNumberEdit = new KLineEdit( this ); - tqlayout->addWidget( mTypeCombo ); - tqlayout->addWidget( mNumberEdit ); + layout->addWidget( mTypeCombo ); + layout->addWidget( mNumberEdit ); connect( mTypeCombo, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); connect( mNumberEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( modified() ) ); @@ -169,19 +169,19 @@ void PhoneNumberWidget::setReadOnly( bool readOnly ) PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), mReadOnly( false ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2 ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 2, 2 ); + layout->setSpacing( KDialog::spacingHint() ); - mWidgetLayout = new TQVBoxLayout( tqlayout ); - tqlayout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 ); + mWidgetLayout = new TQVBoxLayout( layout ); + layout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 ); mAddButton = new TQPushButton( i18n( "Add" ), this ); - mAddButton->setMaximumSize( mAddButton->tqsizeHint() ); - tqlayout->addWidget( mAddButton, 1, 0, TQt::AlignRight ); + mAddButton->setMaximumSize( mAddButton->sizeHint() ); + layout->addWidget( mAddButton, 1, 0, TQt::AlignRight ); mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); - mRemoveButton->setMaximumSize( mRemoveButton->tqsizeHint() ); - tqlayout->addWidget( mRemoveButton, 1, 1 ); + mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() ); + layout->addWidget( mRemoveButton, 1, 1 ); mMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) ); @@ -298,13 +298,13 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent ) { TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, spacingHint() ); mPreferredBox = new TQCheckBox( i18n( "This is the preferred phone number" ), page ); - tqlayout->addWidget( mPreferredBox ); + layout->addWidget( mPreferredBox ); mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "Types" ), page ); - tqlayout->addWidget( mGroup ); + layout->addWidget( mGroup ); // fill widgets mTypeList = KABC::PhoneNumber::typeList(); diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp index 5d970b3b..1019d1c2 100644 --- a/kaddressbook/printing/detailledstyle.cpp +++ b/kaddressbook/printing/detailledstyle.cpp @@ -29,7 +29,7 @@ #include <kdialog.h> #include <kfontcombo.h> #include <kglobalsettings.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <knuminput.h> #include <tqpaintdevicemetrics.h> @@ -112,8 +112,8 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na mPageAppearance->kcbHeaderTextColor->setColor( config->readColorEntry( ContactHeaderForeColor, &TQt::white ) ); - mPageAppearance->tqlayout()->setMargin( KDialog::marginHint() ); - mPageAppearance->tqlayout()->setSpacing( KDialog::spacingHint() ); + mPageAppearance->layout()->setMargin( KDialog::marginHint() ); + mPageAppearance->layout()->setSpacing( KDialog::spacingHint() ); } DetailledPrintStyle::~DetailledPrintStyle() diff --git a/kaddressbook/printing/ds_appearance.ui b/kaddressbook/printing/ds_appearance.ui index 989b360d..9dc64b9e 100644 --- a/kaddressbook/printing/ds_appearance.ui +++ b/kaddressbook/printing/ds_appearance.ui @@ -68,7 +68,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -138,7 +138,7 @@ <property name="text"> <string>Details font:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -149,7 +149,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -160,7 +160,7 @@ <property name="text"> <string>Body font:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -171,7 +171,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -182,7 +182,7 @@ <property name="text"> <string>Fixed font:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -203,7 +203,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -245,7 +245,7 @@ <property name="text"> <string>Contact header font:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -274,7 +274,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -285,7 +285,7 @@ <property name="text"> <string>Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -301,7 +301,7 @@ <property name="text"> <string>Headlines:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -400,7 +400,7 @@ <property name="text"> <string>Headline background color:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -411,7 +411,7 @@ <property name="text"> <string>Headline text color:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp index 91bf9f34..d7be5bd5 100644 --- a/kaddressbook/printing/kabentrypainter.cpp +++ b/kaddressbook/printing/kabentrypainter.cpp @@ -172,7 +172,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, KABC::Address address; // this is used to prepare some fields for printing and decide about - // the tqlayout later: + // the layout later: TQValueList<TQStringList> parts; TQValueList<TQRectList*> contents; @@ -399,27 +399,27 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, line1 = i18n( "Preferred Address" ); } - line1 += TQString::tqfromLatin1( ":" ); + line1 += TQString::fromLatin1( ":" ); text = TQString(); if ( !address.extended().isEmpty() ) text = address.extended().stripWhiteSpace(); if ( !text.isEmpty() ) { - line1 = line1 + TQString::tqfromLatin1( " (" ) + text + - TQString::tqfromLatin1( ")" ); + line1 = line1 + TQString::fromLatin1( " (" ) + text + + TQString::fromLatin1( ")" ); } line1 = line1.stripWhiteSpace(); line2 = address.street(); if ( !address.postOfficeBox().isEmpty() ) - line2 += TQString::tqfromLatin1( " - " ) + address.postOfficeBox(); + line2 += TQString::fromLatin1( " - " ) + address.postOfficeBox(); // print address in american style, this will need localisation: line3 = address.locality() + ( address.region().isEmpty() ? - TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( ", " ) + + TQString::fromLatin1( "" ) : TQString::fromLatin1( ", " ) + address.region() ) + ( address.postalCode().isEmpty() - ? TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( " " ) + ? TQString::fromLatin1( "" ) : TQString::fromLatin1( " " ) + address.postalCode() ); line4 = address.country(); diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp index 746677ec..62f89d55 100644 --- a/kaddressbook/printing/mikesstyle.cpp +++ b/kaddressbook/printing/mikesstyle.cpp @@ -68,7 +68,7 @@ void MikesStyle::print( const KABC::Addressee::List &contacts, PrintProgress *pr mBoldFont = p.font(); mBoldFont.setBold( true ); TQFontMetrics fm( mFont ); - TQPaintDeviceMetrics metrics( p.tqdevice() ); + TQPaintDeviceMetrics metrics( p.device() ); int height = 0; KABC::Addressee::List::ConstIterator it; @@ -141,7 +141,7 @@ void MikesStyle::doPaint( TQPainter &painter, const KABC::Addressee &addr, { TQFontMetrics fm( font ); TQFontMetrics bfm( bFont ); - TQPaintDeviceMetrics metrics( painter.tqdevice() ); + TQPaintDeviceMetrics metrics( painter.device() ); int margin = 10; int width = metrics.width() - 10; int xPos = 5; @@ -205,7 +205,7 @@ void MikesStyle::paintTagLine( TQPainter &p, const TQFont &font ) TQFontMetrics fm( font ); TQString text = i18n( "Printed on %1 by KAddressBook (http://www.kde.org)" ) - .tqarg( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) ); + .arg( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); p.setPen( TQt::black ); p.drawText( 0, fm.height(), text ); diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp index 1ea33d53..fd697791 100644 --- a/kaddressbook/printing/printingwizard.cpp +++ b/kaddressbook/printing/printingwizard.cpp @@ -25,7 +25,7 @@ #include <tqcombobox.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqpixmap.h> #include <tqpushbutton.h> diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp index 3a9c00d1..da6d78fc 100644 --- a/kaddressbook/printing/printprogress.cpp +++ b/kaddressbook/printing/printprogress.cpp @@ -21,9 +21,9 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqprogressbar.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <kapplication.h> #include <kdebug.h> @@ -49,7 +49,7 @@ PrintProgress::PrintProgress( TQWidget *parent, const char *name ) mProgressBar->setProgress( 0 ); topLayout->addWidget( mProgressBar, 1, 0 ); - resize( TQSize( 370, 220 ).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize( 370, 220 ).expandedTo( minimumSizeHint() ) ); } PrintProgress::~PrintProgress() diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp index e71c2789..3813f08f 100644 --- a/kaddressbook/printing/selectionpage.cpp +++ b/kaddressbook/printing/selectionpage.cpp @@ -29,7 +29,7 @@ #include <tqcombobox.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqpushbutton.h> #include <tqradiobutton.h> @@ -52,11 +52,11 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name ) mButtonGroup = new TQButtonGroup( this ); mButtonGroup->setFrameShape( TQButtonGroup::NoFrame ); mButtonGroup->setColumnLayout( 0, Qt::Vertical ); - mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); - mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() ); + mButtonGroup->layout()->setSpacing( KDialog::spacingHint() ); + mButtonGroup->layout()->setMargin( KDialog::marginHint() ); - TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() ); - groupLayout->tqsetAlignment( TQt::AlignTop ); + TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->layout() ); + groupLayout->setAlignment( TQt::AlignTop ); mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup ); mUseWholeBook->setChecked( true ); diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp index b1c29b46..4288919b 100644 --- a/kaddressbook/printing/stylepage.cpp +++ b/kaddressbook/printing/stylepage.cpp @@ -24,7 +24,7 @@ #include <tqbuttongroup.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <tqradiobutton.h> @@ -122,9 +122,9 @@ void StylePage::initGUI() TQButtonGroup *group = new TQButtonGroup( i18n( "Sorting" ), this ); group->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *sortLayout = new TQGridLayout( group->tqlayout(), 2, 2, + TQGridLayout *sortLayout = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); - sortLayout->tqsetAlignment( TQt::AlignTop ); + sortLayout->setAlignment( TQt::AlignTop ); label = new TQLabel( i18n( "Criterion:" ), group ); sortLayout->addWidget( label, 0, 0 ); @@ -142,7 +142,7 @@ void StylePage::initGUI() group = new TQButtonGroup( i18n( "Print Style" ), this ); group->setColumnLayout( 0, Qt::Vertical ); - TQVBoxLayout *styleLayout = new TQVBoxLayout( group->tqlayout(), + TQVBoxLayout *styleLayout = new TQVBoxLayout( group->layout(), KDialog::spacingHint() ); mStyleCombo = new KComboBox( false, group ); @@ -153,7 +153,7 @@ void StylePage::initGUI() font.setPointSize( 20 ); mPreview->setFont( font ); mPreview->setScaledContents( true ); - mPreview->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); + mPreview->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); styleLayout->addWidget( mPreview ); topLayout->addWidget( group, 1, 1 ); diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp index 79d77ead..4ec8f7bb 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 ).tqstartsWith( pattern, false ) ) { + if ( type == StartsWith && (*fieldIt)->value( *it ).startsWith( pattern, false ) ) { mContacts.append( *it ); found = true; break; - } else if ( type == EndsWith && (*fieldIt)->value( *it ).tqendsWith( pattern, false ) ) { + } else if ( type == EndsWith && (*fieldIt)->value( *it ).endsWith( 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).find( ':' ); if ( pos != -1 ) { const TQString value = (*customIt).mid( pos + 1 ); - if ( type == StartsWith && value.tqstartsWith( pattern, false ) ) { + if ( type == StartsWith && value.startsWith( pattern, false ) ) { mContacts.append( *it ); break; - } else if ( type == EndsWith && value.tqendsWith( pattern, false ) ) { + } else if ( type == EndsWith && value.endsWith( pattern, false ) ) { mContacts.append( *it ); break; } else if ( type == Contains && value.find( pattern, 0, false ) != -1 ) { diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp index 29942cb7..7a0520a9 100644 --- a/kaddressbook/secrecywidget.cpp +++ b/kaddressbook/secrecywidget.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <kabc/secrecy.h> #include <kcombobox.h> @@ -32,10 +32,10 @@ SecrecyWidget::SecrecyWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mSecrecyCombo = new KComboBox( this ); - tqlayout->addWidget( mSecrecyCombo ); + layout->addWidget( mSecrecyCombo ); const KABC::Secrecy::TypeList list = KABC::Secrecy::typeList(); KABC::Secrecy::TypeList::ConstIterator it; diff --git a/kaddressbook/simpleaddresseeeditor.cpp b/kaddressbook/simpleaddresseeeditor.cpp index 3a371dc6..6ae925e6 100644 --- a/kaddressbook/simpleaddresseeeditor.cpp +++ b/kaddressbook/simpleaddresseeeditor.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klineedit.h> diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp index e50e129b..8e34e299 100644 --- a/kaddressbook/soundwidget.cpp +++ b/kaddressbook/soundwidget.cpp @@ -33,7 +33,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqwhatsthis.h> @@ -48,7 +48,7 @@ SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *n TQLabel *label = new TQLabel( this ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "multimedia", KIcon::Desktop, KIcon::SizeMedium ) ); - label->tqsetAlignment( TQt::AlignTop ); + label->setAlignment( TQt::AlignTop ); topLayout->addMultiCellWidget( label, 0, 1, 0, 0 ); mPlayButton = new TQPushButton( i18n( "Play" ), this ); diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp index 3216ea73..b5a4ecde 100644 --- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp +++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp @@ -31,7 +31,7 @@ #include <tqpixmap.h> #include <tqimage.h> #include <tqpainter.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <kglobal.h> diff --git a/kaddressbook/typecombo.h b/kaddressbook/typecombo.h index 2ff6591c..e5cf6429 100644 --- a/kaddressbook/typecombo.h +++ b/kaddressbook/typecombo.h @@ -91,8 +91,8 @@ void TypeCombo<T>::updateTypes() } labelCount[ type ] = count; if ( count > 1 ) { - label = i18n("label (number)", "%1 (%2)").tqarg( label ) - .tqarg( TQString::number( count ) ); + label = i18n("label (number)", "%1 (%2)").arg( label ) + .arg( TQString::number( count ) ); } insertItem( label ); } diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp index e05024bd..def62d67 100644 --- a/kaddressbook/undocmds.cpp +++ b/kaddressbook/undocmds.cpp @@ -23,7 +23,7 @@ */ #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <klocale.h> #include <kapplication.h> @@ -261,7 +261,7 @@ void CutCommand::unexecute() mAddresseeList.clear(); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); kapp->processEvents(); cb->setText( mOldText ); } @@ -289,7 +289,7 @@ void CutCommand::execute() // Convert to clipboard mClipText = AddresseeUtil::addresseesToClipboard( mAddresseeList ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); mOldText = cb->text(); kapp->processEvents(); #if defined(KABC_VCARD_ENCODING_FIX) diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp index 9ab4b26e..78ec53f1 100644 --- a/kaddressbook/viewconfigurefieldspage.cpp +++ b/kaddressbook/viewconfigurefieldspage.cpp @@ -22,7 +22,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqpushbutton.h> #include <tqtoolbutton.h> @@ -262,16 +262,16 @@ void ViewConfigureFieldsPage::initGUI() vb2->addStretch(); gl->addLayout( vb2, 1, 3 ); - TQSize tqsizeHint = mUnSelectedBox->tqsizeHint(); + TQSize sizeHint = mUnSelectedBox->sizeHint(); // make sure we fill the list with all items, so that we can // get the maxItemWidth we need to not truncate the view slotShowFields( 0 ); - tqsizeHint = tqsizeHint.expandedTo( mSelectedBox->tqsizeHint() ); - tqsizeHint.setWidth( mUnSelectedBox->maxItemWidth() ); - mUnSelectedBox->setMinimumSize( tqsizeHint ); - mSelectedBox->setMinimumSize( tqsizeHint ); + sizeHint = sizeHint.expandedTo( mSelectedBox->sizeHint() ); + sizeHint.setWidth( mUnSelectedBox->maxItemWidth() ); + mUnSelectedBox->setMinimumSize( sizeHint ); + mSelectedBox->setMinimumSize( sizeHint ); gl->activate(); diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp index 83c358f3..d74ec783 100644 --- a/kaddressbook/viewconfigurefilterpage.cpp +++ b/kaddressbook/viewconfigurefilterpage.cpp @@ -23,7 +23,7 @@ #include <tqbuttongroup.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <kconfig.h> @@ -47,7 +47,7 @@ ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *parent, " this view is displayed. This feature allows you to configure views that only" " interact with certain types of information based on the filter. Once the view" " is activated, the filter can be changed at anytime." ), this ); - label->tqsetAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak ); + label->setAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak ); topLayout->addWidget( label ); TQWidget *spacer = new TQWidget( this ); diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp index efefbd81..9f4e7c92 100644 --- a/kaddressbook/viewconfigurewidget.cpp +++ b/kaddressbook/viewconfigurewidget.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <kapplication.h> diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index b6ab807b..2433d722 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -22,7 +22,7 @@ */ #include <tqfile.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidgetstack.h> #include <libtdepim/kvcarddrag.h> @@ -307,7 +307,7 @@ void ViewManager::editView() void ViewManager::deleteView() { TQString text = i18n( "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>" ) - .tqarg( mActiveView->caption() ); + .arg( mActiveView->caption() ); TQString caption = i18n( "Confirm Delete" ); if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Continue ) { @@ -348,7 +348,7 @@ void ViewManager::addView() firstConflict = false; } - newName = TQString( "%1 <%2>" ).tqarg( newName ).tqarg( numTries ); + newName = TQString( "%1 <%2>" ).arg( newName ).arg( numTries ); numTries++; } @@ -387,7 +387,7 @@ void ViewManager::scrollDown() void ViewManager::createViewFactories() { const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/View", - TQString( "[X-KDE-KAddressBook-ViewPluginVersion] == %1" ).tqarg( KAB_VIEW_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KAddressBook-ViewPluginVersion] == %1" ).arg( KAB_VIEW_PLUGIN_VERSION ) ); KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { if ( !(*it)->hasServiceType( "KAddressBook/View" ) ) @@ -601,9 +601,9 @@ void ViewManager::initActions() void ViewManager::initGUI() { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); + TQHBoxLayout *layout = new TQHBoxLayout( this ); mViewWidgetStack = new TQWidgetStack( this ); - tqlayout->addWidget( mViewWidgetStack ); + layout->addWidget( mViewWidgetStack ); } #include "viewmanager.moc" diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index df956398..03216b05 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -681,7 +681,7 @@ CardViewItem *CardView::itemAt( const TQPoint &viewPos ) const return 0; } -TQRect CardView::tqitemRect( const CardViewItem *item ) const +TQRect CardView::itemRect( const CardViewItem *item ) const { return TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ); } @@ -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()->tqpalette().active(); + TQColorGroup cg = viewport()->palette().active(); TQRect clipRect( clipx, clipy, clipw, cliph ); TQRect cardRect; @@ -893,7 +893,7 @@ void CardView::resizeEvent( TQResizeEvent *event ) void CardView::calcLayout() { - // Start in the upper left corner and tqlayout all the + // Start in the upper left corner and layout all the // cars using their height and width int maxWidth = 0; int maxHeight = 0; @@ -1324,7 +1324,7 @@ void CardView::keyPressEvent( TQKeyEvent *e ) break; case Key_Menu: emit contextMenuRequested( d->mCurrentItem, viewport()->mapToGlobal( - tqitemRect(d->mCurrentItem).center() ) ); + itemRect(d->mCurrentItem).center() ) ); break; default: if ( (e->state() & ControlButton) && e->key() == Key_A ) { @@ -1392,7 +1392,7 @@ void CardView::setLayoutDirty( bool dirty ) { if ( d->mLayoutDirty != dirty ) { d->mLayoutDirty = dirty; - tqrepaint(); + repaint(); } } @@ -1400,7 +1400,7 @@ void CardView::setDrawCardBorder( bool enabled ) { if ( enabled != d->mDrawCardBorder ) { d->mDrawCardBorder = enabled; - tqrepaint(); + repaint(); } } @@ -1426,7 +1426,7 @@ void CardView::setDrawFieldLabels( bool enabled ) { if ( enabled != d->mDrawFieldLabels ) { d->mDrawFieldLabels = enabled; - tqrepaint(); + repaint(); } } @@ -1462,7 +1462,7 @@ void CardView::tryShowFullText() CardViewItem *item = itemAt( cpos ); if ( item ) { // query it for a value to display - TQPoint ipos = cpos - tqitemRect( item ).topLeft(); + TQPoint ipos = cpos - itemRect( item ).topLeft(); item->showFullString( ipos, d->mTip ); } } diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h index e3c29e5a..0bd70e1d 100644 --- a/kaddressbook/views/cardview.h +++ b/kaddressbook/views/cardview.h @@ -87,7 +87,7 @@ class CardViewItem virtual void paintCard( TQPainter *p, TQColorGroup &cg ); /** - Repaints the card. This is done by sending a tqrepaint event to the + Repaints the card. This is done by sending a repaint event to the view with the clip rect defined as this card. */ virtual void repaintCard(); @@ -245,7 +245,7 @@ class CardView : public TQScrollView /** @return The bounding rect of the given item. */ - TQRect tqitemRect( const CardViewItem *item ) const; + TQRect itemRect( const CardViewItem *item ) const; /** Ensures that the given item is in the viewable area of the widget @@ -516,7 +516,7 @@ class CardView : public TQScrollView void drawContents( TQPainter *p, int clipx, int clipy, int clipw, int cliph ); /** - Sets the tqlayout to dirty and repaints. + Sets the layout to dirty and repaints. */ void resizeEvent( TQResizeEvent* ); @@ -526,13 +526,13 @@ class CardView : public TQScrollView void contentsWheelEvent( TQWheelEvent* ); /** - Sets the tqlayout to dirty and calls for a tqrepaint. + Sets the layout to dirty and calls for a repaint. */ void setLayoutDirty( bool dirty ); /** Does the math based on the bounding rect of the cards to properly - lay the cards out on the screen. This is only done if the tqlayout is + lay the cards out on the screen. This is only done if the layout is marked as dirty. */ void calcLayout(); diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 8cacbfec..a2861c71 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -22,7 +22,7 @@ */ #include <tqstring.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqvbox.h> @@ -94,19 +94,19 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config ) c = KGlobalSettings::baseColor(); lbColors->insertItem( new ColorListItem( i18n("Background Color"), config->readColorEntry( "BackgroundColor", &c ) ) ); - c = tqcolorGroup().foreground(); + c = colorGroup().foreground(); lbColors->insertItem( new ColorListItem( i18n("Text Color"), config->readColorEntry( "TextColor", &c ) ) ); - c = tqcolorGroup().button(); + c = colorGroup().button(); lbColors->insertItem( new ColorListItem( i18n("Header, Border & Separator Color"), config->readColorEntry( "HeaderColor", &c ) ) ); - c = tqcolorGroup().buttonText(); + c = colorGroup().buttonText(); lbColors->insertItem( new ColorListItem( i18n("Header Text Color"), config->readColorEntry( "HeaderTextColor", &c ) ) ); - c = tqcolorGroup().highlight(); + c = colorGroup().highlight(); lbColors->insertItem( new ColorListItem( i18n("Highlight Color"), config->readColorEntry( "HighlightColor", &c ) ) ); - c = tqcolorGroup().highlightedText(); + c = colorGroup().highlightedText(); lbColors->insertItem( new ColorListItem( i18n("Highlighted Text Color"), config->readColorEntry( "HighlightedTextColor", &c ) ) ); @@ -120,7 +120,7 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config ) cbEnableCustomFonts->setChecked( config->readBoolEntry( "EnableCustomFonts", false ) ); enableFonts(); - // tqlayout + // layout sbMargin->setValue( config->readNumEntry( "ItemMargin", 0 ) ); sbSpacing->setValue( config->readNumEntry( "ItemSpacing", 10 ) ); sbSepWidth->setValue( config->readNumEntry( "SeparatorWidth", 2 ) ); @@ -152,7 +152,7 @@ void CardViewLookNFeelPage::saveSettings( KConfig *config ) config->writeEntry( "TextFont", lTextFont->font() ); config->writeEntry( "HeaderFont", lHeaderFont->font() ); } - // tqlayout + // layout config->writeEntry( "ItemMargin", sbMargin->value() ); config->writeEntry( "ItemSpacing", sbSpacing->value() ); config->writeEntry( "SeparatorWidth", sbSepWidth->value() ); @@ -313,7 +313,7 @@ void CardViewLookNFeelPage::initGUI() void CardViewLookNFeelPage::updateFontLabel( TQFont fnt, TQLabel *l ) { l->setFont( fnt ); - l->setText( TQString( fnt.family() + " %1" ).tqarg( fnt.pointSize() ) ); + l->setText( TQString( fnt.family() + " %1" ).arg( fnt.pointSize() ) ); } #include "configurecardviewdialog.moc" diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index 404746dc..4e3cba97 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -23,7 +23,7 @@ #include <tqstring.h> #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqcheckbox.h> #include <tqvbox.h> @@ -111,11 +111,11 @@ void LookAndFeelPage::saveSettings( KConfig *config ) void LookAndFeelPage::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal, i18n("Row Separator"), this); - tqlayout->addWidget(group); + layout->addWidget(group); mAlternateButton = new TQRadioButton(i18n("Alternating backgrounds"), group, "mAlternateButton"); @@ -124,7 +124,7 @@ void LookAndFeelPage::initGUI() // Background Checkbox/Selector TQHBoxLayout *backgroundLayout = new TQHBoxLayout(); - tqlayout->addLayout(backgroundLayout); + layout->addLayout(backgroundLayout); mBackgroundBox = new TQCheckBox(i18n("Enable background image:"), this, "mBackgroundBox"); @@ -141,10 +141,10 @@ void LookAndFeelPage::initGUI() // ToolTip Checkbox mToolTipBox = new TQCheckBox(i18n("Enable contact tooltips"), this, "mToolTipBox"); - tqlayout->addWidget(mToolTipBox); + layout->addWidget(mToolTipBox); #if KDE_IS_VERSION(3,2,90) mIMPresenceBox = new TQCheckBox( i18n( "Show instant messaging presence" ), this, "mIMPresenceBox" ); - tqlayout->addWidget( mIMPresenceBox ); + layout->addWidget( mIMPresenceBox ); #endif } diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 0807cce6..75d521da 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -27,7 +27,7 @@ #include <tqdragobject.h> #include <tqcombobox.h> #include <tqpainter.h> -#include <tqbrush.h> +#include <brush.h> #include <tqevent.h> #include <klocale.h> @@ -72,7 +72,7 @@ void DynamicTip::maybeTip( const TQPoint &pos ) return; TQString s; - TQRect r = plv->tqitemRect( lvi ); + TQRect r = plv->itemRect( lvi ); r.moveBy( posVp.x(), posVp.y() ); //kdDebug(5720) << "Tip rec: " << r.x() << "," << r.y() << "," << r.width() @@ -82,17 +82,17 @@ void DynamicTip::maybeTip( const TQPoint &pos ) if (a.isEmpty()) return; - s += i18n("label: value", "%1: %2").tqarg(a.formattedNameLabel()) - .tqarg(a.formattedName()); + s += i18n("label: value", "%1: %2").arg(a.formattedNameLabel()) + .arg(a.formattedName()); s += '\n'; - s += i18n("label: value", "%1: %2").tqarg(a.organizationLabel()) - .tqarg(a.organization()); + s += i18n("label: value", "%1: %2").arg(a.organizationLabel()) + .arg(a.organization()); TQString notes = a.note().stripWhiteSpace(); if ( !notes.isEmpty() ) { notes += '\n'; - s += '\n' + i18n("label: value", "%1: \n").tqarg(a.noteLabel()); + s += '\n' + i18n("label: value", "%1: \n").arg(a.noteLabel()); TQFontMetrics fm( font() ); // Begin word wrap code based on TQMultiLineEdit code diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 211b62dd..b2eb5430 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -25,7 +25,7 @@ #include <tqdragobject.h> #include <tqevent.h> #include <tqiconview.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstringlist.h> #include <kabc/addressbook.h> @@ -96,7 +96,7 @@ class AddresseeCardViewItem : public CardViewItem const KABC::Field::List::ConstIterator endIt( mFields.end() ); for ( ; it != endIt; ++it ) { // insert empty fields or not? not doing so saves a bit of memory and CPU - // (during tqgeometry calculations), but prevents having equally + // (during geometry calculations), but prevents having equally // wide label columns in all cards, unless CardViewItem/CardView search // globally for the widest label. (anders) @@ -149,11 +149,11 @@ KAddressBookCardView::KAddressBookCardView( KAB::Core *core, { mShowEmptyFields = false; - TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() ); + TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() ); mCardView = new AddresseeCardView( viewWidget(), "mCardView" ); mCardView->setSelectionMode( CardView::Extended ); - tqlayout->addWidget( mCardView ); + layout->addWidget( mCardView ); // Connect up the signals connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ), diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index b99bca85..c7907ef2 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -23,7 +23,7 @@ #include <tqapplication.h> #include <tqiconview.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstringlist.h> #include <kabc/addressbook.h> @@ -139,10 +139,10 @@ KAddressBookIconView::KAddressBookIconView( KAB::Core *core, TQWidget *parent, const char *name) : KAddressBookView( core, parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() ); + TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() ); mIconView = new AddresseeIconView( viewWidget(), "mIconView" ); - tqlayout->addWidget( mIconView ); + layout->addWidget( mIconView ); // Connect up the signals connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 19364d59..25e7f671 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -22,7 +22,7 @@ */ #include <tqapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <tqheader.h> #include <tqvbox.h> #include <tqlistbox.h> @@ -210,7 +210,7 @@ void KAddressBookTableView::readConfig( KConfig *config ) if ( config->readBoolEntry( "Background", false ) ) mListView->setBackgroundPixmap( config->readPathEntry( "BackgroundName" ) ); - // Restore the tqlayout of the listview + // Restore the layout of the listview mListView->restoreLayout( config, config->group() ); } @@ -244,7 +244,7 @@ void KAddressBookTableView::refresh( const TQString &uid ) // Sometimes the background pixmap gets messed up when we add lots // of items. - mListView->tqrepaint(); + mListView->repaint(); if ( currentItem ) { mListView->setCurrentItem( currentItem ); diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp index 22f6afad..9c270a2e 100644 --- a/kaddressbook/xxport/csv_xxport.cpp +++ b/kaddressbook/xxport/csv_xxport.cpp @@ -50,7 +50,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& return true; if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } @@ -58,8 +58,8 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& KTempFile tmpFile; if ( tmpFile.status() != 0 ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" ); - KMessageBox::error( parentWidget(), txt.tqarg( url.url() ) - .tqarg( strerror( tmpFile.status() ) ) ); + KMessageBox::error( parentWidget(), txt.arg( url.url() ) + .arg( strerror( tmpFile.status() ) ) ); return false; } @@ -71,7 +71,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& TQFile file( url.path() ); if ( !file.open( IO_WriteOnly ) ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); - KMessageBox::error( parentWidget(), txt.tqarg( url.path() ) ); + KMessageBox::error( parentWidget(), txt.arg( url.path() ) ); return false; } diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 88a2c087..5f24875f 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -24,12 +24,12 @@ #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqradiobutton.h> #include <tqtable.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqtooltip.h> #include <kapplication.h> @@ -367,7 +367,7 @@ void CSVImportDialog::initGUI() { mPage = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( mPage, 1, 1, marginHint(), + TQGridLayout *layout = new TQGridLayout( mPage, 1, 1, marginHint(), spacingHint() ); TQHBoxLayout *hbox = new TQHBoxLayout(); hbox->setSpacing( spacingHint() ); @@ -379,16 +379,16 @@ void CSVImportDialog::initGUI() mUrlRequester->setFilter( "*.csv" ); hbox->addWidget( mUrlRequester ); - tqlayout->addMultiCellLayout( hbox, 0, 0, 0, 4 ); + layout->addMultiCellLayout( hbox, 0, 0, 0, 4 ); // Delimiter: comma, semicolon, tab, space, other mDelimiterBox = new TQButtonGroup( i18n( "Delimiter" ), mPage ); mDelimiterBox->setColumnLayout( 0, Qt::Vertical ); - mDelimiterBox->tqlayout()->setSpacing( spacingHint() ); - mDelimiterBox->tqlayout()->setMargin( marginHint() ); - TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->tqlayout() ); - delimiterLayout->tqsetAlignment( TQt::AlignTop ); - tqlayout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 ); + mDelimiterBox->layout()->setSpacing( spacingHint() ); + mDelimiterBox->layout()->setMargin( marginHint() ); + TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->layout() ); + delimiterLayout->setAlignment( TQt::AlignTop ); + layout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 ); mRadioComma = new TQRadioButton( i18n( "Comma" ), mDelimiterBox ); mRadioComma->setChecked( true ); @@ -411,13 +411,13 @@ void CSVImportDialog::initGUI() mComboLine = new TQComboBox( false, mPage ); mComboLine->insertItem( i18n( "1" ) ); - tqlayout->addWidget( mComboLine, 2, 3 ); + layout->addWidget( mComboLine, 2, 3 ); mComboQuote = new TQComboBox( false, mPage ); mComboQuote->insertItem( i18n( "\"" ), 0 ); mComboQuote->insertItem( i18n( "'" ), 1 ); mComboQuote->insertItem( i18n( "None" ), 2 ); - tqlayout->addWidget( mComboQuote, 2, 2 ); + layout->addWidget( mComboQuote, 2, 2 ); mDatePatternEdit = new TQLineEdit( mPage ); mDatePatternEdit->setText( "Y-M-D" ); // ISO 8601 format as default @@ -427,28 +427,28 @@ void CSVImportDialog::initGUI() "<li>M: month with 2 digits</li>" "<li>d: day with 1 or 2 digits</li>" "<li>D: day with 2 digits</li></ul>" ) ); - tqlayout->addWidget( mDatePatternEdit, 2, 4 ); + layout->addWidget( mDatePatternEdit, 2, 4 ); label = new TQLabel( i18n( "Start at line:" ), mPage ); - tqlayout->addWidget( label, 1, 3 ); + layout->addWidget( label, 1, 3 ); label = new TQLabel( i18n( "Textquote:" ), mPage ); - tqlayout->addWidget( label, 1, 2 ); + layout->addWidget( label, 1, 2 ); label = new TQLabel( i18n( "Date format:" ), mPage ); - tqlayout->addWidget( label, 1, 4 ); + layout->addWidget( label, 1, 4 ); mIgnoreDuplicates = new TQCheckBox( mPage ); mIgnoreDuplicates->setText( i18n( "Ignore duplicate delimiters" ) ); - tqlayout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 ); + layout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 ); mCodecCombo = new TQComboBox( mPage ); - tqlayout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 ); + layout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 ); mTable = new TQTable( 0, 0, mPage ); mTable->setSelectionMode( TQTable::NoSelection ); mTable->horizontalHeader()->hide(); - tqlayout->addMultiCellWidget( mTable, 5, 5, 0, 4 ); + layout->addMultiCellWidget( mTable, 5, 5, 0, 4 ); setButtonText( User1, i18n( "Apply Template..." ) ); setButtonText( User2, i18n( "Save Template..." ) ); @@ -503,7 +503,7 @@ void CSVImportDialog::fillTable() else if ( code == Guess ) { TQTextCodec* codec = TQTextCodec::codecForContent( mFileArray.data(), mFileArray.size() ); if ( codec ) { - KMessageBox::information( this, i18n( "Using codec '%1'" ).tqarg( codec->name() ), i18n( "Encoding" ) ); + KMessageBox::information( this, i18n( "Using codec '%1'" ).arg( codec->name() ), i18n( "Encoding" ) ); inputStream.setCodec( codec ); } } @@ -663,7 +663,7 @@ void CSVImportDialog::reloadCodecs() for ( int i = 0; ( codec = TQTextCodec::codecForIndex( i ) ); i++ ) mCodecs.append( codec ); - mCodecCombo->insertItem( i18n( "Local (%1)" ).tqarg( TQTextCodec::codecForLocale()->name() ), Local ); + mCodecCombo->insertItem( i18n( "Local (%1)" ).arg( TQTextCodec::codecForLocale()->name() ), Local ); mCodecCombo->insertItem( i18n( "[guess]" ), Guess ); mCodecCombo->insertItem( i18n( "Latin1" ), Latin1 ); mCodecCombo->insertItem( i18n( "Unicode" ), Uni ); @@ -858,7 +858,7 @@ void CSVImportDialog::saveTemplate() fileName += ".desktop"; if( TQFileInfo(fileName).exists() ) { - if(KMessageBox::questionYesNo( this, i18n("Do you want to overwrite file \"%1\"").tqarg(fileName) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( this, i18n("Do you want to overwrite file \"%1\"").arg(fileName) ) == KMessageBox::No) return; } TQString name = KInputDialog::getText( i18n( "Template Name" ), i18n( "Please enter a name for the template:" ) ); diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp index abd3234b..9f7b628f 100644 --- a/kaddressbook/xxport/gnokii_xxport.cpp +++ b/kaddressbook/xxport/gnokii_xxport.cpp @@ -63,7 +63,7 @@ extern "C" { #define GNOKII_CHECK_ERROR(error) \ do { \ if (error) \ - kdError() << TQString("ERROR %1: %2\n").tqarg(error).tqarg(gn_error_print(error));\ + kdError() << TQString("ERROR %1: %2\n").arg(error).arg(gn_error_print(error));\ } while (0) // Locale conversion routines: @@ -126,8 +126,8 @@ static TQString businit(void) { GNOKII_DEBUG( "Using new gnokii version." ); - GNOKII_DEBUG( TQString("Compiled with libgnokii version 0x%1\n").tqarg(TQString::number(LIBGNOKII_VERSION,16)) ); - GNOKII_DEBUG( TQString("Using libgnokii runtime version 0x%1\n").tqarg(TQString::number(gn_lib_version(),16)) ); + GNOKII_DEBUG( TQString("Compiled with libgnokii version 0x%1\n").arg(TQString::number(LIBGNOKII_VERSION,16)) ); + GNOKII_DEBUG( TQString("Using libgnokii runtime version 0x%1\n").arg(TQString::number(gn_lib_version(),16)) ); gn_error error = gn_lib_phoneprofile_load(NULL, &state); if (error) @@ -142,7 +142,7 @@ static TQString businit(void) "You might try to run \"gnokii --identify\" on the command line to " "check any cable/transport issues and to verify if your gnokii " "configuration is correct.</center></qt>") - .tqarg(gn_error_print(error)); + .arg(gn_error_print(error)); } // identify phone @@ -152,7 +152,7 @@ static TQString businit(void) imei = gn_lib_get_phone_imei(state); GNOKII_DEBUG( TQString("Found mobile phone: %1 %2, Revision: %3, IMEI: %4\n") - .tqarg(manufacturer, model, revision, imei) ); + .arg(manufacturer, model, revision, imei) ); return TQString(); } @@ -166,23 +166,23 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat error = gn_lib_addressbook_memstat(state, memtype, &memstat->used, &memstat->free); GNOKII_DEBUG( TQString("\n\nMobile phone memory status: Type: %1, used=%2, free=%3, total=%4\n\n") - .tqarg(memtype).tqarg(memstat->used).tqarg(memstat->free).tqarg(memstat->used+memstat->free) ); + .arg(memtype).arg(memstat->used).arg(memstat->free).arg(memstat->used+memstat->free) ); return error; } 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>") - .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))); + TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); + + return TQString::fromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") + .arg(i18n("Mobile Phone information:")) + .arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer))) + .arg(format.arg(i18n("Phone model")).arg(GN_FROM(model))) + .arg(format.arg(i18n("Revision")).arg(GN_FROM(revision))) + .arg(format.arg(i18n("IMEI")).arg(GN_FROM(imei))) + .arg(format.arg(i18n("Phonebook status")) + .arg(i18n("%1 out of %2 contacts used").arg(memstat.used).arg(memstat.used+memstat.free))); } // read and evaluate all phone entries @@ -209,9 +209,9 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty progress->setTotalSteps(memstat.used); m_progressDlg->setLabel(i18n("<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone.<br><br>%3</qt>") - .tqarg(memstat.used) - .tqarg(gn_memory_type2str(memtype)) - .tqarg(buildPhoneInfoString(memstat)) ); + .arg(memstat.used) + .arg(gn_memory_type2str(memtype)) + .arg(buildPhoneInfoString(memstat)) ); int num_read = 0; @@ -233,10 +233,10 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty const char *name = gn_lib_get_pb_name(state); const char *number = gn_lib_get_pb_number(state); - GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").tqarg(i) - .tqarg(GN_FROM(name)).tqarg(GN_FROM(number)) - .tqarg(gn_lib_get_pb_location(state)).tqarg(gn_lib_get_pb_caller_group(state)) - .tqarg(subentries_count)); + GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(i) + .arg(GN_FROM(name)).arg(GN_FROM(number)) + .arg(gn_lib_get_pb_location(state)).arg(gn_lib_get_pb_caller_group(state)) + .arg(subentries_count)); KABC::Addressee *a = new KABC::Addressee(); // try to split Name into FamilyName and GivenName @@ -263,20 +263,20 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty } a->insertCustom(APP, "X_GSM_CALLERGROUP", s.setNum(gn_lib_get_pb_caller_group(state))); - a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").tqarg(memtypestr).tqarg(gn_lib_get_pb_location(state))); + a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").arg(memtypestr).arg(gn_lib_get_pb_location(state))); // set ProductId - a->setProductId(TQString("%1-%2-%3-%4").tqarg(APP).tqarg(model).tqarg(revision).tqarg(imei)); + a->setProductId(TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei)); // evaluate timestamp (ignore timezone) TQDateTime datetime; gn_timestamp ts = gn_lib_get_pb_date(state); if (ts.year<1998) - datetime = TQDateTime::tqcurrentDateTime(); + datetime = TQDateTime::currentDateTime(); else datetime = TQDateTime( TQDate(ts.year, ts.month, ts.day), TQTime(ts.hour, ts.minute, ts.second) ); - GNOKII_DEBUG(TQString(" date=%1\n").tqarg(datetime.toString())); + GNOKII_DEBUG(TQString(" date=%1\n").arg(datetime.toString())); a->setRevision(datetime); if (!subentries_count) @@ -295,7 +295,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty TQString s = GN_FROM(number).simplifyWhiteSpace(); GNOKII_DEBUG(TQString(" Subentry#%1, entry_type=%2, number_type=%3, number=%4\n") - .tqarg(n).tqarg(entry_type).tqarg(number_type).tqarg(s)); + .arg(n).arg(entry_type).arg(number_type).arg(s)); if (s.isEmpty()) continue; switch(entry_type) { @@ -362,7 +362,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty break; default: GNOKII_DEBUG(TQString(" Not handled id=%1, entry=%2\n") - .tqarg(entry_type).tqarg(s)); + .arg(entry_type).arg(s)); break; } // switch() } // if(subentry) @@ -425,8 +425,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem time.hour(), time.minute(), time.second(), 0 ); gn_lib_set_pb_date(state, ts); - GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").tqarg(phone_location) - .tqarg(GN_FROM(gn_lib_get_pb_name(state))).tqarg(GN_FROM(gn_lib_get_pb_number(state)))); + GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location) + .arg(GN_FROM(gn_lib_get_pb_name(state))).arg(GN_FROM(gn_lib_get_pb_number(state)))); const KABC::Address homeAddr = addr->address(KABC::Address::Home); const KABC::Address workAddr = addr->address(KABC::Address::Work); @@ -467,7 +467,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem // only one email allowed if we have URLS, notes, addresses (to avoid phone limitations) if (n && !addr->url().isEmpty() && !addr->note().isEmpty() && addr->addresses().count()) { GNOKII_DEBUG(TQString(" DROPPED email %1 in favor of URLs, notes and addresses.\n") - .tqarg(s)); + .arg(s)); continue; } gn_lib_set_pb_subentry(state, -1 /* index to append entry */, @@ -481,7 +481,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem if (Addr->isEmpty()) continue; TQStringList a; TQChar sem(';'); - TQString sem_repl(TQString::tqfromLatin1(",")); + TQString sem_repl(TQString::fromLatin1(",")); a.append( Addr->postOfficeBox().replace( sem, sem_repl ) ); a.append( Addr->extended() .replace( sem, sem_repl ) ); a.append( Addr->street() .replace( sem, sem_repl ) ); @@ -507,8 +507,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem const char *number; gn_lib_get_pb_subentry(state, st, &entry_type, &number_type, &number); GNOKII_DEBUG(TQString(" SubTel #%1: entry_type=%2, number_type=%3, number=%4\n") - .tqarg(st).tqarg(entry_type) - .tqarg(number_type).tqarg(GN_FROM(number))); + .arg(st).arg(entry_type) + .arg(number_type).arg(GN_FROM(number))); } gn_error error = gn_lib_phonebook_write_entry(state, memtype, phone_location); @@ -656,9 +656,9 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri m_progressDlg->setButtonText(i18n("&Stop Export")); m_progressDlg->setLabel(i18n("<qt>Exporting <b>%1</b> contacts to the <b>%2</b> " "of the Mobile Phone.<br><br>%3</qt>") - .tqarg(list.count()) - .tqarg(gn_memory_type2str(memtype)) - .tqarg(buildPhoneInfoString(memstat)) ); + .arg(list.count()) + .arg(gn_memory_type2str(memtype)) + .arg(buildPhoneInfoString(memstat)) ); // Now run the loop... phone_entry_no = 1; @@ -682,7 +682,7 @@ try_next_phone_entry: break; GNOKII_DEBUG(TQString("Try to write entry '%1' at phone_entry_no=%2, phone_count=%3\n") - .tqarg(addr->realName()).tqarg(phone_entry_no).tqarg(phone_count)); + .arg(addr->realName()).arg(phone_entry_no).arg(phone_count)); error = GN_ERR_NONE; @@ -755,7 +755,7 @@ finish: delete m_progressDlg; if (!failedList.isEmpty()) { - GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", "))); + GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", "))); KMessageBox::informationList(parentWidget(), i18n("<qt>The following contacts could not be exported to the Mobile Phone. " "Possible Reasons for this problem could be:<br><ul>" @@ -801,7 +801,7 @@ static gn_data data; static void busterminate(void) { gn_sm_functions(GN_OP_Terminate, NULL, &state); - if (lockfile) gn_tqdevice_unlock(lockfile); + if (lockfile) gn_device_unlock(lockfile); } static TQString businit(void) @@ -830,7 +830,7 @@ static TQString businit(void) aux = gn_cfg_get(gn_cfg_info, "global", "use_locking"); // Defaults to 'no' if (aux && !strcmp(aux, "yes")) { - lockfile = gn_tqdevice_lock(state.config.port_tqdevice); + lockfile = gn_device_lock(state.config.port_device); if (lockfile == NULL) { return i18n("Gnokii reports a 'Lock File Error'.\n " "Please exit all other running instances of gnokii, check if you have " @@ -851,7 +851,7 @@ static TQString businit(void) "You might try to run \"gnokii --identify\" on the command line to " "check any cable/transport issues and to verify if your gnokii " "configuration is correct.</center></qt>") - .tqarg(gn_error_print(error)); + .arg(gn_error_print(error)); } // identify phone @@ -874,9 +874,9 @@ static TQString businit(void) GNOKII_CHECK_ERROR(error); GNOKII_DEBUG( TQString("Found mobile phone: %1 %2, Revision: %3, IMEI: %4\n") - .tqarg(manufacturer, model, revision, imei) ); + .arg(manufacturer, model, revision, imei) ); - PhoneProductId = TQString("%1-%2-%3-%4").tqarg(APP).tqarg(model).tqarg(revision).tqarg(imei); + PhoneProductId = TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei); return TQString(); } @@ -891,7 +891,7 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat memset(memstat, 0, sizeof(*memstat)); memstat->memory_type = memtype; data.memory_status = memstat; - error = gn_sm_functions(GN_OP_GetMemorytqStatus, &data, &state); + error = gn_sm_functions(GN_OP_GetMemoryStatus, &data, &state); GNOKII_CHECK_ERROR(error); if (error != GN_ERR_NONE) { switch (memtype) { @@ -908,7 +908,7 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat } } GNOKII_DEBUG( TQString("\n\nMobile phone memory status: Type: %1, used=%2, free=%3, total=%4\n\n") - .tqarg(memtype).tqarg(memstat->used).tqarg(memstat->free).tqarg(memstat->used+memstat->free) ); + .arg(memtype).arg(memstat->used).arg(memstat->free).arg(memstat->used+memstat->free) ); return error; } @@ -943,16 +943,16 @@ static bool phone_entry_empty( const int index, const gn_memory_type memtype ) 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>") - .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))); + TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>"); + + return TQString::fromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>") + .arg(i18n("Mobile Phone information:")) + .arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer))) + .arg(format.arg(i18n("Phone model")).arg(GN_FROM(model))) + .arg(format.arg(i18n("Revision")).arg(GN_FROM(revision))) + .arg(format.arg(i18n("IMEI")).arg(GN_FROM(imei))) + .arg(format.arg(i18n("Phonebook status")) + .arg(i18n("%1 out of %2 contacts used").arg(memstat.used).arg(memstat.used+memstat.free))); } static TQString buildMemoryTypeString( gn_memory_type memtype ) @@ -989,9 +989,9 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty progress->setTotalSteps(memstat.used); m_progressDlg->setLabel(i18n("<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone.<br><br>%3</qt>") - .tqarg(memstat.used) - .tqarg(buildMemoryTypeString(memtype)) - .tqarg(buildPhoneInfoString(memstat)) ); + .arg(memstat.used) + .arg(buildMemoryTypeString(memtype)) + .arg(buildPhoneInfoString(memstat)) ); int num_read = 0; @@ -1008,8 +1008,8 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty if (error == GN_ERR_INVALIDMEMORYTYPE) break; if (error == GN_ERR_NONE) { - GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").tqarg(i).tqarg(GN_FROM(entry.name)) - .tqarg(GN_FROM(entry.number)).tqarg(entry.location).tqarg(entry.caller_group).tqarg(entry.subentries_count)); + GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(i).arg(GN_FROM(entry.name)) + .arg(GN_FROM(entry.number)).arg(entry.location).arg(entry.caller_group).arg(entry.subentries_count)); KABC::Addressee *a = new KABC::Addressee(); // try to split Name into FamilyName and GivenName @@ -1036,7 +1036,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty } a->insertCustom(APP, "X_GSM_CALLERGROUP", s.setNum(entry.caller_group)); - a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").tqarg(memtypestr).tqarg(entry.location)); + a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").arg(memtypestr).arg(entry.location)); // set ProductId a->setProductId(PhoneProductId); @@ -1044,11 +1044,11 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty // evaluate timestamp (ignore timezone) TQDateTime datetime; if (entry.date.year<1998) - datetime = TQDateTime::tqcurrentDateTime(); + datetime = TQDateTime::currentDateTime(); else datetime = TQDateTime( TQDate(entry.date.year, entry.date.month, entry.date.day), TQTime(entry.date.hour, entry.date.minute, entry.date.second) ); - GNOKII_DEBUG(TQString(" date=%1\n").tqarg(datetime.toString())); + GNOKII_DEBUG(TQString(" date=%1\n").arg(datetime.toString())); a->setRevision(datetime); if (!entry.subentries_count) @@ -1059,8 +1059,8 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty for (int n=0; n<entry.subentries_count; n++) { TQString s = GN_FROM(entry.subentries[n].data.number).simplifyWhiteSpace(); GNOKII_DEBUG(TQString(" Subentry#%1, entry_type=%2, number_type=%3, number=%4\n") - .tqarg(n).tqarg(entry.subentries[n].entry_type) - .tqarg(entry.subentries[n].number_type).tqarg(s)); + .arg(n).arg(entry.subentries[n].entry_type) + .arg(entry.subentries[n].number_type).arg(s)); if (s.isEmpty()) continue; switch(entry.subentries[n].entry_type) { @@ -1127,7 +1127,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty break; default: GNOKII_DEBUG(TQString(" Not handled id=%1, entry=%2\n") - .tqarg(entry.subentries[n].entry_type).tqarg(s)); + .arg(entry.subentries[n].entry_type).arg(s)); break; } // switch() } // if(subentry) @@ -1191,8 +1191,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem entry.date.minute = time.minute(); entry.date.second = time.second(); - GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").tqarg(phone_location) - .tqarg(GN_FROM(entry.name)).tqarg(GN_FROM(entry.number))); + GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location) + .arg(GN_FROM(entry.name)).arg(GN_FROM(entry.number))); const KABC::Address homeAddr = addr->address(KABC::Address::Home); const KABC::Address workAddr = addr->address(KABC::Address::Work); @@ -1244,7 +1244,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem // only one email allowed if we have URLS, notes, addresses (to avoid phone limitations) if (n && !addr->url().isEmpty() && !addr->note().isEmpty() && addr->addresses().count()) { GNOKII_DEBUG(TQString(" DROPPED email %1 in favor of URLs, notes and addresses.\n") - .tqarg(s)); + .arg(s)); continue; } subentry->entry_type = GN_PHONEBOOK_ENTRY_Email; @@ -1263,7 +1263,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem subentry->entry_type = GN_PHONEBOOK_ENTRY_Postal; TQStringList a; TQChar sem(';'); - TQString sem_repl(TQString::tqfromLatin1(",")); + TQString sem_repl(TQString::fromLatin1(",")); a.append( Addr->postOfficeBox().replace( sem, sem_repl ) ); a.append( Addr->extended() .replace( sem, sem_repl ) ); a.append( Addr->street() .replace( sem, sem_repl ) ); @@ -1289,8 +1289,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem for (int st=0; st<entry.subentries_count; st++) { gn_phonebook_subentry *subentry = &entry.subentries[st]; GNOKII_DEBUG(TQString(" SubTel #%1: entry_type=%2, number_type=%3, number=%4\n") - .tqarg(st).tqarg(subentry->entry_type) - .tqarg(subentry->number_type).tqarg(GN_FROM(subentry->data.number))); + .arg(st).arg(subentry->entry_type) + .arg(subentry->number_type).arg(GN_FROM(subentry->data.number))); } data.phonebook_entry = &entry; @@ -1309,7 +1309,7 @@ static gn_error xxport_phone_delete_entry( int phone_location, gn_memory_type me entry.memory_type = memtype; entry.location = phone_location; data.phonebook_entry = &entry; - GNOKII_DEBUG(TQString("Deleting entry %1\n").tqarg(phone_location)); + GNOKII_DEBUG(TQString("Deleting entry %1\n").arg(phone_location)); gn_error error = gn_sm_functions(GN_OP_WritePhonebook, &data, &state); GNOKII_CHECK_ERROR(error); return error; @@ -1447,9 +1447,9 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri m_progressDlg->setButtonText(i18n("&Stop Export")); m_progressDlg->setLabel(i18n("<qt>Exporting <b>%1</b> contacts to the <b>%2</b> " "of the Mobile Phone.<br><br>%3</qt>") - .tqarg(list.count()) - .tqarg(buildMemoryTypeString(memtype)) - .tqarg(buildPhoneInfoString(memstat)) ); + .arg(list.count()) + .arg(buildMemoryTypeString(memtype)) + .arg(buildPhoneInfoString(memstat)) ); // Now run the loop... phone_entry_no = 1; @@ -1473,7 +1473,7 @@ try_next_phone_entry: break; GNOKII_DEBUG(TQString("Try to write entry '%1' at phone_entry_no=%2, phone_count=%3\n") - .tqarg(addr->realName()).tqarg(phone_entry_no).tqarg(phone_count)); + .arg(addr->realName()).arg(phone_entry_no).arg(phone_count)); error = GN_ERR_NONE; @@ -1546,7 +1546,7 @@ finish: delete m_progressDlg; if (!failedList.isEmpty()) { - GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", "))); + GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", "))); KMessageBox::informationList(parentWidget(), i18n("<qt>The following contacts could not be exported to the Mobile Phone. " "Possible Reasons for this problem could be:<br><ul>" diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp index 3b60ca5e..309bb9b5 100644 --- a/kaddressbook/xxport/kde2_xxport.cpp +++ b/kaddressbook/xxport/kde2_xxport.cpp @@ -49,7 +49,7 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const { TQString fileName = locateLocal( "data", "kabc/std.vcf" ); if ( !TQFile::exists( fileName ) ) { - KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).tqarg( fileName ) ); + KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).arg( fileName ) ); return KABC::AddresseeList(); } diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp index a51169e7..30718a9f 100644 --- a/kaddressbook/xxport/ldif_xxport.cpp +++ b/kaddressbook/xxport/ldif_xxport.cpp @@ -71,7 +71,7 @@ KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" ); - KMessageBox::error( parentWidget(), msg.tqarg( fileName ) ); + KMessageBox::error( parentWidget(), msg.arg( fileName ) ); return addrList; } @@ -97,7 +97,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString return true; if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } @@ -106,8 +106,8 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString KTempFile tmpFile; if ( tmpFile.status() != 0 ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" ); - KMessageBox::error( parentWidget(), txt.tqarg( url.url() ) - .tqarg( strerror( tmpFile.status() ) ) ); + KMessageBox::error( parentWidget(), txt.arg( url.url() ) + .arg( strerror( tmpFile.status() ) ) ); return false; } @@ -121,7 +121,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString if ( !file.open( IO_WriteOnly ) ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); - KMessageBox::error( parentWidget(), txt.tqarg( filename ) ); + KMessageBox::error( parentWidget(), txt.arg( filename ) ); return false; } diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp index 4c2949cc..800f11fa 100644 --- a/kaddressbook/xxport/opera_xxport.cpp +++ b/kaddressbook/xxport/opera_xxport.cpp @@ -48,14 +48,14 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const { KABC::AddresseeList addrList; - TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::tqfromLatin1( "/.opera/contacts.adr" ) ); + TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::fromLatin1( "/.opera/contacts.adr" ) ); if ( fileName.isEmpty() ) return addrList; TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" ); - KMessageBox::error( parentWidget(), msg.tqarg( fileName ) ); + KMessageBox::error( parentWidget(), msg.arg( fileName ) ); return addrList; } @@ -70,7 +70,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const while ( !stream.atEnd() ) { line = stream.readLine(); line = line.stripWhiteSpace(); - if ( line == TQString::tqfromLatin1( "#CONTACT" ) ) { + if ( line == TQString::fromLatin1( "#CONTACT" ) ) { parseContact = true; addr = KABC::Addressee(); continue; @@ -87,9 +87,9 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const int sep = line.find( '=' ); key = line.left( sep ).lower(); value = line.mid( sep + 1 ); - if ( key == TQString::tqfromLatin1( "name" ) ) + if ( key == TQString::fromLatin1( "name" ) ) addr.setNameFromString( value ); - else if ( key == TQString::tqfromLatin1( "mail" ) ) { + else if ( key == TQString::fromLatin1( "mail" ) ) { TQStringList emails = TQStringList::split( separator, value ); TQStringList::Iterator it = emails.begin(); @@ -98,20 +98,20 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const addr.insertEmail( *it, preferred ); preferred = false; } - } else if ( key == TQString::tqfromLatin1( "phone" ) ) + } else if ( key == TQString::fromLatin1( "phone" ) ) addr.insertPhoneNumber( KABC::PhoneNumber( value ) ); - else if ( key == TQString::tqfromLatin1( "fax" ) ) + else if ( key == TQString::fromLatin1( "fax" ) ) addr.insertPhoneNumber( KABC::PhoneNumber( value, KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home ) ); - else if ( key == TQString::tqfromLatin1( "postaladdress" ) ) { + else if ( key == TQString::fromLatin1( "postaladdress" ) ) { KABC::Address address( KABC::Address::Home ); address.setLabel( value.replace( separator, "\n" ) ); addr.insertAddress( address ); - } else if ( key == TQString::tqfromLatin1( "description" ) ) + } else if ( key == TQString::fromLatin1( "description" ) ) addr.setNote( value.replace( separator, "\n" ) ); - else if ( key == TQString::tqfromLatin1( "url" ) ) + else if ( key == TQString::fromLatin1( "url" ) ) addr.setUrl( KURL( value ) ); - else if ( key == TQString::tqfromLatin1( "pictureurl" ) ) { + else if ( key == TQString::fromLatin1( "pictureurl" ) ) { KABC::Picture pic( value ); addr.setPhoto( pic ); } diff --git a/kaddressbook/xxport/pab_pablib.cpp b/kaddressbook/xxport/pab_pablib.cpp index 198e683f..344647f6 100644 --- a/kaddressbook/xxport/pab_pablib.cpp +++ b/kaddressbook/xxport/pab_pablib.cpp @@ -46,7 +46,7 @@ adr_t A; bool ret; if (!in.isOpen()) {TQString msg; - msg=i18n("Cannot open %1 for reading").tqarg(pabfile); + msg=i18n("Cannot open %1 for reading").arg(pabfile); // info->alert(msg); return false; } @@ -243,7 +243,7 @@ bool pab::knownPAB(void) content_t id; id=go(0); if (id!=PAB_FILE_ID) {TQString msg; - msg=i18n("%1 has no PAB id that I know of, cannot convert this").tqarg(pabfile); + msg=i18n("%1 has no PAB id that I know of, cannot convert this").arg(pabfile); // info->alert(msg); return false; } diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp index 021f671c..911e92de 100644 --- a/kaddressbook/xxport/pab_xxport.cpp +++ b/kaddressbook/xxport/pab_xxport.cpp @@ -55,7 +55,7 @@ KABC::AddresseeList PABXXPort::importContacts( const TQString& ) const if ( fileName.isEmpty() ) return addrList; if ( !TQFile::exists( fileName ) ) { - KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).tqarg( fileName ) ); + KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).arg( fileName ) ); return addrList; } diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index e752b905..1e5d7ee9 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -25,7 +25,7 @@ #include <tqfile.h> #include <tqfont.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <kabc/vcardconverter.h> @@ -237,12 +237,12 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const TQString vCardText; - // With version 3.0, vCards are encoded with UTF-8 by default. Otherwise, use tqfromLatin1() + // With version 3.0, vCards are encoded with UTF-8 by default. Otherwise, use fromLatin1() // and hope that are fields are encoded correctly. - if ( TQString::tqfromLatin1( rawData ).lower().contains( "version:3.0" ) ) { + if ( TQString::fromLatin1( rawData ).lower().contains( "version:3.0" ) ) { vCardText = TQString::fromUtf8( rawData ); } else { - vCardText = TQString::tqfromLatin1( rawData ); + vCardText = TQString::fromLatin1( rawData ); } addrList += parseVCard( vCardText ); } @@ -250,15 +250,15 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const KIO::NetAccess::removeTempFile( fileName ); } else { TQString text = i18n( "<qt>When trying to read the vCard, there was an error opening the file '%1': %2</qt>" ); - text = text.tqarg( (*it).url() ); - text = text.tqarg( kapp->translate( "TQFile", + text = text.arg( (*it).url() ); + text = text.arg( kapp->translate( "TQFile", TQString(file.errorString()).latin1() ) ); KMessageBox::error( parentWidget(), text, caption ); anyFailures = true; } } else { TQString text = i18n( "<qt>Unable to access vCard: %1</qt>" ); - text = text.tqarg( KIO::NetAccess::lastErrorString() ); + text = text.arg( KIO::NetAccess::lastErrorString() ); KMessageBox::error( parentWidget(), text, caption ); anyFailures = true; } @@ -293,7 +293,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQByteArray &data ) const bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data ) { if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } KTempFile tmpFile; @@ -315,7 +315,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const bool VCardXXPort::doExport( const KURL &url, const TQString &data ) { if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No) return false; } KTempFile tmpFile; @@ -471,18 +471,18 @@ VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list, mContacts( list ) { TQFrame *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( i18n( "Do you want to import this contact in your address book?" ), page ); TQFont font = label->font(); font.setBold( true ); label->setFont( font ); - tqlayout->addWidget( label ); + layout->addWidget( label ); mView = new KPIM::AddresseeView( page ); mView->enableLinks( 0 ); mView->setVScrollBarMode( TQScrollView::Auto ); - tqlayout->addWidget( mView ); + layout->addWidget( mView ); setButtonText( Apply, i18n( "Import All..." ) ); @@ -544,22 +544,22 @@ VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent, { TQFrame *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( i18n( "Select the fields which shall be exported in the vCard." ), page ); - tqlayout->addWidget( label ); + layout->addWidget( label ); mPrivateBox = new TQCheckBox( i18n( "Private fields" ), page ); - tqlayout->addWidget( mPrivateBox ); + layout->addWidget( mPrivateBox ); mBusinessBox = new TQCheckBox( i18n( "Business fields" ), page ); - tqlayout->addWidget( mBusinessBox ); + layout->addWidget( mBusinessBox ); mOtherBox = new TQCheckBox( i18n( "Other fields" ), page ); - tqlayout->addWidget( mOtherBox ); + layout->addWidget( mOtherBox ); mEncryptionKeys = new TQCheckBox( i18n( "Encryption keys" ), page ); - tqlayout->addWidget( mEncryptionKeys ); + layout->addWidget( mEncryptionKeys ); KConfig config( "kaddressbookrc" ); config.setGroup( "XXPortVCard" ); diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp index 642f8bfe..0baf8614 100644 --- a/kaddressbook/xxportmanager.cpp +++ b/kaddressbook/xxportmanager.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <tqlayout.h> +#include <layout.h> #include <kabc/addressbook.h> #include <kabc/resource.h> @@ -77,7 +77,7 @@ void XXPortManager::slotImport( const TQString &identifier, const TQString &data { KAB::XXPort *obj = mXXPortObjects[ identifier ]; if ( !obj ) { - KMessageBox::error( mCore->widget(), i18n( "<qt>No import plugin available for <b>%1</b>.</qt>" ).tqarg( identifier ) ); + KMessageBox::error( mCore->widget(), i18n( "<qt>No import plugin available for <b>%1</b>.</qt>" ).arg( identifier ) ); return; } @@ -101,7 +101,7 @@ void XXPortManager::slotExport( const TQString &identifier, const TQString &data { KAB::XXPort *obj = mXXPortObjects[ identifier ]; if ( !obj ) { - KMessageBox::error( mCore->widget(), i18n( "<qt>No export plugin available for <b>%1</b>.</qt>" ).tqarg( identifier ) ); + KMessageBox::error( mCore->widget(), i18n( "<qt>No export plugin available for <b>%1</b>.</qt>" ).arg( identifier ) ); return; } @@ -121,7 +121,7 @@ void XXPortManager::loadPlugins() mXXPortObjects.clear(); const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/XXPort", - TQString( "[X-KDE-KAddressBook-XXPortPluginVersion] == %1" ).tqarg( KAB_XXPORT_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KAddressBook-XXPortPluginVersion] == %1" ).arg( KAB_XXPORT_PLUGIN_VERSION ) ); KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { if ( !(*it)->hasServiceType( "KAddressBook/XXPort" ) ) diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index b932f9d9..1b567b2c 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp @@ -31,7 +31,7 @@ #include <tqcombobox.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqpushbutton.h> #include <tqradiobutton.h> @@ -187,11 +187,11 @@ void XXPortSelectDialog::initGUI() mButtonGroup = new TQButtonGroup( i18n( "Selection" ), page ); mButtonGroup->setColumnLayout( 0, Qt::Vertical ); - mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); - mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() ); + mButtonGroup->layout()->setSpacing( KDialog::spacingHint() ); + mButtonGroup->layout()->setMargin( KDialog::marginHint() ); - TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() ); - groupLayout->tqsetAlignment( TQt::AlignTop ); + TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->layout() ); + groupLayout->setAlignment( TQt::AlignTop ); mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup ); mUseWholeBook->setChecked( true ); @@ -226,9 +226,9 @@ void XXPortSelectDialog::initGUI() TQButtonGroup *sortingGroup = new TQButtonGroup( i18n( "Sorting" ), page ); sortingGroup->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->tqlayout(), 2, 2, + TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->layout(), 2, 2, KDialog::spacingHint() ); - sortLayout->tqsetAlignment( TQt::AlignTop ); + sortLayout->setAlignment( TQt::AlignTop ); label = new TQLabel( i18n( "Criterion:" ), sortingGroup ); sortLayout->addWidget( label, 0, 0 ); |