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

5 files changed, 51 insertions, 50 deletions

diff --git a/libkdenetwork/qgpgme/dataprovider.cpp b/libkdenetwork/qgpgme/dataprovider.cpp
index 3fe991d95..a37684d0d 100644
--- a/libkdenetwork/qgpgme/dataprovider.cpp
+++ b/libkdenetwork/qgpgme/dataprovider.cpp
@@ -1,20 +1,20 @@
 /* dataprovider.cpp
    Copyright (C) 2004 Klarälvdalens Datakonsult AB
 
-   This file is part of QGPGME.
+   This file is part of TQGPGME.
 
-   QGPGME is free software; you can redistribute it and/or modify it
+   TQGPGME is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   QGPGME is distributed in the hope that it will be useful, but
+   TQGPGME is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with QGPGME; if not, write to the Free Software Foundation,
+   along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
 
 // -*- c++ -*-
@@ -36,32 +36,32 @@ static bool resizeAndInit( TQByteArray & ba, size_t newSize ) {
   return ok;
 }
 
-QGpgME::QByteArrayDataProvider::QByteArrayDataProvider()
+QGpgME::TQByteArrayDataProvider::TQByteArrayDataProvider()
   : GpgME::DataProvider(), mOff( 0 ) {}
 
-QGpgME::QByteArrayDataProvider::QByteArrayDataProvider( const TQByteArray & initialData )
+QGpgME::TQByteArrayDataProvider::TQByteArrayDataProvider( const TQByteArray & initialData )
   : GpgME::DataProvider(), mArray( initialData ), mOff( 0 ) {}
 
-QGpgME::QByteArrayDataProvider::~QByteArrayDataProvider() {}
+QGpgME::TQByteArrayDataProvider::~TQByteArrayDataProvider() {}
 
-ssize_t QGpgME::QByteArrayDataProvider::read( void * buffer, size_t bufSize ) {
+ssize_t QGpgME::TQByteArrayDataProvider::read( void * buffer, size_t bufSize ) {
 #ifndef NDEBUG
-  //qDebug( "QGpgME::QByteArrayDataProvider::read( %p, %d )", buffer, bufSize );
+  //qDebug( "QGpgME::TQByteArrayDataProvider::read( %p, %d )", buffer, bufSize );
 #endif
   if ( bufSize == 0 )
     return 0;
   if ( mOff >= mArray.size() )
     return 0; // EOF
-  size_t amount = QMIN( bufSize, mArray.size() - mOff );
+  size_t amount = TQMIN( bufSize, mArray.size() - mOff );
   assert( amount > 0 );
   memcpy( buffer, mArray.data() + mOff, amount );
   mOff += amount;
   return amount;
 }
 
-ssize_t QGpgME::QByteArrayDataProvider::write( const void * buffer, size_t bufSize ) {
+ssize_t QGpgME::TQByteArrayDataProvider::write( const void * buffer, size_t bufSize ) {
 #ifndef NDEBUG
-  qDebug( "QGpgME::QByteArrayDataProvider::write( %p, %d )", buffer, bufSize );
+  qDebug( "QGpgME::TQByteArrayDataProvider::write( %p, %d )", buffer, bufSize );
 #endif
   if ( bufSize == 0 )
     return 0;
@@ -77,9 +77,9 @@ ssize_t QGpgME::QByteArrayDataProvider::write( const void * buffer, size_t bufSi
   return bufSize;
 }
 
-off_t QGpgME::QByteArrayDataProvider::seek( off_t offset, int whence ) {
+off_t QGpgME::TQByteArrayDataProvider::seek( off_t offset, int whence ) {
 #ifndef NDEBUG
-  qDebug( "QGpgME::QByteArrayDataProvider::seek( %d, %d )", int(offset), whence );
+  qDebug( "QGpgME::TQByteArrayDataProvider::seek( %d, %d )", int(offset), whence );
 #endif
   int newOffset = mOff;
   switch ( whence ) {
@@ -99,9 +99,9 @@ off_t QGpgME::QByteArrayDataProvider::seek( off_t offset, int whence ) {
   return mOff = newOffset;
 }
 
-void QGpgME::QByteArrayDataProvider::release() {
+void QGpgME::TQByteArrayDataProvider::release() {
 #ifndef NDEBUG
-  qDebug( "QGpgME::QByteArrayDataProvider::release()" );
+  qDebug( "QGpgME::TQByteArrayDataProvider::release()" );
 #endif
   mArray = TQByteArray();
 }
diff --git a/libkdenetwork/qgpgme/dataprovider.h b/libkdenetwork/qgpgme/dataprovider.h
index 52957afa5..6f1c9ca93 100644
--- a/libkdenetwork/qgpgme/dataprovider.h
+++ b/libkdenetwork/qgpgme/dataprovider.h
@@ -1,25 +1,25 @@
 /* dataprovider.h
    Copyright (C) 2004 Klarälvdalens Datakonsult AB
 
-   This file is part of QGPGME.
+   This file is part of TQGPGME.
  
-   QGPGME is free software; you can redistribute it and/or modify it
+   TQGPGME is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
  
-   QGPGME is distributed in the hope that it will be useful, but
+   TQGPGME is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with QGPGME; if not, write to the Free Software Foundation,
+   along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
 
 // -*- c++ -*-
-#ifndef __QGPGME_DATAPROVIDER_H__
-#define __QGPGME_DATAPROVIDER_H__
+#ifndef __TQGPGME_DATAPROVIDER_H__
+#define __TQGPGME_DATAPROVIDER_H__
 
 #include <gpgmepp/interfaces/dataprovider.h>
 
@@ -28,11 +28,11 @@
 
 namespace QGpgME {
 
-  class KDE_EXPORT QByteArrayDataProvider : public GpgME::DataProvider {
+  class KDE_EXPORT TQByteArrayDataProvider : public GpgME::DataProvider {
   public:
-    QByteArrayDataProvider();
-    QByteArrayDataProvider( const TQByteArray & initialData );
-    ~QByteArrayDataProvider();
+    TQByteArrayDataProvider();
+    TQByteArrayDataProvider( const TQByteArray & initialData );
+    ~TQByteArrayDataProvider();
 
     const TQByteArray & data() const { return mArray; }
 
@@ -57,6 +57,6 @@ namespace QGpgME {
 
 } // namespace QGpgME
 
-#endif // __QGPGME_EVENTLOOPINTERACTOR_H__
+#endif // __TQGPGME_EVENTLOOPINTERACTOR_H__
 
 
diff --git a/libkdenetwork/qgpgme/eventloopinteractor.cpp b/libkdenetwork/qgpgme/eventloopinteractor.cpp
index 8846bb2a5..a773860e1 100644
--- a/libkdenetwork/qgpgme/eventloopinteractor.cpp
+++ b/libkdenetwork/qgpgme/eventloopinteractor.cpp
@@ -1,20 +1,20 @@
 /* qeventloopinteractor.cpp
    Copyright (C) 2003 Klarälvdalens Datakonsult AB
 
-   This file is part of QGPGME.
+   This file is part of TQGPGME.
  
-   QGPGME is free software; you can redistribute it and/or modify it
+   TQGPGME is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
  
-   QGPGME is distributed in the hope that it will be useful, but
+   TQGPGME is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with QGPGME; if not, write to the Free Software Foundation,
+   along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
 
 // -*- c++ -*-
@@ -32,10 +32,10 @@
 
 using namespace GpgME;
 
-QGpgME::EventLoopInteractor::EventLoopInteractor( TQObject * parent, const char * name )
- : TQObject( parent, name ), GpgME::EventLoopInteractor()
+QGpgME::EventLoopInteractor::EventLoopInteractor( TQObject * tqparent, const char * name )
+ : TQObject( tqparent, name ), GpgME::EventLoopInteractor()
 {
-  if ( !parent )
+  if ( !tqparent )
     if ( tqApp ) {
       connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) );
       connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SIGNAL(aboutToDestroy()) );
diff --git a/libkdenetwork/qgpgme/eventloopinteractor.h b/libkdenetwork/qgpgme/eventloopinteractor.h
index 73d9a1778..e1d514f5c 100644
--- a/libkdenetwork/qgpgme/eventloopinteractor.h
+++ b/libkdenetwork/qgpgme/eventloopinteractor.h
@@ -1,25 +1,25 @@
 /* qeventloopinteractor.h
    Copyright (C) 2003 Klarälvdalens Datakonsult AB
 
-   This file is part of QGPGME.
+   This file is part of TQGPGME.
  
-   QGPGME is free software; you can redistribute it and/or modify it
+   TQGPGME is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
  
-   QGPGME is distributed in the hope that it will be useful, but
+   TQGPGME is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with QGPGME; if not, write to the Free Software Foundation,
+   along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
 
 // -*- c++ -*-
-#ifndef __QGPGME_EVENTLOOPINTERACTOR_H__
-#define __QGPGME_EVENTLOOPINTERACTOR_H__
+#ifndef __TQGPGME_EVENTLOOPINTERACTOR_H__
+#define __TQGPGME_EVENTLOOPINTERACTOR_H__
 
 #include <gpgmepp/eventloopinteractor.h>
 
@@ -37,8 +37,9 @@ namespace QGpgME {
 
   class KDE_EXPORT EventLoopInteractor : public TQObject, public GpgME::EventLoopInteractor {
     Q_OBJECT
+  TQ_OBJECT
   protected:
-    EventLoopInteractor( TQObject * parent, const char * name=0 );
+    EventLoopInteractor( TQObject * tqparent, const char * name=0 );
   public:
     virtual ~EventLoopInteractor();
 
@@ -84,6 +85,6 @@ namespace QGpgME {
 
 } // namespace QGpgME
 
-#endif // __QGPGME_EVENTLOOPINTERACTOR_H__
+#endif // __TQGPGME_EVENTLOOPINTERACTOR_H__
 
 
diff --git a/libkdenetwork/qgpgme/tests/dataprovidertest.cpp b/libkdenetwork/qgpgme/tests/dataprovidertest.cpp
index 2493c5860..675c85ea8 100644
--- a/libkdenetwork/qgpgme/tests/dataprovidertest.cpp
+++ b/libkdenetwork/qgpgme/tests/dataprovidertest.cpp
@@ -1,20 +1,20 @@
 /* tests/dataprovidertest.cpp
    Copyright (C) 2004 Klarälvdalens Datakonsult AB
 
-   This file is part of QGPGME's regression test suite.
+   This file is part of TQGPGME's regression test suite.
  
-   QGPGME is free software; you can redistribute it and/or modify it
+   TQGPGME is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
  
-   QGPGME is distributed in the hope that it will be useful, but
+   TQGPGME is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with QGPGME; if not, write to the Free Software Foundation,
+   along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
 
 // -*- c++ -*-
@@ -60,11 +60,11 @@ int main( int, char** ) {
 
   {
     //
-    // QByteArrayDataProvider
+    // TQByteArrayDataProvider
     //
 
     // writing:
-    QGpgME::QByteArrayDataProvider qba_dp;
+    QGpgME::TQByteArrayDataProvider qba_dp;
     Data data( &qba_dp );
 
     assertEqual( data.write( input, inputSize ), inputSize );
@@ -108,11 +108,11 @@ int main( int, char** ) {
 
   {
     //
-    // QByteArrayDataProvider with initial data:
+    // TQByteArrayDataProvider with initial data:
     //
     TQByteArray ba;
     ba.duplicate( input, inputSize );
-    QGpgME::QByteArrayDataProvider qba_dp( ba );
+    QGpgME::TQByteArrayDataProvider qba_dp( ba );
     Data data( &qba_dp );
 
     assertEqual( data.seek( 0, SEEK_END ), inputSize );