Remove USEWEBENGINE (#4757)

This code has been sitting behind a define since 2018 (de3a490). I'm not opposed to this code coming back however in this state, it feels better to remove it.

BUILDING_ON_WINDOWS.md

@@ -31,7 +31,6 @@ Notes:
 2. Unfold the top most tree element (latest stable Qt version, e.g. `Qt 5.15.2`)
 3. Under this version, select the following entries:
    - `MSVC 2019 64-bit` (or alternative version if you are using that)
-   - `Qt WebEngine` (optional)
 4. Under the "Tools" tree element (at the bottom), ensure that `Qt Creator X.X.X` and `Debugging Tools for Windows` are selected. (they should be checked by default)
 5. Continue through the installer and let the installer finish installing Qt.
 

CHANGELOG.md

@@ -59,6 +59,7 @@
 - Dev: The Windows installer is now built in CI. (#4408)
 - Dev: Removed `getApp` and `getSettings` calls from message rendering. (#4535)
 - Dev: Get the default browser executable instead of the entire command line when opening incognito links. (#4745)
+- Dev: Removed unused code hidden behind the USEWEBENGINE define (#4757)
 
 ## 2.4.4
 

src/CMakeLists.txt

@@ -469,8 +469,6 @@ set(SOURCE_FILES
         widgets/Notebook.hpp
         widgets/Scrollbar.cpp
         widgets/Scrollbar.hpp
-        widgets/StreamView.cpp
-        widgets/StreamView.hpp
         widgets/TooltipEntryWidget.cpp
         widgets/TooltipEntryWidget.hpp
         widgets/TooltipWidget.cpp

src/controllers/hotkeys/ActionNames.hpp

@@ -180,7 +180,6 @@ inline const std::map<HotkeyCategory, ActionDefinitionMap> actionNames{
           }},
          {"showSearch", ActionDefinition{"Search current channel"}},
          {"showGlobalSearch", ActionDefinition{"Search all channels"}},
-         {"startWatching", ActionDefinition{"Start watching"}},
          {"debug", ActionDefinition{"Show debug popup"}},
      }},
     {HotkeyCategory::SplitInput,

src/widgets/StreamView.cpp

@@ -1,35 +0,0 @@
-#include "StreamView.hpp"
-
-#include "common/Channel.hpp"
-#include "util/Helpers.hpp"
-#include "util/LayoutCreator.hpp"
-#include "widgets/helper/ChannelView.hpp"
-#include "widgets/splits/Split.hpp"
-
-#ifdef USEWEBENGINE
-#    include <QtWebEngineWidgets>
-#endif
-
-namespace chatterino {
-
-StreamView::StreamView(ChannelPtr channel, const QUrl &url)
-{
-    LayoutCreator<StreamView> layoutCreator(this);
-
-#ifdef USEWEBENGINE
-    auto web =
-        layoutCreator.emplace<QWebEngineView>(this).assign(&this->stream);
-    web->setUrl(url);
-    web->settings()->setAttribute(QWebEngineSettings::FullScreenSupportEnabled,
-                                  true);
-#endif
-
-    auto chat = layoutCreator.emplace<ChannelView>();
-    chat->setFixedWidth(300);
-    chat->setChannel(std::move(channel));
-
-    this->layout()->setSpacing(0);
-    this->layout()->setContentsMargins(0, 0, 0, 0);
-}
-
-}  // namespace chatterino

src/widgets/StreamView.hpp

@@ -1,25 +0,0 @@
-#pragma once
-
-#include <QUrl>
-#include <QWidget>
-
-#include <memory>
-
-class QWebEngineView;
-
-namespace chatterino {
-
-class Channel;
-
-class StreamView : public QWidget
-{
-public:
-    StreamView(std::shared_ptr<Channel> channel, const QUrl &url);
-
-private:
-#ifdef USEWEBENGINE
-    QWebEngineView *stream;
-#endif
-};
-
-}  // namespace chatterino

src/widgets/splits/Split.cpp

@@ -524,11 +524,6 @@ void Split::addShortcuts()
              this->setFiltersDialog();
              return "";
          }},
-        {"startWatching",
-         [this](std::vector<QString>) -> QString {
-             this->startWatching();
-             return "";
-         }},
         {"openInBrowser",
          [this](std::vector<QString>) -> QString {
              if (this->getChannel()->getType() == Channel::Type::TwitchWhispers)
@@ -1401,22 +1396,6 @@ void Split::openSubPage()
     }
 }
 
-void Split::startWatching()
-{
-#ifdef USEWEBENGINE
-    ChannelPtr _channel = this->getChannel();
-    TwitchChannel *tc = dynamic_cast<TwitchChannel *>(_channel.get());
-
-    if (tc != nullptr)
-    {
-        StreamView *view = new StreamView(
-            _channel,
-            "https://player.twitch.tv/?parent=twitch.tv&channel=" + tc->name);
-        view->setAttribute(Qt::WA_DeleteOnClose, true);
-        view->show();
-    }
-#endif
-}
 void Split::setFiltersDialog()
 {
     SelectChannelFiltersDialog d(this->getFilters(), this);

src/widgets/splits/Split.hpp

@@ -184,7 +184,6 @@ public slots:
     void openBrowserPlayer();
     void openInStreamlink();
     void openWithCustomScheme();
-    void startWatching();
     void setFiltersDialog();
     void showSearch(bool singleChannel);
     void showViewerList();

src/widgets/splits/SplitHeader.cpp

@@ -37,10 +37,6 @@
 
 #include <cmath>
 
-#ifdef USEWEBENGINE
-#    include "widgets/StreamView.hpp"
-#endif
-
 namespace {
 
 using namespace chatterino;
@@ -383,11 +379,6 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
         "Set filters", this->split_, &Split::setFiltersDialog,
         h->getDisplaySequence(HotkeyCategory::Split, "pickFilters"));
     menu->addSeparator();
-#ifdef USEWEBENGINE
-    this->dropdownMenu.addAction(
-        "Start watching", this->split_, &Split::startWatching;
-        h->getDisplaySequence(HotkeyCategory::Split, "startWatching"));
-#endif
 
     auto *twitchChannel =
         dynamic_cast<TwitchChannel *>(this->split_->getChannel().get());
@@ -397,12 +388,10 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
         menu->addAction(
             OPEN_IN_BROWSER, this->split_, &Split::openInBrowser,
             h->getDisplaySequence(HotkeyCategory::Split, "openInBrowser"));
-#ifndef USEWEBENGINE
         menu->addAction(OPEN_PLAYER_IN_BROWSER, this->split_,
                         &Split::openBrowserPlayer,
                         h->getDisplaySequence(HotkeyCategory::Split,
                                               "openPlayerInBrowser"));
-#endif
         menu->addAction(
             OPEN_IN_STREAMLINK, this->split_, &Split::openInStreamlink,
             h->getDisplaySequence(HotkeyCategory::Split, "openInStreamlink"));