Changeset 6417 for trunk/licq/include/licq_user.h

Timestamp:

07/04/08 05:44:34 (5 months ago)

Author:

flynd

Message:

Marked uin functions in licq_user.h as deprecated.

Files:

• trunk/licq/include/licq_user.h (modified) (12 diffs)

trunk/licq/include/licq_user.h

@@ -431 +431 @@
 {
 public:
-  ICQUser(unsigned long id, char *filename);
-  ICQUser(unsigned long id);
   ICQUser(const char *id, unsigned long ppid, char *filename);
   ICQUser(const char *id, unsigned long ppid, bool bTempUser = false);
@@ -595 +593 @@
   bool EnableSave()                     { return m_bEnableSave; }
   bool ShowAwayMsg()                    { return m_bShowAwayMsg; }
-  unsigned long Uin()                   { return m_nUin; }
-  char *UinString()                     { return m_szUinString; }
   unsigned short Sequence(bool = false);
   char Mode()                           { return m_nMode; }
@@ -924 +920 @@
   void Unlock();
 
+  // Deprecated functions, to be removed
+  LICQ_DEPRECATED ICQUser(unsigned long id, char *filename);
+  LICQ_DEPRECATED ICQUser(unsigned long id);
+  LICQ_DEPRECATED unsigned long Uin() const;
+  LICQ_DEPRECATED const char* UinString() const { return m_szId; }
+
 protected:
   ICQUser() { /* ICQOwner inherited constructor - does nothing */ }
@@ -937 +939 @@
   void LoadPictureInfo();
   void LoadLicqInfo();
-  void Init(unsigned long nUin);
   void Init(const char *, unsigned long);
   bool LoadInfo();
@@ -956 +957 @@
   void SetIdleSince(time_t t)       { m_nIdleSince = t; }
   void SetRegisteredTime(time_t t)  { m_nRegisteredTime = t; }
+
+  // Deprecated functions, to be removed
+  LICQ_DEPRECATED void Init(unsigned long nUin);
 
   CIniFile m_fConf;
@@ -973 +977 @@
   unsigned short m_nPort, m_nLocalPort, m_nConnectionVersion;
   unsigned short m_nTyping;
-  unsigned long m_nUin,
-                m_nStatus;
+  unsigned long m_nStatus;
   UserGroupList myGroups;               /**< List of user groups */
   unsigned long mySystemGroups;         /**< Bitmask for system groups */
@@ -986 +989 @@
   char *m_szCustomAutoResponse;
   char *m_szId;
-  char m_szUinString[13];
   bool m_bOnlineNotify,
        m_bSendIntIp,
@@ -1105 +1107 @@
 {
 public:
-  ICQOwner();
   ICQOwner(const char *, unsigned long);
   virtual ~ICQOwner();
@@ -1117 +1118 @@
   void SetHideIp(bool b)       {  m_bHideIp = b; SaveLicqInfo(); }
   void SetSavePassword(bool b) {  m_bSavePassword = b; SaveLicqInfo(); }
-  void SetUin(unsigned long n) { m_nUin = n; SaveLicqInfo(); }
   void SetId(const char *s)    { SetString(&m_szId, s); SaveLicqInfo(); }
   void SetRandomChatGroup(unsigned long n)  { m_nRandomChatGroup = n; SaveLicqInfo(); }
@@ -1125 +1125 @@
   unsigned long RandomChatGroup() { return m_nRandomChatGroup; }
   unsigned long AddStatusFlags(unsigned long nStatus);
+
+  // Deprecated functions, to be removed
+  LICQ_DEPRECATED void SetUin(unsigned long n);
 
   // Server Side List functions
@@ -1292 +1295 @@
 
   // ICQ Protocol only (from original Licq)
-  unsigned long AddUser(ICQUser *);
-  void RemoveUser(unsigned long);
-  ICQUser *FetchUser(unsigned long, unsigned short);
+  void AddUser(ICQUser *);
   void DropUser(ICQUser *);
-  bool IsOnList(unsigned long nUin);
+
+  // Deprecated user functions, to be removed
+  LICQ_DEPRECATED ICQUser *FetchUser(unsigned long, unsigned short);
+  LICQ_DEPRECATED void RemoveUser(unsigned long);
+  LICQ_DEPRECATED bool IsOnList(unsigned long nUin);
 
   // Deprecated owner functions, to be removed
@@ -1483 +1488 @@
 
   // Deprecated group manipulation functions
-  void AddUserToGroup(unsigned long _nUin, unsigned short _nGroup);
-  void RemoveUserFromGroup(unsigned long _nUin, unsigned short _nGroup);
+  LICQ_DEPRECATED void AddUserToGroup(unsigned long _nUin, unsigned short _nGroup);
+  LICQ_DEPRECATED void RemoveUserFromGroup(unsigned long _nUin, unsigned short _nGroup);
 
   /**