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