Changeset 7780ba686 in mythtv

Timestamp:

Mar 2, 2013, 2:42:25 AM (11 years ago)

Author:

Daniel Thor Kristjansson <danielk@…>

Branches:

devel/2020-player, devel/ffmpeg-resync, fixes/0.27, fixes/0.28, fixes/29, fixes/30, fixes/31, github-templates, master

Children:

aa58b17580

Parents:

d5cc7a1c7

Message:

Fix QTcpSocket code on Qt4 (SIGNAL/SLOT macros are not type aware).

Location:

mythtv/libs

Files:

• libmythbase/serverpool.cpp (modified) (1 diff)
• libmythprotoserver/mythsocketmanager.cpp (modified) (1 diff)

mythtv/libs/libmythbase/serverpool.cpp

@@ -391 +391 @@
                 this,   &ServerPool::newTcpConnection);
 #else
-        connect(server, SIGNAL(newConnection(int)),
-                this,   SLOT(newTcpConnection(int)));
+        connect(server, SIGNAL(newConnection(qt_socket_fd_t)),
+                this,   SLOT(newTcpConnection(qt_socket_fd_t)));
 #endif
         if (server->listen(*it, m_port))

mythtv/libs/libmythprotoserver/mythsocketmanager.cpp

@@ -102 +102 @@
             this,     &MythSocketManager::newConnection);
 #else
-    connect(m_server, SIGNAL(newConnection(int)),
-            this,     SLOT(newConnection(int)));
+    connect(m_server, SIGNAL(newConnection(qt_socket_fd_t)),
+            this,     SLOT(newConnection(qt_socket_fd_t)));
 #endif
     return true;