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, 10 insertions, 10 deletions

diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp
index 9f629c4d2..d5c89bc8f 100644
--- a/kitchensync/src/groupconfigcommon.cpp
+++ b/kitchensync/src/groupconfigcommon.cpp
@@ -41,8 +41,8 @@
 ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this );
-  layout->setMargin( 0 );
+  TQGridLayout *tqlayout = new TQGridLayout( this );
+  tqlayout->setMargin( 0 );
 
   const QSync::Conversion conversion = SyncProcessManager::self()->environment()->conversion();
 
@@ -78,7 +78,7 @@ ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent )
       continue;
 
     TQCheckBox *objectCheckBox = new TQCheckBox( objectTypeMap[ objectType ], this );
-    layout->addWidget( objectCheckBox, row, col );
+    tqlayout->addWidget( objectCheckBox, row, col );
     mObjectTypeChecks.insert( objectType, objectCheckBox );
 
     col++;
@@ -103,7 +103,7 @@ void ObjectTypeSelector::load( const QSync::Group &group )
   TQMap<TQString, TQCheckBox*>::ConstIterator it;
   for( it = mObjectTypeChecks.begin(); it != mObjectTypeChecks.end(); ++it ) {
     TQCheckBox *check = it.data();
-    check->setChecked( objectTypes.contains( it.key() ) || initialLoad );
+    check->setChecked( objectTypes.tqcontains( it.key() ) || initialLoad );
   }
 }
 
@@ -128,19 +128,19 @@ void ObjectTypeSelector::save( QSync::Group group )
 GroupConfigCommon::GroupConfigCommon( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
-  layout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 );
 
   mGroupName = new KLineEdit( this );
-  layout->addWidget( mGroupName, 0, 1 );
+  tqlayout->addWidget( mGroupName, 0, 1 );
 
-  layout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, Qt::AlignTop );
+  tqlayout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, Qt::AlignTop );
 
   mObjectTypeSelector = new ObjectTypeSelector( this );
-  layout->addWidget( mObjectTypeSelector, 1, 1 );
+  tqlayout->addWidget( mObjectTypeSelector, 1, 1 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 }
 
 void GroupConfigCommon::setSyncProcess( SyncProcess *syncProcess )