switch to QObject::isSignalConnected

pedrolcl · Dec 3, 2024 · face722 · face722
1 parent 95443b2
commit face722
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/library/alsa/alsaclient.cpp b/library/alsa/alsaclient.cpp
@@ -16,17 +16,20 @@
     along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "errorcheck.h"
 #include <QCoreApplication>
 #include <QFile>
+#include <QMetaMethod>
 #include <QReadLocker>
 #include <QRegularExpression>
 #include <QThread>
 #include <QWriteLocker>
+
 #include <drumstick/alsaclient.h>
 #include <drumstick/alsaevent.h>
 #include <drumstick/alsaqueue.h>
 
+#include "errorcheck.h"
+
 #if defined(RTKIT_SUPPORT)
 #include <QDBusConnection>
 #include <QDBusInterface>
@@ -587,6 +590,7 @@ MidiClient::getSequencerType()
 void
 MidiClient::doEvents()
 {
+    static const QMetaMethod receivedSignal = QMetaMethod::fromSignal(&MidiClient::eventReceived);
     do {
         int err = 0;
         snd_seq_event_t* evp = nullptr;
@@ -688,7 +692,7 @@ MidiClient::doEvents()
                     }
                 } else {
                     // finally, process signals
-                    if (receivers(SIGNAL(eventReceived(drumstick::ALSA::SequencerEvent *))) > 0) {
+                    if (isSignalConnected(receivedSignal)) {
                         Q_EMIT eventReceived(event->clone());
                     }
                 }

diff --git a/library/alsa/alsaport.cpp b/library/alsa/alsaport.cpp
@@ -16,6 +16,8 @@
     along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <QMetaMethod>
+
 #include "errorcheck.h"
 #include <drumstick/alsaclient.h>
 #include <drumstick/alsaqueue.h>
@@ -638,10 +640,10 @@ MidiPort::setMidiClient( MidiClient* seq )
 void
 MidiPort::subscribe(Subscription* subs)
 {
+    static const QMetaMethod subscribedSignal = QMetaMethod::fromSignal(&MidiPort::subscribed);
     subs->subscribe(m_MidiClient);
     m_Subscriptions.append(*subs);
-    if (receivers(SIGNAL(subscribed(drumstick::ALSA::MidiPort *, drumstick::ALSA::Subscription *)))
-        > 0) {
+    if (isSignalConnected(subscribedSignal)) {
         Q_EMIT subscribed(this, subs->clone());
     }
 }