From bbcbc4e3d75100ad65e750f79268860322bc0a57 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sun, 15 Jan 2017 17:12:19 +0100 Subject: [PATCH] potential fix for stuff --- chatwidgetheader.cpp | 25 +++++++++++++------------ chatwidgetheaderbutton.cpp | 8 ++++---- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/chatwidgetheader.cpp b/chatwidgetheader.cpp index d2cd7101..31221a17 100644 --- a/chatwidgetheader.cpp +++ b/chatwidgetheader.cpp @@ -33,30 +33,31 @@ ChatWidgetHeader::ChatWidgetHeader() leftLabel.label().setText( ""); - QObject::connect(&leftLabel, ChatWidgetHeaderButton::clicked, this, - leftButtonClicked); + QObject::connect(&leftLabel, &ChatWidgetHeaderButton::clicked, this, + &ChatWidgetHeader::leftButtonClicked); - leftMenu.addAction("Add new split", this, ChatWidgetHeader::menuAddSplit, + leftMenu.addAction("Add new split", this, &ChatWidgetHeader::menuAddSplit, QKeySequence(tr("Ctrl+T"))); - leftMenu.addAction("Close split", this, ChatWidgetHeader::menuCloseSplit, + leftMenu.addAction("Close split", this, &ChatWidgetHeader::menuCloseSplit, QKeySequence(tr("Ctrl+W"))); - leftMenu.addAction("Move split", this, ChatWidgetHeader::menuMoveSplit); + leftMenu.addAction("Move split", this, &ChatWidgetHeader::menuMoveSplit); leftMenu.addSeparator(); leftMenu.addAction("Change channel", this, - ChatWidgetHeader::menuChangeChannel, + &ChatWidgetHeader::menuChangeChannel, QKeySequence(tr("Ctrl+R"))); - leftMenu.addAction("Clear chat", this, ChatWidgetHeader::menuClearChat); - leftMenu.addAction("Open channel", this, ChatWidgetHeader::menuOpenChannel); + leftMenu.addAction("Clear chat", this, &ChatWidgetHeader::menuClearChat); + leftMenu.addAction("Open channel", this, + &ChatWidgetHeader::menuOpenChannel); leftMenu.addAction("Open pop-out player", this, - ChatWidgetHeader::menuPopupPlayer); + &ChatWidgetHeader::menuPopupPlayer); leftMenu.addSeparator(); leftMenu.addAction("Reload channel emotes", this, - ChatWidgetHeader::menuReloadChannelEmotes); + &ChatWidgetHeader::menuReloadChannelEmotes); leftMenu.addAction("Manual reconnect", this, - ChatWidgetHeader::menuManualReconnect); + &ChatWidgetHeader::menuManualReconnect); leftMenu.addSeparator(); leftMenu.addAction("Show changelog", this, - ChatWidgetHeader::menuShowChangelog); + &ChatWidgetHeader::menuShowChangelog); // middle middleLabel.setAlignment(Qt::AlignCenter); diff --git a/chatwidgetheaderbutton.cpp b/chatwidgetheaderbutton.cpp index e6ce5f94..43ee4053 100644 --- a/chatwidgetheaderbutton.cpp +++ b/chatwidgetheaderbutton.cpp @@ -18,10 +18,10 @@ ChatWidgetHeaderButton::ChatWidgetHeaderButton() hbox.addWidget(&m_label); hbox.addSpacing(6); - QObject::connect(&m_label, ChatWidgetHeaderButtonLabel::mouseUp, this, - labelMouseUp); - QObject::connect(&m_label, ChatWidgetHeaderButtonLabel::mouseDown, this, - labelMouseDown); + QObject::connect(&m_label, &ChatWidgetHeaderButtonLabel::mouseUp, this, + &ChatWidgetHeaderButton::labelMouseUp); + QObject::connect(&m_label, &ChatWidgetHeaderButtonLabel::mouseDown, this, + &ChatWidgetHeaderButton::labelMouseDown); } void