cmake: avoid de-duplication of user's CXXFLAGS

[quassel.git] / src / core / coreirclisthelper.cpp

diff --git a/src/core/coreirclisthelper.cpp b/src/core/coreirclisthelper.cpp
index 1e81d60..927af37 100644 (file)
--- a/src/core/coreirclisthelper.cpp
+++ b/src/core/coreirclisthelper.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -73,13 +73,13 @@ bool CoreIrcListHelper::dispatchQuery(const NetworkId& netId, const QString& que
 bool CoreIrcListHelper::endOfChannelList(const NetworkId& netId)
 {
     if (_queryTimeoutByNetId.contains(netId)) {
-        // If we recieved an actual RPL_LISTEND, remove the timer
+        // If we received an actual RPL_LISTEND, remove the timer
         int timerId = _queryTimeoutByNetId.take(netId)->timerId();
         _queryTimeoutByTimerId.remove(timerId);
     }
 
     if (_queuedQuery.contains(netId)) {
-        // we're no longer interessted in the current data. drop it and issue a new request.
+        // we're no longer interested in the current data. drop it and issue a new request.
         return dispatchQuery(netId, _queuedQuery.take(netId));
     }
     else if (_channelLists.contains(netId)) {
@@ -87,7 +87,7 @@ bool CoreIrcListHelper::endOfChannelList(const NetworkId& netId)
         foreach (ChannelDescription channel, _channelLists[netId]) {
             QVariantList channelVariant;
             channelVariant << channel.channelName << channel.userCount << channel.topic;
-            channelList << qVariantFromValue<QVariant>(channelVariant);
+            channelList << QVariant::fromValue<QVariant>(channelVariant);
         }
         _finishedChannelLists[netId] = channelList;
         _channelLists.remove(netId);