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

1 files changed, 9 insertions, 9 deletions

diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp
index 7d7805c42..e7c037610 100644
--- a/kitchensync/src/multiconflictdialog.cpp
+++ b/kitchensync/src/multiconflictdialog.cpp
@@ -37,10 +37,10 @@ class ChangeItem : public KWidgetListItem
       : KWidgetListItem( parent ),
         mChange( change )
     {
-      TQGridLayout *layout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
+      TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
 
       MemberInfo mi( change.member() );
-      layout->addWidget( new TQLabel( mi.name(), this ), 0, 0 );
+      tqlayout->addWidget( new TQLabel( mi.name(), this ), 0, 0 );
 
       TQString type;
       switch ( change.changeType() ) {
@@ -62,7 +62,7 @@ class ChangeItem : public KWidgetListItem
           break;
       }
 
-      layout->addWidget( new TQLabel( type, this ), 1, 0 );
+      tqlayout->addWidget( new TQLabel( type, this ), 1, 0 );
     }
 
     QSync::SyncChange change() const { return mChange; }
@@ -118,24 +118,24 @@ void MultiConflictDialog::ignoreChange()
 
 void MultiConflictDialog::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() );
 
-  layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 );
+  tqlayout->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 );
+  tqlayout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 );
 
   TQPushButton *button = new TQPushButton( i18n( "Use Selected Item" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSelectedChange() ) );
-  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 );
 }
 
 #include "multiconflictdialog.moc"