Changeset 6180 for trunk/qt-gui

Timestamp:

05/05/08 05:45:14 (7 months ago)

Author:

flynd

Message:

Added const declarations to event classes and fixed (hopefully) everything else that broke.

Location:

trunk/qt-gui/src

Files:

• eventdesc.cpp (modified) (1 diff)
• eventdesc.h (modified) (1 diff)
• ewidgets.cpp (modified) (1 diff)
• ewidgets.h (modified) (1 diff)
• mainwin.cpp (modified) (1 diff)
• searchuserdlg.cpp (modified) (2 diffs)
• searchuserdlg.h (modified) (2 diffs)
• usereventdlg.cpp (modified) (2 diffs)
• usereventdlg.h (modified) (3 diffs)

trunk/qt-gui/src/eventdesc.cpp

@@ -59 +59 @@
 };
 
-QString EventDescription(CUserEvent *e)
+QString EventDescription(const CUserEvent* e)
 {
   QString desc;

trunk/qt-gui/src/eventdesc.h

@@ -29 +29 @@
 class CUserEvent;
 
-QString EventDescription(CUserEvent *e);
+QString EventDescription(const CUserEvent* e);
 
 #endif

trunk/qt-gui/src/ewidgets.cpp

@@ -1103 +1103 @@
 }
 
-void CMessageViewWidget::addMsg(CUserEvent* e, const char *_szId, unsigned long _nPPID)
+void CMessageViewWidget::addMsg(const CUserEvent* e, const char* _szId, unsigned long _nPPID)
 {
   QDateTime date;

trunk/qt-gui/src/ewidgets.h

@@ -254 +254 @@
   
 public slots:
-  virtual void addMsg(CUserEvent *, const char * = 0, unsigned long = 0);
+  virtual void addMsg(const CUserEvent* e, const char* _szId = NULL, unsigned long _nPPID = 0);
   void addMsg(ICQEvent *);
 

trunk/qt-gui/src/mainwin.cpp

@@ -1346 +1346 @@
 void CMainWindow::slot_updatedUser(CICQSignal *sig)
 {
-  char *szId = sig->Id();
+  const char* szId = sig->Id();
   unsigned long nPPID = sig->PPID();
 

trunk/qt-gui/src/searchuserdlg.cpp

@@ -72 +72 @@
 
 
-SearchItem::SearchItem(CSearchAck *s, const QString &encoding, QListView *parent)
+SearchItem::SearchItem(const CSearchAck* s, const QString& encoding, QListView* parent)
   : QListViewItem(parent)
 {
@@ -453 +453 @@
 }
 
-void SearchUserDlg::searchFound(CSearchAck *s)
+void SearchUserDlg::searchFound(const CSearchAck* s)
 {
   (void) new SearchItem(s, m_Encoding, foundView);
 }
 
-
-void SearchUserDlg::searchDone(CSearchAck *sa)
+void SearchUserDlg::searchDone(const CSearchAck* sa)
 {
   if (sa == NULL || sa->More() == 0)

trunk/qt-gui/src/searchuserdlg.h

@@ -57 +57 @@
 {
 public:
-   SearchItem(CSearchAck *, const QString &, QListView *parent);
+  SearchItem(const CSearchAck* s, const QString& encoding, QListView* parent);
    unsigned long uin();
 protected:
@@ -97 +97 @@
    QString m_Encoding;
 
-   void searchFound(CSearchAck *);
-   void searchDone(CSearchAck *);
+  void searchFound(const CSearchAck* s);
+  void searchDone(const CSearchAck* sa);
    void searchFailed();
 

trunk/qt-gui/src/usereventdlg.cpp

@@ -1437 +1437 @@
 
 
-void UserViewEvent::UserUpdated(CICQSignal *sig, char *szId, unsigned long nPPID)
+void UserViewEvent::UserUpdated(CICQSignal* sig, const char* szId, unsigned long nPPID)
 {
   ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
@@ -2650 +2650 @@
 
 //-----UserSendCommon::UserUpdated-------------------------------------------
-void UserSendCommon::UserUpdated(CICQSignal *sig, char *szId, unsigned long nPPID)
+void UserSendCommon::UserUpdated(CICQSignal* sig, const char* szId, unsigned long nPPID)
 {
   ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_R);

trunk/qt-gui/src/usereventdlg.h

@@ -170 +170 @@
   int m_highestEventId;
 
-  virtual void UserUpdated(CICQSignal *, char * = 0, unsigned long = 0) = 0;
+  virtual void UserUpdated(CICQSignal* signal, const char* id = NULL,
+      unsigned long ppid = 0) = 0;
   void SetGeneralInfo(ICQUser *);
   void FlashTaskbar(bool _bFlash);
@@ -221 +222 @@
   void sendMsg(QString txt);
   void updateNextButton();
-  virtual void UserUpdated(CICQSignal *, char * = 0, unsigned long = 0);
+  virtual void UserUpdated(CICQSignal* sig, const char* szId = NULL, unsigned long nPPID = 0);
 
 protected slots:
@@ -279 +280 @@
 
   void RetrySend(ICQEvent *e, bool bOnline, unsigned short nLevel);
-  virtual void UserUpdated(CICQSignal *, char * = 0, unsigned long = 0);
+  virtual void UserUpdated(CICQSignal* sig, const char* szId = NULL, unsigned long nPPID = 0);
   virtual bool sendDone(ICQEvent *) = 0;
   bool checkSecure();