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

4 files changed, 21 insertions, 20 deletions

diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp
index 1d74c5709..8c84977a8 100644
--- a/kresources/scalix/kcal/resourcescalix.cpp
+++ b/kresources/scalix/kcal/resourcescalix.cpp
@@ -21,11 +21,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.
@@ -249,7 +249,7 @@ void ResourceScalix::removeIncidences( const TQCString& incidenceType )
     // better call event(uid), todo(uid) etc. directly.
 
     // A  faster but hackish way would probably be to check the type of the resource,
-    // like mEventSubResources.find( it.data().resource() ) != mEventSubResources.end() ?
+    // like mEventSubResources.tqfind( it.data().resource() ) != mEventSubResources.end() ?
     const TQString& uid = it.key();
     if ( incidenceType == "Event" && mCalendar.event( uid ) )
       mUidMap.remove( it );
@@ -268,7 +268,7 @@ bool ResourceScalix::doSave()
 void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* incidencebase )
 {
   if ( incidencebase->isReadOnly() ) return; // Should not happen (TM)
-  incidencebase->setSyncStatus( KCal::Event::SYNCMOD );
+  incidencebase->setSynctqStatus( KCal::Event::SYNCMOD );
   incidencebase->setLastModified( TQDateTime::tqcurrentDateTime() );
   // we should probably update the revision number here,
   // or internally in the Event itself when certain things change.
@@ -482,7 +482,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _
       }
     }
     /* Check if there are updates for this uid pending and if so process them. */
-    if ( KCal::IncidenceBase *update = mPendingUpdates.find( uid ) ) {
+    if ( KCal::IncidenceBase *update = mPendingUpdates.tqfind( uid ) ) {
       mSilent = false; // we do want to tell KMail
       mPendingUpdates.remove( uid );
       incidenceUpdated( update );
@@ -507,7 +507,7 @@ bool ResourceScalix::addEvent( KCal::Event* event )
   if ( mUidMap.tqcontains( event->uid() ) )
     return true; //noop
   else
-    return addIncidence( event, TQString::null, 0 );
+    return addIncidence( event, TQString(), 0 );
 }
 
 bool ResourceScalix::addEvent( KCal::Event *event, const TQString &subresource )
@@ -575,7 +575,7 @@ bool ResourceScalix::addTodo( KCal::Todo* todo )
   if ( mUidMap.tqcontains( todo->uid() ) )
     return true; //noop
   else
-    return addIncidence( todo, TQString::null, 0 );
+    return addIncidence( todo, TQString(), 0 );
 }
 
 bool ResourceScalix::addTodo( KCal::Todo *todo, const TQString &subresource )
@@ -609,7 +609,7 @@ bool ResourceScalix::addJournal( KCal::Journal* journal )
   if ( mUidMap.tqcontains( journal->uid() ) )
     return true; //noop
   else
-    return addIncidence( journal, TQString::null, 0 );
+    return addIncidence( journal, TQString(), 0 );
 }
 
 bool ResourceScalix::addJournal( KCal::Journal *journal, const TQString &subresource )
@@ -693,7 +693,7 @@ void ResourceScalix::fromKMailDelIncidence( const TQString& type,
     mUidsPendingDeletion.remove( uid );
   } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // tqreplace it, so let's just sit tight.
+    // replace it, so let's just sit tight.
   } else {
     // We didn't trigger this, so KMail did, remove the reference to the uid
     KCal::Incidence* incidence = mCalendar.incidence( uid );
@@ -804,7 +804,7 @@ TQStringList ResourceScalix::subresources() const
          + mJournalSubResources.keys() );
 }
 
-const QString
+const TQString
 ResourceScalix::labelForSubresource( const TQString& subresource ) const
 {
   if ( mEventSubResources.tqcontains( subresource ) )
diff --git a/kresources/scalix/kcal/resourcescalix.h b/kresources/scalix/kcal/resourcescalix.h
index e00909c7e..67ecac365 100644
--- a/kresources/scalix/kcal/resourcescalix.h
+++ b/kresources/scalix/kcal/resourcescalix.h
@@ -21,11 +21,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.
@@ -51,6 +51,7 @@ class KDE_EXPORT ResourceScalix : public KCal::ResourceCalendar,
                       public Scalix::ResourceScalixBase
 {
   Q_OBJECT
+  TQ_OBJECT
     friend struct TemporarySilencer;
 
 public:
@@ -194,11 +195,11 @@ private:
   ICalFormat mFormat;
 
   /**
-    This map tqcontains the association between a new added incidence
+    This map contains the association between a new added incidence
     and the subresource it belongs to.
     That's needed to return the correct mapping in subresourceIdentifier().
 
-    We can't trust on mUidMap here, because it tqcontains only non-pending uids.
+    We can't trust on mUidMap here, because it contains only non-pending uids.
    */
   TQMap<TQString, TQString> mNewIncidencesMap;
   int mProgressDialogIncidenceLimit;
diff --git a/kresources/scalix/kcal/resourcescalix_plugin.cpp b/kresources/scalix/kcal/resourcescalix_plugin.cpp
index a36f5bf2c..728dc280d 100644
--- a/kresources/scalix/kcal/resourcescalix_plugin.cpp
+++ b/kresources/scalix/kcal/resourcescalix_plugin.cpp
@@ -21,11 +21,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/scalix/kcal/scalix.desktop b/kresources/scalix/kcal/scalix.desktop
index 1c468cca4..2d87bfcbe 100644
--- a/kresources/scalix/kcal/scalix.desktop
+++ b/kresources/scalix/kcal/scalix.desktop
@@ -17,7 +17,7 @@ Name[nl]=Agenda op Scalix-server via KMail
 Name[pl]=Kalendarz na serwerze Scalix za pośrednictwem KMaila
 Name[pt_BR]=Calendário em Servidor Scalix via KMail
 Name[ru]=Календарь на сервере Scalix через KMail
-Name[sk]=Kalendár na Scalix serveri pomocou KMail
+Name[sk]=Kalendár na Scalix serveri potqmocou KMail
 Name[sr]=Календар на Scalix серверу преко KMail-а
 Name[sr@Latn]=Kalendar na Scalix serveru preko KMail-a
 Name[sv]=Kalender på Scalix-server via Kmail