Capitalize NetworkModel::ItemType for consistency with naming rules

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 89ecb96..b28ec40 100644 (file)
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -259,7 +259,7 @@ class NetworkModel : public TreeModel {
   Q_OBJECT
 
 public:
   Q_OBJECT
 
 public:

-  enum myRoles {
+  enum Role {

     BufferTypeRole = TreeModel::UserRole,
     ItemActiveRole,
     BufferActivityRole,
     BufferTypeRole = TreeModel::UserRole,
     ItemActiveRole,
     BufferActivityRole,


@@ -270,13 +270,13 @@ public:
     UserAwayRole
   };
 
     UserAwayRole
   };
 

-  enum itemType {
+  enum ItemType {

     NetworkItemType = 0x01,
     BufferItemType = 0x02,
     UserCategoryItemType = 0x04,
     IrcUserItemType = 0x08
   };
     NetworkItemType = 0x01,
     BufferItemType = 0x02,
     UserCategoryItemType = 0x04,
     IrcUserItemType = 0x08
   };

-  Q_DECLARE_FLAGS(itemTypes, itemType)
+  Q_DECLARE_FLAGS(ItemTypes, ItemType)

 
   NetworkModel(QObject *parent = 0);
   static QList<QVariant> defaultHeader();
 
   NetworkModel(QObject *parent = 0);
   static QList<QVariant> defaultHeader();


@@ -343,6 +343,6 @@ private:
 
   QHash<BufferId, BufferItem *> _bufferItemCache;
 };
 
   QHash<BufferId, BufferItem *> _bufferItemCache;
 };

-Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes)
+Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::ItemTypes)

 
 #endif // NETWORKMODEL_H
 
 #endif // NETWORKMODEL_H

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 6ce560a..1e10456 100644 (file)
--- 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<NetworkId>());
   Q_CHECK_PTR(network);
 
   const Network *network = Client::network(index.data(NetworkModel::NetworkIdRole).value<NetworkId>());
   Q_CHECK_PTR(network);
 

-  NetworkModel::itemType itemType = static_cast<NetworkModel::itemType>(index.data(NetworkModel::ItemTypeRole).toInt());
+  NetworkModel::ItemType itemType = static_cast<NetworkModel::ItemType>(index.data(NetworkModel::ItemTypeRole).toInt());

 
   switch(itemType) {
   case NetworkModel::NetworkItemType:
 
   switch(itemType) {
   case NetworkModel::NetworkItemType: