diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:23:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:23:31 -0600 |
| commit | 36b1e019b76f39cca8fc81f6d4df544f1c94c179 (patch) | |
| tree | 3ca2f4886d1a2810b952164dd1b0f3e92ef6bf3a /cervisia/mergedlg.cpp | |
| parent | f78838f2f736acc2b235d8b680f3379a07a6d372 (diff) | |
| download | tdesdk-36b1e019b76f39cca8fc81f6d4df544f1c94c179.tar.gz tdesdk-36b1e019b76f39cca8fc81f6d4df544f1c94c179.zip | |
Rename obsolete tq methods to standard names
Diffstat (limited to 'cervisia/mergedlg.cpp')
| -rw-r--r-- | cervisia/mergedlg.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cervisia/mergedlg.cpp b/cervisia/mergedlg.cpp index b91ca889..e2b770c6 100644 --- a/cervisia/mergedlg.cpp +++ b/cervisia/mergedlg.cpp @@ -40,15 +40,15 @@ MergeDialog::MergeDialog(CvsService_stub* service, cvsService(service) { int const iComboBoxMinWidth(30 * fontMetrics().width('0')); - int const iWidgetIndent(tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6); + int const iWidgetIndent(style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6); TQFrame* mainWidget = makeMainWidget(); - TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint()); bybranch_button = new TQRadioButton(i18n("Merge from &branch:"), mainWidget); bybranch_button->setChecked(true); - tqlayout->addWidget(bybranch_button); + layout->addWidget(bybranch_button); branch_combo = new TQComboBox(true, mainWidget); branch_combo->setMinimumWidth(iComboBoxMinWidth); @@ -57,13 +57,13 @@ MergeDialog::MergeDialog(CvsService_stub* service, connect( branch_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(branchButtonClicked()) ); - TQBoxLayout *branchedit_layout = new TQHBoxLayout(tqlayout); + TQBoxLayout *branchedit_layout = new TQHBoxLayout(layout); branchedit_layout->addSpacing(iWidgetIndent); branchedit_layout->addWidget(branch_combo, 2); branchedit_layout->addWidget(branch_button, 0); bytags_button = new TQRadioButton(i18n("Merge &modifications:"), mainWidget); - tqlayout->addWidget(bytags_button); + layout->addWidget(bytags_button); TQLabel *tag1_label = new TQLabel(i18n("between tag: "), mainWidget); tag1_combo = new TQComboBox(true, mainWidget); @@ -77,7 +77,7 @@ MergeDialog::MergeDialog(CvsService_stub* service, connect( tag_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(tagButtonClicked()) ); - TQGridLayout *tagsedit_layout = new TQGridLayout(tqlayout); + TQGridLayout *tagsedit_layout = new TQGridLayout(layout); tagsedit_layout->addColSpacing(0, iWidgetIndent); tagsedit_layout->setColStretch(0, 0); tagsedit_layout->setColStretch(1, 1); |