de-duplicate class MythServer (ODR violation)

The two versions were equivalent, since ServerPool() defaults to nullptr.

It is a minimal class, and always has been, so inline it completely.
It has been only rarely edited and must include "serverpool.h" for
its inheritance, so place it in "serverpool.h".

Author: ulmus-scott

mythtv/libs/libmythbase/serverpool.h

@@ -20,7 +20,8 @@
  *  collectively for any new connections.
  *
  *  This can be subclassed with new 'newTcpConnection()' and 'newConnection()'
- *  methods to allow signalling for alternate socket types.
+ *  methods to allow signalling for alternate socket types.  For a minimal
+ *  example see MythServer.
  */
 
 class PrivUdpSocket;
@@ -127,4 +128,20 @@ class MBASE_PUBLIC ServerPool : public QObject
     PrivUdpSocket          *m_lastUdpSocket {nullptr};
 };
 
+class MBASE_PUBLIC MythServer : public ServerPool
+{
+    Q_OBJECT
+  public:
+    explicit MythServer(QObject *parent = nullptr) : ServerPool(parent) {}
+
+  signals:
+    void newConnection(qintptr socket);
+
+  protected slots:
+    void newTcpConnection(qintptr socket) override // ServerPool
+    {
+        emit newConnection(socket);
+    }
+};
+
 #endif

mythtv/libs/libmythprotoserver/mythsocketmanager.cpp

@@ -46,15 +46,6 @@ class ProcessRequestRunnable : public QRunnable
     MythSocket        *m_sock;
 };
 
-MythServer::MythServer(QObject *parent) : ServerPool(parent)
-{
-}
-
-void MythServer::newTcpConnection(qintptr socket)
-{
-    emit newConnection(socket);
-}
-
 MythSocketManager::MythSocketManager() :
     m_threadPool("MythSocketManager")
 {

mythtv/libs/libmythprotoserver/mythsocketmanager.h

@@ -17,19 +17,6 @@
 #include "mythsocket.h"
 #include "serverpool.h"
 
-class MythServer : public ServerPool
-{
-    Q_OBJECT
-  public:
-    explicit MythServer(QObject *parent=nullptr);
-
-  signals:
-    void newConnection(qintptr socket);
-
-  protected slots:
-    void newTcpConnection(qintptr socket) override; // ServerPool
-};
-
 class PROTOSERVER_PUBLIC MythSocketManager : public QObject, public MythSocketCBs
 {
     Q_OBJECT

mythtv/programs/mythbackend/mainserver.cpp

@@ -51,7 +51,7 @@
 #include "mythversion.h"
 #include "mythdb.h"
 #include "mainserver.h"
-#include "server.h"
+#include "serverpool.h"
 #include "mthread.h"
 #include "scheduler.h"
 #include "requesthandler/fileserverutil.h"
@@ -293,7 +293,7 @@ MainServer::MainServer(bool master, int port,
         SetExitCode(GENERIC_EXIT_SOCKET_ERROR, false);
         return;
     }
-    connect(m_mythserver, &MythServer::NewConnection,
+    connect(m_mythserver, &MythServer::newConnection,
             this,       &MainServer::NewConnection);
 
     gCoreContext->addListener(this);

mythtv/programs/mythbackend/mythbackend.pro

@@ -24,7 +24,7 @@ QMAKE_CLEAN += $(TARGET)
 
 # Input
 HEADERS += autoexpire.h encoderlink.h filetransfer.h httpstatus.h mainserver.h
-HEADERS += playbacksock.h scheduler.h server.h backendhousekeeper.h
+HEADERS += playbacksock.h scheduler.h backendhousekeeper.h
 HEADERS += upnpcdstv.h upnpcdsmusic.h upnpcdsvideo.h mediaserver.h
 HEADERS += internetContent.h main_helpers.h backendcontext.h
 HEADERS += httpconfig.h mythsettings.h commandlineparser.h
@@ -42,7 +42,7 @@ HEADERS += services/capture.h services/image.h services/music.h
 
 
 SOURCES += autoexpire.cpp encoderlink.cpp filetransfer.cpp httpstatus.cpp
-SOURCES += main.cpp mainserver.cpp playbacksock.cpp scheduler.cpp server.cpp
+SOURCES += main.cpp mainserver.cpp playbacksock.cpp scheduler.cpp
 SOURCES += backendhousekeeper.cpp
 SOURCES += upnpcdstv.cpp upnpcdsmusic.cpp upnpcdsvideo.cpp mediaserver.cpp
 SOURCES += internetContent.cpp main_helpers.cpp backendcontext.cpp