From 9e89beeaa0dadc6ae8d90f28eae8f6788f56390a Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Fri, 28 Nov 2008 22:19:23 +0100 Subject: [PATCH] Capitalize NetworkModel::ItemType for consistency with naming rules --- src/client/networkmodel.h | 8 ++++---- src/uisupport/bufferview.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h index 89ecb968..b28ec40a 100644 --- a/src/client/networkmodel.h +++ b/src/client/networkmodel.h @@ -259,7 +259,7 @@ class NetworkModel : public TreeModel { Q_OBJECT public: - enum myRoles { + enum Role { BufferTypeRole = TreeModel::UserRole, ItemActiveRole, BufferActivityRole, @@ -270,13 +270,13 @@ public: UserAwayRole }; - enum itemType { + enum ItemType { NetworkItemType = 0x01, BufferItemType = 0x02, UserCategoryItemType = 0x04, IrcUserItemType = 0x08 }; - Q_DECLARE_FLAGS(itemTypes, itemType) + Q_DECLARE_FLAGS(ItemTypes, ItemType) NetworkModel(QObject *parent = 0); static QList defaultHeader(); @@ -343,6 +343,6 @@ private: QHash _bufferItemCache; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes) +Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::ItemTypes) #endif // NETWORKMODEL_H diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index 6ce560aa..1e10456b 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -417,7 +417,7 @@ void BufferView::addActionsToMenu(QMenu *contextMenu, const QModelIndex &index) const Network *network = Client::network(index.data(NetworkModel::NetworkIdRole).value()); Q_CHECK_PTR(network); - NetworkModel::itemType itemType = static_cast(index.data(NetworkModel::ItemTypeRole).toInt()); + NetworkModel::ItemType itemType = static_cast(index.data(NetworkModel::ItemTypeRole).toInt()); switch(itemType) { case NetworkModel::NetworkItemType: -- 2.20.1