Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 16 insertions, 16 deletions

diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp
index 996ef08af..7d7805c42 100644
--- a/kitchensync/src/multiconflictdialog.cpp
+++ b/kitchensync/src/multiconflictdialog.cpp
@@ -22,9 +22,9 @@
 #include <klocale.h>
 #include <kwidgetlist.h>
 
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
 
 #include "memberinfo.h"
 
@@ -37,12 +37,12 @@ class ChangeItem : public KWidgetListItem
       : KWidgetListItem( parent ),
         mChange( change )
     {
-      QGridLayout *layout = new QGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
+      TQGridLayout *layout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
 
       MemberInfo mi( change.member() );
-      layout->addWidget( new QLabel( mi.name(), this ), 0, 0 );
+      layout->addWidget( new TQLabel( mi.name(), this ), 0, 0 );
 
-      QString type;
+      TQString type;
       switch ( change.changeType() ) {
         case QSync::SyncChange::UnknownChange:
           type = i18n( "Unknown" );
@@ -62,7 +62,7 @@ class ChangeItem : public KWidgetListItem
           break;
       }
 
-      layout->addWidget( new QLabel( type, this ), 1, 0 );
+      layout->addWidget( new TQLabel( type, this ), 1, 0 );
     }
 
     QSync::SyncChange change() const { return mChange; }
@@ -71,7 +71,7 @@ class ChangeItem : public KWidgetListItem
     QSync::SyncChange mChange;
 };
 
-MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, QWidget *parent )
+MultiConflictDialog::MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent )
   : ConflictDialog( mapping, parent )
 {
   initGUI();
@@ -118,23 +118,23 @@ void MultiConflictDialog::ignoreChange()
 
 void MultiConflictDialog::initGUI()
 {
-  QGridLayout *layout = new QGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *layout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() );
 
-  layout->addMultiCellWidget( new QLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 );
+  layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 );
 
   mWidgetList = new KWidgetList( this );
   layout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 );
 
-  QPushButton *button = new QPushButton( i18n( "Use Selected Item" ), this );
-  connect( button, SIGNAL( clicked() ), SLOT( useSelectedChange() ) );
+  TQPushButton *button = new TQPushButton( i18n( "Use Selected Item" ), this );
+  connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSelectedChange() ) );
   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 );
 }