Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 16 insertions, 15 deletions

diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index ba11d9b5..3e757713 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqimage.h>
@@ -49,8 +49,8 @@
 
 #include "summarywidget.h"
 
-SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
-  : Kontact::Summary( parent, name ),
+SummaryWidget::SummaryWidget( TQWidget *tqparent, const char *name )
+  : Kontact::Summary( tqparent, name ),
     DCOPObject( "KPilotSummaryWidget" ),
     mDCOPSuccess( false ),
     mStartedDaemon( false ),
@@ -88,9 +88,9 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   mPilotDeviceLabel = new TQLabel( i18n( "Unknown" ), this );
   mLayout->addMultiCellWidget( mPilotDeviceLabel, row, row, 1, 3 );
 
-  // Status
+  // tqStatus
   row++;
-  mDaemonStatusTextLabel = new TQLabel( i18n( "<i>Status:</i>" ), this);
+  mDaemonStatusTextLabel = new TQLabel( i18n( "<i>tqStatus:</i>" ), this);
   mLayout->addWidget( mDaemonStatusTextLabel, row, 0 );
   mDaemonStatusLabel = new TQLabel( i18n( "No communication with the daemon possible" ), this );
   mLayout->addMultiCellWidget( mDaemonStatusLabel, row, row, 1, 3 );
@@ -101,7 +101,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   mConduitsTextLabel->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs );
   mLayout->addWidget( mConduitsTextLabel, row, 0 );
   mConduitsLabel = new TQLabel( i18n( "No information available" ), this );
-  mConduitsLabel->tqsetAlignment( mConduitsLabel->tqalignment() | Qt::WordBreak );
+  mConduitsLabel->tqsetAlignment( mConduitsLabel->tqalignment() | TQt::WordBreak );
   mLayout->addMultiCellWidget( mConduitsLabel, row, row, 1, 3 );
 
   // widgets shown if kpilotDaemon is not running
@@ -141,7 +141,7 @@ void SummaryWidget::receiveDaemonStatusDetails(TQDateTime lastSyncTime, TQString
 {
   mDCOPSuccess = true;
   mLastSyncTime = lastSyncTime;
-  mDaemonStatus = status;
+  mDaemontqStatus = status;
   mConduits = conduits;
   mSyncLog = logFileName;
   mUserName = userName;
@@ -154,7 +154,7 @@ void SummaryWidget::updateView()
 {
   if ( mDCOPSuccess ) {
     if ( mLastSyncTime.isValid() ) {
-      mSyncTimeLabel->setText( mLastSyncTime.toString(Qt::LocalDate) );
+      mSyncTimeLabel->setText( mLastSyncTime.toString(TQt::LocalDate) );
     } else {
       mSyncTimeLabel->setText( i18n( "No information available" ) );
     }
@@ -166,7 +166,7 @@ void SummaryWidget::updateView()
     }
     mPilotUserLabel->setText( mUserName.isEmpty() ? i18n( "unknown" ) : mUserName );
     mPilotDeviceLabel->setText( mPilotDevice.isEmpty() ? i18n( "unknown" ) : mPilotDevice );
-    mDaemonStatusLabel->setText( mDaemonStatus );
+    mDaemonStatusLabel->setText( mDaemontqStatus );
     mConduitsLabel->setText( mConduits.join( ", " ) );
   } else {
     mSyncTimeLabel->setText( i18n( "No information available (Daemon not running?)" ) );
@@ -194,7 +194,7 @@ void SummaryWidget::updateView()
 
 void SummaryWidget::showSyncLog( const TQString &filename )
 {
-  KDialogBase dlg( this, 0, true, TQString::null, KDialogBase::Ok, KDialogBase::Ok );
+  KDialogBase dlg( this, 0, true, TQString(), KDialogBase::Ok, KDialogBase::Ok );
   dlg.setCaption( i18n( "KPilot HotSync Log" ) );
 
   TQTextEdit *edit = new TQTextEdit( dlg.makeVBoxMainWidget() );
diff --git a/kontact/plugins/kpilot/summarywidget.h b/kontact/plugins/kpilot/summarywidget.h
index 09b3e77d..cfb87ae5 100644
--- a/kontact/plugins/kpilot/summarywidget.h
+++ b/kontact/plugins/kpilot/summarywidget.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef SUMMARYWIDGET_H
@@ -45,10 +45,11 @@ class KURLLabel;
 class SummaryWidget : public Kontact::Summary, public DCOPObject
 {
   Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
   public:
-    SummaryWidget( TQWidget *parent, const char *name = 0 );
+    SummaryWidget( TQWidget *tqparent, const char *name = 0 );
     virtual ~SummaryWidget();
 
     int summaryHeight() const { return 1; }
@@ -84,7 +85,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject
     TQGridLayout *mLayout;
 
     TQDateTime mLastSyncTime;
-    TQString mDaemonStatus;
+    TQString mDaemontqStatus;
     TQStringList mConduits;
     TQString mSyncLog;
     TQString mUserName;