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

7 files changed, 25 insertions, 25 deletions

diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp
index dcf74944f..4ab53c3b2 100644
--- a/wizards/egroupwarewizard.cpp
+++ b/wizards/egroupwarewizard.cpp
@@ -347,7 +347,7 @@ EGroupwareWizard::EGroupwareWizard() : KConfigWizard( new EGroupwarePropagator )
   setupRulesPage();
   setupChangesPage();
 
-  resize( sizeHint() );
+  resize( tqsizeHint() );
 }
 
 EGroupwareWizard::~EGroupwareWizard()
diff --git a/wizards/groupwarewizard.cpp b/wizards/groupwarewizard.cpp
index d023a8d71..48ac3b5a7 100644
--- a/wizards/groupwarewizard.cpp
+++ b/wizards/groupwarewizard.cpp
@@ -33,14 +33,14 @@ GroupwareWizard::GroupwareWizard( TQWidget *parent, const char *name )
 {
   setCaption( i18n( "KDE Groupware Wizard" ) );
 
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   mOverViewPage = new OverViewPage( this );
 
-  layout->addWidget( mOverViewPage );
+  tqlayout->addWidget( mOverViewPage );
 
   connect( mOverViewPage, TQT_SIGNAL( cancel() ),
-           qApp, TQT_SLOT( quit() ) );
+           tqApp, TQT_SLOT( quit() ) );
 
   resize( 400, 200 );
 }
diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp
index 79e06f585..4ad256f78 100644
--- a/wizards/kmailchanges.cpp
+++ b/wizards/kmailchanges.cpp
@@ -280,7 +280,7 @@ void CreateDisconnectedImapAccount::apply()
   es.setSetting( KEMailSettings::EmailAddress, mEmail );
 
   KPIM::IdentityManager identityManager;
-  if ( !identityManager.allEmails().contains( mEmail ) ) {
+  if ( !identityManager.allEmails().tqcontains( mEmail ) ) {
     // Not sure how to name the identity. First one is "Default", next one mAccountName, but then...
     // let's use the server name after that.
     TQString accountName = mAccountName;
@@ -375,8 +375,8 @@ bool CreateImapAccount::writeToWallet(const TQString & type, int id)
   if ( !mWallet || !mWallet->isOpen() ) {
     delete mWallet;
     WId window = 0;
-    if ( qApp->activeWindow() )
-      window = qApp->activeWindow()->winId();
+    if ( tqApp->activeWindow() )
+      window = tqApp->activeWindow()->winId();
     mWallet = Wallet::openWallet( Wallet::NetworkWallet(), window );
     if ( !mWallet )
       return false;
diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp
index e8a452b16..59b7a2514 100644
--- a/wizards/kolabwizard.cpp
+++ b/wizards/kolabwizard.cpp
@@ -72,7 +72,7 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change
         c.writeEntry( "Default domain", basedn );
       }
 
-      basedn.replace(".",",dc=");
+      basedn.tqreplace(".",",dc=");
       basedn.prepend("dc=");
 
       // Set the changes
diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp
index 2ee90096b..e0a544ad9 100644
--- a/wizards/overviewpage.cpp
+++ b/wizards/overviewpage.cpp
@@ -42,54 +42,54 @@
 OverViewPage::OverViewPage( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 7, 4, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 7, 4, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   const TQString msg = i18n( "KDE Groupware Wizard" );
   TQLabel *label = new TQLabel( "<qt><b><u><h2>" + msg + "</h2></u></b></qt>" , this );
-  layout->addMultiCellWidget( label, 0, 0, 0, 2 );
+  tqlayout->addMultiCellWidget( label, 0, 0, 0, 2 );
 
   label = new TQLabel( this );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "network", KIcon::Desktop ) );
-  layout->addWidget( label, 0, 3 );
+  tqlayout->addWidget( label, 0, 3 );
 
   label = new TQLabel( "", this );
-  layout->addWidget( label, 1, 0 );
-  layout->setRowSpacing( 1, 20 );
+  tqlayout->addWidget( label, 1, 0 );
+  tqlayout->setRowSpacing( 1, 20 );
 
   label = new TQLabel( i18n( "Select the type of server you want connect your KDE to:" ), this );
-  layout->addMultiCellWidget( label, 2, 2, 0, 3 );
+  tqlayout->addMultiCellWidget( label, 2, 2, 0, 3 );
 
   TQPushButton *button = new TQPushButton( i18n("eGroupware"), this );
-  layout->addMultiCellWidget( button, 3, 3, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 3, 3, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardEGroupware() ) );
 
   // FIXME: Maybe hyperlinks would be better than buttons.
 
   button = new TQPushButton( i18n("Kolab"), this );
-  layout->addMultiCellWidget( button, 4, 4, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 4, 4, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardKolab() ) );
 
   button = new TQPushButton( i18n("SUSE Linux Openexchange (SLOX)"), this );
-  layout->addMultiCellWidget( button, 5, 5, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 5, 5, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardSlox() ) );
 
   button = new TQPushButton( i18n("Microsoft Exchange"), this );
   button->hide(); // not quite ready yet
-  layout->addMultiCellWidget( button, 6, 6, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 6, 6, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardExchange() ) );
 
 
   TQFrame *frame = new TQFrame( this );
   frame->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
-  layout->addMultiCellWidget( frame, 7, 7, 0, 3 );
+  tqlayout->addMultiCellWidget( frame, 7, 7, 0, 3 );
 
   TQPushButton *cancelButton = new KPushButton( KStdGuiItem::close(), this );
-  layout->addWidget( cancelButton, 8, 3 );
+  tqlayout->addWidget( cancelButton, 8, 3 );
 
   connect( cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( cancel() ) );
 
-  layout->setRowStretch( 7, 1 );
+  tqlayout->setRowStretch( 7, 1 );
 
   KAcceleratorManager::manage( this );
 }
diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp
index dfc638f70..beb059481 100644
--- a/wizards/scalixwizard.cpp
+++ b/wizards/scalixwizard.cpp
@@ -200,12 +200,12 @@ class SynchronizeScalixAccount : public KConfigPropagator::Change
 
     void apply()
     {
-      TQMessageBox *msg = new TQMessageBox( qApp->mainWidget() );
+      TQMessageBox *msg = new TQMessageBox( tqApp->mainWidget() );
       msg->setText( "Preparing initial synchronization with Scalix server..." );
       msg->show();
-      qApp->processEvents();
+      tqApp->processEvents();
       sleep( 1 );
-      qApp->processEvents();
+      tqApp->processEvents();
 
       TQString error;
       TQCString dcopService;
diff --git a/wizards/servertype.h b/wizards/servertype.h
index 245036664..8e6954b4c 100644
--- a/wizards/servertype.h
+++ b/wizards/servertype.h
@@ -50,7 +50,7 @@ class ServerType : public QObject
     };
 
     /**
-      This map contains the uids and the user visible names
+      This map tqcontains the uids and the user visible names
       of a server type.
      */
     typedef TQValueList<ConnectionInfo> ConnectionInfoList;