Changeset 6097 for trunk/qt4-gui/src/userevents

Timestamp:

03/15/08 06:23:52 (9 months ago)

Author:

flynd

Message:

Let user menu and event dialog user same enum for event type so we don't have to convert between them.

Location:

trunk/qt4-gui/src/userevents

Files:

• usereventcommon.h (modified) (1 diff)
• usersendchatevent.cpp (modified) (3 diffs)
• usersendcommon.cpp (modified) (4 diffs)
• usersendcontactevent.cpp (modified) (3 diffs)
• usersendfileevent.cpp (modified) (3 diffs)
• usersendmsgevent.cpp (modified) (3 diffs)
• usersendsmsevent.cpp (modified) (3 diffs)
• usersendurlevent.cpp (modified) (3 diffs)
• userviewevent.cpp (modified) (1 diff)

trunk/qt4-gui/src/userevents/usereventcommon.h

@@ -43 +43 @@
 {
 class InfoField;
-
-enum EventType
-{
-  ET_MESSAGE,
-  ET_URL,
-  ET_CHAT,
-  ET_FILE,
-  ET_CONTACT,
-  ET_SMS
-};
 
 class UserEventCommon : public QWidget

trunk/qt4-gui/src/userevents/usersendchatevent.cpp

@@ -32 +32 @@
 #include "config/chat.h"
 
+#include "core/gui-defines.h"
 #include "core/licqgui.h"
 #include "core/messagebox.h"
@@ -47 +48 @@
 
 UserSendChatEvent::UserSendChatEvent(QString id, unsigned long ppid, QWidget* parent)
-  : UserSendCommon(ET_CHAT, id, ppid, parent, "UserSendChatEvent")
+  : UserSendCommon(ChatEvent, id, ppid, parent, "UserSendChatEvent")
 {
   myChatPort = 0;
@@ -79 +80 @@
 
   setWindowTitle(myBaseTitle);
-  grpSendType->actions().at(ET_CHAT)->setChecked(true);
+  grpSendType->actions().at(ChatEvent)->setChecked(true);
 }
 

trunk/qt4-gui/src/userevents/usersendcommon.cpp

@@ -56 +56 @@
 #include "config/iconmanager.h"
 
+#include "core/gui-defines.h"
 #include "core/licqgui.h"
 #include "core/mainwin.h"
@@ -129 +130 @@
 
   action = new QAction(tr("Message"), grpSendType);
-  action->setData(ET_MESSAGE);
+  action->setData(MessageEvent);
   action->setCheckable(true);
 
   action = new QAction(tr("URL"), grpSendType);
-  action->setData(ET_URL);
+  action->setData(UrlEvent);
   action->setCheckable(true);
 
   action = new QAction(tr("Chat Request"), grpSendType);
-  action->setData(ET_CHAT);
+  action->setData(ChatEvent);
   action->setCheckable(true);
 
   action = new QAction(tr("File Transfer"), grpSendType);
-  action->setData(ET_FILE);
+  action->setData(FileEvent);
   action->setCheckable(true);
 
   action = new QAction(tr("Contact List"), grpSendType);
-  action->setData(ET_CONTACT);
+  action->setData(ContactEvent);
   action->setCheckable(true);
 
   action = new QAction(tr("SMS"), grpSendType);
-  action->setData(ET_SMS);
+  action->setData(SmsEvent);
   action->setCheckable(true);
 
@@ -532 +533 @@
   switch (type)
   {
-    case ET_URL:
+    case UrlEvent:
       return IconManager::instance()->getIcon(IconManager::UrlMessageIcon);
 
-    case ET_CHAT:
+    case ChatEvent:
       return IconManager::instance()->getIcon(IconManager::ChatMessageIcon);
 
-    case ET_FILE:
+    case FileEvent:
       return IconManager::instance()->getIcon(IconManager::FileMessageIcon);
 
-    case ET_CONTACT:
+    case ContactEvent:
       return IconManager::instance()->getIcon(IconManager::ContactMessageIcon);
 
-    case ET_SMS:
+    case SmsEvent:
       return IconManager::instance()->getIcon(IconManager::SmsMessageIcon);
 
-    case ET_MESSAGE:
+    case MessageEvent:
     default:
       return IconManager::instance()->getIcon(IconManager::StandardMessageIcon);
@@ -678 +679 @@
   switch (type)
   {
-    case ET_MESSAGE:
+    case MessageEvent:
       e = new UserSendMsgEvent(myUsers.front().c_str(), myPpid, parent);
       break;
-    case ET_URL:
+    case UrlEvent:
       e = new UserSendUrlEvent(myUsers.front().c_str(), myPpid, parent);
       break;
-    case ET_CHAT:
+    case ChatEvent:
       e = new UserSendChatEvent(myUsers.front().c_str(), myPpid, parent);
       break;
-    case ET_FILE:
+    case FileEvent:
       e = new UserSendFileEvent(myUsers.front().c_str(), myPpid, parent);
       break;
-    case ET_CONTACT:
+    case ContactEvent:
       e = new UserSendContactEvent(myUsers.front().c_str(), myPpid, parent);
       break;
-    case ET_SMS:
+    case SmsEvent:
       e = new UserSendSmsEvent(myUsers.front().c_str(), myPpid, parent);
       break;

trunk/qt4-gui/src/userevents/usersendcontactevent.cpp

@@ -30 +30 @@
 #include <licq_icqd.h>
 
+#include "core/gui-defines.h"
 #include "core/licqgui.h"
 
@@ -45 +46 @@
 
 UserSendContactEvent::UserSendContactEvent(QString id, unsigned long ppid, QWidget* parent)
-  : UserSendCommon(ET_CONTACT, id, ppid, parent, "UserSendContactEvent")
+  : UserSendCommon(ContactEvent, id, ppid, parent, "UserSendContactEvent")
 {
   chkMass->setChecked(false);
@@ -78 +79 @@
 
   setWindowTitle(myBaseTitle);
-  grpSendType->actions().at(ET_CONTACT)->setChecked(true);
+  grpSendType->actions().at(ContactEvent)->setChecked(true);
 }
 

trunk/qt4-gui/src/userevents/usersendfileevent.cpp

@@ -39 +39 @@
 #include <licq_icqd.h>
 
+#include "core/gui-defines.h"
 #include "core/licqgui.h"
 #include "core/messagebox.h"
@@ -54 +55 @@
 
 UserSendFileEvent::UserSendFileEvent(QString id, unsigned long ppid, QWidget* parent)
-  : UserSendCommon(ET_FILE, id, ppid, parent, "UserSendFileEvent")
+  : UserSendCommon(FileEvent, id, ppid, parent, "UserSendFileEvent")
 {
   chkMass->setChecked(false);
@@ -88 +89 @@
 
   setWindowTitle(myBaseTitle);
-  grpSendType->actions().at(ET_FILE)->setChecked(true);
+  grpSendType->actions().at(FileEvent)->setChecked(true);
 }
 

trunk/qt4-gui/src/userevents/usersendmsgevent.cpp

@@ -33 +33 @@
 #include "config/chat.h"
 
+#include "core/gui-defines.h"
 #include "core/licqgui.h"
 #include "core/messagebox.h"
@@ -48 +49 @@
 
 UserSendMsgEvent::UserSendMsgEvent(QString id, unsigned long ppid, QWidget* parent)
-  : UserSendCommon(ET_MESSAGE, id, ppid, parent, "UserSendMsgEvent")
+  : UserSendCommon(MessageEvent, id, ppid, parent, "UserSendMsgEvent")
 {
   mainWidget->addWidget(splView);
@@ -62 +63 @@
 
   setWindowTitle(myBaseTitle);
-  grpSendType->actions().at(ET_MESSAGE)->setChecked(true);
+  grpSendType->actions().at(MessageEvent)->setChecked(true);
 }
 

trunk/qt4-gui/src/userevents/usersendsmsevent.cpp

@@ -32 +32 @@
 #include <licq_icqd.h>
 
+#include "core/gui-defines.h"
 #include "core/licqgui.h"
 #include "core/messagebox.h"
@@ -44 +45 @@
 
 UserSendSmsEvent::UserSendSmsEvent(QString id, unsigned long ppid, QWidget* parent)
-  : UserSendCommon(ET_SMS, id, ppid, parent, "UserSendSmsEvent")
+  : UserSendCommon(SmsEvent, id, ppid, parent, "UserSendSmsEvent")
 {
   chkSendServer->setChecked(true);
@@ -90 +91 @@
 
   setWindowTitle(myBaseTitle);
-  grpSendType->actions().at(ET_SMS)->setChecked(true);
+  grpSendType->actions().at(SmsEvent)->setChecked(true);
 }
 

trunk/qt4-gui/src/userevents/usersendurlevent.cpp

@@ -36 +36 @@
 #include "config/chat.h"
 
+#include "core/gui-defines.h"
 #include "core/licqgui.h"
 #include "core/messagebox.h"
@@ -51 +52 @@
 
 UserSendUrlEvent::UserSendUrlEvent(QString id, unsigned long ppid, QWidget* parent)
-  : UserSendCommon(ET_URL, id, ppid, parent, "UserSendUrlEvent")
+  : UserSendCommon(UrlEvent, id, ppid, parent, "UserSendUrlEvent")
 {
   mainWidget->addWidget(splView);
@@ -71 +72 @@
 
   setWindowTitle(myBaseTitle);
-  grpSendType->actions().at(ET_URL)->setChecked(true);
+  grpSendType->actions().at(UrlEvent)->setChecked(true);
 }
 

trunk/qt4-gui/src/userevents/userviewevent.cpp

@@ -560 +560 @@
   {
     case ICQ_CMDxSUB_MSG:
-      LicqGui::instance()->showEventDialog(mnuUserSendChat, myUsers.front().c_str(), myPpid);
+      LicqGui::instance()->showEventDialog(ChatEvent, myUsers.front().c_str(), myPpid);
       break;