diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
| commit | f4fae92b6768541e2952173c3d4b09040f95bf7e (patch) | |
| tree | d8c5d93232235cd635f3310b4d95490df181ba2d /kitchensync/src/singleconflictdialog.cpp | |
| parent | 125c0a08265b75a133644d3b55f47e37c919f45d (diff) | |
| download | tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip | |
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kitchensync/src/singleconflictdialog.cpp')
| -rw-r--r-- | kitchensync/src/singleconflictdialog.cpp | 14 |
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" |