From ba2a3ce341c0c71bbbcf350fcbcd60c552220b31 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:23:13 -0600 Subject: Rename obsolete tq methods to standard names --- kresources/blogging/resourcebloggingsettings.ui | 2 +- kresources/caldav/configwidgets.cpp | 4 ++-- kresources/carddav/configwidgets.cpp | 4 ++-- kresources/egroupware/debugdialog.cpp | 4 ++-- kresources/groupwise/kcal_resourcegroupwiseconfig.cpp | 2 +- kresources/lib/folderselectdialog.cpp | 8 ++++---- kresources/scalix/scalixadmin/delegatedialog.cpp | 10 +++++----- kresources/scalix/scalixadmin/delegatepage.cpp | 10 +++++----- kresources/scalix/scalixadmin/otheruserpage.cpp | 8 ++++---- kresources/scalix/scalixadmin/outofofficepage.cpp | 10 +++++----- kresources/scalix/scalixadmin/passwordpage.cpp | 14 +++++++------- 11 files changed, 38 insertions(+), 38 deletions(-) (limited to 'kresources') diff --git a/kresources/blogging/resourcebloggingsettings.ui b/kresources/blogging/resourcebloggingsettings.ui index df9baeff..7d7e0227 100644 --- a/kresources/blogging/resourcebloggingsettings.ui +++ b/kresources/blogging/resourcebloggingsettings.ui @@ -19,7 +19,7 @@ - tqlayout12 + layout12 diff --git a/kresources/caldav/configwidgets.cpp b/kresources/caldav/configwidgets.cpp index 4a7072b5..ab8c7905 100644 --- a/kresources/caldav/configwidgets.cpp +++ b/kresources/caldav/configwidgets.cpp @@ -114,7 +114,7 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent ) d->mIntervalSpin->setEnabled( false ); groupBox->setColumnLayout(1, Qt::Vertical); - TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout()); + TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(intervalRadio); vbox->addWidget(intervalBox); vbox->addWidget(automaticReloadOnStartup); @@ -207,7 +207,7 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent ) intervalBox->hide(); groupBox->setColumnLayout(1, Qt::Vertical); - TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout()); + TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(delay); vbox->addWidget(every); vbox->addWidget(intervalRadio); diff --git a/kresources/carddav/configwidgets.cpp b/kresources/carddav/configwidgets.cpp index b159a021..b2d505df 100644 --- a/kresources/carddav/configwidgets.cpp +++ b/kresources/carddav/configwidgets.cpp @@ -113,7 +113,7 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent ) d->mIntervalSpin->setEnabled( false ); groupBox->setColumnLayout(1, Qt::Vertical); - TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout()); + TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(intervalRadio); vbox->addWidget(intervalBox); vbox->addWidget(automaticReloadOnStartup); @@ -206,7 +206,7 @@ CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent ) intervalBox->hide(); groupBox->setColumnLayout(1, Qt::Vertical); - TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout()); + TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(delay); vbox->addWidget(every); vbox->addWidget(intervalRadio); diff --git a/kresources/egroupware/debugdialog.cpp b/kresources/egroupware/debugdialog.cpp index 0b2764c6..75a8ab81 100644 --- a/kresources/egroupware/debugdialog.cpp +++ b/kresources/egroupware/debugdialog.cpp @@ -38,10 +38,10 @@ DebugDialog::DebugDialog() User1 | User2 | Ok, Ok, true ) { TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() ); mView = new KTextBrowser( page ); - tqlayout->addWidget( mView ); + layout->addWidget( mView ); setButtonText( User1, "Save As..." ); setButtonText( User2, "Clear" ); diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp index 26689315..b23a81a1 100644 --- a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp +++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp @@ -124,7 +124,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings() if ( s ) { KDialogBase * dialog = new KDialogBase( ::tqqt_cast(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) ); -// TQVBoxLayout * tqlayout = new TQVBoxLayout( dialog ); +// TQVBoxLayout * layout = new TQVBoxLayout( dialog ); GroupWiseSettingsWidget * settingsWidget = new GroupWiseSettingsWidget( dialog ); dialog->setMainWidget( settingsWidget ); // populate dialog diff --git a/kresources/lib/folderselectdialog.cpp b/kresources/lib/folderselectdialog.cpp index f05dccf0..9d0f48a5 100644 --- a/kresources/lib/folderselectdialog.cpp +++ b/kresources/lib/folderselectdialog.cpp @@ -42,16 +42,16 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString& : KDialogBase(0, 0, true, caption, Ok|Cancel, Ok, true) { TQFrame* frame = makeMainWidget(); - TQVBoxLayout* tqlayout = new TQVBoxLayout( frame, 0, spacingHint() ); + TQVBoxLayout* layout = new TQVBoxLayout( frame, 0, spacingHint() ); TQLabel* labelWidget = new TQLabel( label, frame ); - tqlayout->addWidget( labelWidget ); + layout->addWidget( labelWidget ); mListBox = new KListBox( frame ); mListBox->insertStringList( list ); mListBox->setSelected( 0, true ); mListBox->ensureCurrentVisible(); - tqlayout->addWidget( mListBox, 10 ); + layout->addWidget( mListBox, 10 ); connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), TQT_SLOT( slotOk() ) ); @@ -60,7 +60,7 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString& mListBox->setFocus(); - tqlayout->addStretch(); + layout->addStretch(); setMinimumWidth( 320 ); } diff --git a/kresources/scalix/scalixadmin/delegatedialog.cpp b/kresources/scalix/scalixadmin/delegatedialog.cpp index d0a9644e..661f5743 100644 --- a/kresources/scalix/scalixadmin/delegatedialog.cpp +++ b/kresources/scalix/scalixadmin/delegatedialog.cpp @@ -35,18 +35,18 @@ DelegateDialog::DelegateDialog( TQWidget *parent ) : KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true ) { TQWidget *page = new TQWidget( this ); - TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( page, 5, 3, 11, 6 ); TQLabel *label = new TQLabel( i18n( "User:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mEmail = new TQLineEdit( page ); - tqlayout->addWidget( mEmail, 0, 1 ); + layout->addWidget( mEmail, 0, 1 ); TQToolButton *emailSelector = new TQToolButton( page ); emailSelector->setUsesTextLabel( true ); emailSelector->setTextLabel( i18n( "..." ) ); - tqlayout->addWidget( emailSelector, 0, 2 ); + layout->addWidget( emailSelector, 0, 2 ); TQValueList types; types << Scalix::SendOnBehalfOf; @@ -57,7 +57,7 @@ DelegateDialog::DelegateDialog( TQWidget *parent ) int row = 1; for ( uint i = 0; i < types.count(); ++i ) { TQCheckBox *box = new TQCheckBox( Scalix::Delegate::rightsAsString( types[ i ] ), page ); - tqlayout->addMultiCellWidget( box, row, row, 1, 2 ); + layout->addMultiCellWidget( box, row, row, 1, 2 ); mRights.insert( types[ i ], box ); row++; diff --git a/kresources/scalix/scalixadmin/delegatepage.cpp b/kresources/scalix/scalixadmin/delegatepage.cpp index 32b29d46..03347290 100644 --- a/kresources/scalix/scalixadmin/delegatepage.cpp +++ b/kresources/scalix/scalixadmin/delegatepage.cpp @@ -37,21 +37,21 @@ DelegatePage::DelegatePage( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 ); mView = new DelegateView( &mManager, this ); - tqlayout->addMultiCellWidget( mView, 0, 0, 0, 2 ); + layout->addMultiCellWidget( mView, 0, 0, 0, 2 ); mAddButton = new TQPushButton( i18n( "Add Delegate..." ), this ); - tqlayout->addWidget( mAddButton, 1, 0 ); + layout->addWidget( mAddButton, 1, 0 ); mEditButton = new TQPushButton( i18n( "Edit Delegate..." ), this ); mEditButton->setEnabled( false ); - tqlayout->addWidget( mEditButton, 1, 1 ); + layout->addWidget( mEditButton, 1, 1 ); mRemoveButton = new TQPushButton( i18n( "Remove Delegate" ), this ); mRemoveButton->setEnabled( false ); - tqlayout->addWidget( mRemoveButton, 1, 2 ); + layout->addWidget( mRemoveButton, 1, 2 ); connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) ); connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addDelegate() ) ); diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/kresources/scalix/scalixadmin/otheruserpage.cpp index ab5a417a..98b7b226 100644 --- a/kresources/scalix/scalixadmin/otheruserpage.cpp +++ b/kresources/scalix/scalixadmin/otheruserpage.cpp @@ -40,17 +40,17 @@ OtherUserPage::OtherUserPage( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 2, 11, 6 ); mView = new OtherUserView( &mManager, this ); - tqlayout->addMultiCellWidget( mView, 0, 0, 0, 1 ); + layout->addMultiCellWidget( mView, 0, 0, 0, 1 ); mAddButton = new TQPushButton( i18n( "Add Account..." ), this ); - tqlayout->addWidget( mAddButton, 1, 0 ); + layout->addWidget( mAddButton, 1, 0 ); mDeleteButton = new TQPushButton( i18n( "Remove Account" ), this ); mDeleteButton->setEnabled( false ); - tqlayout->addWidget( mDeleteButton, 1, 1 ); + layout->addWidget( mDeleteButton, 1, 1 ); connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) ); connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addUser() ) ); diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp index 401d4de1..e1e331fc 100644 --- a/kresources/scalix/scalixadmin/outofofficepage.cpp +++ b/kresources/scalix/scalixadmin/outofofficepage.cpp @@ -36,7 +36,7 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent ) : TQWidget( parent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 ); TQButtonGroup *group = new TQButtonGroup( 1, Qt::Vertical, this ); @@ -48,10 +48,10 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent ) mMessage = new TQTextEdit( this ); mSaveButton = new TQPushButton( i18n( "Save" ), this ); - tqlayout->addMultiCellWidget( group, 0, 0, 0, 1 ); - tqlayout->addMultiCellWidget( mLabel, 1, 1, 0, 1 ); - tqlayout->addMultiCellWidget( mMessage, 2, 2, 0, 1 ); - tqlayout->addWidget( mSaveButton, 3, 1 ); + layout->addMultiCellWidget( group, 0, 0, 0, 1 ); + layout->addMultiCellWidget( mLabel, 1, 1, 0, 1 ); + layout->addMultiCellWidget( mMessage, 2, 2, 0, 1 ); + layout->addWidget( mSaveButton, 3, 1 ); statusChanged(); diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp index e75d3fdd..de1a9aac 100644 --- a/kresources/scalix/scalixadmin/passwordpage.cpp +++ b/kresources/scalix/scalixadmin/passwordpage.cpp @@ -38,29 +38,29 @@ PasswordPage::PasswordPage( TQWidget *parent ) : TQWidget( parent ), mJob( 0 ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 ); TQLabel *label = new TQLabel( i18n( "New password:" ), this ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mPassword = new TQLineEdit( this ); mPassword->setEchoMode( TQLineEdit::Password ); label->setBuddy( mPassword ); - tqlayout->addWidget( mPassword, 0, 1 ); + layout->addWidget( mPassword, 0, 1 ); label = new TQLabel( i18n( "Retype new password:" ), this ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mPasswordRetype = new TQLineEdit( this ); mPasswordRetype->setEchoMode( TQLineEdit::Password ); label->setBuddy( mPasswordRetype ); - tqlayout->addWidget( mPasswordRetype, 1, 1 ); + layout->addWidget( mPasswordRetype, 1, 1 ); mButton = new TQPushButton( i18n( "Change" ), this ); mButton->setEnabled( false ); - tqlayout->addWidget( mButton, 2, 1 ); + layout->addWidget( mButton, 2, 1 ); - tqlayout->setRowSpacing( 3, 1 ); + layout->setRowSpacing( 3, 1 ); connect( mPassword, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) ); connect( mPasswordRetype, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) ); -- cgit v1.2.3