.clang-tidy

@@ -45,9 +45,11 @@ CheckOptions:
   - key: readability-identifier-naming.MemberCase
     value: camelBack
   - key: readability-identifier-naming.PrivateMemberIgnoredRegexp
-    value: ^.*_$
+    value: .*
-  - key: readability-identifier-naming.ProtectedMemberIgnoredRegexp
+  - key: readability-identifier-naming.PrivateMemberSuffix
-    value: ^.*_$
+    value: _
+  - key: readability-identifier-naming.ProtectedMemberSuffix
+    value: _
   - key: readability-identifier-naming.UnionCase
     value: CamelCase
   - key: readability-identifier-naming.GlobalConstantCase

.github/workflows/clang-tidy.yml

@@ -119,7 +119,7 @@ jobs:
 
       - name: clang-tidy review
         timeout-minutes: 20
-        uses: ZedThree/clang-tidy-review@v0.15.1
+        uses: ZedThree/clang-tidy-review@v0.15.0
         with:
           build_dir: build-clang-tidy
           config_file: ".clang-tidy"
@@ -145,4 +145,4 @@ jobs:
             libbenchmark-dev
 
       - name: clang-tidy-review upload
-        uses: ZedThree/clang-tidy-review/upload@v0.15.1
+        uses: ZedThree/clang-tidy-review/upload@v0.15.0

.github/workflows/post-clang-tidy-review.yml

@@ -14,6 +14,6 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
 
     steps:
-      - uses: ZedThree/clang-tidy-review/post@v0.15.1
+      - uses: ZedThree/clang-tidy-review/post@v0.15.0
         with:
           lgtm_comment_body: ""

CHANGELOG.md

@@ -105,11 +105,10 @@
 - Dev: Move `clang-tidy` checker to its own CI job. (#4996)
 - Dev: Refactored the Image Uploader feature. (#4971)
 - Dev: Refactored the SplitOverlay code. (#5082)
-- Dev: Moved the Network files to their own folder. (#5089)
 - Dev: Fixed deadlock and use-after-free in tests. (#4981)
 - Dev: Moved all `.clang-format` files to the root directory. (#5037)
 - Dev: Load less message history upon reconnects. (#5001, #5018)
-- Dev: Removed the `NullablePtr` class. (#5091)
+- Dev: Load less message history upon reconnects. (#5001)
 - Dev: BREAKING: Replace custom `import()` with normal Lua `require()`. (#5014)
 - Dev: Fixed most compiler warnings. (#5028)
 - Dev: Added the ability to show `ChannelView`s without a `Split`. (#4747)

lib/serialize

@@ -1 +1 @@
-Subproject commit 17946d65a41a72b447da37df6e314cded9650c32
+Subproject commit bbf0a34260a3e8d6e6c48be57653840ac3fa8c30

lib/signals

@@ -1 +1 @@
-Subproject commit d06770649a7e83db780865d09c313a876bf0f4eb
+Subproject commit ca452a811d684db42f93d6352301406754d0c536

src/CMakeLists.txt

@@ -33,6 +33,16 @@ set(SOURCE_FILES
         common/Literals.hpp
         common/Modes.cpp
         common/Modes.hpp
+        common/NetworkCommon.cpp
+        common/NetworkCommon.hpp
+        common/NetworkManager.cpp
+        common/NetworkManager.hpp
+        common/NetworkPrivate.cpp
+        common/NetworkPrivate.hpp
+        common/NetworkRequest.cpp
+        common/NetworkRequest.hpp
+        common/NetworkResult.cpp
+        common/NetworkResult.hpp
         common/QLogging.cpp
         common/QLogging.hpp
         common/WindowDescriptors.cpp
@@ -40,18 +50,8 @@ set(SOURCE_FILES
 
         common/enums/MessageOverflow.hpp
 
-        common/network/NetworkCommon.cpp
-        common/network/NetworkCommon.hpp
-        common/network/NetworkManager.cpp
-        common/network/NetworkManager.hpp
-        common/network/NetworkPrivate.cpp
-        common/network/NetworkPrivate.hpp
-        common/network/NetworkRequest.cpp
-        common/network/NetworkRequest.hpp
-        common/network/NetworkResult.cpp
-        common/network/NetworkResult.hpp
-        common/network/NetworkTask.cpp
         common/network/NetworkTask.hpp
+        common/network/NetworkTask.cpp
 
         controllers/accounts/Account.cpp
         controllers/accounts/Account.hpp

src/RunGui.cpp

@@ -3,7 +3,7 @@
 #include "Application.hpp"
 #include "common/Args.hpp"
 #include "common/Modes.hpp"
-#include "common/network/NetworkManager.hpp"
+#include "common/NetworkManager.hpp"
 #include "common/QLogging.hpp"
 #include "singletons/CrashHandler.hpp"
 #include "singletons/Paths.hpp"

src/common/NetworkCommon.cpp

@@ -1,4 +1,4 @@
-#include "common/network/NetworkCommon.hpp"
+#include "common/NetworkCommon.hpp"
 
 #include <QStringList>
 

src/common/NetworkManager.cpp

@@ -1,4 +1,4 @@
-#include "common/network/NetworkManager.hpp"
+#include "common/NetworkManager.hpp"
 
 #include <QNetworkAccessManager>
 

src/common/NetworkPrivate.cpp

@@ -1,8 +1,8 @@
-#include "common/network/NetworkPrivate.hpp"
+#include "common/NetworkPrivate.hpp"
 
-#include "common/network/NetworkManager.hpp"
-#include "common/network/NetworkResult.hpp"
 #include "common/network/NetworkTask.hpp"
+#include "common/NetworkManager.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "singletons/Paths.hpp"
 #include "util/AbandonObject.hpp"

src/common/NetworkPrivate.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "common/Common.hpp"
-#include "common/network/NetworkCommon.hpp"
+#include "common/NetworkCommon.hpp"
 
 #include <QHttpMultiPart>
 #include <QNetworkRequest>

src/common/NetworkRequest.cpp

@@ -1,6 +1,6 @@
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
 
-#include "common/network/NetworkPrivate.hpp"
+#include "common/NetworkPrivate.hpp"
 #include "common/QLogging.hpp"
 #include "common/Version.hpp"
 

src/common/NetworkRequest.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/network/NetworkCommon.hpp"
+#include "common/NetworkCommon.hpp"
 
 #include <QHttpMultiPart>
 

src/common/NetworkResult.cpp

@@ -1,4 +1,4 @@
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 
 #include "common/QLogging.hpp"
 

src/common/NullablePtr.hpp

@@ -0,0 +1,73 @@
+#pragma once
+
+#include <type_traits>
+
+namespace chatterino {
+
+template <typename T>
+class NullablePtr
+{
+public:
+    NullablePtr()
+        : element_(nullptr)
+    {
+    }
+
+    NullablePtr(T *element)
+        : element_(element)
+    {
+    }
+
+    T *operator->() const
+    {
+        assert(this->hasElement());
+
+        return element_;
+    }
+
+    typename std::add_lvalue_reference<T>::type operator*() const
+    {
+        assert(this->hasElement());
+
+        return *element_;
+    }
+
+    T *get() const
+    {
+        assert(this->hasElement());
+
+        return this->element_;
+    }
+
+    bool isNull() const
+    {
+        return this->element_ == nullptr;
+    }
+
+    bool hasElement() const
+    {
+        return this->element_ != nullptr;
+    }
+
+    operator bool() const
+    {
+        return this->hasElement();
+    }
+
+    bool operator!() const
+    {
+        return !this->hasElement();
+    }
+
+    template <typename X = T,
+              typename = std::enable_if_t<!std::is_const<X>::value>>
+    operator NullablePtr<const T>() const
+    {
+        return NullablePtr<const T>(this->element_);
+    }
+
+private:
+    T *element_;
+};
+
+}  // namespace chatterino

src/common/network/NetworkTask.cpp

@@ -1,8 +1,8 @@
 #include "common/network/NetworkTask.hpp"
 
-#include "common/network/NetworkManager.hpp"
+#include "common/NetworkManager.hpp"
-#include "common/network/NetworkPrivate.hpp"
+#include "common/NetworkPrivate.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "singletons/Paths.hpp"
 #include "util/AbandonObject.hpp"

src/controllers/commands/builtin/twitch/DeleteMessages.cpp

@@ -2,7 +2,7 @@
 
 #include "Application.hpp"
 #include "common/Channel.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/commands/CommandContext.hpp"
 #include "messages/Message.hpp"

src/controllers/commands/builtin/twitch/UpdateChannel.cpp

@@ -1,7 +1,7 @@
 #include "controllers/commands/builtin/twitch/UpdateChannel.hpp"
 
 #include "common/Channel.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "controllers/commands/CommandContext.hpp"
 #include "messages/MessageBuilder.hpp"
 #include "providers/twitch/api/Helix.hpp"

src/messages/Image.cpp

@@ -2,8 +2,8 @@
 
 #include "Application.hpp"
 #include "common/Common.hpp"
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "debug/AssertInGuiThread.hpp"
 #include "debug/Benchmark.hpp"

src/providers/IvrApi.cpp

@@ -1,6 +1,6 @@
 #include "IvrApi.hpp"
 
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 
 #include <QUrlQuery>

src/providers/IvrApi.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
 #include "providers/twitch/TwitchEmotes.hpp"
 
 #include <QJsonArray>

src/providers/LinkResolver.cpp

@@ -1,8 +1,8 @@
 #include "providers/LinkResolver.hpp"
 
 #include "common/Env.hpp"
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "messages/Image.hpp"
 #include "messages/Link.hpp"
 #include "singletons/Settings.hpp"

src/providers/bttv/BttvEmotes.cpp

@@ -1,7 +1,7 @@
 #include "providers/bttv/BttvEmotes.hpp"
 
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/Outcome.hpp"
 #include "common/QLogging.hpp"
 #include "messages/Emote.hpp"

src/providers/chatterino/ChatterinoBadges.cpp

@@ -1,7 +1,7 @@
 #include "ChatterinoBadges.hpp"
 
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "messages/Emote.hpp"
 
 #include <QJsonArray>

src/providers/ffz/FfzBadges.cpp

@@ -1,7 +1,7 @@
 #include "FfzBadges.hpp"
 
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "messages/Emote.hpp"
 #include "providers/ffz/FfzUtil.hpp"
 

src/providers/ffz/FfzEmotes.cpp

@@ -1,7 +1,7 @@
 #include "providers/ffz/FfzEmotes.hpp"
 
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "messages/Emote.hpp"
 #include "messages/Image.hpp"

src/providers/recentmessages/Api.cpp

@@ -1,7 +1,7 @@
 #include "providers/recentmessages/Api.hpp"
 
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "providers/recentmessages/Impl.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"

src/providers/seventv/SeventvAPI.cpp

@@ -1,8 +1,8 @@
 #include "providers/seventv/SeventvAPI.hpp"
 
 #include "common/Literals.hpp"
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 
 namespace {
 

src/providers/seventv/SeventvEmotes.cpp

@@ -2,7 +2,7 @@
 
 #include "Application.hpp"
 #include "common/Literals.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "messages/Emote.hpp"
 #include "messages/Image.hpp"

src/providers/twitch/TwitchAccount.cpp

@@ -3,7 +3,7 @@
 #include "Application.hpp"
 #include "common/Channel.hpp"
 #include "common/Env.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "debug/AssertInGuiThread.hpp"

src/providers/twitch/TwitchBadges.cpp

@@ -1,7 +1,7 @@
 #include "TwitchBadges.hpp"
 
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "messages/Emote.hpp"
 #include "messages/Image.hpp"

src/providers/twitch/TwitchChannel.cpp

@@ -3,8 +3,8 @@
 #include "Application.hpp"
 #include "common/Common.hpp"
 #include "common/Env.hpp"
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/notifications/NotificationController.hpp"

src/providers/twitch/api/Helix.cpp

@@ -1,8 +1,8 @@
 #include "providers/twitch/api/Helix.hpp"
 
 #include "common/Literals.hpp"
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "util/CancellationToken.hpp"
 

src/providers/twitch/api/Helix.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "common/Aliases.hpp"
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
 #include "providers/twitch/TwitchEmotes.hpp"
 #include "util/Helpers.hpp"
 #include "util/QStringHash.hpp"

src/singletons/ImageUploader.cpp

@@ -1,8 +1,8 @@
 #include "singletons/ImageUploader.hpp"
 
 #include "common/Env.hpp"
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "messages/MessageBuilder.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"

src/singletons/Updates.cpp

@@ -1,8 +1,8 @@
 #include "Updates.hpp"
 
 #include "common/Modes.hpp"
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "common/Version.hpp"
 #include "Settings.hpp"

src/widgets/dialogs/LoginDialog.cpp

@@ -2,7 +2,7 @@
 
 #include "Application.hpp"
 #include "common/Common.hpp"
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
 #include "common/QLogging.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "providers/twitch/TwitchAccount.hpp"

src/widgets/dialogs/UserInfoPopup.cpp

@@ -2,7 +2,7 @@
 
 #include "Application.hpp"
 #include "common/Channel.hpp"
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
 #include "common/QLogging.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/commands/CommandController.hpp"

src/widgets/splits/Split.cpp

@@ -2,8 +2,8 @@
 
 #include "Application.hpp"
 #include "common/Common.hpp"
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/commands/CommandController.hpp"
@@ -911,7 +911,7 @@ void Split::insertTextToInput(const QString &text)
 void Split::showChangeChannelPopup(const char *dialogTitle, bool empty,
                                    std::function<void(bool)> callback)
 {
-    if (!this->selectChannelDialog_.isNull())
+    if (this->selectChannelDialog_.hasElement())
     {
         this->selectChannelDialog_->raise();
 
@@ -935,6 +935,7 @@ void Split::showChangeChannelPopup(const char *dialogTitle, bool empty,
         }
 
         callback(dialog->hasSeletedChannel());
+        this->selectChannelDialog_ = nullptr;
     });
     this->selectChannelDialog_ = dialog;
 }

src/widgets/splits/Split.hpp

@@ -2,13 +2,13 @@
 
 #include "common/Aliases.hpp"
 #include "common/Channel.hpp"
+#include "common/NullablePtr.hpp"
 #include "widgets/BaseWidget.hpp"
 #include "widgets/splits/SplitCommon.hpp"
 
 #include <boost/signals2.hpp>
 #include <pajlada/signals/signalholder.hpp>
 #include <QFont>
-#include <QPointer>
 #include <QShortcut>
 #include <QVBoxLayout>
 #include <QWidget>
@@ -155,7 +155,7 @@ private:
     SplitInput *const input_;
     SplitOverlay *const overlay_;
 
-    QPointer<SelectChannelDialog> selectChannelDialog_;
+    NullablePtr<SelectChannelDialog> selectChannelDialog_;
 
     pajlada::Signals::Connection channelIDChangedConnection_;
     pajlada::Signals::Connection usermodeChangedConnection_;

src/widgets/splits/SplitHeader.cpp

@@ -1,9 +1,9 @@
 #include "widgets/splits/SplitHeader.hpp"
 
 #include "Application.hpp"
-#include "common/network/NetworkCommon.hpp"
+#include "common/NetworkCommon.hpp"
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/commands/CommandController.hpp"
 #include "controllers/hotkeys/Hotkey.hpp"

tests/src/NetworkCommon.cpp

@@ -1,4 +1,4 @@
-#include "common/network/NetworkCommon.hpp"
+#include "common/NetworkCommon.hpp"
 
 #include <gtest/gtest.h>
 

tests/src/NetworkRequest.cpp

@@ -1,7 +1,7 @@
-#include "common/network/NetworkRequest.hpp"
+#include "common/NetworkRequest.hpp"
 
-#include "common/network/NetworkManager.hpp"
+#include "common/NetworkManager.hpp"
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 
 #include <gtest/gtest.h>
 #include <QCoreApplication>

tests/src/NetworkResult.cpp

@@ -1,4 +1,4 @@
-#include "common/network/NetworkResult.hpp"
+#include "common/NetworkResult.hpp"
 
 #include <gtest/gtest.h>
 

tests/src/main.cpp

@@ -1,4 +1,4 @@
-#include "common/network/NetworkManager.hpp"
+#include "common/NetworkManager.hpp"
 #include "singletons/Resources.hpp"
 #include "singletons/Settings.hpp"