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

Timestamp:

07/01/08 18:58:01 (5 months ago)

Author:

flynd

Message:

Marked old owner functions in user manager as deprecated. Updated daemon to use newer owner calls.

Files:

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

trunk/licq/include/licq_user.h

@@ -1255 +1255 @@
   ~CUserManager();
   bool Load();
-  void SetOwnerUin(unsigned long _nUin);
 
   // For protocol plugins
@@ -1264 +1263 @@
   ICQUser *FetchUser(const char *, unsigned long, unsigned short);
   ICQOwner *FetchOwner(unsigned long, unsigned short);
-  void DropOwner(unsigned long);
 
   /**
@@ -1287 +1285 @@
   ICQUser *FetchUser(unsigned long, unsigned short);
   void DropUser(ICQUser *);
-  ICQOwner *FetchOwner(unsigned short);
-  void DropOwner();
-  unsigned long OwnerUin()  {return m_nOwnerUin; }
   bool IsOnList(unsigned long nUin);
+
+  // Deprecated owner functions, to be removed
+  void SetOwnerUin(unsigned long _nUin) __attribute__ ((deprecated));
+  unsigned long OwnerUin() __attribute__ ((deprecated)) { return icqOwnerUin(); }
+  ICQOwner *FetchOwner(unsigned short) __attribute__ ((deprecated));
+  void DropOwner() __attribute__ ((deprecated));
+  void DropOwner(unsigned long) __attribute__ ((deprecated));
+
+  /**
+   * Convenience function to get icq owner as an unsigned long
+   * Only meant to be used internally for icq protocol functions
+   *
+   * @return Icq owner
+   */
+  unsigned long icqOwnerUin();
 
   /**
@@ -1502 +1512 @@
   OwnerList m_vpcOwners;
   ICQOwner *m_xOwner;
-  unsigned long m_nOwnerUin;
   unsigned short m_nUserListLockType;
   unsigned short myGroupListLockType;