X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fuisupport%2Fbufferview.cpp;h=526a04056b12f82be47621acb78a07595e05cd79;hb=5c7679408a9f2306b908fab205db08046ea6c520;hp=3362c53c6c7e952d6dc0fdbbea5d4606cf2dbff6;hpb=512aaff2677379080f349e46535743824ef5bb57;p=quassel.git

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 3362c53c..526a0405 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -299,7 +299,7 @@ void BufferView::toggleHeader(bool checked) {
   header()->setSectionHidden((action->property("column")).toInt(), !checked);
 }
 
-bool BufferView::checkRequirements(const QModelIndex &index, itemActiveStates requiredActiveState) {
+bool BufferView::checkRequirements(const QModelIndex &index, ItemActiveStates requiredActiveState) {
   if(!index.isValid())
     return false;
 
@@ -307,9 +307,9 @@ bool BufferView::checkRequirements(const QModelIndex &index, itemActiveStates re
 //   if(!(itemType & validItemTypes))
 //     return false;
 
-  itemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool()
-    ? activeState
-    : inactiveState;
+  ItemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool()
+    ? ActiveState
+    : InactiveState;
 
   if(!(isActive & requiredActiveState))
     return false;
@@ -317,7 +317,7 @@ bool BufferView::checkRequirements(const QModelIndex &index, itemActiveStates re
   return true;
 }
 
-void BufferView::addItemToMenu(QAction &action, QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState) {
+void BufferView::addItemToMenu(QAction &action, QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) {
   if(checkRequirements(index, requiredActiveState)) {
     menu.addAction(&action);
     action.setVisible(true);
@@ -336,7 +336,7 @@ void BufferView::addItemToMenu(QAction &action, QMenu &menu, bool condition) {
 }
 
 
-void BufferView::addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState) {
+void BufferView::addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) {
   if(checkRequirements(index, requiredActiveState)) {
     menu.addMenu(&subMenu);
     subMenu.setVisible(true);
@@ -345,7 +345,7 @@ void BufferView::addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &i
   }
 }
 
-void BufferView::addSeparatorToMenu(QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState) {
+void BufferView::addSeparatorToMenu(QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) {
   if(checkRequirements(index, requiredActiveState)) {
     menu.addSeparator();
   }
@@ -389,20 +389,20 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) {
   case NetworkModel::NetworkItemType:
     _disconnectNetAction.setIcon(connectionStateIcon);
     _connectNetAction.setIcon(connectionStateIcon);
-    addItemToMenu(_disconnectNetAction, contextMenu, index, activeState);
-    addItemToMenu(_connectNetAction, contextMenu, index, inactiveState);
-    addSeparatorToMenu(contextMenu, index, activeState);
-    addItemToMenu(_joinChannelAction, contextMenu, index, activeState);
+    addItemToMenu(_disconnectNetAction, contextMenu, index, ActiveState);
+    addItemToMenu(_connectNetAction, contextMenu, index, InactiveState);
+    addSeparatorToMenu(contextMenu, index, ActiveState);
+    addItemToMenu(_joinChannelAction, contextMenu, index, ActiveState);
     break;
   case NetworkModel::BufferItemType:
     {
       BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
       switch(bufferInfo.type()) {
       case BufferInfo::ChannelBuffer:
-	addItemToMenu(_joinBufferAction, contextMenu, index, inactiveState);
-	addItemToMenu(_partBufferAction, contextMenu, index, activeState);
+	addItemToMenu(_joinBufferAction, contextMenu, index, InactiveState);
+	addItemToMenu(_partBufferAction, contextMenu, index, ActiveState);
 	addItemToMenu(_hideBufferAction, contextMenu, (bool)config());
-	addItemToMenu(_removeBufferAction, contextMenu, index, inactiveState);
+	addItemToMenu(_removeBufferAction, contextMenu, index, InactiveState);
 	createHideEventsSubMenu(contextMenu);
 	addItemToMenu(_ignoreListAction, contextMenu);
 	break;