Merge 2e30ebc825 into f66bc37368

CHANGELOG.md

@@ -113,6 +113,7 @@
 - Dev: Refactored static `MessageBuilder` helpers to standalone functions. (#5652)
 - Dev: Decoupled reply parsing from `MessageBuilder`. (#5660, #5668)
 - Dev: Refactored IRC message building. (#5663)
+- Dev: Fixed some compiler warnings. (#5672)
 
 ## 2.5.1
 

mocks/include/mocks/Helix.hpp

@@ -350,7 +350,7 @@ public:
     // contains a comma
     MOCK_METHOD(
         void, getChatters,
-        (QString broadcasterID, QString moderatorID, int maxChattersToFetch,
+        (QString broadcasterID, QString moderatorID, size_t maxChattersToFetch,
          ResultCallback<HelixChatters> successCallback,
          (FailureCallback<HelixGetChattersError, QString> failureCallback)),
         (override));  // getChatters

src/CMakeLists.txt

@@ -2,6 +2,7 @@ set(LIBRARY_PROJECT "${PROJECT_NAME}-lib")
 set(VERSION_PROJECT "${LIBRARY_PROJECT}-version")
 set(EXECUTABLE_PROJECT "${PROJECT_NAME}")
 add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050F00)
+add_compile_definitions(QT_WARN_DEPRECATED_UP_TO=0x050F00)
 
 # registers the native messageing host
 option(CHATTERINO_DEBUG_NATIVE_MESSAGES "Debug native messages" OFF)

src/common/ProviderId.hpp

@@ -2,6 +2,8 @@
 
 namespace chatterino {
 
-enum class ProviderId { Twitch, Irc };
+enum class ProviderId {  // NOLINT(performance-enum-size)
+    Twitch,
+};
 //
 }  // namespace chatterino

src/common/SignalVector.hpp

@@ -87,7 +87,8 @@ public:
             }
             else
             {
-                assert(index >= 0 && index <= this->items_.size());
+                assert(index >= 0 &&
+                       index <= static_cast<int>(this->items_.size()));
             }
 
             this->items_.insert(this->items_.begin() + index, item);
@@ -116,7 +117,7 @@ public:
     void removeAt(int index, void *caller = nullptr)
     {
         assertInGuiThread();
-        assert(index >= 0 && index < int(this->items_.size()));
+        assert(index >= 0 && index < static_cast<int>(this->items_.size()));
 
         T item = this->items_[index];
         this->items_.erase(this->items_.begin() + index);
@@ -132,13 +133,14 @@ public:
     {
         assertInGuiThread();
 
-        for (int index = 0; index < this->items_.size(); ++index)
+        for (size_t index = 0; index < this->items_.size(); ++index)
         {
             T item = this->items_[index];
             if (matcher(item))
             {
                 this->items_.erase(this->items_.begin() + index);
-                SignalVectorItemEvent<T> args{item, index, caller};
+                SignalVectorItemEvent<T> args{item, static_cast<int>(index),
+                                              caller};
                 this->itemRemoved.invoke(args);
                 this->itemsChanged_();
                 return true;

src/common/SignalVectorModel.hpp

@@ -43,7 +43,7 @@ public:
             }
             // get row index
             int index = this->getModelIndexFromVectorIndex(args.index);
-            assert(index >= 0 && index <= this->rows_.size());
+            assert(index >= 0 && index <= static_cast<int>(this->rows_.size()));
 
             // get row items
             std::vector<QStandardItem *> row = this->createRow();
@@ -75,7 +75,7 @@ public:
             }
 
             int row = this->getModelIndexFromVectorIndex(args.index);
-            assert(row >= 0 && row <= this->rows_.size());
+            assert(row >= 0 && row <= static_cast<int>(this->rows_.size()));
 
             // remove row
             std::vector<QStandardItem *> items = this->rows_[row].items;
@@ -130,7 +130,8 @@ public:
     {
         int row = index.row();
         int column = index.column();
-        if (row < 0 || column < 0 || row >= this->rows_.size() ||
+        if (row < 0 || column < 0 ||
+            row >= static_cast<int>(this->rows_.size()) ||
             column >= this->columnCount_)
         {
             return QVariant();
@@ -144,7 +145,8 @@ public:
     {
         int row = index.row();
         int column = index.column();
-        if (row < 0 || column < 0 || row >= this->rows_.size() ||
+        if (row < 0 || column < 0 ||
+            row >= static_cast<int>(this->rows_.size()) ||
             column >= this->columnCount_)
         {
             return false;
@@ -152,7 +154,7 @@ public:
 
         Row &rowItem = this->rows_[row];
 
-        assert(this->columnCount_ == rowItem.items.size());
+        assert(this->columnCount_ == static_cast<int>(rowItem.items.size()));
 
         auto &cell = rowItem.items[column];
 
@@ -167,7 +169,7 @@ public:
             int vecRow = this->getVectorIndexFromModelIndex(row);
             // TODO: This is only a safety-thing for when we modify data that's being modified right now.
             // It should not be necessary, but it would require some rethinking about this surrounding logic
-            if (vecRow >= this->vector_->readOnly()->size())
+            if (vecRow >= static_cast<int>(this->vector_->readOnly()->size()))
             {
                 return false;
             }
@@ -224,18 +226,19 @@ public:
     {
         int row = index.row(), column = index.column();
 
-        if (row < 0 || column < 0 || row >= this->rows_.size() ||
+        if (row < 0 || column < 0 ||
+            row >= static_cast<int>(this->rows_.size()) ||
             column >= this->columnCount_)
         {
             return Qt::NoItemFlags;
         }
 
-        assert(row >= 0 && row < this->rows_.size() && column >= 0 &&
+        assert(row >= 0 && row < static_cast<int>(this->rows_.size()) &&
-               column < this->columnCount_);
+               column >= 0 && column < this->columnCount_);
 
         const auto &rowItem = this->rows_[row];
 
-        assert(this->columnCount_ == rowItem.items.size());
+        assert(this->columnCount_ == static_cast<int>(rowItem.items.size()));
 
         return rowItem.items[column]->flags();
     }
@@ -267,7 +270,8 @@ public:
             return false;
         }
 
-        assert(sourceRow >= 0 && sourceRow < this->rows_.size());
+        assert(sourceRow >= 0 &&
+               sourceRow < static_cast<int>(this->rows_.size()));
 
         int signalVectorRow = this->getVectorIndexFromModelIndex(sourceRow);
         this->beginMoveRows(sourceParent, sourceRow, sourceRow,
@@ -294,7 +298,7 @@ public:
             return false;
         }
 
-        assert(row >= 0 && row < this->rows_.size());
+        assert(row >= 0 && row < static_cast<int>(this->rows_.size()));
 
         int signalVectorRow = this->getVectorIndexFromModelIndex(row);
         this->vector_->removeAt(signalVectorRow);
@@ -337,8 +341,10 @@ public:
             int from = data->data("chatterino_row_id").toInt();
             int to = parent.row();
 
-            int vectorFrom = this->getVectorIndexFromModelIndex(from);
+            auto vectorFrom =
-            int vectorTo = this->getVectorIndexFromModelIndex(to);
+                static_cast<size_t>(this->getVectorIndexFromModelIndex(from));
+            auto vectorTo =
+                static_cast<size_t>(this->getVectorIndexFromModelIndex(to));
 
             if (vectorFrom < 0 || vectorFrom > this->vector_->raw().size() ||
                 vectorTo < 0 || vectorTo > this->vector_->raw().size())
@@ -402,7 +408,7 @@ protected:
 
     void insertCustomRow(std::vector<QStandardItem *> row, int index)
     {
-        assert(index >= 0 && index <= this->rows_.size());
+        assert(index >= 0 && index <= static_cast<int>(this->rows_.size()));
 
         this->beginInsertRows(QModelIndex(), index, index);
         this->rows_.insert(this->rows_.begin() + index,
@@ -412,7 +418,7 @@ protected:
 
     void removeCustomRow(int index)
     {
-        assert(index >= 0 && index <= this->rows_.size());
+        assert(index >= 0 && index <= static_cast<int>(this->rows_.size()));
         assert(this->rows_[index].isCustomRow);
 
         this->beginRemoveRows(QModelIndex(), index, index);

src/controllers/completion/sources/UnifiedSource.cpp

@@ -37,7 +37,7 @@ void UnifiedSource::addToListModel(GenericListModel &model,
         source->addToListModel(model, maxCount - used);
         // Calculate how many items have been added so far
         used = model.rowCount() - startingSize;
-        if (used >= maxCount)
+        if (used >= static_cast<int>(maxCount))
         {
             // Used up all of limit
             break;
@@ -58,15 +58,15 @@ void UnifiedSource::addToStringList(QStringList &list, size_t maxCount,
     }
 
     // Make sure to only add maxCount elements in total.
-    int startingSize = list.size();
+    auto startingSize = list.size();
-    int used = 0;
+    QStringList::size_type used = 0;
 
     for (const auto &source : this->sources_)
     {
         source->addToStringList(list, maxCount - used, isFirstWord);
         // Calculate how many items have been added so far
         used = list.size() - startingSize;
-        if (used >= maxCount)
+        if (used >= static_cast<QStringList::size_type>(maxCount))
         {
             // Used up all of limit
             break;

src/messages/LimitedQueue.hpp

@@ -196,12 +196,12 @@ public:
         std::unique_lock lock(this->mutex_);
 
         Equals eq;
-        for (int i = 0; i < this->buffer_.size(); ++i)
+        for (size_t i = 0; i < this->buffer_.size(); ++i)
         {
             if (eq(this->buffer_[i], needle))
             {
                 this->buffer_[i] = replacement;
-                return i;
+                return static_cast<int>(i);
             }
         }
         return -1;

src/messages/MessageBuilder.cpp

@@ -116,7 +116,7 @@ QString formatUpdatedEmoteList(const QString &platform,
         text += QString(" %1 %2 emotes ").arg(emoteNames.size()).arg(platform);
     }
 
-    auto i = 0;
+    size_t i = 0;
     for (const auto &emoteName : emoteNames)
     {
         i++;

src/messages/layouts/MessageLayoutContainer.cpp

@@ -212,7 +212,8 @@ void MessageLayoutContainer::breakLine()
     this->lineStart_ = this->elements_.size();
     //    this->currentX = (int)(this->scale * 8);
 
-    if (this->canCollapse() && this->line_ + 1 >= maxUncollapsedLines())
+    if (this->canCollapse() &&
+        static_cast<int>(this->line_ + 1) >= maxUncollapsedLines())
     {
         this->canAddMessages_ = false;
         return;

src/messages/layouts/MessageLayoutElement.cpp

@@ -514,9 +514,10 @@ int TextLayoutElement::getXFromIndex(size_t index)
     else if (index < static_cast<size_t>(this->getText().size()))
     {
         int x = 0;
-        for (int i = 0; i < index; i++)
+        for (size_t i = 0; i < index; i++)
         {
-            x += metrics.horizontalAdvance(this->getText()[i]);
+            x += metrics.horizontalAdvance(
+                this->getText()[static_cast<QString::size_type>(i)]);
         }
         return x + this->getRect().left();
     }

src/providers/twitch/IrcMessageHandler.cpp

@@ -1411,7 +1411,7 @@ float IrcMessageHandler::similarity(
     float similarityPercent = 0.0F;
     int checked = 0;
 
-    for (int i = 1; i <= messages.size(); ++i)
+    for (size_t i = 1; i <= messages.size(); ++i)
     {
         if (checked >= getSettings()->hideSimilarMaxMessagesToCheck)
         {

src/providers/twitch/api/Helix.cpp

@@ -1909,7 +1909,7 @@ void Helix::updateChatSettings(
 
 void Helix::onFetchChattersSuccess(
     std::shared_ptr<HelixChatters> finalChatters, QString broadcasterID,
-    QString moderatorID, int maxChattersToFetch,
+    QString moderatorID, size_t maxChattersToFetch,
     ResultCallback<HelixChatters> successCallback,
     FailureCallback<HelixGetChattersError, QString> failureCallback,
     HelixChatters chatters)
@@ -2022,7 +2022,7 @@ void Helix::fetchChatters(
 
 void Helix::onFetchModeratorsSuccess(
     std::shared_ptr<std::vector<HelixModerator>> finalModerators,
-    QString broadcasterID, int maxModeratorsToFetch,
+    QString broadcasterID, size_t maxModeratorsToFetch,
     ResultCallback<std::vector<HelixModerator>> successCallback,
     FailureCallback<HelixGetModeratorsError, QString> failureCallback,
     HelixModerators moderators)
@@ -2459,7 +2459,7 @@ void Helix::sendWhisper(
 
 // https://dev.twitch.tv/docs/api/reference#get-chatters
 void Helix::getChatters(
-    QString broadcasterID, QString moderatorID, int maxChattersToFetch,
+    QString broadcasterID, QString moderatorID, size_t maxChattersToFetch,
     ResultCallback<HelixChatters> successCallback,
     FailureCallback<HelixGetChattersError, QString> failureCallback)
 {

src/providers/twitch/api/Helix.hpp

@@ -1073,7 +1073,7 @@ public:
     // This will follow the returned cursor and return up to `maxChattersToFetch` chatters
     // https://dev.twitch.tv/docs/api/reference#get-chatters
     virtual void getChatters(
-        QString broadcasterID, QString moderatorID, int maxChattersToFetch,
+        QString broadcasterID, QString moderatorID, size_t maxChattersToFetch,
         ResultCallback<HelixChatters> successCallback,
         FailureCallback<HelixGetChattersError, QString> failureCallback) = 0;
 
@@ -1417,7 +1417,7 @@ public:
     // This will follow the returned cursor and return up to `maxChattersToFetch` chatters
     // https://dev.twitch.tv/docs/api/reference#get-chatters
     void getChatters(
-        QString broadcasterID, QString moderatorID, int maxChattersToFetch,
+        QString broadcasterID, QString moderatorID, size_t maxChattersToFetch,
         ResultCallback<HelixChatters> successCallback,
         FailureCallback<HelixGetChattersError, QString> failureCallback) final;
 
@@ -1505,7 +1505,7 @@ protected:
     // Recursive boy
     void onFetchChattersSuccess(
         std::shared_ptr<HelixChatters> finalChatters, QString broadcasterID,
-        QString moderatorID, int maxChattersToFetch,
+        QString moderatorID, size_t maxChattersToFetch,
         ResultCallback<HelixChatters> successCallback,
         FailureCallback<HelixGetChattersError, QString> failureCallback,
         HelixChatters chatters);
@@ -1520,7 +1520,7 @@ protected:
     // Recursive boy
     void onFetchModeratorsSuccess(
         std::shared_ptr<std::vector<HelixModerator>> finalModerators,
-        QString broadcasterID, int maxModeratorsToFetch,
+        QString broadcasterID, size_t maxModeratorsToFetch,
         ResultCallback<std::vector<HelixModerator>> successCallback,
         FailureCallback<HelixGetModeratorsError, QString> failureCallback,
         HelixModerators moderators);

src/widgets/TooltipWidget.cpp

@@ -119,9 +119,9 @@ void TooltipWidget::set(const std::vector<TooltipEntry> &entries,
 
     this->setVisibleEntries(entries.size());
 
-    for (int i = 0; i < entries.size(); ++i)
+    for (size_t i = 0; i < entries.size(); ++i)
     {
-        if (auto *entryWidget = this->entryAt(i))
+        if (auto *entryWidget = this->entryAt(static_cast<int>(i)))
         {
             const auto &entry = entries[i];
             entryWidget->setImage(entry.image);

src/widgets/dialogs/EditHotkeyDialog.cpp

@@ -79,7 +79,7 @@ void EditHotkeyDialog::setFromHotkey(std::shared_ptr<Hotkey> hotkey)
         this->ui_->easyArgsLabel->setText(def->argumentsPrompt);
         this->ui_->easyArgsLabel->setToolTip(def->argumentsPromptHover);
         int matchIdx = -1;
-        for (int i = 0; i < def->possibleArguments.size(); i++)
+        for (size_t i = 0; i < def->possibleArguments.size(); i++)
         {
             const auto &[displayText, argData] = def->possibleArguments.at(i);
             this->ui_->easyArgsPicker->addItem(displayText);
@@ -90,7 +90,7 @@ void EditHotkeyDialog::setFromHotkey(std::shared_ptr<Hotkey> hotkey)
                 continue;
             }
             bool matches = true;
-            for (int j = 0; j < argData.size(); j++)
+            for (size_t j = 0; j < argData.size(); j++)
             {
                 if (argData.at(j) != hotkey->arguments().at(j))
                 {
@@ -100,7 +100,7 @@ void EditHotkeyDialog::setFromHotkey(std::shared_ptr<Hotkey> hotkey)
             }
             if (matches)
             {
-                matchIdx = i;
+                matchIdx = static_cast<int>(i);
             }
         }
         if (matchIdx != -1)

src/widgets/dialogs/UserInfoPopup.cpp

@@ -219,11 +219,13 @@ UserInfoPopup::UserInfoPopup(bool closeAutomatically, Split *split)
 
                  const auto &timeoutButtons =
                      getSettings()->timeoutButtons.getValue();
-                 if (timeoutButtons.size() < buttonNum || 0 >= buttonNum)
+                 if (static_cast<int>(timeoutButtons.size()) < buttonNum ||
+                     0 >= buttonNum)
                  {
                      return QString("Invalid argument for execModeratorAction: "
                                     "%1. Integer out of usable range: [1, %2]")
-                         .arg(buttonNum, timeoutButtons.size() - 1);
+                         .arg(buttonNum,
+                              static_cast<int>(timeoutButtons.size()) - 1);
                  }
                  const auto &button = timeoutButtons.at(buttonNum - 1);
                  msg = QString("/timeout %1 %2")
@@ -690,9 +692,10 @@ void UserInfoPopup::installEvents()
             {
                 const auto &vector = getSettings()->blacklistedUsers.raw();
 
-                for (int i = 0; i < vector.size(); i++)
+                for (int i = 0; i < static_cast<int>(vector.size()); i++)
                 {
-                    if (this->userName_ == vector[i].getPattern())
+                    if (this->userName_ ==
+                        vector[static_cast<size_t>(i)].getPattern())
                     {
                         getSettings()->blacklistedUsers.removeAt(i);
                         i--;
@@ -899,9 +902,9 @@ void UserInfoPopup::updateUserData()
         // get ignoreHighlights state
         bool isIgnoringHighlights = false;
         const auto &vector = getSettings()->blacklistedUsers.raw();
-        for (int i = 0; i < vector.size(); i++)
+        for (const auto &user : vector)
         {
-            if (this->userName_ == vector[i].getPattern())
+            if (this->userName_ == user.getPattern())
             {
                 isIgnoringHighlights = true;
                 break;

src/widgets/helper/ChannelView.cpp

@@ -2204,7 +2204,7 @@ void ChannelView::mouseReleaseEvent(QMouseEvent *event)
         {
             this->isDoubleClick_ = false;
             // Was actually not a wanted triple-click
-            if (fabsf(distanceBetweenPoints(this->lastDoubleClickPosition_,
+            if (std::abs(distanceBetweenPoints(this->lastDoubleClickPosition_,
                                                event->screenPos())) > 10.F)
             {
                 this->clickTimer_.stop();
@@ -2215,7 +2215,7 @@ void ChannelView::mouseReleaseEvent(QMouseEvent *event)
         {
             this->isLeftMouseDown_ = false;
 
-            if (fabsf(distanceBetweenPoints(this->lastLeftPressPosition_,
+            if (std::abs(distanceBetweenPoints(this->lastLeftPressPosition_,
                                                event->screenPos())) > 15.F)
             {
                 return;
@@ -2223,7 +2223,7 @@ void ChannelView::mouseReleaseEvent(QMouseEvent *event)
 
             // Triple-clicking a message selects the whole message
             if (foundElement && this->clickTimer_.isActive() &&
-                (fabsf(distanceBetweenPoints(this->lastDoubleClickPosition_,
+                (std::abs(distanceBetweenPoints(this->lastDoubleClickPosition_,
                                                 event->screenPos())) < 10.F))
             {
                 this->selectWholeMessage(layout.get(), messageIndex);
@@ -2241,7 +2241,7 @@ void ChannelView::mouseReleaseEvent(QMouseEvent *event)
         {
             this->isRightMouseDown_ = false;
 
-            if (fabsf(distanceBetweenPoints(this->lastRightPressPosition_,
+            if (std::abs(distanceBetweenPoints(this->lastRightPressPosition_,
                                                event->screenPos())) > 15.F)
             {
                 return;

src/widgets/helper/SearchPopup.cpp

@@ -242,9 +242,8 @@ LimitedQueueSnapshot<MessagePtr> SearchPopup::buildSnapshot()
             sharedView.channel()->getMessageSnapshot();
 
         // TODO: implement iterator on LimitedQueueSnapshot?
-        for (auto i = 0; i < snapshot.size(); ++i)
+        for (const auto &message : snapshot)
         {
-            const MessagePtr &message = snapshot[i];
             if (filterSet && !filterSet->filter(message, sharedView.channel()))
             {
                 continue;

src/widgets/listview/GenericListModel.cpp

@@ -19,7 +19,7 @@ QVariant GenericListModel::data(const QModelIndex &index, int /* role */) const
         return {};
     }
 
-    if (index.row() >= this->items_.size())
+    if (index.row() >= static_cast<int>(this->items_.size()))
     {
         return {};
     }

src/widgets/splits/SplitHeader.cpp

@@ -42,7 +42,7 @@ namespace {
 using namespace chatterino;
 
 // 5 minutes
-constexpr const uint64_t THUMBNAIL_MAX_AGE_MS = 5ULL * 60 * 1000;
+constexpr const qint64 THUMBNAIL_MAX_AGE_MS = 5LL * 60 * 1000;
 
 auto formatRoomModeUnclean(
     const SharedAccessGuard<const TwitchChannel::RoomModes> &modes) -> QString