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

3 files changed, 5 insertions, 5 deletions

diff --git a/kontact/plugins/kpilot/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp
index 953c5f255..88e9d7886 100644
--- a/kontact/plugins/kpilot/kpilot_plugin.cpp
+++ b/kontact/plugins/kpilot/kpilot_plugin.cpp
@@ -43,9 +43,9 @@ KPilotPlugin::KPilotPlugin( Kontact::Core *core, const char *name, const TQStrin
 
 }
 
-Kontact::Summary *KPilotPlugin::createSummaryWidget( TQWidget *parentWidget )
+Kontact::Summary *KPilotPlugin::createSummaryWidget( TQWidget *tqparentWidget )
 {
-  return new SummaryWidget( parentWidget );
+  return new SummaryWidget( tqparentWidget );
 }
 
 const KAboutData *KPilotPlugin::aboutData()
diff --git a/kontact/plugins/kpilot/kpilot_plugin.h b/kontact/plugins/kpilot/kpilot_plugin.h
index 5695d2605..b1a08cbef 100644
--- a/kontact/plugins/kpilot/kpilot_plugin.h
+++ b/kontact/plugins/kpilot/kpilot_plugin.h
@@ -33,7 +33,7 @@ class KPilotPlugin : public Kontact::Plugin
     KPilotPlugin( Kontact::Core *core, const char *name, const TQStringList& );
     KPilotPlugin();
 
-    virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget );
+    virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparentWidget );
 
     virtual bool showInSideBar() const { return false; }
 //    virtual TQStringList configModules() const;
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index 779a55c19..ba11d9b57 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -98,10 +98,10 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   // Conduits:
   row++;
   mConduitsTextLabel = new TQLabel( i18n( "<i>Conduits:</i>" ), this );
-  mConduitsTextLabel->setAlignment( AlignAuto | AlignTop | ExpandTabs );
+  mConduitsTextLabel->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs );
   mLayout->addWidget( mConduitsTextLabel, row, 0 );
   mConduitsLabel = new TQLabel( i18n( "No information available" ), this );
-  mConduitsLabel->setAlignment( mConduitsLabel->alignment() | Qt::WordBreak );
+  mConduitsLabel->tqsetAlignment( mConduitsLabel->tqalignment() | Qt::WordBreak );
   mLayout->addMultiCellWidget( mConduitsLabel, row, row, 1, 3 );
 
   // widgets shown if kpilotDaemon is not running