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.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp
index 53acba799..8975b6f98 100644
--- a/kitchensync/src/singleconflictdialog.cpp
+++ b/kitchensync/src/singleconflictdialog.cpp
@@ -21,9 +21,9 @@
#include <kdialog.h>
#include <klocale.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
#include "addresseediffalgo.h"
#include "genericdiffalgo.h"
@@ -32,12 +32,12 @@
#include "singleconflictdialog.h"
-SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, QWidget *parent )
+SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent )
: ConflictDialog( mapping, parent ), mDiffAlgo( 0 )
{
initGUI();
- QString format = mapping.changeAt( 0 ).objectFormatName();
+ TQString format = mapping.changeAt( 0 ).objectFormatName();
QSync::SyncChange leftChange = mapping.changeAt( 0 );
QSync::SyncChange rightChange = mapping.changeAt( 1 );
@@ -96,27 +96,27 @@ void SingleConflictDialog::ignoreChange()
void SingleConflictDialog::initGUI()
{
- QGridLayout *layout = new QGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() );
+ TQGridLayout *layout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() );
- layout->addMultiCellWidget( new QLabel( 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 );
layout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 );
- QPushButton *button = new QPushButton( i18n( "Use Item" ), this );
- connect( button, SIGNAL( clicked() ), SLOT( useFirstChange() ) );
+ TQPushButton *button = new TQPushButton( i18n( "Use Item" ), this );
+ connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useFirstChange() ) );
layout->addWidget( button, 2, 0 );
- button = new QPushButton( i18n( "Duplicate Items" ), this );
- connect( button, SIGNAL( clicked() ), SLOT( duplicateChange() ) );
+ button = new TQPushButton( i18n( "Duplicate Items" ), this );
+ connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) );
layout->addWidget( button, 2, 1 );
- button = new QPushButton( i18n( "Ignore Conflict" ), this );
- connect( button, SIGNAL( clicked() ), SLOT( ignoreChange() ) );
+ button = new TQPushButton( i18n( "Ignore Conflict" ), this );
+ connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) );
layout->addWidget( button, 2, 2 );
- button = new QPushButton( i18n( "Use Item" ), this );
- connect( button, SIGNAL( clicked() ), SLOT( useSecondChange() ) );
+ button = new TQPushButton( i18n( "Use Item" ), this );
+ connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSecondChange() ) );
layout->addWidget( button, 2, 3 );
}