From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:50 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12. --- libtdepim/addresseeselector.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'libtdepim/addresseeselector.cpp') diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp index 006e4591b..792d57625 100644 --- a/libtdepim/addresseeselector.cpp +++ b/libtdepim/addresseeselector.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include @@ -267,7 +267,7 @@ void AddresseeSelector::init() void AddresseeSelector::initGUI() { - TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); TQGridLayout *topLayout = new TQGridLayout( this, 2, 2, KDialog::marginHint() ); TQLabel *label = new TQLabel( i18n( "Address book:" ), this ); @@ -284,7 +284,7 @@ void AddresseeSelector::initGUI() topLayout->setColStretch( 1, 1 ); - layout->addMultiCellLayout( topLayout, 0, 0, 0, 2 ); + tqlayout->addMultiCellLayout( topLayout, 0, 0, 0, 2 ); int row = 1; @@ -303,8 +303,8 @@ void AddresseeSelector::initGUI() mRemoveMapper->setMapping( TQT_TQOBJECT(listView), i ); TQVBoxLayout *buttonLayout = new TQVBoxLayout( this ); - buttonLayout->setAlignment( TQt::AlignBottom ); - layout->addLayout( buttonLayout, row, 1 ); + buttonLayout->tqsetAlignment( TQt::AlignBottom ); + tqlayout->addLayout( buttonLayout, row, 1 ); // move button TQToolButton *moveButton = new TQToolButton( this ); @@ -327,7 +327,7 @@ void AddresseeSelector::initGUI() buttonLayout->addWidget( moveButton ); buttonLayout->addWidget( removeButton ); - layout->addWidget( listView, row, 2 ); + tqlayout->addWidget( listView, row, 2 ); } mAddresseeView = new KListView( this ); @@ -335,7 +335,7 @@ void AddresseeSelector::initGUI() mAddresseeView->header()->hide(); mAddresseeView->setFullWidth( true ); - layout->addMultiCellWidget( mAddresseeView, 1, row, 0, 0 ); + tqlayout->addMultiCellWidget( mAddresseeView, 1, row, 0, 0 ); } void AddresseeSelector::finish() @@ -565,9 +565,9 @@ AddresseeSelectorDialog::AddresseeSelectorDialog( Selection *selection, : KDialogBase( Plain, "", Ok | Cancel, Ok, parent, name, true ) { TQFrame *frame = plainPage(); - TQVBoxLayout *layout = new TQVBoxLayout( frame ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( frame ); mSelector = new KPIM::AddresseeSelector( selection, frame ); - layout->addWidget( mSelector ); + tqlayout->addWidget( mSelector ); resize( 500, 490 ); } -- cgit v1.2.1