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

30 files changed, 73 insertions, 60 deletions

diff --git a/kresources/lib/addressbookadaptor.cpp b/kresources/lib/addressbookadaptor.cpp
index 65ca96290..80da39421 100644
--- a/kresources/lib/addressbookadaptor.cpp
+++ b/kresources/lib/addressbookadaptor.cpp
@@ -62,7 +62,7 @@ TQString AddressBookAdaptor::mimeType() const
 
 bool AddressBookAdaptor::localItemExists( const TQString &localId )
 {
-  KABC::Addressee a = mResource->tqfindByUid( localId );
+  KABC::Addressee a = mResource->findByUid( localId );
   return !a.isEmpty();
 }
 
@@ -85,7 +85,7 @@ bool AddressBookAdaptor::localItemHasChanged( const TQString &localId )
 
 void AddressBookAdaptor::deleteItem( const TQString &localId )
 {
-  KABC::Addressee a = mResource->tqfindByUid( localId );
+  KABC::Addressee a = mResource->findByUid( localId );
   if ( !a.isEmpty() ) {
     mResource->removeAddressee( a );
     mResource->clearChange( a.uid() );
diff --git a/kresources/lib/calendaradaptor.cpp b/kresources/lib/calendaradaptor.cpp
index 88685bdfe..9c6084b92 100644
--- a/kresources/lib/calendaradaptor.cpp
+++ b/kresources/lib/calendaradaptor.cpp
@@ -75,11 +75,11 @@ bool CalendarAdaptor::localItemHasChanged( const TQString &localId )
   if ( !i ) return false;
 
   if ( !mResource->deletedIncidences().isEmpty() &&
-      mResource->deletedIncidences().find( i )
+      mResource->deletedIncidences().tqfind( i )
    != mResource->deletedIncidences().end() )
     return true;
   if ( !mResource->changedIncidences().isEmpty() &&
-       mResource->changedIncidences().find( i )
+       mResource->changedIncidences().tqfind( i )
     != mResource->changedIncidences().end() )
     return true;
 
diff --git a/kresources/lib/calendaradaptor.h b/kresources/lib/calendaradaptor.h
index fddcfd7aa..b8df62f9d 100644
--- a/kresources/lib/calendaradaptor.h
+++ b/kresources/lib/calendaradaptor.h
@@ -52,6 +52,7 @@ class CalendarUploadItem : public KPIM::GroupwareUploadItem
 class KDE_EXPORT CalendarAdaptor : public KPIM::GroupwareDataAdaptor
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     CalendarAdaptor();
 
diff --git a/kresources/lib/davcalendaradaptor.cpp b/kresources/lib/davcalendaradaptor.cpp
index a950e405c..0bd64a838 100644
--- a/kresources/lib/davcalendaradaptor.cpp
+++ b/kresources/lib/davcalendaradaptor.cpp
@@ -30,7 +30,7 @@
 using namespace KCal;
 
 // TODO: This is exactly the same code as for the DavAddressBookAdaptor::interpretListFoldersJob!
-//       But as this emits a signal, it needs to be located inside a QObject
+//       But as this emits a signal, it needs to be located inside a TQObject
 void DavCalendarAdaptor::interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister */*folderLister*/ )
 {
   KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>( job );
diff --git a/kresources/lib/folderconfig.cpp b/kresources/lib/folderconfig.cpp
index 0a530361f..06d9f9fc2 100644
--- a/kresources/lib/folderconfig.cpp
+++ b/kresources/lib/folderconfig.cpp
@@ -41,8 +41,8 @@
 
 using namespace KPIM;
 
-FolderConfig::FolderConfig( TQWidget *parent )
-  : TQWidget( parent ), mFolderLister( 0 )
+FolderConfig::FolderConfig( TQWidget *tqparent )
+  : TQWidget( tqparent ), mFolderLister( 0 )
 {
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
   topLayout->addSpacing( KDialog::spacingHint() );
diff --git a/kresources/lib/folderconfig.h b/kresources/lib/folderconfig.h
index 4a6959a1d..538c1b478 100644
--- a/kresources/lib/folderconfig.h
+++ b/kresources/lib/folderconfig.h
@@ -35,11 +35,12 @@ namespace KPIM {
 
 class FolderLister;
 
-class KDE_EXPORT FolderConfig : public QWidget
+class KDE_EXPORT FolderConfig : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    FolderConfig( TQWidget *parent );
+    FolderConfig( TQWidget *tqparent );
     ~FolderConfig();
 
     void setFolderLister( FolderLister * );
diff --git a/kresources/lib/folderlister.cpp b/kresources/lib/folderlister.cpp
index a39b316a9..a0ef5f0e2 100644
--- a/kresources/lib/folderlister.cpp
+++ b/kresources/lib/folderlister.cpp
@@ -56,7 +56,7 @@ TQString FolderLister::writeDestinationId( KPIM::FolderLister::ContentType type
     return mWriteDestinationId[ KPIM::FolderLister::All ];
   } else if ( mWriteDestinationId.tqcontains( KPIM::FolderLister::Unknown ) ) {
     return mWriteDestinationId[ KPIM::FolderLister::Unknown ];
-  } else return TQString::null;
+  } else return TQString();
 }
 
 
@@ -151,7 +151,7 @@ void FolderLister::readConfig( KPIM::GroupwarePrefsBase *newprefs )
     for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) {
       e.type = (FolderLister::ContentType)( e.type | contentTypeFromString( *it ) );
     }
-    if ( active.find( e.id ) != active.end() ) e.active = true;
+    if ( active.tqfind( e.id ) != active.end() ) e.active = true;
     mFolders.append( e );
   }
 
@@ -198,7 +198,7 @@ void FolderLister::writeConfig( GroupwarePrefsBase *newprefs )
   #define writeDestination(type) \
     if ( mWriteDestinationId.tqcontains( type ) ) \
       defaultFolders << mWriteDestinationId[type]; \
-    else defaultFolders << TQString::null;
+    else defaultFolders << TQString();
   writeDestination( KPIM::FolderLister::Event );
   writeDestination( KPIM::FolderLister::Todo );
   writeDestination( KPIM::FolderLister::Journal );
@@ -230,8 +230,8 @@ void FolderLister::folderSubitemRetrieved( const KURL &url, bool isFolder )
     doRetrieveFolder( url );
   else {
     KURL u( url ) ;
-    u.setUser( TQString::null );
-    u.setPass( TQString::null );
+    u.setUser( TQString() );
+    u.setPass( TQString() );
     mProcessedPathes.append( url.path(-1) );
   }
 }
diff --git a/kresources/lib/folderlister.h b/kresources/lib/folderlister.h
index f2f19d10e..e2f55953c 100644
--- a/kresources/lib/folderlister.h
+++ b/kresources/lib/folderlister.h
@@ -45,9 +45,10 @@ class GroupwareDataAdaptor;
 class GroupwarePrefsBase;
 
 
-class KDE_EXPORT FolderLister : public QObject
+class KDE_EXPORT FolderLister : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     enum Type { AddressBook, Calendar };
     enum ContentType {
diff --git a/kresources/lib/folderlistview.cpp b/kresources/lib/folderlistview.cpp
index d0a11f434..23e115c0a 100644
--- a/kresources/lib/folderlistview.cpp
+++ b/kresources/lib/folderlistview.cpp
@@ -38,8 +38,8 @@ static const int BoxSize = 16;
 
 
 //BEGIN FolderListView
-FolderListView::FolderListView( TQWidget *parent, const TQValueList<Property> &types )
-    : KListView( parent )
+FolderListView::FolderListView( TQWidget *tqparent, const TQValueList<Property> &types )
+    : KListView( tqparent )
 {
   setEnabledTypes( types );
 
@@ -147,10 +147,10 @@ void FolderListView::slotPopupHandler( int z )
 void FolderListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& pos, int c)
 {
   if ( dynamic_cast<FolderListItem*>(i) ) {
-    if ( btn == Qt::RightButton ) {
+    if ( btn == TQt::RightButton ) {
       showPopupMenu( (FolderListItem*)i, /*mapToGlobal(*/pos/*)*/ );
     }
-    else if ( btn == Qt::LeftButton && c > 0 ) {
+    else if ( btn == TQt::LeftButton && c > 0 ) {
       // map pos to item/column and call FolderListItem::activate(col, pos)
       ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(i).top() ) );
 //     } else {
diff --git a/kresources/lib/folderlistview.h b/kresources/lib/folderlistview.h
index 627668305..e4d5a56de 100644
--- a/kresources/lib/folderlistview.h
+++ b/kresources/lib/folderlistview.h
@@ -38,6 +38,7 @@ class FolderListCaption;
 class FolderListView : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   friend class FolderListItem;
 
@@ -45,7 +46,7 @@ class FolderListView : public KListView
     /* mainly for readability */
     enum Property { FolderName, Event, Todo, Journal, Contact, All, Unknown, PROP_MAX };
     
-    FolderListView( TQWidget *parent, const TQValueList<Property> &types = TQValueList<Property>() );
+    FolderListView( TQWidget *tqparent, const TQValueList<Property> &types = TQValueList<Property>() );
     ~FolderListView() {};
 
     /* Display a popupmenu for item i at the specified global position, eventually with a title,
@@ -77,13 +78,13 @@ class FolderListView : public KListView
     TQListViewItem subclass to display/edit a folder on a groupware server. 
     Selection of default destinations will be done via radio items.
 */
-class FolderListItem : public QCheckListItem
+class FolderListItem : public TQCheckListItem
 {
   typedef TQCheckListItem super;
   public:
-    FolderListItem( FolderListItem *parent, const KPIM::FolderLister::Entry &folder )
-      : TQCheckListItem( parent, folder.name, TQCheckListItem::CheckBoxController ), 
-        mFolder( folder ), mFolderListView( parent?(parent->folderListView()):0 )
+    FolderListItem( FolderListItem *tqparent, const KPIM::FolderLister::Entry &folder )
+      : TQCheckListItem( tqparent, folder.name, TQCheckListItem::CheckBoxController ), 
+        mFolder( folder ), mFolderListView( tqparent?(tqparent->folderListView()):0 )
     {
       setOn( mFolder.active );
     }
diff --git a/kresources/lib/folderselectdialog.cpp b/kresources/lib/folderselectdialog.cpp
index 8703c4415..189506182 100644
--- a/kresources/lib/folderselectdialog.cpp
+++ b/kresources/lib/folderselectdialog.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/lib/folderselectdialog.h b/kresources/lib/folderselectdialog.h
index e5901239a..884b91328 100644
--- a/kresources/lib/folderselectdialog.h
+++ b/kresources/lib/folderselectdialog.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
diff --git a/kresources/lib/groupwaredataadaptor.cpp b/kresources/lib/groupwaredataadaptor.cpp
index 53b2ecdb4..88ca09c10 100644
--- a/kresources/lib/groupwaredataadaptor.cpp
+++ b/kresources/lib/groupwaredataadaptor.cpp
@@ -203,8 +203,8 @@ bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const TQString &/*
       if ( error ) {
         emit itemDeletionError( *it, err );
       } else {
-        // FIXME: Don't use TQString::null here
-        emit itemDeleted( TQString::null, *it );
+        // FIXME: Don't use TQString() here
+        emit itemDeleted( TQString(), *it );
       }
     }
     return true;
@@ -266,7 +266,7 @@ kdDebug()<<"GroupwareDataAdaptor::uidFromJob( "<<job<<")"<<endl;
     kdDebug()<<"  Contained: "<< mJobUIDMap[job] << endl;
     return mJobUIDMap[ job ];
   } else {
-    return TQString::null;
+    return TQString();
   }
 }
 
diff --git a/kresources/lib/groupwaredataadaptor.h b/kresources/lib/groupwaredataadaptor.h
index 95119354c..2216fa560 100644
--- a/kresources/lib/groupwaredataadaptor.h
+++ b/kresources/lib/groupwaredataadaptor.h
@@ -88,9 +88,10 @@ class KDE_EXPORT GroupwareUploadItem
 };
 
 
-class KDE_EXPORT GroupwareDataAdaptor : public QObject
+class KDE_EXPORT GroupwareDataAdaptor : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
   public:
     GroupwareDataAdaptor();
     virtual ~GroupwareDataAdaptor();
@@ -309,7 +310,7 @@ Q_OBJECT
     /** Return the default file name for a new item. */
     virtual TQString defaultNewItemName( GroupwareUploadItem * )
     {
-      return TQString::null; 
+      return TQString(); 
     }
     virtual TQString uidFromJob( KIO::Job *job ) const;
     virtual void setUidForJob( KIO::Job *job, const TQString &uid );
diff --git a/kresources/lib/groupwaredownloadjob.cpp b/kresources/lib/groupwaredownloadjob.cpp
index 85f9c9f34..5cf494b97 100644
--- a/kresources/lib/groupwaredownloadjob.cpp
+++ b/kresources/lib/groupwaredownloadjob.cpp
@@ -102,7 +102,7 @@ void GroupwareDownloadJob::listItems()
 
     kdDebug(5800) << "OpenGroupware::listIncidences(): " << url << endl;
 
-    mListItemsData = TQString::null;
+    mListItemsData = TQString();
     mListEventsJob = adaptor()->createListItemsJob( url );
 
     connect( mListEventsJob, TQT_SIGNAL( result( KIO::Job * ) ),
@@ -135,7 +135,7 @@ void GroupwareDownloadJob::slotListItemsResult( KIO::Job *job )
     adaptor()->interpretListItemsJob( job, mListItemsData );
   }
 
-  mListItemsData = TQString::null;
+  mListItemsData = TQString();
   mListEventsJob = 0;
 
   listItems();
@@ -170,7 +170,7 @@ void GroupwareDownloadJob::downloadItem()
     success();
   } else {
     if ( adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResBatchRequest ) {
-      mDownloadItemsData = TQString::null;
+      mDownloadItemsData = TQString();
       mDownloadJob = adaptor()->createDownloadJob( mItemsForDownload );
       mItemsDownloading = mItemsForDownload;
       mItemsForDownload.clear();
@@ -183,7 +183,7 @@ void GroupwareDownloadJob::downloadItem()
       mItemsForDownload.remove( it.key() );
  
       adaptor()->adaptDownloadUrl( href );
-      mDownloadItemsData = TQString::null;
+      mDownloadItemsData = TQString();
 
       mDownloadJob = adaptor()->createDownloadJob( href, ctype );
     }
@@ -211,7 +211,7 @@ void GroupwareDownloadJob::slotDownloadItemResult( KIO::Job *job )
     mProgress->incCompletedItems();
     mProgress->updateProgress();
   }
-  mDownloadItemsData = TQString::null;
+  mDownloadItemsData = TQString();
   mDownloadJob = 0;
 
   downloadItem();
diff --git a/kresources/lib/groupwaredownloadjob.h b/kresources/lib/groupwaredownloadjob.h
index a52413bd2..58f473ef9 100644
--- a/kresources/lib/groupwaredownloadjob.h
+++ b/kresources/lib/groupwaredownloadjob.h
@@ -42,6 +42,7 @@ class ProgressItem;
 class GroupwareDownloadJob : public GroupwareJob
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     GroupwareDownloadJob( GroupwareDataAdaptor *adaptor );
 
diff --git a/kresources/lib/groupwareresourcejob.cpp b/kresources/lib/groupwareresourcejob.cpp
index a0094f6a1..c1b23d16d 100644
--- a/kresources/lib/groupwareresourcejob.cpp
+++ b/kresources/lib/groupwareresourcejob.cpp
@@ -45,7 +45,7 @@ TQString GroupwareJob::errorString() const
 
 void GroupwareJob::success()
 {
-  mErrorString = TQString::null;
+  mErrorString = TQString();
   emit( result( this ) );
 }
 
diff --git a/kresources/lib/groupwareresourcejob.h b/kresources/lib/groupwareresourcejob.h
index 76cd2bbcd..5260b485a 100644
--- a/kresources/lib/groupwareresourcejob.h
+++ b/kresources/lib/groupwareresourcejob.h
@@ -35,9 +35,10 @@ class GroupwareDataAdaptor;
   This class provides a resource for accessing a Groupware kioslave-based
   calendar.
 */
-class GroupwareJob : public QObject
+class GroupwareJob : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     GroupwareJob( GroupwareDataAdaptor *adaptor );
 
diff --git a/kresources/lib/groupwareuploadjob.cpp b/kresources/lib/groupwareuploadjob.cpp
index e4d6cb131..cde428d03 100644
--- a/kresources/lib/groupwareuploadjob.cpp
+++ b/kresources/lib/groupwareuploadjob.cpp
@@ -101,7 +101,7 @@ kdDebug() << "Not using batch delete " << endl;
     }
 
     if ( mDeletionJob ) {
-      mDeletionJobData = TQString::null;
+      mDeletionJobData = TQString();
       connect( mDeletionJob, TQT_SIGNAL( result( KIO::Job* ) ),
                TQT_SLOT( slotDeletionJobResult( KIO::Job* ) ) );
 //       connect( mDeletionJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
@@ -158,7 +158,7 @@ kdDebug() << "Not using batch upload " << endl;
     }
 
     if ( mUploadJob ) {
-      mUploadJobData = TQString::null;
+      mUploadJobData = TQString();
       connect( mUploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
                TQT_SLOT( slotUploadJobResult( KIO::Job* ) ) );
       connect( mUploadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
@@ -216,7 +216,7 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " <
     }
 
     if ( mUploadJob ) {
-      mUploadNewJobData = TQString::null;
+      mUploadNewJobData = TQString();
       connect( mUploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
                TQT_SLOT( slotUploadNewJobResult( KIO::Job* ) ) );
       connect( mUploadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
diff --git a/kresources/lib/groupwareuploadjob.h b/kresources/lib/groupwareuploadjob.h
index 5edbca9b4..80816d153 100644
--- a/kresources/lib/groupwareuploadjob.h
+++ b/kresources/lib/groupwareuploadjob.h
@@ -47,6 +47,7 @@ class ProgressItem;
 class GroupwareUploadJob : public GroupwareJob
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     GroupwareUploadJob( GroupwareDataAdaptor *adaptor );
 
diff --git a/kresources/lib/kabc_resourcegroupwarebase.h b/kresources/lib/kabc_resourcegroupwarebase.h
index d7381a92f..b8d7fe71a 100644
--- a/kresources/lib/kabc_resourcegroupwarebase.h
+++ b/kresources/lib/kabc_resourcegroupwarebase.h
@@ -43,6 +43,7 @@ class AddressBookAdaptor;
 class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceGroupwareBase( const KConfig * );
diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
index 803037342..ba16ccae8 100644
--- a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
+++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
@@ -37,8 +37,8 @@
 
 using namespace KABC;
 
-ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent,  const char* name )
-  : KRES::ConfigWidget( parent, name )
+ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* tqparent,  const char* name )
+  : KRES::ConfigWidget( tqparent, name )
 {
   TQGridLayout *mainLayout = new TQGridLayout( this, 7, 2, 0, KDialog::spacingHint() );
 
diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.h b/kresources/lib/kabc_resourcegroupwarebaseconfig.h
index 68e8fc0af..59c99f486 100644
--- a/kresources/lib/kabc_resourcegroupwarebaseconfig.h
+++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.h
@@ -39,9 +39,10 @@ class ResourceGroupwareBase;
 class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ResourceGroupwareBaseConfig( TQWidget* parent = 0, const char* name = 0 );
+    ResourceGroupwareBaseConfig( TQWidget* tqparent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kresources/lib/kcal_cachesettingsdlg.cpp b/kresources/lib/kcal_cachesettingsdlg.cpp
index 808a16734..0d7e4248d 100644
--- a/kresources/lib/kcal_cachesettingsdlg.cpp
+++ b/kresources/lib/kcal_cachesettingsdlg.cpp
@@ -38,8 +38,8 @@
 
 using namespace KCal;
 
-CacheSettingsDialog::CacheSettingsDialog( TQWidget* parent, const char* name )
-    : KDialogBase( parent, name, true, i18n("Resource Cache Settings"), KDialogBase::Close )
+CacheSettingsDialog::CacheSettingsDialog( TQWidget* tqparent, const char* name )
+    : KDialogBase( tqparent, name, true, i18n("Resource Cache Settings"), KDialogBase::Close )
 {
   TQWidget *mainWidget = new TQWidget( this );
   setMainWidget( mainWidget );
diff --git a/kresources/lib/kcal_cachesettingsdlg.h b/kresources/lib/kcal_cachesettingsdlg.h
index e50b2cad4..07e8337f6 100644
--- a/kresources/lib/kcal_cachesettingsdlg.h
+++ b/kresources/lib/kcal_cachesettingsdlg.h
@@ -42,8 +42,9 @@ class ResourceCachedSaveConfig;
 class KDE_EXPORT CacheSettingsDialog : public KDialogBase
 { 
     Q_OBJECT
+  TQ_OBJECT
   public:
-    CacheSettingsDialog( TQWidget *parent = 0, const char *name = 0 );
+    CacheSettingsDialog( TQWidget *tqparent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/lib/kcal_resourcegroupwarebase.h b/kresources/lib/kcal_resourcegroupwarebase.h
index f0994a54e..ac2bc3303 100644
--- a/kresources/lib/kcal_resourcegroupwarebase.h
+++ b/kresources/lib/kcal_resourcegroupwarebase.h
@@ -52,6 +52,7 @@ class CalendarAdaptor;
 class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     ResourceGroupwareBase();
   
diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
index 9ae91a0d8..e3fc3f93e 100644
--- a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
+++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
@@ -42,9 +42,9 @@
 
 using namespace KCal;
 
-ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent,
+ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* tqparent,
                                                           const char* name )
-    : KRES::ConfigWidget( parent, name )
+    : KRES::ConfigWidget( tqparent, name )
 {
   resize( 245, 115 );
 
diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.h b/kresources/lib/kcal_resourcegroupwarebaseconfig.h
index 61e71b370..ee10fa5c1 100644
--- a/kresources/lib/kcal_resourcegroupwarebaseconfig.h
+++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.h
@@ -47,8 +47,9 @@ class CacheSettingsDialog;
 class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ResourceGroupwareBaseConfig( TQWidget *parent = 0, const char *name = 0 );
+    ResourceGroupwareBaseConfig( TQWidget *tqparent = 0, const char *name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/lib/webdavhandler.cpp b/kresources/lib/webdavhandler.cpp
index 180740662..0eb2144fa 100644
--- a/kresources/lib/webdavhandler.cpp
+++ b/kresources/lib/webdavhandler.cpp
@@ -120,7 +120,7 @@ bool WebdavHandler::extractDateTime( const TQDomElement &node, const TQString &e
 {
   TQDomElement element = node.namedItem( entry ).toElement();
   if ( !element.isNull() && !element.text().isEmpty() ) {
-    value = TQDateTime::fromString( element.text(), Qt::ISODate );
+    value = TQDateTime::fromString( element.text(), TQt::ISODate );
     return true;
   }
   return false;
@@ -154,10 +154,10 @@ bool WebdavHandler::extractStringList( const TQDomElement &node, const TQString
 
 const TQString WebdavHandler::getEtagFromHeaders( const TQString& headers )
 {
-  int start = headers.find( "etag:", 0, false );
+  int start = headers.tqfind( "etag:", 0, false );
   if ( start < 0 ) return TQString();
   start += 6;
-  return headers.mid( start, headers.find( "\n", start ) - start );
+  return headers.mid( start, headers.tqfind( "\n", start ) - start );
 }
 
 //TODO: should not call libical functions directly -- better to make
diff --git a/kresources/lib/webdavhandler.h b/kresources/lib/webdavhandler.h
index 668f99fdd..f978759f8 100644
--- a/kresources/lib/webdavhandler.h
+++ b/kresources/lib/webdavhandler.h
@@ -39,11 +39,11 @@ class KDE_EXPORT WebdavHandler
 
     static TQDomElement addElementNS( TQDomDocument &doc, TQDomNode &node,
                                      const TQString &ns, const TQString &tag,
-                                     const TQString &value = TQString::null );
+                                     const TQString &value = TQString() );
     static TQDomElement addElement( TQDomDocument &, TQDomNode &,
-                         const TQString &tag, const TQString &value = TQString::null );
+                         const TQString &tag, const TQString &value = TQString() );
     static TQDomElement addDavElement( TQDomDocument &, TQDomNode &,
-                         const TQString &tag, const TQString &value = TQString::null );
+                         const TQString &tag, const TQString &value = TQString() );
 
     static bool extractBool( const TQDomElement &node, 
                          const TQString &entry, bool &value );