Changeset 231

Timestamp:

02/03/06 03:12:20 (3 years ago)

Author:

edmanm

Message:

Rename the EventType? namespace to CustomEventType? so as not to conflict with
Carbon's EventType? enum.

Location:

trunk/src/control

Files:

• bandwidthevent.cpp (modified) (1 diff)
• circuitevent.cpp (modified) (1 diff)
• eventtype.h (modified) (1 diff)
• logevent.cpp (modified) (1 diff)
• streamevent.cpp (modified) (1 diff)

trunk/src/control/bandwidthevent.cpp

@@ -27 +27 @@
 /** Default constructor */
 BandwidthEvent::BandwidthEvent(quint64 bytesRead, quint64 bytesWritten)
- : QEvent((QEvent::Type)EventType::BandwidthEvent)
+ : QEvent((QEvent::Type)CustomEventType::BandwidthEvent)
 {
   _bytesRead    = bytesRead;

trunk/src/control/circuitevent.cpp

@@ -27 +27 @@
 /** Default constructor */
 CircuitEvent::CircuitEvent(quint64 circId, Status status, QString path)
-: QEvent((QEvent::Type)EventType::CircuitEvent)
+: QEvent((QEvent::Type)CustomEventType::CircuitEvent)
 {
   _circId = circId;

trunk/src/control/eventtype.h

@@ -27 +27 @@
 #include <QEvent>
 
-namespace EventType {
+namespace CustomEventType {
   const int BandwidthEvent = QEvent::User;
   const int CircuitEvent   = QEvent::User+1;

trunk/src/control/logevent.cpp

@@ -27 +27 @@
 /** Default constructor */
 LogEvent::LogEvent(Severity severity, QString message)
-: QEvent((QEvent::Type)EventType::LogEvent)
+: QEvent((QEvent::Type)CustomEventType::LogEvent)
 {
   _severity = severity;

trunk/src/control/streamevent.cpp

@@ -28 +28 @@
 StreamEvent::StreamEvent(quint64 streamId, Status status, 
                          quint64 circuitId, QString target)
-: QEvent((QEvent::Type)EventType::StreamEvent)
+: QEvent((QEvent::Type)CustomEventType::StreamEvent)
 {
   _streamId  = streamId;