From 670d25342d4437555a66171b042976491dc277cf Mon Sep 17 00:00:00 2001
From: daniel <daniel@debian>
Date: Mon, 16 Jan 2017 18:42:32 -0500
Subject: [PATCH] fixed switch channel popup

---
 chatwidgetheader.cpp | 4 ++--
 emotes.cpp           | 2 +-
 ircmanager.cpp       | 2 +-
 textinputdialog.cpp  | 8 +++++---
 textinputdialog.h    | 1 +
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/chatwidgetheader.cpp b/chatwidgetheader.cpp
index 32843ff2..d49be2f1 100644
--- a/chatwidgetheader.cpp
+++ b/chatwidgetheader.cpp
@@ -58,8 +58,8 @@ ChatWidgetHeader::ChatWidgetHeader(ChatWidget *parent)
 
     // middle
     m_middleLabel.setAlignment(Qt::AlignCenter);
-    QObject::connect(&m_middleLabel, &m_middleLabel.mouseDoubleClickEvent, this,
-                     &mouseDoubleClickEvent);
+    QObject::connect(&m_middleLabel, SIGNAL(mouseDoubleClickEvent(QMouseEvent)), this,
+                     SLOT(mouseDoubleClickEvent));
 
     // right
     m_rightLabel.setMinimumWidth(height());
diff --git a/emotes.cpp b/emotes.cpp
index 0490cfc2..fe004e6d 100644
--- a/emotes.cpp
+++ b/emotes.cpp
@@ -2,7 +2,7 @@
 #include "resources.h"
 
 QString Emotes::m_twitchEmoteTemplate(
-    "http://static-cdn.jtvnw.net/emoticons/v1/{id}/{scale}.0");
+    "https://static-cdn.jtvnw.net/emoticons/v1/{id}/{scale}.0");
 
 ConcurrentMap<QString, TwitchEmoteValue *> Emotes::m_twitchEmotes;
 ConcurrentMap<QString, LazyLoadedImage *> Emotes::m_bttvEmotes;
diff --git a/ircmanager.cpp b/ircmanager.cpp
index 577d382b..af64709c 100644
--- a/ircmanager.cpp
+++ b/ircmanager.cpp
@@ -176,7 +176,7 @@ IrcManager::partChannel(const QString &channel)
 void
 IrcManager::messageReceived(IrcMessage *message)
 {
-    qInfo(message->command().toStdString().c_str());
+//    qInfo(message->command().toStdString().c_str());
 
     //    if (message->command() == "")
 }
diff --git a/textinputdialog.cpp b/textinputdialog.cpp
index e8057bd9..20231efb 100644
--- a/textinputdialog.cpp
+++ b/textinputdialog.cpp
@@ -15,9 +15,9 @@ TextInputDialog::TextInputDialog(QWidget *parent)
     m_buttonBox.addWidget(&m_okButton);
     m_buttonBox.addWidget(&m_cancelButton);
 
-    QObject::connect(&m_okButton, &m_okButton.clicked, this, &okButtonClicked);
-    QObject::connect(&m_cancelButton, &m_cancelButton.clicked, this,
-                     &cancelButtonClicked);
+    QObject::connect(&m_okButton, SIGNAL(clicked()), this, SLOT(okButtonClicked()));
+    QObject::connect(&m_cancelButton, SIGNAL(clicked()), this,
+                      SLOT(cancelButtonClicked()));
 
     setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
@@ -29,10 +29,12 @@ void
 TextInputDialog::okButtonClicked()
 {
     accept();
+    close();
 }
 
 void
 TextInputDialog::cancelButtonClicked()
 {
     reject();
+    close();
 }
diff --git a/textinputdialog.h b/textinputdialog.h
index 49777b2a..7e18fcc2 100644
--- a/textinputdialog.h
+++ b/textinputdialog.h
@@ -34,6 +34,7 @@ private:
     QPushButton m_okButton;
     QPushButton m_cancelButton;
 
+private slots:
     void okButtonClicked();
     void cancelButtonClicked();
 };