removed namespaces

src/widgets/splits/Split.cpp

@@ -416,9 +416,9 @@ void Split::doOpenPopupPlayer()
 void Split::doOpenStreamlink()
 {
     try {
-        streamlink::Start(this->getChannel()->name);
-    } catch (const streamlink::Exception &ex) {
-        debug::Log("Error in doOpenStreamlink: {}", ex.what());
+        Start(this->getChannel()->name);
+    } catch (const Exception &ex) {
+        Log("Error in doOpenStreamlink: {}", ex.what());
     }
 }
 
@@ -449,7 +449,7 @@ void Split::doOpenViewerList()
     }
     auto loadingLabel = new QLabel("Loading...");
 
-    util::twitch::get("https://tmi.twitch.tv/group/user/" + this->getChannel()->name + "/chatters",
+    get("https://tmi.twitch.tv/group/user/" + this->getChannel()->name + "/chatters",
                       this, [=](QJsonObject obj) {
                           QJsonObject chattersObj = obj.value("chatters").toObject();
 

src/widgets/splits/SplitColumn.hpp

@@ -11,13 +11,13 @@ class SplitColumn
 public:
     SplitColumn() = default;
 
-    void insert(widgets::Split *split, int index = -1);
+    void insert(Split *split, int index = -1);
     void remove(int index);
     double getFlex();
     void setFlex(double flex);
 
 private:
-    std::vector<widgets::Split> items;
+    std::vector<Split> items;
 };
 
 }  // namespace chatterino

src/widgets/splits/SplitContainer.cpp

@@ -104,7 +104,7 @@ void SplitContainer::resetMouseStatus()
 
 void SplitContainer::appendNewSplit(bool openChannelNameDialog)
 {
-    util::assertInGuiThread();
+    assertInGuiThread();
 
     Split *split = new Split(this);
     this->appendSplit(split);
@@ -138,7 +138,7 @@ void SplitContainer::insertSplit(Split *split, Direction direction, Split *relat
 
 void SplitContainer::insertSplit(Split *split, Direction direction, Node *relativeTo)
 {
-    util::assertInGuiThread();
+    assertInGuiThread();
 
     split->setContainer(this);
 
@@ -161,7 +161,7 @@ void SplitContainer::insertSplit(Split *split, Direction direction, Node *relati
 
 void SplitContainer::addSplit(Split *split)
 {
-    util::assertInGuiThread();
+    assertInGuiThread();
 
     split->setParent(this);
     split->show();
@@ -202,7 +202,7 @@ void SplitContainer::setPreferedTargetRecursive(Node *node)
 
 SplitContainer::Position SplitContainer::releaseSplit(Split *split)
 {
-    util::assertInGuiThread();
+    assertInGuiThread();
 
     Node *node = this->baseNode.findNodeContainingSplit(split);
     assert(node != nullptr);
@@ -230,7 +230,7 @@ SplitContainer::Position SplitContainer::releaseSplit(Split *split)
 
 SplitContainer::Position SplitContainer::deleteSplit(Split *split)
 {
-    util::assertInGuiThread();
+    assertInGuiThread();
     assert(split != nullptr);
 
     split->deleteLater();
@@ -239,7 +239,7 @@ SplitContainer::Position SplitContainer::deleteSplit(Split *split)
 
 void SplitContainer::selectNextSplit(Direction direction)
 {
-    util::assertInGuiThread();
+    assertInGuiThread();
 
     if (Node *node = this->baseNode.findNodeContainingSplit(this->selected)) {
         this->selectSplitRecursive(node, direction);
@@ -565,7 +565,7 @@ void SplitContainer::decodeNodeRecusively(QJsonObject &obj, Node *node)
 
     if (type == "split") {
         auto *split = new Split(this);
-        split->setChannel(singletons::WindowManager::decodeChannel(obj.value("data").toObject()));
+        split->setChannel(chatterino::WindowManager::decodeChannel(obj.value("data").toObject()));
 
         this->appendSplit(split);
     } else if (type == "horizontal" || type == "vertical") {
@@ -582,7 +582,7 @@ void SplitContainer::decodeNodeRecusively(QJsonObject &obj, Node *node)
             if (_type == "split") {
                 auto *split = new Split(this);
                 split->setChannel(
-                    singletons::WindowManager::decodeChannel(_obj.value("data").toObject()));
+                    chatterino::WindowManager::decodeChannel(_obj.value("data").toObject()));
 
                 Node *_node = new Node();
                 _node->parent = node;
@@ -606,7 +606,7 @@ void SplitContainer::decodeNodeRecusively(QJsonObject &obj, Node *node)
             if (node->getChildren().size() < 2) {
                 auto *split = new Split(this);
                 split->setChannel(
-                    singletons::WindowManager::decodeChannel(obj.value("data").toObject()));
+                    chatterino::WindowManager::decodeChannel(obj.value("data").toObject()));
 
                 this->insertSplit(split, direction, node);
             }

src/widgets/splits/SplitHeader.cpp

@@ -33,7 +33,7 @@ SplitHeader::SplitHeader(Split *_split)
 
     auto app = getApp();
 
-    util::LayoutCreator<SplitHeader> layoutCreator(this);
+    LayoutCreator<SplitHeader> layoutCreator(this);
     auto layout = layoutCreator.emplace<QHBoxLayout>().withoutMargin();
     {
         // dropdown label
@@ -234,7 +234,7 @@ void SplitHeader::scaleChangedEvent(float scale)
     this->dropdownButton->setFixedWidth(w);
     this->moderationButton->setFixedWidth(w);
     //    this->titleLabel->setFont(
-    //        singletons::FontManager::getInstance().getFont(FontStyle::Medium, scale));
+    //        chatterino::FontManager::getInstance().getFont(FontStyle::Medium, scale));
 }
 
 void SplitHeader::updateChannelText()

src/widgets/splits/SplitInput.cpp

@@ -40,7 +40,7 @@ SplitInput::SplitInput(Split *_chatWidget)
 void SplitInput::initLayout()
 {
     auto app = getApp();
-    util::LayoutCreator<SplitInput> layoutCreator(this);
+    LayoutCreator<SplitInput> layoutCreator(this);
 
     auto layout =
         layoutCreator.setLayoutType<QHBoxLayout>().withoutMargin().assign(&this->ui_.hbox);
@@ -67,19 +67,19 @@ void SplitInput::initLayout()
 
     // set edit font
     this->ui_.textEdit->setFont(
-        app->fonts->getFont(singletons::FontManager::Type::ChatMedium, this->getScale()));
+        app->fonts->getFont(chatterino::FontManager::Type::ChatMedium, this->getScale()));
 
     this->managedConnections_.push_back(app->fonts->fontChanged.connect([=]() {
         this->ui_.textEdit->setFont(
-            app->fonts->getFont(singletons::FontManager::Type::ChatMedium, this->getScale()));
+            app->fonts->getFont(chatterino::FontManager::Type::ChatMedium, this->getScale()));
     }));
 
     // open emote popup
     QObject::connect(this->ui_.emoteButton, &RippleEffectLabel::clicked, [this] {
         if (!this->emotePopup_) {
             this->emotePopup_ = std::make_unique<EmotePopup>();
-            this->emotePopup_->linkClicked.connect([this](const messages::Link &link) {
-                if (link.type == messages::Link::InsertText) {
+            this->emotePopup_->linkClicked.connect([this](const chatterino::Link &link) {
+                if (link.type == chatterino::Link::InsertText) {
                     this->insertText(link.value + " ");
                 }
             });