5 files changed, 14 insertions, 14 deletions
diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp
index acff34f12..085292309 100644
--- a/libkpimexchange/core/exchangeaccount.cpp
+++ b/libkpimexchange/core/exchangeaccount.cpp
@@ -21,7 +21,7 @@
 */
 
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqapplication.h>
 #include <tqdom.h>
 #include <tqwidgetlist.h>
@@ -89,8 +89,8 @@ TQString endecryptStr( const TQString &aStr )
 {
   TQString result;
   for (uint i = 0; i < aStr.length(); i++)
-    result += (aStr[i].tqunicode() < 0x20) ? aStr[i] :
-              TQChar(0x1001F - aStr[i].tqunicode());
+    result += (aStr[i].unicode() < 0x20) ? aStr[i] :
+              TQChar(0x1001F - aStr[i].unicode());
   return result;
 }
 
@@ -163,7 +163,7 @@ bool ExchangeAccount::authenticate( TQWidget *window )
 bool ExchangeAccount::authenticate()
 {
   long windowId;
-  TQWidgetList *widgets = TQApplication::tqtopLevelWidgets();
+  TQWidgetList *widgets = TQApplication::topLevelWidgets();
   if ( widgets->isEmpty() )
     windowId = 0;
   else
@@ -249,7 +249,7 @@ void ExchangeAccount::slotFolderResult( KIO::Job *job )
   if ( job->error() ) {
     kdError() << "Error: Cannot get well-know folder names; " << job->error() << endl;
     TQString text = i18n("ExchangeAccount\nError accessing '%1': %2")
-                   .tqarg( baseURL().prettyURL() ).tqarg( job->errorString() );
+                   .arg( baseURL().prettyURL() ).arg( job->errorString() );
     KMessageBox::error( 0, text );
     mError = true;
     return;
diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp
index e5a09b530..d51a7a43e 100644
--- a/libkpimexchange/core/exchangedownload.cpp
+++ b/libkpimexchange/core/exchangedownload.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqdatastream.h>
 #include <tqcstring.h>
 #include <tqregexp.h>
@@ -182,8 +182,8 @@ void ExchangeDownload::slotSearchResult( KIO::Job *job )
     kdError() << "ExchangeDownload::slotSearchResult() error: "
               << job->error() << endl;
     TQString text = i18n("ExchangeDownload\nError accessing '%1': %2")
-                   .tqarg( mAccount->calendarURL().prettyURL() )
-                   .tqarg( job->errorString() );
+                   .arg( mAccount->calendarURL().prettyURL() )
+                   .arg( job->errorString() );
     KMessageBox::error( 0, text );
     finishUp( ExchangeClient::CommunicationError, job );
     return;
@@ -231,7 +231,7 @@ void ExchangeDownload::handleAppointments( const TQDomDocument &response,
        item = item.nextSibling().toElement() ) {
     //kdDebug() << "Current item:" << item.tagName() << endl;
     TQDomNodeList propstats = item.elementsByTagNameNS( "DAV:", "propstat" );
-    // kdDebug() << "Item has " << propstats.count() << " propstat tqchildren" << endl;
+    // kdDebug() << "Item has " << propstats.count() << " propstat children" << endl;
     for( uint i=0; i < propstats.count(); i++ ) {
       TQDomElement propstat = propstats.item(i).toElement();
       TQDomElement prop = propstat.namedItem( "prop" ).toElement();
diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp
index c9f8c627a..c932436af 100644
--- a/libkpimexchange/core/exchangemonitor.cpp
+++ b/libkpimexchange/core/exchangemonitor.cpp
@@ -22,7 +22,7 @@
 #include <tqregexp.h>
 #include <tqsocketdevice.h>
 #include <tqsocketnotifier.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/libkpimexchange/core/exchangeprogress.cpp b/libkpimexchange/core/exchangeprogress.cpp
index 911e8f59d..502d72fe1 100644
--- a/libkpimexchange/core/exchangeprogress.cpp
+++ b/libkpimexchange/core/exchangeprogress.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 
@@ -65,7 +65,7 @@ void ExchangeProgress::slotTransferFinished()
 void ExchangeProgress::updateLabel()
 {
   progressBar()->setValue( m_finished );
-  TQString str = i18n( "Downloading, %1 of %2" ).tqarg( m_finished ).tqarg( m_total );
+  TQString str = i18n( "Downloading, %1 of %2" ).arg( m_finished ).arg( m_total );
   setLabel( str );
 }
 
diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp
index 4317a2565..d317976d0 100644
--- a/libkpimexchange/core/exchangeupload.cpp
+++ b/libkpimexchange/core/exchangeupload.cpp
@@ -253,9 +253,9 @@ void ExchangeUpload::startUpload( const KURL &url )
   if ( tzOffset == 0 ) 
     offsetString = "Z";
   else if ( tzOffset > 0 ) 
-    offsetString = TQString( "+%1:%2" ).tqarg(tzOffset/60, 2).tqarg( tzOffset%60, 2 );
+    offsetString = TQString( "+%1:%2" ).arg(tzOffset/60, 2).arg( tzOffset%60, 2 );
   else
-    offsetString = TQString( "-%1:%2" ).tqarg((-tzOffset)/60, 2).tqarg( (-tzOffset)%60, 2 );
+    offsetString = TQString( "-%1:%2" ).arg((-tzOffset)/60, 2).arg( (-tzOffset)%60, 2 );
   offsetString = offsetString.replace( TQRegExp(" "), "0" );
 
   kdDebug() << "Timezone offset: " << tzOffset << " : " << offsetString << endl;