From 39d7cb00553d01cea32bfd52fa406aac15742ba0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:24:21 -0600 Subject: Rename obsolete tq methods to standard names (cherry picked from commit abcbb684982167791304dc2fe0bc979489506b43) --- vcs/clearcase/commentdlg.cpp | 16 ++++++++-------- vcs/cvsservice/checkoutdialogbase.ui | 6 +++--- vcs/cvsservice/commitdialogbase.ui | 4 ++-- vcs/cvsservice/diffdialogbase.ui | 6 +++--- vcs/cvsservice/diffwidget.cpp | 6 +++--- vcs/cvsservice/integrator/integratordlgbase.ui | 2 +- vcs/cvsservice/releaseinputdialogbase.ui | 6 +++--- vcs/cvsservice/tagdialogbase.ui | 4 ++-- vcs/perforce/commitdlg.cpp | 20 ++++++++++---------- vcs/subversion/commitdlgbase.ui | 4 ++-- vcs/subversion/integrator/svnintegratordlgbase.ui | 2 +- vcs/subversion/subversionprojectwidget.ui | 2 +- vcs/subversion/svn_co.ui | 14 +++++++------- vcs/subversion/svn_commitdlgbase.ui | 2 +- vcs/subversion/svn_switchdlgbase.ui | 2 +- 15 files changed, 48 insertions(+), 48 deletions(-) (limited to 'vcs') diff --git a/vcs/clearcase/commentdlg.cpp b/vcs/clearcase/commentdlg.cpp index a7f90ff7..df9fc10b 100644 --- a/vcs/clearcase/commentdlg.cpp +++ b/vcs/clearcase/commentdlg.cpp @@ -25,21 +25,21 @@ CcaseCommentDlg::CcaseCommentDlg(bool bCheckin) { setCaption( i18n("Clearcase Comment") ); - TQBoxLayout *tqlayout = new TQVBoxLayout(this, 10); + TQBoxLayout *layout = new TQVBoxLayout(this, 10); TQLabel *messagelabel = new TQLabel(i18n("Enter log message:"), this); messagelabel->setMinimumSize(messagelabel->sizeHint()); - tqlayout->addWidget(messagelabel, 0); + layout->addWidget(messagelabel, 0); _edit = new TQMultiLineEdit(this); TQFontMetrics fm(_edit->fontMetrics()); _edit->setMinimumSize(fm.width("0")*40, fm.lineSpacing()*3); - tqlayout->addWidget(_edit, 10); + layout->addWidget(_edit, 10); - TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout); + TQBoxLayout *layout2 = new TQHBoxLayout(layout); if(bCheckin) { _check = new TQCheckBox(i18n("Reserve"), this); - tqlayout2->addWidget(_check); + layout2->addWidget(_check); } KButtonBox *buttonbox = new KButtonBox(this); @@ -49,10 +49,10 @@ CcaseCommentDlg::CcaseCommentDlg(bool bCheckin) connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); ok->setDefault(true); - buttonbox->tqlayout(); - tqlayout2->addWidget(buttonbox, 0); + buttonbox->layout(); + layout2->addWidget(buttonbox, 0); - tqlayout->activate(); + layout->activate(); adjustSize(); } diff --git a/vcs/cvsservice/checkoutdialogbase.ui b/vcs/cvsservice/checkoutdialogbase.ui index 06172a80..38f1e7f0 100644 --- a/vcs/cvsservice/checkoutdialogbase.ui +++ b/vcs/cvsservice/checkoutdialogbase.ui @@ -56,7 +56,7 @@ - tqlayout4 + layout4 @@ -106,7 +106,7 @@ - tqlayout5 + layout5 @@ -238,7 +238,7 @@ - tqlayout5 + layout5 diff --git a/vcs/cvsservice/commitdialogbase.ui b/vcs/cvsservice/commitdialogbase.ui index d11b0b70..61805f99 100644 --- a/vcs/cvsservice/commitdialogbase.ui +++ b/vcs/cvsservice/commitdialogbase.ui @@ -42,7 +42,7 @@ - tqlayout2 + layout2 @@ -88,7 +88,7 @@ - tqlayout5 + layout5 diff --git a/vcs/cvsservice/diffdialogbase.ui b/vcs/cvsservice/diffdialogbase.ui index 6e79b54a..a5e07812 100644 --- a/vcs/cvsservice/diffdialogbase.ui +++ b/vcs/cvsservice/diffdialogbase.ui @@ -35,7 +35,7 @@ - tqlayout3 + layout3 @@ -69,7 +69,7 @@ - tqlayout3 + layout3 @@ -171,7 +171,7 @@ - tqlayout2 + layout2 diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index 2ecf8ddc..ecc7c053 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/diffwidget.cpp @@ -186,8 +186,8 @@ DiffWidget::DiffWidget( TQWidget *parent, const char *name, WFlags f ): // te->setMinimumSize( 300, 200 ); connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( te ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->addWidget( te ); } DiffWidget::~DiffWidget() @@ -226,7 +226,7 @@ void DiffWidget::loadExtPart( const TQString& partName ) if ( !extPart || !extPart->widget() ) return; - tqlayout()->add( extPart->widget() ); + layout()->add( extPart->widget() ); setExtPartVisible( true ); diff --git a/vcs/cvsservice/integrator/integratordlgbase.ui b/vcs/cvsservice/integrator/integratordlgbase.ui index 150ac9bc..6b53c738 100644 --- a/vcs/cvsservice/integrator/integratordlgbase.ui +++ b/vcs/cvsservice/integrator/integratordlgbase.ui @@ -29,7 +29,7 @@ - tqlayout1 + layout1 diff --git a/vcs/cvsservice/releaseinputdialogbase.ui b/vcs/cvsservice/releaseinputdialogbase.ui index df734c00..226a0a14 100644 --- a/vcs/cvsservice/releaseinputdialogbase.ui +++ b/vcs/cvsservice/releaseinputdialogbase.ui @@ -57,7 +57,7 @@ - tqlayout3 + layout3 @@ -92,7 +92,7 @@ - tqlayout2 + layout2 @@ -158,7 +158,7 @@ - tqlayout2 + layout2 diff --git a/vcs/cvsservice/tagdialogbase.ui b/vcs/cvsservice/tagdialogbase.ui index b4b9ecce..86390490 100644 --- a/vcs/cvsservice/tagdialogbase.ui +++ b/vcs/cvsservice/tagdialogbase.ui @@ -24,7 +24,7 @@ - tqlayout3 + layout3 @@ -83,7 +83,7 @@ - tqlayout2 + layout2 diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp index 44ff0875..1ef28287 100644 --- a/vcs/perforce/commitdlg.cpp +++ b/vcs/perforce/commitdlg.cpp @@ -38,11 +38,11 @@ CommitDialog::CommitDialog( TQWidget *parent, const char *name ) TQFontMetrics fm(edit->fontMetrics()); edit->setMinimumSize(fm.width("0")*40, fm.lineSpacing()*3); - TQVBoxLayout *tqlayout = new TQVBoxLayout( w, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( w, 0, spacingHint() ); TQLabel *editLabel = new TQLabel(i18n("&Enter description:"), w); editLabel->setBuddy(edit); - tqlayout->addWidget(editLabel); - tqlayout->addWidget(edit); + layout->addWidget(editLabel); + layout->addWidget(edit); w = new TQWidget( this, "details widget" ); @@ -50,19 +50,19 @@ CommitDialog::CommitDialog( TQWidget *parent, const char *name ) userEdit = new KLineEdit( w ); filesBox = new KListBox( w ); - tqlayout = new TQVBoxLayout( w, 0, spacingHint() ); + layout = new TQVBoxLayout( w, 0, spacingHint() ); TQLabel *clientLabel = new TQLabel(i18n("C&lient:"), w); clientLabel->setBuddy(clientEdit); - tqlayout->addWidget(clientLabel); - tqlayout->addWidget( clientEdit ); + layout->addWidget(clientLabel); + layout->addWidget( clientEdit ); TQLabel *userLabel = new TQLabel(i18n("&User:"), w); userLabel->setBuddy(userEdit); - tqlayout->addWidget( userLabel ); - tqlayout->addWidget( userEdit ); + layout->addWidget( userLabel ); + layout->addWidget( userEdit ); TQLabel *filesLabel = new TQLabel(i18n("&File(s):"), w); filesLabel->setBuddy(filesBox); - tqlayout->addWidget( filesLabel ); - tqlayout->addWidget( filesBox ); + layout->addWidget( filesLabel ); + layout->addWidget( filesBox ); setDetailsWidget( w ); autoGuess(); diff --git a/vcs/subversion/commitdlgbase.ui b/vcs/subversion/commitdlgbase.ui index d472c8f1..d58bd745 100644 --- a/vcs/subversion/commitdlgbase.ui +++ b/vcs/subversion/commitdlgbase.ui @@ -21,7 +21,7 @@ - tqlayout2 + layout2 @@ -42,7 +42,7 @@ - tqlayout1 + layout1 diff --git a/vcs/subversion/integrator/svnintegratordlgbase.ui b/vcs/subversion/integrator/svnintegratordlgbase.ui index a1818437..5c119634 100644 --- a/vcs/subversion/integrator/svnintegratordlgbase.ui +++ b/vcs/subversion/integrator/svnintegratordlgbase.ui @@ -105,7 +105,7 @@ file:///home/user/subversion/mynewproject - tqlayout5 + layout5 diff --git a/vcs/subversion/subversionprojectwidget.ui b/vcs/subversion/subversionprojectwidget.ui index 19529991..22f43ba9 100644 --- a/vcs/subversion/subversionprojectwidget.ui +++ b/vcs/subversion/subversionprojectwidget.ui @@ -21,7 +21,7 @@ - tqlayout1 + layout1 diff --git a/vcs/subversion/svn_co.ui b/vcs/subversion/svn_co.ui index 64bd3ed6..db9d8f31 100644 --- a/vcs/subversion/svn_co.ui +++ b/vcs/subversion/svn_co.ui @@ -48,7 +48,7 @@ - tqlayout8 + layout8 @@ -82,7 +82,7 @@ - tqlayout6 + layout6 @@ -139,7 +139,7 @@ - tqlayout11 + layout11 @@ -191,7 +191,7 @@ - tqlayout8 + layout8 @@ -225,7 +225,7 @@ - tqlayout9 + layout9 @@ -253,7 +253,7 @@ - tqlayout6 + layout6 @@ -278,7 +278,7 @@ - tqlayout5 + layout5 diff --git a/vcs/subversion/svn_commitdlgbase.ui b/vcs/subversion/svn_commitdlgbase.ui index ea572fc6..75937324 100644 --- a/vcs/subversion/svn_commitdlgbase.ui +++ b/vcs/subversion/svn_commitdlgbase.ui @@ -76,7 +76,7 @@ - tqlayout8 + layout8 diff --git a/vcs/subversion/svn_switchdlgbase.ui b/vcs/subversion/svn_switchdlgbase.ui index 84d28cf8..87533197 100644 --- a/vcs/subversion/svn_switchdlgbase.ui +++ b/vcs/subversion/svn_switchdlgbase.ui @@ -43,7 +43,7 @@ - tqlayout2 + layout2 -- cgit v1.2.1