From 7c31160c54304a168bdb44888e12802c01cba896 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 30 Apr 2013 09:43:28 +0100 Subject: [PATCH] Use QNetworkInterface::allAddresses() instead of ServerPool. Fixes #11393 --- mythtv/programs/mythtv-setup/backendsettings.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mythtv/programs/mythtv-setup/backendsettings.cpp b/mythtv/programs/mythtv-setup/backendsettings.cpp index 4ebfe6f882c..1960b6a7296 100644 --- a/mythtv/programs/mythtv-setup/backendsettings.cpp +++ b/mythtv/programs/mythtv-setup/backendsettings.cpp @@ -5,19 +5,21 @@ #include "mythcorecontext.h" #include "settings.h" #include "channelsettings.h" // for ChannelTVFormat::GetFormats() -#include "serverpool.h" #include +#include + static HostComboBox *LocalServerIP() { HostComboBox *gc = new HostComboBox("BackendServerIP"); gc->setLabel(QObject::tr("IPv4 address")); - QList list = ServerPool::DefaultListenIPv4(); + QList list = QNetworkInterface::allAddresses(); QList::iterator it; for (it = list.begin(); it != list.end(); ++it) { - gc->addSelection((*it).toString(), (*it).toString()); + if ((*it).protocol() == QAbstractSocket::IPv4Protocol) + gc->addSelection((*it).toString(), (*it).toString()); } gc->setValue("127.0.0.1"); @@ -34,11 +36,12 @@ static HostComboBox *LocalServerIP6() { HostComboBox *gc = new HostComboBox("BackendServerIP6"); gc->setLabel(QObject::tr("IPv6 address")); - QList list = ServerPool::DefaultListenIPv6(); + QList list = QNetworkInterface::allAddresses(); QList::iterator it; for (it = list.begin(); it != list.end(); ++it) { - gc->addSelection((*it).toString(), (*it).toString()); + if ((*it).protocol() == QAbstractSocket::IPv6Protocol) + gc->addSelection((*it).toString(), (*it).toString()); } #if defined(QT_NO_IPV6)