1 files changed, 45 insertions, 45 deletions

diff --git a/kresources/scalix/kcal/resourcescalix.h b/kresources/scalix/kcal/resourcescalix.h
index 0c845a6ce..223161b4b 100644
--- a/kresources/scalix/kcal/resourcescalix.h
+++ b/kresources/scalix/kcal/resourcescalix.h
@@ -34,7 +34,7 @@
 #ifndef KCAL_RESOURCESCALIX_H
 #define KCAL_RESOURCESCALIX_H
 
-#include <qtimer.h>
+#include <tqtimer.h>
 
 #include <kdepimmacros.h>
 #include <libkcal/calendarlocal.h>
@@ -71,63 +71,63 @@ public:
   // The libkcal functions. See the resource for descriptions
   bool addEvent( KCal::Event* anEvent );
   bool deleteEvent( KCal::Event* );
-  KCal::Event* event( const QString &UniqueStr );
+  KCal::Event* event( const TQString &UniqueStr );
   KCal::Event::List rawEvents( EventSortField sortField = EventSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
   KCal::Event::List rawEventsForDate(
-    const QDate& date,
+    const TQDate& date,
     EventSortField sortField=EventSortUnsorted,
     SortDirection sortDirection=SortDirectionAscending );
-  KCal::Event::List rawEventsForDate( const QDateTime& qdt );
-  KCal::Event::List rawEvents( const QDate& start, const QDate& end,
+  KCal::Event::List rawEventsForDate( const TQDateTime& qdt );
+  KCal::Event::List rawEvents( const TQDate& start, const TQDate& end,
                                bool inclusive = false );
 
   bool addTodo( KCal::Todo* todo );
   bool deleteTodo( KCal::Todo* );
-  KCal::Todo* todo( const QString& uid );
+  KCal::Todo* todo( const TQString& uid );
   KCal::Todo::List rawTodos( TodoSortField sortField = TodoSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
-  KCal::Todo::List rawTodosForDate( const QDate& date );
+  KCal::Todo::List rawTodosForDate( const TQDate& date );
 
   bool addJournal( KCal::Journal* );
   bool deleteJournal( KCal::Journal* );
-  KCal::Journal* journal( const QString& uid );
+  KCal::Journal* journal( const TQString& uid );
   KCal::Journal::List rawJournals( JournalSortField sortField = JournalSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
-  KCal::Journal::List rawJournalsForDate( const QDate &date );
+  KCal::Journal::List rawJournalsForDate( const TQDate &date );
 
-  KCal::Alarm::List alarms( const QDateTime& from, const QDateTime& to );
-  KCal::Alarm::List alarmsTo( const QDateTime& to );
+  KCal::Alarm::List alarms( const TQDateTime& from, const TQDateTime& to );
+  KCal::Alarm::List alarmsTo( const TQDateTime& to );
 
-  void setTimeZoneId( const QString& tzid );
+  void setTimeZoneId( const TQString& tzid );
 
   bool deleteIncidence( KCal::Incidence* i );
 
   /// The ResourceScalixBase methods called by KMail
-  bool fromKMailAddIncidence( const QString& type, const QString& subResource,
-                              Q_UINT32 sernum, int format, const QString& data );
-  void fromKMailDelIncidence( const QString& type, const QString& subResource,
-                              const QString& uid );
-  void fromKMailRefresh( const QString& type, const QString& subResource );
+  bool fromKMailAddIncidence( const TQString& type, const TQString& subResource,
+                              Q_UINT32 sernum, int format, const TQString& data );
+  void fromKMailDelIncidence( const TQString& type, const TQString& subResource,
+                              const TQString& uid );
+  void fromKMailRefresh( const TQString& type, const TQString& subResource );
 
   /// Listen to KMail changes in the amount of sub resources
-  void fromKMailAddSubresource( const QString& type, const QString& subResource,
-                                const QString& label, bool writable );
-  void fromKMailDelSubresource( const QString& type, const QString& subResource );
+  void fromKMailAddSubresource( const TQString& type, const TQString& subResource,
+                                const TQString& label, bool writable );
+  void fromKMailDelSubresource( const TQString& type, const TQString& subResource );
 
-  void fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
-                                 const QString& type,
-                                 const QString& folder );
+  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+                                 const TQString& type,
+                                 const TQString& folder );
 
   /** Return the list of subresources. */
-  QStringList subresources() const;
+  TQStringList subresources() const;
 
   /** Is this subresource active? */
-  bool subresourceActive( const QString& ) const;
+  bool subresourceActive( const TQString& ) const;
   /** (De)activate the subresource */
-  virtual void setSubresourceActive( const QString &, bool );
+  virtual void setSubresourceActive( const TQString &, bool );
 
   /** What is the label for this subresource? */
-  virtual const QString labelForSubresource( const QString& resource ) const;
+  virtual const TQString labelForSubresource( const TQString& resource ) const;
 
-  virtual QString subresourceIdentifier( Incidence *incidence );
+  virtual TQString subresourceIdentifier( Incidence *incidence );
 
   KABC::Lock* lock();
 
@@ -137,20 +137,20 @@ protected slots:
    void slotEmitResourceChanged();
 
 private:
-  void removeIncidences( const QCString& incidenceType );
-  void resolveConflict( KCal::Incidence*, const QString& subresource, Q_UINT32 sernum );
+  void removeIncidences( const TQCString& incidenceType );
+  void resolveConflict( KCal::Incidence*, const TQString& subresource, Q_UINT32 sernum );
 
-  void addIncidence( const char* mimetype, const QString& xml,
-                     const QString& subResource, Q_UINT32 sernum );
+  void addIncidence( const char* mimetype, const TQString& xml,
+                     const TQString& subResource, Q_UINT32 sernum );
 
-  bool addIncidence( KCal::Incidence* i, const QString& subresource,
+  bool addIncidence( KCal::Incidence* i, const TQString& subresource,
                      Q_UINT32 sernum );
 /*
-  void addEvent( const QString& xml, const QString& subresource,
+  void addEvent( const TQString& xml, const TQString& subresource,
                  Q_UINT32 sernum );
-  void addTodo( const QString& xml, const QString& subresource,
+  void addTodo( const TQString& xml, const TQString& subresource,
                 Q_UINT32 sernum );
-  void addJournal( const QString& xml, const QString& subresource,
+  void addJournal( const TQString& xml, const TQString& subresource,
                    Q_UINT32 sernum );
 */
 
@@ -165,18 +165,18 @@ private:
 
   bool openResource( KConfig& config, const char* contentType,
                      Scalix::ResourceMap& map );
-  void loadSubResourceConfig( KConfig& config, const QString& name,
-                              const QString& label, bool writable,
+  void loadSubResourceConfig( KConfig& config, const TQString& name,
+                              const TQString& label, bool writable,
                               Scalix::ResourceMap& subResource );
-  bool loadSubResource( const QString& subResource, const char* mimetype );
+  bool loadSubResource( const TQString& subResource, const char* mimetype );
 
-  QString configFile() const {
+  TQString configFile() const {
     return ResourceScalixBase::configFile( "kcal" );
   }
 
-  Scalix::ResourceMap* subResourceMap( const QString& contentsType );
+  Scalix::ResourceMap* subResourceMap( const TQString& contentsType );
 
-  bool sendKMailUpdate( KCal::IncidenceBase* incidence, const QString& _subresource,
+  bool sendKMailUpdate( KCal::IncidenceBase* incidence, const TQString& _subresource,
                         Q_UINT32 sernum );
 
 
@@ -186,8 +186,8 @@ private:
   Scalix::ResourceMap mEventSubResources, mTodoSubResources, mJournalSubResources;
 
   bool mOpen; // If the resource is open, this is true
-  QDict<KCal::IncidenceBase> mPendingUpdates;
-  QTimer mResourceChangedTimer;
+  TQDict<KCal::IncidenceBase> mPendingUpdates;
+  TQTimer mResourceChangedTimer;
   ICalFormat mFormat;
 
   /**
@@ -197,7 +197,7 @@ private:
 
     We can't trust on mUidMap here, because it contains only non-pending uids.
    */
-  QMap<QString, QString> mNewIncidencesMap;
+  TQMap<TQString, TQString> mNewIncidencesMap;
   int mProgressDialogIncidenceLimit;
 };