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.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp
index f9228e174..3c11cd058 100644
--- a/kitchensync/src/singleconflictdialog.cpp
+++ b/kitchensync/src/singleconflictdialog.cpp
@@ -22,7 +22,7 @@
#include <klocale.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include "addresseediffalgo.h"
@@ -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"