Changeset 4416

Timestamp:

05/02/06 07:22:56 (3 years ago)

Author:

emostar

Message:

CICQDaemon -> CLicqDaemon
ICQUser -> CLicqUser
Name change, provided by Erik Johansson.

Location:

branches/newapi/licq

Files:

• doc/PLUGINS.HOWTO (modified) (1 diff)
• doc/README.CodingStyle (modified) (1 diff)
• include/licq_chat.h (modified) (4 diffs)
• include/licq_events.h (modified) (6 diffs)
• include/licq_filetransfer.h (modified) (3 diffs)
• include/licq_icqd.h (modified) (11 diffs)
• include/licq_message.h (modified) (19 diffs)
• include/licq_onevent.h (modified) (2 diffs)
• include/licq_packets.h (modified) (65 diffs)
• include/licq_plugin.h (modified) (3 diffs)
• include/licq_plugind.h (modified) (2 diffs)
• include/licq_protoplugin.h (modified) (3 diffs)
• include/licq_protoplugind.h (modified) (3 diffs)
• include/licq_user.h (modified) (17 diffs)
• include/licq_utility.h (modified) (3 diffs)
• src/fifo.cpp (modified) (18 diffs)
• src/gpg.cpp (modified) (1 diff)
• src/icqd-chat.cpp (modified) (8 diffs)
• src/icqd-filetransfer.cpp (modified) (5 diffs)
• src/icqd-srv.cpp (modified) (144 diffs)
• src/icqd-tcp.cpp (modified) (78 diffs)
• src/icqd-threads.cpp (modified) (9 diffs)
• src/icqd-udp.cpp (modified) (49 diffs)
• src/icqd.cpp (modified) (81 diffs)
• src/icqevent.cpp (modified) (3 diffs)
• src/icqpacket.cpp (modified) (69 diffs)
• src/licq.cpp (modified) (2 diffs)
• src/licq.h (modified) (2 diffs)
• src/message.cpp (modified) (17 diffs)
• src/onevent.cpp (modified) (1 diff)
• src/rtf.cc (modified) (3 diffs)
• src/rtf.ll (modified) (3 diffs)
• src/socket.cpp (modified) (1 diff)
• src/user.cpp (modified) (118 diffs)
• src/utility.cpp (modified) (3 diffs)

branches/newapi/licq/doc/PLUGINS.HOWTO

@@ -39 +39 @@
     function should return whether or not it was successful in
     initializing the plugin.
-    LP_Main(CICQDaemon *): This function is called within its own thread
+    LP_Main(CLicqDaemon *): This function is called within its own thread
     and should actually run the plugin.  It can exit by calling
     LP_Exit(int) or by returning an integer return code.
 
 2.  Each plugin must register with the licq daemon it gets passed in
-    LP_Main().  This is done simply by calling CICQDaemon::Register().
+    LP_Main().  This is done simply by calling CLicqDaemon::Register().
     This function returns the descriptor of the pipe to listen on for
     notification of signals and events.  If a plugin exits without either
-    calling CICQDaemon::Shutdown() or receiving a shutdown signal then it
-    must call CICQDaemon::Unregister() to unregister itself.
+    calling CLicqDaemon::Shutdown() or receiving a shutdown signal then it
+    must call CLicqDaemon::Unregister() to unregister itself.
 
 3.  Each plugin must exit properly when it receives a PLUGIN_SHUTDOWN

branches/newapi/licq/doc/README.CodingStyle

@@ -125 +125 @@
     * remote user should be notified or not.
     */
-    class AddUserDlg (CICQDaemon *s, QWidget *parent)
+    class AddUserDlg (CLicqDaemon *s, QWidget *parent)
       : QDialog(parent, "AddUserDialog")
     {

branches/newapi/licq/include/licq_chat.h

@@ -5 +5 @@
 
 #include "licq_packets.h"
-class CICQDaemon;
+class CLicqDaemon;
 
 
@@ -234 +234 @@
 public:
   CChatClient();
-  CChatClient(ICQUser *);
+  CChatClient(CLicqUser *);
   CChatClient(const CChatClient &);
   CChatClient& operator=(const CChatClient &);
@@ -557 +557 @@
 {
 public:
-  CChatManager(CICQDaemon *d, unsigned long nUin,
+  CChatManager(CLicqDaemon *d, unsigned long nUin,
      const char *fontFamily = "courier",
      unsigned char fontEncoding = ENCODING_DEFAULT,
@@ -617 +617 @@
   static pthread_mutex_t waiting_thread_cancel_mutex;
 
-  CICQDaemon *licqDaemon;
+  CLicqDaemon *licqDaemon;
   int pipe_events[2], pipe_thread[2];
   unsigned long m_nUin;

branches/newapi/licq/include/licq_events.h

@@ -12 +12 @@
 
 class CPacket;
-class CICQDaemon;
+class CLicqDaemon;
 class CUserEvent;
-class ICQUser;
+class CLicqUser;
 
 //-----CExtendedAck----------------------------------------------------------
@@ -44 +44 @@
   char *m_szResponse;
 
-friend class CICQDaemon;
+friend class CLicqDaemon;
 };
 
@@ -114 +114 @@
   char m_nAuth;
 
-friend class CICQDaemon;
+friend class CLicqDaemon;
 };
 
@@ -227 +227 @@
   //!to avoid having to add the user to the list before checking their
   //!other information.
-  ICQUser *UnknownUser()       { return m_pUnknownUser; }
+  CLicqUser *UnknownUser()       { return m_pUnknownUser; }
 
   // Returns the event and transfers ownership to the calling function
   CUserEvent *GrabUserEvent();
   CSearchAck *GrabSearchAck();
-  ICQUser *GrabUnknownUser();
+  CLicqUser *GrabUnknownUser();
 
   //!Compare this event to the id to see if the plugin matches a waiting
@@ -241 +241 @@
 
 protected:
-  ICQEvent(CICQDaemon *_xDaemon, int _nSocketDesc, CPacket *p, ConnectType _eConnect,
+  ICQEvent(CLicqDaemon *_xDaemon, int _nSocketDesc, CPacket *p, ConnectType _eConnect,
            unsigned long _nUin, CUserEvent *e);
-  ICQEvent(CICQDaemon *_xDaemon, int _nSocketDesc, CPacket *p, ConnectType _eConnect,
+  ICQEvent(CLicqDaemon *_xDaemon, int _nSocketDesc, CPacket *p, ConnectType _eConnect,
            const char *_szId, unsigned long _nPPID, CUserEvent *e);
   ICQEvent(ICQEvent *);
@@ -283 +283 @@
   CExtendedAck  *m_pExtendedAck;
   CSearchAck    *m_pSearchAck;
-  ICQUser       *m_pUnknownUser;
-
-  CICQDaemon    *m_pDaemon;
+  CLicqUser       *m_pUnknownUser;
+
+  CLicqDaemon    *m_pDaemon;
 
   unsigned long  m_nEventId;
   static unsigned long s_nNextEventId;
 
-friend class CICQDaemon;
+friend class CLicqDaemon;
 friend class CMSN;
 friend void *ProcessRunningEvent_Client_tep(void *p);

branches/newapi/licq/include/licq_filetransfer.h

@@ -58 +58 @@
 
 #include "licq_packets.h"
-class CICQDaemon;
+class CLicqDaemon;
 
 
@@ -190 +190 @@
 {
 public:
-  CFileTransferManager(CICQDaemon *d, unsigned long nUin);
+  CFileTransferManager(CLicqDaemon *d, unsigned long nUin);
   ~CFileTransferManager();
 
@@ -246 +246 @@
   pthread_t m_tThread;
 
-  CICQDaemon *licqDaemon;
+  CLicqDaemon *licqDaemon;
   int pipe_events[2], pipe_thread[2];
   FileTransferEventList ftEvents;

branches/newapi/licq/include/licq_icqd.h

@@ -36 +36 @@
 class CLicq;
 class CUserManager;
-class ICQUser;
+class CLicqUser;
 class CICQEventTag;
 class TCPSocket;
@@ -103 +103 @@
   char m_szName[32];
 
-friend class CICQDaemon;
+friend class CLicqDaemon;
 friend class CMSN;
 };
@@ -144 +144 @@
   static pthread_mutex_t s_xMutex;
   
-  friend class CICQDaemon;
+  friend class CLicqDaemon;
 };
 
 typedef std::list<CConversation *> ConversationList;
 
-//=====CICQDaemon===============================================================
+//=====CLicqDaemon===============================================================
 enum EDaemonStatus {STATUS_ONLINE, STATUS_OFFLINE_MANUAL, STATUS_OFFLINE_FORCED };
 
-class CICQDaemon
+class CLicqDaemon
 {
 public:
-  CICQDaemon(CLicq *);
-  ~CICQDaemon();
+  CLicqDaemon(CLicq *);
+  ~CLicqDaemon();
   int RegisterPlugin(unsigned long _nSignalMask);
   void UnregisterPlugin();
@@ -416 +416 @@
                            char nLanguage2, char nLanguage3);
   unsigned long icqSetSecurityInfo(bool bAuthorize, bool bHideIp, bool bWebAware);
-  unsigned long icqSetInterestsInfo(const ICQUserCategory *interests);
-  unsigned long icqSetOrgBackInfo(const ICQUserCategory *orgs,
-                                  const ICQUserCategory *background);
+  unsigned long icqSetInterestsInfo(const CLicqUserCategory *interests);
+  unsigned long icqSetOrgBackInfo(const CLicqUserCategory *orgs,
+                                  const CLicqUserCategory *background);
   unsigned long icqSetHomepageInfo(bool bCatetory, unsigned short nCategory,
                                 const char *szHomepageDesc, bool bICQHomepage);
@@ -536 +536 @@
                      bool bTempUser = false);
   bool AddUserToList(unsigned long _nUin, bool bNotify = true);
-  void AddUserToList(ICQUser *);
+  void AddUserToList(CLicqUser *);
   void RemoveUserFromList(unsigned long _nUin);
   void RemoveUserFromList(const char *szId, unsigned long nPPID);
@@ -638 +638 @@
   
   // Common message handler
-  void ProcessMessage(ICQUser *user, CBuffer &packet, char *message,
+  void ProcessMessage(CLicqUser *user, CBuffer &packet, char *message,
      unsigned short nMsgType, unsigned long nMask,
      unsigned long nMsgID[], unsigned short nSequence,
      bool bIsAck, bool &bNewUser);
 
-  bool ProcessPluginMessage(CBuffer &packet, ICQUser *u, unsigned char nChannel,
+  bool ProcessPluginMessage(CBuffer &packet, CLicqUser *u, unsigned char nChannel,
      bool bIsAck, unsigned long nMsgID1,
      unsigned long nMsgID2, unsigned short nSequence,
@@ -733 +733 @@
   unsigned short m_nServerAck;
 
-  void ChangeUserStatus(ICQUser *u, unsigned long s);
-  bool AddUserEvent(ICQUser *, CUserEvent *);
+  void ChangeUserStatus(CLicqUser *u, unsigned long s);
+  bool AddUserEvent(CLicqUser *, CUserEvent *);
   void RejectEvent(unsigned long, CUserEvent *);
-  ICQUser *FindUserForInfoUpdate(const char *szId, ICQEvent *e, const char *);
+  CLicqUser *FindUserForInfoUpdate(const char *szId, ICQEvent *e, const char *);
   unsigned long FindUinByCellular(const char *_szCellular);
 
@@ -769 +769 @@
   ICQEvent *SendExpectEvent_Server(unsigned long nUin, CPacket *, CUserEvent *, bool = false);
   ICQEvent *SendExpectEvent_Server(const char *, unsigned long, CPacket *, CUserEvent *, bool = false);
-  ICQEvent *SendExpectEvent_Client(ICQUser *, CPacket *, CUserEvent *);
+  ICQEvent *SendExpectEvent_Client(CLicqUser *, CPacket *, CUserEvent *);
   ICQEvent *SendExpectEvent(ICQEvent *, void *(*fcn)(void *));
   void AckTCP(CPacketTcp &, int);
@@ -811 +811 @@
 
   // Protected plugin related stuff
-  unsigned long icqRequestInfoPlugin(ICQUser *, bool, const char *);
-  unsigned long icqRequestStatusPlugin(ICQUser *, bool, const char *);
+  unsigned long icqRequestInfoPlugin(CLicqUser *, bool, const char *);
+  unsigned long icqRequestStatusPlugin(CLicqUser *, bool, const char *);
   void icqUpdateInfoTimestamp(const char *);
 
@@ -826 +826 @@
   friend void *Shutdown_tep(void *p);
   friend void *ConnectToServer_tep(void *s);
-  friend class ICQUser;
+  friend class CLicqUser;
   friend class CSocketManager;
   friend class CChatManager;
@@ -837 +837 @@
 
 // Global pointer
-extern CICQDaemon *gLicqDaemon;
+extern CLicqDaemon *gLicqDaemon;
 
 // Helper functions for the daemon

branches/newapi/licq/include/licq_message.h

@@ -23 +23 @@
 const unsigned long E_UNKNOWN       = 0x80000000;
 
-class ICQUser;
+class CLicqUser;
 
 
@@ -61 +61 @@
 
 protected:
-   virtual void AddToHistory(ICQUser *, unsigned long, direction) = 0;
+   virtual void AddToHistory(CLicqUser *, unsigned long, direction) = 0;
    int AddToHistory_Header(direction, char *);
-   void AddToHistory_Flush(ICQUser *, unsigned long, char *);
+   void AddToHistory_Flush(CLicqUser *, unsigned long, char *);
 
    void SetDirection(direction d)  { m_eDir = d; }
@@ -88 +88 @@
    unsigned long  m_nConvoId;
    
-friend class CICQDaemon;
+friend class CLicqDaemon;
 friend class CMSN;
 friend class CUserHistory;
@@ -109 +109 @@
       }
    const char *Message()  { return m_szMessage; }
-   virtual void AddToHistory(ICQUser *, unsigned long, direction);
+   virtual void AddToHistory(CLicqUser *, unsigned long, direction);
 
    static CEventMsg *Parse(char *sz, unsigned short nCmd, time_t nTime,
@@ -129 +129 @@
               unsigned long _nMsgID1 = 0, unsigned long _nMsgID2 = 0);
    virtual ~CEventFile();
-   virtual void AddToHistory(ICQUser *, unsigned long,  direction);
+   virtual void AddToHistory(CLicqUser *, unsigned long,  direction);
    virtual CEventFile *Copy()
       {
@@ -162 +162 @@
              unsigned long _nFlags, unsigned long _nConvoId = 0);
    virtual ~CEventUrl();
-   virtual void AddToHistory(ICQUser *, unsigned long, direction);
+   virtual void AddToHistory(CLicqUser *, unsigned long, direction);
    virtual CEventUrl *Copy()
       {
@@ -193 +193 @@
       unsigned long _nConvoId = 0, unsigned long nMsgID1 = 0, unsigned long nMsgID2 = 0);
   virtual ~CEventChat();
-  virtual void AddToHistory(ICQUser *, unsigned long, direction);
+  virtual void AddToHistory(CLicqUser *, unsigned long, direction);
   virtual CEventChat *Copy()
      {
@@ -225 +225 @@
                unsigned short _nCommand, time_t _tTime, unsigned long _nFlags);
    virtual ~CEventAdded();
-   virtual void AddToHistory(ICQUser *, unsigned long, direction);
+   virtual void AddToHistory(CLicqUser *, unsigned long, direction);
    virtual CEventAdded *Copy()
       {
@@ -261 +261 @@
                  unsigned short _nCommand, time_t _tTime, unsigned long _nFlags);
    virtual ~CEventAuthRequest();
-   virtual void AddToHistory(ICQUser *, unsigned long, direction);
+   virtual void AddToHistory(CLicqUser *, unsigned long, direction);
    virtual CEventAuthRequest *Copy()
       {
@@ -295 +295 @@
               unsigned short _nCommand, time_t _tTime, unsigned long _nFlags);
    virtual ~CEventAuthGranted();
-   virtual void AddToHistory(ICQUser *, unsigned long, direction);
+   virtual void AddToHistory(CLicqUser *, unsigned long, direction);
    virtual CEventAuthGranted *Copy()
       {
@@ -324 +324 @@
               unsigned short _nCommand, time_t _tTime, unsigned long _nFlags);
    virtual ~CEventAuthRefused();
-   virtual void AddToHistory(ICQUser *, unsigned long, direction);
+   virtual void AddToHistory(CLicqUser *, unsigned long, direction);
    virtual CEventAuthRefused *Copy()
       {
@@ -351 +351 @@
                    unsigned short _nCommand, time_t _tTime, unsigned long _nFlags);
    virtual ~CEventWebPanel();
-   virtual void AddToHistory(ICQUser *, unsigned long, direction);
+   virtual void AddToHistory(CLicqUser *, unsigned long, direction);
    virtual CEventWebPanel *Copy()
       {
@@ -374 +374 @@
                     unsigned short _nCommand, time_t _tTime, unsigned long _nFlags);
    virtual ~CEventEmailPager();
-   virtual void AddToHistory(ICQUser *, unsigned long, direction);
+   virtual void AddToHistory(CLicqUser *, unsigned long, direction);
    virtual CEventEmailPager *Copy()
       {
@@ -419 +419 @@
      time_t tTime, unsigned long nFlags);
   virtual ~CEventContactList();
-  virtual void AddToHistory(ICQUser *, unsigned long, direction);
+  virtual void AddToHistory(CLicqUser *, unsigned long, direction);
   virtual CEventContactList *Copy()
     {
@@ -452 +452 @@
    const char *Number()  { return m_szNumber; }
    const char *Message()  { return m_szMessage; }
-   virtual void AddToHistory(ICQUser *, unsigned long, direction);
+   virtual void AddToHistory(CLicqUser *, unsigned long, direction);
 
    static CEventSms *Parse(char *sz, unsigned short nCmd, time_t nTime, unsigned long nFlags);
@@ -469 +469 @@
   virtual ~CEventServerMessage();
 
-  virtual void AddToHistory(ICQUser *, unsigned long, direction);
+  virtual void AddToHistory(CLicqUser *, unsigned long, direction);
 
   virtual CEventServerMessage *Copy()
@@ -501 +501 @@
   virtual ~CEventEmailAlert();
 
-  virtual void AddToHistory(ICQUser *, unsigned long, direction);
+  virtual void AddToHistory(CLicqUser *, unsigned long, direction);
 
   virtual CEventEmailAlert *Copy()
@@ -552 +552 @@
      time_t tTime, unsigned long nFlags);
   ~CEventPlugin();
-  virtual void AddToHistory(ICQUser *, unsigned long, direction);
+  virtual void AddToHistory(CLicqUser *, unsigned long, direction);
   virtual CEventPlugin *Copy()
     { return new CEventPlugin(m_sz, m_nSubCommand, m_tTime, m_nFlags); }
@@ -576 +576 @@
                 time_t _tTime, unsigned long _nFlags);
   ~CEventUnknownSysMsg();
-  virtual void AddToHistory(ICQUser *, unsigned long, direction);
+  virtual void AddToHistory(CLicqUser *, unsigned long, direction);
   virtual CEventUnknownSysMsg *Copy()
     {

branches/newapi/licq/include/licq_onevent.h

@@ -5 +5 @@
 //#include "pthread_rdwr.h"
 
-class ICQUser;
+class CLicqUser;
 
 //=====COnEventManager==========================================================
@@ -27 +27 @@
   ~COnEventManager();
 
-  void Do(unsigned short m_nEvent, ICQUser *u);
+  void Do(unsigned short m_nEvent, CLicqUser *u);
   void SetParameters(const char *, const char **);
   void SetCommandType(unsigned short _nCommandType);

branches/newapi/licq/include/licq_packets.h

@@ -654 +654 @@
 {
 public:
-  CPU_Type2Message(ICQUser *u, bool _bAck, bool _bDirectInfo, const char *cap,
+  CPU_Type2Message(CLicqUser *u, bool _bAck, bool _bDirectInfo, const char *cap,
                    unsigned long nMsgID1 = 0,
                    unsigned long nMsgID2 = 0);
@@ -660 +660 @@
   void InitBuffer();
 
-  ICQUser *m_pUser;
+  CLicqUser *m_pUser;
   bool m_bAck;
   bool m_bDirectInfo;
@@ -672 +672 @@
 {
 public:
-  CPU_ReverseConnect(ICQUser *u, unsigned long nLocalIP,
+  CPU_ReverseConnect(CLicqUser *u, unsigned long nLocalIP,
                      unsigned short nLocalPort, unsigned short nRemotePort);
 };
@@ -689 +689 @@
 {
 public:
-  CPU_PluginMessage(ICQUser *u, bool bAck, const char *PluginGUID,
+  CPU_PluginMessage(CLicqUser *u, bool bAck, const char *PluginGUID,
                     unsigned long nMsgID1 = 0, unsigned long nMsgID2 = 0);
 
@@ -702 +702 @@
 {
 public:
-  CPU_InfoPluginReq(ICQUser *u, const char *GUID, unsigned long nTime);
+  CPU_InfoPluginReq(CLicqUser *u, const char *GUID, unsigned long nTime);
   virtual const char *RequestGUID() { return m_ReqGUID; }
   virtual const unsigned short ExtraInfo() { return ServerInfoPluginRequest; }
@@ -714 +714 @@
 {
 public:
-  CPU_StatusPluginReq(ICQUser *u, const char *GUID, unsigned long nTime);
+  CPU_StatusPluginReq(CLicqUser *u, const char *GUID, unsigned long nTime);
   virtual const unsigned short ExtraInfo() { return ServerStatusPluginRequest; }
   virtual const char *RequestGUID() { return m_ReqGUID; }
@@ -726 +726 @@
 {
 public:
-  CPU_AdvancedMessage(ICQUser *u, unsigned short _nMsgType,
+  CPU_AdvancedMessage(CLicqUser *u, unsigned short _nMsgType,
                       unsigned short _nMsgFlags, bool _bAck,
                       unsigned short _nSequence,
@@ -744 +744 @@
 public:
   CPU_ChatRequest(char *szReason, const char *szChatUsers, unsigned short nPort,
-                  unsigned short nLevel, ICQUser *pUser, bool bICBM);
+                  unsigned short nLevel, CLicqUser *pUser, bool bICBM);
 };
 
@@ -751 +751 @@
 {
 public:
-  CPU_FileTransfer(ICQUser *, ConstFileList &lFileList, const char *_szFile,
+  CPU_FileTransfer(CLicqUser *, ConstFileList &lFileList, const char *_szFile,
            const char *_szDesc, unsigned short nLevel, bool bICBM);
 };
@@ -759 +759 @@
 {
 public:
-    CPU_NoManager(ICQUser *u, unsigned long nMsgID1, unsigned long nMsgID2);
+    CPU_NoManager(CLicqUser *u, unsigned long nMsgID1, unsigned long nMsgID2);
 };
 
@@ -766 +766 @@
 {
 public:
-    CPU_AckThroughServer(ICQUser *u, unsigned long msgid1,
+    CPU_AckThroughServer(CLicqUser *u, unsigned long msgid1,
                          unsigned long msgid2, unsigned short sequence,
                          unsigned short msgType, bool bAccept,