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

5 files changed, 29 insertions, 29 deletions

diff --git a/kontact/plugins/summary/dropwidget.cpp b/kontact/plugins/summary/dropwidget.cpp
index 341c37d80..5b6039827 100644
--- a/kontact/plugins/summary/dropwidget.cpp
+++ b/kontact/plugins/summary/dropwidget.cpp
@@ -36,9 +36,9 @@ void DropWidget::dragEnterEvent( TQDragEnterEvent *event )
 
 void DropWidget::dropEvent( TQDropEvent *event )
 {
-  int alignment = ( event->pos().x() < (width() / 2) ? Qt::AlignLeft : Qt::AlignRight );
-  alignment |= ( event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom );
-  emit summaryWidgetDropped( this, event->source(), alignment );
+  int tqalignment = ( event->pos().x() < (width() / 2) ? Qt::AlignLeft : Qt::AlignRight );
+  tqalignment |= ( event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom );
+  emit summaryWidgetDropped( this, event->source(), tqalignment );
 }
 
 #include "dropwidget.moc"
diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h
index ade7b6c17..41c892eaf 100644
--- a/kontact/plugins/summary/dropwidget.h
+++ b/kontact/plugins/summary/dropwidget.h
@@ -32,7 +32,7 @@ class DropWidget : public QWidget
     DropWidget( TQWidget *parent, const char *name = 0 );
 
   signals:
-    void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment );
+    void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment );
 
   protected:
     virtual void dragEnterEvent( TQDragEnterEvent* );
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index f21a2bb35..22d27f47d 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -93,15 +93,15 @@ PluginView::~PluginView()
 KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
   : KCModule( parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Here you can select which summary plugins to have visible in your summary view." ), this );
-  layout->addWidget( label );
+  tqlayout->addWidget( label );
 
   mPluginView = new PluginView( this );
-  layout->addWidget( mPluginView );
+  tqlayout->addWidget( mPluginView );
 
-  layout->setStretchFactor( mPluginView, 1 );
+  tqlayout->setStretchFactor( mPluginView, 1 );
 
   connect( mPluginView, TQT_SIGNAL( clicked( TQListViewItem* ) ),
            this, TQT_SLOT( itemClicked( TQListViewItem* ) ) );
@@ -119,7 +119,7 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
 void KCMKontactSummary::load()
 {
   KTrader::OfferList offers = KTrader::self()->query(
-      TQString::fromLatin1( "Kontact/Plugin" ),
+      TQString::tqfromLatin1( "Kontact/Plugin" ),
       TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
 
   TQStringList activeSummaries;
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 0b22f853b..e7c161ea1 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -58,7 +58,7 @@
 #include "summaryview_part.h"
 
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 
 namespace Kontact
 {
@@ -80,7 +80,7 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*,
   connect( kapp, TQT_SIGNAL( kdisplayPaletteChanged() ), TQT_SLOT( slotAdjustPalette() ) );
   slotAdjustPalette();
 
-  setDate( TQDate::currentDate() );
+  setDate( TQDate::tqcurrentDate() );
   connect( mCore, TQT_SIGNAL( dayChanged( const TQDate& ) ),
            TQT_SLOT( setDate( const TQDate& ) ) );
 
@@ -137,7 +137,7 @@ void SummaryViewPart::updateWidgets()
   const KPIM::Identity &id = idm.defaultIdentity();
 
   TQString currentUser = i18n( "Summary for %1" ).arg( id.fullName() );
-  mUsernameLabel->setText( TQString::fromLatin1( "<b>%1</b>" ).arg( currentUser ) );
+  mUsernameLabel->setText( TQString::tqfromLatin1( "<b>%1</b>" ).arg( currentUser ) );
 
   mSummaries.clear();
 
@@ -177,12 +177,12 @@ void SummaryViewPart::updateWidgets()
         mSummaries.insert( plugin->identifier(), summary );
 
         connect( summary, TQT_SIGNAL( message( const TQString& ) ),
-                 BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
+                 BroadcasStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
         connect( summary, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
                  this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
 
-        if ( !mLeftColumnSummaries.contains( plugin->identifier() ) &&
-             !mRightColumnSummaries.contains( plugin->identifier() ) ) {
+        if ( !mLeftColumnSummaries.tqcontains( plugin->identifier() ) &&
+             !mRightColumnSummaries.tqcontains( plugin->identifier() ) ) {
           mLeftColumnSummaries.append( plugin->identifier() );
         }
 
@@ -214,11 +214,11 @@ void SummaryViewPart::updateWidgets()
   TQFrame *vline = new TQFrame( mFrame );
   vline->setFrameStyle( TQFrame::VLine | TQFrame::Plain );
 
-  TQHBoxLayout *layout = new TQHBoxLayout( mFrame );
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( mFrame );
 
-  mLeftColumn = new TQVBoxLayout( layout, KDialog::spacingHint() );
-  layout->addWidget( vline );
-  mRightColumn = new TQVBoxLayout( layout, KDialog::spacingHint()  );
+  mLeftColumn = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
+  tqlayout->addWidget( vline );
+  mRightColumn = new TQVBoxLayout( tqlayout, KDialog::spacingHint()  );
 
 
   TQStringList::Iterator strIt;
@@ -241,7 +241,7 @@ void SummaryViewPart::updateWidgets()
   mRightColumn->addStretch();
 }
 
-void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment )
+void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment )
 {
   if ( target == widget )
     return;
@@ -266,17 +266,17 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
   if ( target == mFrame ) {
     int pos = 0;
 
-    if ( alignment & Qt::AlignTop )
+    if ( tqalignment & Qt::AlignTop )
       pos = 0;
 
-    if ( alignment & Qt::AlignLeft ) {
-      if ( alignment & Qt::AlignBottom )
+    if ( tqalignment & Qt::AlignLeft ) {
+      if ( tqalignment & Qt::AlignBottom )
         pos = mLeftColumnSummaries.count();
 
       mLeftColumn->insertWidget( pos, widget );
       mLeftColumnSummaries.insert( mLeftColumnSummaries.at( pos ), widgetName( widget ) );
     } else {
-      if ( alignment & Qt::AlignBottom )
+      if ( tqalignment & Qt::AlignBottom )
         pos = mRightColumnSummaries.count();
 
       mRightColumn->insertWidget( pos, widget );
@@ -288,7 +288,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
 
   int targetPos = mLeftColumn->findWidget( target );
   if ( targetPos != -1 ) {
-    if ( alignment == Qt::AlignBottom )
+    if ( tqalignment == Qt::AlignBottom )
       targetPos++;
 
     mLeftColumn->insertWidget( targetPos, widget );
@@ -296,7 +296,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
   } else {
     targetPos = mRightColumn->findWidget( target );
 
-    if ( alignment == Qt::AlignBottom )
+    if ( tqalignment == Qt::AlignBottom )
       targetPos++;
 
     mRightColumn->insertWidget( targetPos, widget );
@@ -346,7 +346,7 @@ TQStringList SummaryViewPart::configModules() const
     TQStringList cm = it.data()->configModules();
     TQStringList::ConstIterator strIt;
     for ( strIt = cm.begin(); strIt != cm.end(); ++strIt )
-      if ( !(*strIt).isEmpty() && !modules.contains( *strIt ) )
+      if ( !(*strIt).isEmpty() && !modules.tqcontains( *strIt ) )
         modules.append( *strIt );
   }
 
@@ -374,7 +374,7 @@ void SummaryViewPart::initGUI( Kontact::Core *core )
   mUsernameLabel = new TQLabel( mMainWidget );
   hbl->addWidget( mUsernameLabel );
   mDateLabel = new TQLabel( mMainWidget );
-  mDateLabel->setAlignment( AlignRight );
+  mDateLabel->tqsetAlignment( AlignRight );
   hbl->addWidget( mDateLabel );
 
   TQFrame *hline = new TQFrame( mMainWidget );
diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h
index 1e99f7369..38e68b153 100644
--- a/kontact/plugins/summary/summaryview_part.h
+++ b/kontact/plugins/summary/summaryview_part.h
@@ -75,7 +75,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart
   protected slots:
     void slotConfigure();
     void updateWidgets();
-    void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment );
+    void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment );
 
   private:
     void initGUI( Kontact::Core *core );