summaryrefslogtreecommitdiffstats
path: root/kaddressbook/kcmconfigs
diff options
context:
space:
mode:
Diffstat (limited to 'kaddressbook/kcmconfigs')
-rw-r--r--kaddressbook/kcmconfigs/addhostdialog.cpp6
-rw-r--r--kaddressbook/kcmconfigs/addresseewidget.cpp22
-rw-r--r--kaddressbook/kcmconfigs/extensionconfigdialog.cpp6
-rw-r--r--kaddressbook/kcmconfigs/kabconfigwidget.cpp24
-rw-r--r--kaddressbook/kcmconfigs/kcmkabconfig.cpp6
-rw-r--r--kaddressbook/kcmconfigs/kcmkabldapconfig.cpp6
-rw-r--r--kaddressbook/kcmconfigs/ldapoptionswidget.cpp12
7 files changed, 41 insertions, 41 deletions
diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp
index 155f6f6ba..51faef690 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 8c04002d5..42f0eb6b0 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 68f4643ab..e88f91c92 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 6f99bbcde..3d335e845 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 4217a0a82..1b3c76f9a 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 e9541ea9f..e5a854492 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 a091c0f0c..3294dd96f 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"
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 06:36:03 +0000