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

diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index 57558cb46..0e3094521 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -41,25 +41,25 @@
 KeyWidget::KeyWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 4, 2, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Keys:" ), this );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mKeyCombo = new KComboBox( this );
-  layout->addWidget( mKeyCombo, 0, 1 );
+  tqlayout->addWidget( mKeyCombo, 0, 1 );
 
   mAddButton = new TQPushButton( i18n( "Add..." ), this );
-  layout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 );
+  tqlayout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 );
 
   mRemoveButton = new TQPushButton( i18n( "Remove" ), this );
   mRemoveButton->setEnabled( false );
-  layout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 );
+  tqlayout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 );
 
   mExportButton = new TQPushButton( i18n( "Export..." ), this );
   mExportButton->setEnabled( false );
-  layout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 );
+  tqlayout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 );
 
   connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addKey() ) );
   connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeKey() ) );
@@ -98,7 +98,7 @@ void KeyWidget::addKey()
   KABC::Key::TypeList::ConstIterator it;
   for ( it = typeList.begin(); it != typeList.end(); ++it ) {
     if ( (*it) != KABC::Key::Custom &&
-         !existingKeyTypes.contains( KABC::Key::typeLabel( *it ) ) ) {
+         !existingKeyTypes.tqcontains( KABC::Key::typeLabel( *it ) ) ) {
       keyMap.insert( KABC::Key::typeLabel( *it ), *it );
       keyTypeNames.append( KABC::Key::typeLabel( *it ) );
     }
@@ -110,7 +110,7 @@ void KeyWidget::addKey()
     return;
 
   int type = keyMap[ name ];
-  if ( !keyTypeNames.contains( name ) )
+  if ( !keyTypeNames.tqcontains( name ) )
     type = KABC::Key::Custom;
 
   KURL url = KFileDialog::getOpenURL();