Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

2 files changed, 9 insertions, 9 deletions

diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index 51539f598..46ec7fdfe 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -24,11 +24,11 @@
 
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqvbox.h>
 
 #include <dcopclient.h>
@@ -88,7 +88,7 @@ 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);
   mLayout->addWidget( mDaemonStatusTextLabel, row, 0 );
@@ -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() | TQt::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;
@@ -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?)" ) );
@@ -202,7 +202,7 @@ void SummaryWidget::showSyncLog( const TQString &filename )
 
   TQFile f(filename);
   if ( !f.open( IO_ReadOnly ) ) {
-    KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).arg( filename ) );
+    KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).tqarg( filename ) );
     return;
   }
 
diff --git a/kontact/plugins/kpilot/summarywidget.h b/kontact/plugins/kpilot/summarywidget.h
index 3e04ed88d..b1b60a053 100644
--- a/kontact/plugins/kpilot/summarywidget.h
+++ b/kontact/plugins/kpilot/summarywidget.h
@@ -85,7 +85,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject
     TQGridLayout *mLayout;
 
     TQDateTime mLastSyncTime;
-    TQString mDaemonStatus;
+    TQString mDaemontqStatus;
     TQStringList mConduits;
     TQString mSyncLog;
     TQString mUserName;