1 files changed, 2 insertions, 3 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index bda6b3e..d799e19 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -359,61 +359,61 @@ void QtChatWindow::tabComplete() {
         return;
     }
     QString suggestion = P2QSTRING(completer_->completeWord(Q2PSTRING(root)));
     if (root == suggestion) {
         return;
     }
     tabCompletion_ = true;
     cursor.beginEditBlock();
     cursor.removeSelectedText();
     int oldPosition = cursor.position();
 
     cursor.insertText(suggestion);
     tabCompleteCursor_ = cursor;
     tabCompleteCursor_.setPosition(oldPosition, QTextCursor::KeepAnchor);
 
     cursor.endEditBlock();
     tabCompletion_ = false;
 }
 
 void QtChatWindow::setRosterModel(Roster* roster) {
     treeWidget_->setRosterModel(roster);
 }
 
 void QtChatWindow::setAvailableSecurityLabels(const std::vector<SecurityLabelsCatalog::Item>& labels) {
     delete labelModel_;
     labelModel_ = new LabelModel();
     labelModel_->availableLabels_ = labels;
     int i = 0;
     int defaultIndex = 0;
     labelsWidget_->setModel(labelModel_);
-    foreach (SecurityLabelsCatalog::Item label, labels) {
+    for (const auto& label : labels) {
         if (label.getIsDefault()) {
             defaultIndex = i;
             break;
         }
         i++;
     }
     labelsWidget_->setCurrentIndex(defaultIndex);
 }
 
 void QtChatWindow::handleCurrentLabelChanged(int index) {
     if (static_cast<size_t>(index) >= labelModel_->availableLabels_.size()) {
         SWIFT_LOG(debug) << "User selected a label that doesn't exist";
         return;
     }
     const SecurityLabelsCatalog::Item& label = labelModel_->availableLabels_[index];
     if (label.getLabel()) {
         QPalette palette = labelsWidget_->palette();
         //palette.setColor(QPalette::Base, P2QSTRING(label.getLabel()->getBackgroundColor()));
         palette.setColor(labelsWidget_->backgroundRole(), P2QSTRING(label.getLabel()->getBackgroundColor()));
         palette.setColor(labelsWidget_->foregroundRole(), P2QSTRING(label.getLabel()->getForegroundColor()));
         labelsWidget_->setPalette(palette);
         midBar_->setPalette(palette);
         labelsWidget_->setAutoFillBackground(true);
     }
     else {
         labelsWidget_->setAutoFillBackground(false);
         labelsWidget_->setPalette(defaultLabelsPalette_);
         midBar_->setPalette(defaultLabelsPalette_);
     }
 }
@@ -685,62 +685,61 @@ void QtChatWindow::handleTextInputLostFocus() {
 }
 
 void QtChatWindow::handleActionButtonClicked() {
     QMenu contextMenu;
     QAction* changeSubject = nullptr;
     QAction* configure = nullptr;
     QAction* affiliations = nullptr;
     QAction* destroy = nullptr;
     QAction* invite = nullptr;
 
     QAction* block = nullptr;
     QAction* unblock = nullptr;
 
     if (availableRoomActions_.empty()) {
         if (blockingState_ == IsBlocked) {
             unblock = contextMenu.addAction(tr("Unblock"));
             unblock->setEnabled(isOnline_);
         }
         else if (!isMUC_ && blockingState_ == IsUnblocked) {
             block = contextMenu.addAction(tr("Block"));
             block->setEnabled(isOnline_);
         }
 
         if (supportsImpromptuChat_) {
             invite = contextMenu.addAction(tr("Invite person to this chat…"));
             invite->setEnabled(isOnline_ && (blockingState_ != IsBlocked));
         }
 
     }
     else {
-        foreach(ChatWindow::RoomAction availableAction, availableRoomActions_)
-        {
+        for (auto&& availableAction : availableRoomActions_) {
             if (impromptu_) {
                 // hide options we don't need in impromptu chats
                 if (availableAction == ChatWindow::ChangeSubject ||
                     availableAction == ChatWindow::Configure ||
                     availableAction == ChatWindow::Affiliations ||
                     availableAction == ChatWindow::Destroy) {
                     continue;
                 }
             }
             switch(availableAction)
             {
                 case ChatWindow::ChangeSubject:
                     changeSubject = contextMenu.addAction(tr("Change subject…"));
                     changeSubject->setEnabled(isOnline_);
                     break;
                 case ChatWindow::Configure:
                     configure = contextMenu.addAction(tr("Configure room…"));
                     configure->setEnabled(isOnline_);
                     break;
                 case ChatWindow::Affiliations:
                     affiliations = contextMenu.addAction(tr("Edit affiliations…"));
                     affiliations->setEnabled(isOnline_);
                     break;
                 case ChatWindow::Destroy:
                     destroy = contextMenu.addAction(tr("Destroy room"));
                     destroy->setEnabled(isOnline_);
                     break;
                 case ChatWindow::Invite:
                     invite = contextMenu.addAction(tr("Invite person to this room…"));
                     invite->setEnabled(isOnline_);