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 --- kitchensync/src/singleconflictdialog.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kitchensync/src/singleconflictdialog.cpp') diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp index f9228e174..8975b6f98 100644 --- a/kitchensync/src/singleconflictdialog.cpp +++ b/kitchensync/src/singleconflictdialog.cpp @@ -96,28 +96,28 @@ void SingleConflictDialog::ignoreChange() void SingleConflictDialog::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() ); - tqlayout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 ); + layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 ); mDiffAlgoDisplay = new KSync::HTMLDiffAlgoDisplay( this ); - tqlayout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 ); + layout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 ); TQPushButton *button = new TQPushButton( i18n( "Use Item" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useFirstChange() ) ); - tqlayout->addWidget( button, 2, 0 ); + layout->addWidget( button, 2, 0 ); button = new TQPushButton( i18n( "Duplicate Items" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) ); - tqlayout->addWidget( button, 2, 1 ); + layout->addWidget( button, 2, 1 ); button = new TQPushButton( i18n( "Ignore Conflict" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) ); - tqlayout->addWidget( button, 2, 2 ); + layout->addWidget( button, 2, 2 ); button = new TQPushButton( i18n( "Use Item" ), this ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSecondChange() ) ); - tqlayout->addWidget( button, 2, 3 ); + layout->addWidget( button, 2, 3 ); } #include "singleconflictdialog.moc" -- cgit v1.2.1