diff options
author | Timothy Pearson <[email protected]> | 2011-12-16 09:59:50 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-16 09:59:50 -0600 |
commit | 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch) | |
tree | ab537a329b9613e11dce8195761f93ffe82aed24 /kitchensync/src/singleconflictdialog.cpp | |
parent | 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff) | |
download | tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'kitchensync/src/singleconflictdialog.cpp')
-rw-r--r-- | kitchensync/src/singleconflictdialog.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp index 3c11cd058..f9228e174 100644 --- a/kitchensync/src/singleconflictdialog.cpp +++ b/kitchensync/src/singleconflictdialog.cpp @@ -22,7 +22,7 @@ #include <klocale.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include "addresseediffalgo.h" @@ -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" |