summaryrefslogtreecommitdiffstats
path: root/kaddressbook/addresseditwidget.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
commit9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch)
treeab537a329b9613e11dce8195761f93ffe82aed24 /kaddressbook/addresseditwidget.cpp
parent3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff)
downloadtdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz
tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'kaddressbook/addresseditwidget.cpp')
-rw-r--r--kaddressbook/addresseditwidget.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index 1008169e5..cc71bd4f9 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -26,13 +26,13 @@
#include <tqcheckbox.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlistbox.h>
#include <tqlistview.h>
#include <tqpushbutton.h>
#include <tqsignal.h>
#include <tqstring.h>
-#include <textedit.h>
+#include <tqtextedit.h>
#include <tqtoolbutton.h>
#include <tqtooltip.h>
@@ -82,25 +82,25 @@ class TabPressEater : public TQObject
AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
- TQBoxLayout *layout = new TQVBoxLayout( this, 4, 2 );
- layout->setSpacing( KDialog::spacingHint() );
+ TQBoxLayout *tqlayout = new TQVBoxLayout( this, 4, 2 );
+ tqlayout->setSpacing( KDialog::spacingHint() );
mTypeCombo = new AddressTypeCombo( mAddressList, this );
connect( mTypeCombo, TQT_SIGNAL( activated( int ) ),
TQT_SLOT( updateAddressEdit() ) );
- layout->addWidget( mTypeCombo );
+ tqlayout->addWidget( mTypeCombo );
mAddressField = new KActiveLabel( this );
mAddressField->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
mAddressField->setMinimumHeight( 20 );
- mAddressField->setAlignment( TQt::AlignTop );
+ mAddressField->tqsetAlignment( TQt::AlignTop );
mAddressField->setTextFormat( TQt::PlainText );
- layout->addWidget( mAddressField );
+ tqlayout->addWidget( mAddressField );
mEditButton = new TQPushButton( i18n( "street/postal", "&Edit Addresses..." ), this );
connect( mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) );
- layout->addWidget( mEditButton );
+ tqlayout->addWidget( mEditButton );
}
AddressEditWidget::~AddressEditWidget()
@@ -273,8 +273,8 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
mTypeCombo = new AddressTypeCombo( mAddressList, page );
topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 );
- TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).arg( KABC::Address::streetLabel() ), page );
- label->setAlignment( TQt::AlignTop | TQt::AlignLeft );
+ TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).tqarg( KABC::Address::streetLabel() ), page );
+ label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft );
topLayout->addWidget( label, 1, 0 );
mStreetTextEdit = new TQTextEdit( page );
mStreetTextEdit->setTextFormat( TQt::PlainText );
@@ -284,31 +284,31 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
TabPressEater *eater = new TabPressEater( TQT_TQOBJECT(this) );
mStreetTextEdit->installEventFilter( eater );
- label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( KABC::Address::postOfficeBoxLabel() ), page );
+ label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).tqarg( KABC::Address::postOfficeBoxLabel() ), page );
topLayout->addWidget( label, 2 , 0 );
mPOBoxEdit = new KLineEdit( page );
label->setBuddy( mPOBoxEdit );
topLayout->addWidget( mPOBoxEdit, 2, 1 );
- label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).arg( KABC::Address::localityLabel() ), page );
+ label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).tqarg( KABC::Address::localityLabel() ), page );
topLayout->addWidget( label, 3, 0 );
mLocalityEdit = new KLineEdit( page );
label->setBuddy( mLocalityEdit );
topLayout->addWidget( mLocalityEdit, 3, 1 );
- label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).arg( KABC::Address::regionLabel() ), page );
+ label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).tqarg( KABC::Address::regionLabel() ), page );
topLayout->addWidget( label, 4, 0 );
mRegionEdit = new KLineEdit( page );
label->setBuddy( mRegionEdit );
topLayout->addWidget( mRegionEdit, 4, 1 );
- label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).arg( KABC::Address::postalCodeLabel() ), page );
+ label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).tqarg( KABC::Address::postalCodeLabel() ), page );
topLayout->addWidget( label, 5, 0 );
mPostalCodeEdit = new KLineEdit( page );
label->setBuddy( mPostalCodeEdit );
topLayout->addWidget( mPostalCodeEdit, 5, 1 );
- label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).arg( KABC::Address::countryLabel() ), page );
+ label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).tqarg( KABC::Address::countryLabel() ), page );
topLayout->addWidget( label, 6, 0 );
mCountryCombo = new KComboBox( page );
mCountryCombo->setEditable( true );
@@ -604,10 +604,10 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent )
parent, "AddressTypeDialog" )
{
TQWidget *page = plainPage();
- TQVBoxLayout *layout = new TQVBoxLayout( page );
+ TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "street/postal", "Address Types" ), page );
- layout->addWidget( mGroup );
+ tqlayout->addWidget( mGroup );
mTypeList = KABC::Address::typeList();
mTypeList.remove( KABC::Address::Pref );