Merge branch 'master' into apa-notification-on-live

src/common/Channel.cpp

@@ -143,7 +143,8 @@ void Channel::addOrReplaceTimeout(MessagePtr message)
         if (s->flags.hasNone({MessageFlag::Timeout, MessageFlag::Untimeout}) &&
             s->loginName == message->timeoutUser) {
             // FOURTF: disabled for now
-            // s->flags.EnableFlag(MessageFlag::Disabled);
+            // PAJLADA: Shitty solution described in Message.hpp
+            s->flags.set(MessageFlag::Disabled);
         }
     }
 

src/common/SignalVectorModel.hpp

@@ -124,7 +124,7 @@ public:
         rowItem.items[column]->setData(value, role);
 
         if (rowItem.isCustomRow) {
-            this->customRowSetData(rowItem.items, column, value, role);
+            this->customRowSetData(rowItem.items, column, value, role, row);
         } else {
             int vecRow = this->getVectorIndexFromModelIndex(row);
             this->vector_->removeItem(vecRow, this);
@@ -230,7 +230,8 @@ protected:
     }
 
     virtual void customRowSetData(const std::vector<QStandardItem *> &row,
-                                  int column, const QVariant &value, int role)
+                                  int column, const QVariant &value, int role,
+                                  int rowIndex)
     {
     }