1 files changed, 23 insertions, 23 deletions

diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h
index b07ba7434..59b2d1c74 100644
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@@ -33,7 +33,7 @@
 
 #include <libkdepim/configmanager.h>
 
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
 #include <dcopobject.h>
 #include <kdepimmacros.h>
 
@@ -65,12 +65,12 @@ public:
    * This means in particular that if there is no identity configured,
    * the default identity created here will not be saved.
    */
-  IdentityManager( bool readonly = false, QObject * parent=0, const char * name=0 );
+  IdentityManager( bool readonly = false, TQObject * parent=0, const char * name=0 );
   virtual ~IdentityManager();
 
 public:
-  typedef QValueList<Identity>::Iterator Iterator;
-  typedef QValueList<Identity>::ConstIterator ConstIterator;
+  typedef TQValueList<Identity>::Iterator Iterator;
+  typedef TQValueList<Identity>::ConstIterator ConstIterator;
 
   /** Commit changes to disk and emit changed() if necessary. */
   void commit();
@@ -81,14 +81,14 @@ public:
   bool hasPendingChanges() const;
 
   /** @return the list of identities */
-  QStringList identities() const;
+  TQStringList identities() const;
 
   /** Convenience method.
 
       @return the list of (shadow) identities, ie. the ones currently
       under configuration.
   */
-  QStringList shadowIdentities() const;
+  TQStringList shadowIdentities() const;
 
   /** Sort the identities by name (the default is always first). This
       operates on the @em shadow list, so you need to @ref commit for
@@ -99,19 +99,19 @@ public:
   /** @return an identity whose address matches any in @p addresses
       or @ref Identity::null if no such identity exists.
   **/
-  const Identity & identityForAddress( const QString & addresses ) const;
+  const Identity & identityForAddress( const TQString & addresses ) const;
 
   /** @return true if @p addressList contains any of our addresses,
       false otherwise.
       @see #identityForAddress
   **/
-  bool thatIsMe( const QString & addressList ) const;
+  bool thatIsMe( const TQString & addressList ) const;
 
   /** @deprecated
       @return the identity named @p identityName or @ref
       Identity::null if not found.
   **/
-  const Identity & identityForName( const QString & identityName ) const;
+  const Identity & identityForName( const TQString & identityName ) const;
 
   /** @return the identity with Unique Object Identifier (UOID) @p
       uoid or @ref Identity::null if not found.
@@ -124,7 +124,7 @@ public:
       @return the identity named @p identityName or the default
       identity if not found.
   **/
-  const Identity & identityForNameOrDefault( const QString & identityName ) const;
+  const Identity & identityForNameOrDefault( const TQString & identityName ) const;
 
   /** Convenience menthod.
 
@@ -142,7 +142,7 @@ public:
 
       @return false if an identity named @p identityName was not found
   **/
-  bool setAsDefault( const QString & identityName );
+  bool setAsDefault( const TQString & identityName );
 
   /** Sets the identity with Unique Object Identifier (UOID) @p uoid
       to be new the default identity. As usual, use @ref commit to
@@ -156,7 +156,7 @@ public:
       reference to the identity that can be modified. To let others
       see this change, use @ref commit.
   **/
-  Identity & modifyIdentityForName( const QString & identityName );
+  Identity & modifyIdentityForName( const TQString & identityName );
 
   /** @return the identity with Unique Object Identifier (UOID) @p uoid.
       This method returns a reference to the identity that can
@@ -165,7 +165,7 @@ public:
   Identity & modifyIdentityForUoid( uint uoid );
 
   /** Removes the identity with name @p identityName */
-  bool removeIdentity( const QString & identityName );
+  bool removeIdentity( const TQString & identityName );
 
   ConstIterator begin() const;
   ConstIterator end() const;
@@ -174,13 +174,13 @@ public:
   Iterator modifyBegin();
   Iterator modifyEnd();
 
-  Identity & newFromScratch( const QString & name );
-  Identity & newFromControlCenter( const QString & name );
+  Identity & newFromScratch( const TQString & name );
+  Identity & newFromControlCenter( const TQString & name );
   Identity & newFromExisting( const Identity & other,
-				const QString & name=QString::null );
+				const TQString & name=TQString::null );
 
   /** Returns the list of all email addresses (only name@host) from all identities */
-  QStringList allEmails() const;
+  TQStringList allEmails() const;
 
 signals:
   /** Emitted whenever the identity with Unique Object Identifier
@@ -205,28 +205,28 @@ protected:
    * The parameters are filled with some default values from KUser,
    * but reimplementations of this method can give them another value.
    */
-  virtual void createDefaultIdentity( QString& /*fullName*/, QString& /*emailAddress*/ ) {}
+  virtual void createDefaultIdentity( TQString& /*fullName*/, TQString& /*emailAddress*/ ) {}
 
 protected slots:
   void slotRollback() { rollback(); };
 
 protected:
   /** The list that will be seen by everyone */
-  QValueList<Identity> mIdentities;
+  TQValueList<Identity> mIdentities;
   /** The list that will be seen by the config dialog */
-  QValueList<Identity> mShadowIdentities;
+  TQValueList<Identity> mShadowIdentities;
 
 //k_dcop_signals:
-//  void identitiesChanged( QCString appId, QCString objId );
+//  void identitiesChanged( TQCString appId, TQCString objId );
 
 k_dcop:
   // Connected to the DCOP signal
-  void slotIdentitiesChanged( QCString appId, QCString objId );
+  void slotIdentitiesChanged( TQCString appId, TQCString objId );
 
 private:
   void writeConfig() const;
   void readConfig(KConfigBase* config);
-  QStringList groupList(KConfigBase* config) const;
+  TQStringList groupList(KConfigBase* config) const;
   void createDefaultIdentity();
 
   // returns a new Unique Object Identifier