projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the EventType meta enum and related accessors static
[quassel.git]
/
src
/
common
/
eventmanager.cpp
diff --git
a/src/common/eventmanager.cpp
b/src/common/eventmanager.cpp
index
13614f3
..
03e891f
100644
(file)
--- a/
src/common/eventmanager.cpp
+++ b/
src/common/eventmanager.cpp
@@
-44,27
+44,31
@@
EventManager::EventManager(QObject *parent)
: QObject(parent) {
}
: QObject(parent) {
}
-QMetaEnum EventManager::eventEnum()
const
{
+QMetaEnum EventManager::eventEnum() {
if(!_enum.isValid()) {
if(!_enum.isValid()) {
- int eventEnumIndex =
metaObject()->
indexOfEnumerator("EventType");
+ int eventEnumIndex =
staticMetaObject.
indexOfEnumerator("EventType");
Q_ASSERT(eventEnumIndex >= 0);
Q_ASSERT(eventEnumIndex >= 0);
- _enum =
metaObject()->
enumerator(eventEnumIndex);
+ _enum =
staticMetaObject.
enumerator(eventEnumIndex);
Q_ASSERT(_enum.isValid());
}
return _enum;
}
Q_ASSERT(_enum.isValid());
}
return _enum;
}
-EventManager::EventType EventManager::eventTypeByName(const QString &name)
const
{
+EventManager::EventType EventManager::eventTypeByName(const QString &name) {
int val = eventEnum().keyToValue(name.toLatin1());
return (val == -1) ? Invalid : static_cast<EventType>(val);
}
int val = eventEnum().keyToValue(name.toLatin1());
return (val == -1) ? Invalid : static_cast<EventType>(val);
}
-EventManager::EventType EventManager::eventGroupByName(const QString &name)
const
{
+EventManager::EventType EventManager::eventGroupByName(const QString &name) {
EventType type = eventTypeByName(name);
return type == Invalid? Invalid : static_cast<EventType>(type & EventGroupMask);
}
EventType type = eventTypeByName(name);
return type == Invalid? Invalid : static_cast<EventType>(type & EventGroupMask);
}
-QString EventManager::enumName(EventType type) const {
+QString EventManager::enumName(EventType type) {
+ return eventEnum().valueToKey(type);
+}
+
+QString EventManager::enumName(int type) {
return eventEnum().valueToKey(type);
}
return eventEnum().valueToKey(type);
}
@@
-295,3
+299,5
@@
void EventManager::insertFilters(const QList<Handler> &newFilters, QHash<QObject
existing[filter.object] = filter;
}
}
existing[filter.object] = filter;
}
}
+
+QMetaEnum EventManager::_enum;