diff options
author | Timothy Pearson <[email protected]> | 2011-12-21 14:23:13 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-21 14:23:13 -0600 |
commit | ba2a3ce341c0c71bbbcf350fcbcd60c552220b31 (patch) | |
tree | 08ba9504290f461f1244dded6b37fc4db00847ab /kaddressbook | |
parent | d5b298be14c173d62e8fbc6a3803ba8f657f3dcb (diff) | |
download | tdepim-ba2a3ce341c0c71bbbcf350fcbcd60c552220b31.tar.gz tdepim-ba2a3ce341c0c71bbbcf350fcbcd60c552220b31.zip |
Rename obsolete tq methods to standard names
Diffstat (limited to 'kaddressbook')
49 files changed, 272 insertions, 272 deletions
diff --git a/kaddressbook/TODO b/kaddressbook/TODO index 83f335873..df0db82b0 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 09047fa64..3924f9012 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -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->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() @@ -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 5ac80b065..cbb60bd26 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp @@ -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 ); diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp index 72e119d9a..d13232b77 100644 --- a/kaddressbook/addresseeeditorextension.cpp +++ b/kaddressbook/addresseeeditorextension.cpp @@ -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 49013aa68..cceba5458 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -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,16 +178,16 @@ void AddresseeEditorWidget::setupTab1() mNameLabel->show(); } - tqlayout->addWidget( button, 0, 1 ); - tqlayout->addWidget( mNameEdit, 0, 2 ); - tqlayout->addWidget( mNameLabel, 0, 2 ); + 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:" ).arg( KABC::Addressee::organizationLabel() ), tab1 ); @@ -195,59 +195,59 @@ void AddresseeEditorWidget::setupTab1() 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 ); @@ -263,7 +263,7 @@ void AddresseeEditorWidget::setupTab1() 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:" ).arg( KABC::Addressee::titleLabel() ), tab2 ); - tqlayout->addWidget( label, 2, 3 ); + 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->setAlignment( TQt::AlignTop | TQt::AlignLeft ); - tqlayout->addWidget( label, 7, 0 ); + layout->addWidget( label, 7, 0 ); mNoteEdit = new TQTextEdit( tab2 ); mNoteEdit->setWordWrap( TQTextEdit::WidgetWidth ); 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 b9f89249a..2da1ad4e1 100644 --- a/kaddressbook/addviewdialog.cpp +++ b/kaddressbook/addviewdialog.cpp @@ -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; diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp index 9ba590525..6af325236 100644 --- a/kaddressbook/advancedcustomfields.cpp +++ b/kaddressbook/advancedcustomfields.cpp @@ -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/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h index 5c7ff9fb1..6bc418eb9 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 752fd6cc8..3212e8c0d 100644 --- a/kaddressbook/customfieldswidget.cpp +++ b/kaddressbook/customfieldswidget.cpp @@ -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,18 +124,18 @@ 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 = 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 = new TQVBoxLayout( layout, KDialog::spacingHint() ); mLocalLayout->setAlignment( TQt::AlignTop ); } @@ -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 c9ac1254b..0084fe86b 100644 --- a/kaddressbook/distributionlisteditor.cpp +++ b/kaddressbook/distributionlisteditor.cpp @@ -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() ) ); } diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp index aa59fe217..d82dc69f1 100644 --- a/kaddressbook/distributionlistpicker.cpp +++ b/kaddressbook/distributionlistpicker.cpp @@ -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& ) ), diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index 39727ecd6..6f49e32e1 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -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(); diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp index 6b39414ec..f91142e89 100644 --- a/kaddressbook/features/distributionlistngwidget.cpp +++ b/kaddressbook/features/distributionlistngwidget.cpp @@ -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/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp index 5e1586e11..b1c5df433 100644 --- a/kaddressbook/filtereditdialog.cpp +++ b/kaddressbook/filtereditdialog.cpp @@ -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 7b81d9ccb..7565584d6 100644 --- a/kaddressbook/freebusywidget.cpp +++ b/kaddressbook/freebusywidget.cpp @@ -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 3f5a2972b..000cc41df 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -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 ); diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index f0917eca7..dd844499c 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -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/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp index 8509018a5..b3ee3b090 100644 --- a/kaddressbook/incsearchwidget.cpp +++ b/kaddressbook/incsearchwidget.cpp @@ -40,7 +40,7 @@ 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->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); @@ -48,24 +48,24 @@ IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name ) 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->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); - tqlayout->addWidget( label ); + layout->addWidget( label ); mSearchText = new KLineEdit( this ); 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->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight ); - tqlayout->addWidget( label ); + 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/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index 07bc98093..4d052fd75 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -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->setAlignment( 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 ); } @@ -98,7 +98,7 @@ void JumpButtonBar::updateButtons() TQFontMetrics fm = fontMetrics(); TQPushButton *btn = new TQPushButton( "", this ); btn->hide(); - TQSize buttonSize = tqstyle().tqsizeFromContents( TQStyle::CT_PushButton, btn, + TQSize buttonSize = style().tqsizeFromContents( TQStyle::CT_PushButton, btn, fm.size( ShowPrefix, "X - X") ). expandedTo( TQApplication::globalStrut() ); delete btn; diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 3c8a10d21..8c475e349 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -430,7 +430,7 @@ 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->encodedData( "text/x-vcard" ) ); @@ -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,7 +575,7 @@ 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->encodedData( "text/x-vcard" ) ); @@ -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() diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp index 43d709d2d..028663e3e 100644 --- a/kaddressbook/kaddressbookview.cpp +++ b/kaddressbook/kaddressbookview.cpp @@ -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 155f6f6ba..53c06e2ac 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.cpp +++ b/kaddressbook/kcmconfigs/addhostdialog.cpp @@ -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 8c04002d5..80af92274 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.cpp +++ b/kaddressbook/kcmconfigs/addresseewidget.cpp @@ -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 68f4643ab..97c8d0b2d 100644 --- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp +++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp @@ -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 f97749e22..9b826b9ef 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -56,11 +56,11 @@ 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() ); + TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->layout() ); boxLayout->setAlignment( TQt::AlignTop ); mViewsSingleClickBox = new TQCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" ); @@ -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,10 +124,10 @@ 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 = new TQVBoxLayout( groupBox->layout(), KDialog::spacingHint() ); boxLayout->setAlignment( TQt::AlignTop ); mLocationMapURL = new TQComboBox( true, groupBox ); @@ -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() ) ); diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index 4217a0a82..823f24f7d 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -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 e9541ea9f..a3a9ee1be 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -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 e1f47e3db..92eda9910 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -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,9 +293,9 @@ 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( sizeHint() ) ); } diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp index 8aceceecf..42920b3b6 100644 --- a/kaddressbook/keywidget.cpp +++ b/kaddressbook/keywidget.cpp @@ -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() ) ); diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index be7f899ea..0ba765df3 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -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 ); diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp index 4bb6e3700..718ce8e2b 100644 --- a/kaddressbook/nameeditdialog.cpp +++ b/kaddressbook/nameeditdialog.cpp @@ -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 47d8d506a..ff787e128 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp @@ -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->sizeHint() ); - tqlayout->addWidget( mAddButton, 1, 0, TQt::AlignRight ); + layout->addWidget( mAddButton, 1, 0, TQt::AlignRight ); mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() ); - tqlayout->addWidget( mRemoveButton, 1, 1 ); + 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 5d970b3b7..a9c0b8d3b 100644 --- a/kaddressbook/printing/detailledstyle.cpp +++ b/kaddressbook/printing/detailledstyle.cpp @@ -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/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp index 427dd9de1..d7be5bd53 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; diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp index 4e52b57db..c77c00d90 100644 --- a/kaddressbook/printing/selectionpage.cpp +++ b/kaddressbook/printing/selectionpage.cpp @@ -52,10 +52,10 @@ 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() ); + TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->layout() ); groupLayout->setAlignment( TQt::AlignTop ); mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup ); diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp index e157f1820..c3fdc1e0d 100644 --- a/kaddressbook/printing/stylepage.cpp +++ b/kaddressbook/printing/stylepage.cpp @@ -122,7 +122,7 @@ 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->setAlignment( TQt::AlignTop ); @@ -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 ); diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp index 29942cb71..5e4af7490 100644 --- a/kaddressbook/secrecywidget.cpp +++ b/kaddressbook/secrecywidget.cpp @@ -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/undocmds.cpp b/kaddressbook/undocmds.cpp index e05024bdc..a249c2953 100644 --- a/kaddressbook/undocmds.cpp +++ b/kaddressbook/undocmds.cpp @@ -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/viewmanager.cpp b/kaddressbook/viewmanager.cpp index c1f9da03d..073898dfe 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -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 44632e906..9675cdc8b 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -316,7 +316,7 @@ void CardViewItem::paintCard( TQPainter *p, TQColorGroup &cg ) // if we are the current item and the view has focus, draw focus rect if ( mView->currentItem() == this && mView->hasFocus() ) { - mView->tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, + mView->style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 0, 0, mView->itemWidth(), h + (2 * mg) ), cg, TQStyle::Style_FocusAtBorder, TQStyleOption( isSelected() ? cg.highlight() : cg.base() ) ); @@ -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; diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h index 7a007d956..0bd70e1de 100644 --- a/kaddressbook/views/cardview.h +++ b/kaddressbook/views/cardview.h @@ -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 repaint. + 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 a8d4537fd..e4c00e7d5 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -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() ); diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index 404746dc1..ae9d61551 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -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/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 7d95c043e..4656f62b1 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -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 b99bca85c..d9c3aa2f6 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -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 6fa731308..de1ae2ec3 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -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() ); } diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 72ae7e782..a860b5f6f 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -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() ); + mDelimiterBox->layout()->setSpacing( spacingHint() ); + mDelimiterBox->layout()->setMargin( marginHint() ); + TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->layout() ); delimiterLayout->setAlignment( TQt::AlignTop ); - tqlayout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 ); + 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..." ) ); diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 022f6c5f2..ad85389fe 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -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/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index fce57e74f..fa029a52b 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp @@ -187,10 +187,10 @@ 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() ); + TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->layout() ); groupLayout->setAlignment( TQt::AlignTop ); mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup ); @@ -226,7 +226,7 @@ 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->setAlignment( TQt::AlignTop ); |