diff options
Diffstat (limited to 'kaddressbook/kcmconfigs')
-rw-r--r-- | kaddressbook/kcmconfigs/addhostdialog.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/addresseewidget.cpp | 20 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/extensionconfigdialog.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kabconfigwidget.cpp | 20 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kcmkabconfig.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kcmkabldapconfig.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/ldapoptionswidget.cpp | 10 |
7 files changed, 33 insertions, 33 deletions
diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp index 14abca147..c09e5b945 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 *layout = new TQHBoxLayout( page, marginHint(), spacingHint() ); + TQHBoxLayout *tqlayout = 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 ); - layout->addWidget( mCfg ); + tqlayout->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 1c074d397..a7d9ebe6f 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 *layout = new TQHBoxLayout( this ); + TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this ); - TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 2, 2, + TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 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" ), this, TQT_SLOT( remove() ) ); mRemoveButton->setEnabled( false ); - bbox->layout(); + bbox->tqlayout(); groupLayout->addWidget( bbox, 0, 1 ); - layout->addWidget( group ); + tqlayout->addWidget( group ); } NamePartWidget::~NamePartWidget() @@ -134,20 +134,20 @@ void NamePartWidget::selectionChanged( TQListBoxItem *item ) AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), + TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); mPrefix = new NamePartWidget( i18n( "Prefixes"), i18n( "Enter prefix:" ), this ); - layout->addWidget( mPrefix, 0, 0 ); + tqlayout->addWidget( mPrefix, 0, 0 ); mInclusion = new NamePartWidget( i18n( "Inclusions"), i18n( "Enter inclusion:" ), this ); - layout->addWidget( mInclusion, 0, 1 ); + tqlayout->addWidget( mInclusion, 0, 1 ); mSuffix = new NamePartWidget( i18n( "Suffixes" ), i18n( "Enter suffix:" ), this ); - layout->addWidget( mSuffix, 0, 2 ); + tqlayout->addWidget( mSuffix, 0, 2 ); TQLabel *label = new TQLabel( i18n( "Default formatted name:" ), this ); - layout->addWidget( label, 1, 0 ); + tqlayout->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" ) ); - layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 ); + tqlayout->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 80f73f469..0758f320c 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 *layout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() ); mWidget = factory->configureWidget( page, "ExtensionConfigWidget" ); - layout->addWidget( mWidget, 0, 0 ); + tqlayout->addWidget( mWidget, 0, 0 ); mWidget->restoreSettings( mConfig ); } diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index e4fea7409..d1888624e 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -56,12 +56,12 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) // General page TQWidget *generalPage = new TQWidget( this ); - TQVBoxLayout *layout = new TQVBoxLayout( generalPage, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout( generalPage, KDialog::marginHint(), KDialog::spacingHint() ); TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage ); - TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->layout() ); - boxLayout->setAlignment( Qt::AlignTop ); + TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->tqlayout() ); + boxLayout->tqsetAlignment( Qt::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 ); - layout->addWidget( groupBox ); + tqlayout->addWidget( groupBox ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage ); - TQGridLayout *grid = new TQGridLayout( groupBox->layout(), 3, 2, + TQGridLayout *grid = new TQGridLayout( groupBox->tqlayout(), 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 ); - layout->addWidget( groupBox ); + tqlayout->addWidget( groupBox ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage ); - boxLayout = new TQVBoxLayout( groupBox->layout(), KDialog::spacingHint() ); - boxLayout->setAlignment( Qt::AlignTop ); + boxLayout = new TQVBoxLayout( groupBox->tqlayout(), KDialog::spacingHint() ); + boxLayout->tqsetAlignment( Qt::AlignTop ); mLocationMapURL = new TQComboBox( true, groupBox ); - mLocationMapURL->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + mLocationMapURL->tqsetSizePolicy( 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 ); - layout->addWidget( groupBox ); + tqlayout->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 6b516249a..f112c4c89 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 *layout = new TQVBoxLayout( this ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); mConfigWidget = new KABConfigWidget( this, "mConfigWidget" ); - layout->addWidget( mConfigWidget ); + tqlayout->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 e899198b5..4cadf2633 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 *layout = new TQVBoxLayout( this ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); mConfigWidget = new LDAPOptionsWidget( this ); - layout->addWidget( mConfigWidget ); + tqlayout->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 3825ac1d8..639cec027 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -258,7 +258,7 @@ void LDAPOptionsWidget::defaults() void LDAPOptionsWidget::initGUI() { - TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = 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 ); - layout->addWidget( groupBox ); + tqlayout->addWidget( groupBox ); KButtonBox *buttons = new KButtonBox( this ); buttons->addButton( i18n( "&Add Host..." ), this, TQT_SLOT( slotAddHost() ) ); @@ -293,11 +293,11 @@ void LDAPOptionsWidget::initGUI() mEditButton->setEnabled( false ); mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), this, TQT_SLOT( slotRemoveHost() ) ); mRemoveButton->setEnabled( false ); - buttons->layout(); + buttons->tqlayout(); - layout->addWidget( buttons ); + tqlayout->addWidget( buttons ); - resize( TQSize( 460, 300 ).expandedTo( sizeHint() ) ); + resize( TQSize( 460, 300 ).expandedTo( tqsizeHint() ) ); } #include "ldapoptionswidget.moc" |