Commit 3699bd09 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Qt4: remove useless IPv6 option

We have been able to autodetect this for ages
parent 225b543a
...@@ -418,7 +418,6 @@ NetOpenPanel::NetOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) : ...@@ -418,7 +418,6 @@ NetOpenPanel::NetOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
CONNECT( ui.portSpin, valueChanged( int ), this, updateMRL() ); CONNECT( ui.portSpin, valueChanged( int ), this, updateMRL() );
CONNECT( ui.addressText, textChanged( QString ), this, updateMRL()); CONNECT( ui.addressText, textChanged( QString ), this, updateMRL());
CONNECT( ui.timeShift, clicked(), this, updateMRL()); CONNECT( ui.timeShift, clicked(), this, updateMRL());
CONNECT( ui.ipv6, clicked(), this, updateMRL());
ui.protocolCombo->addItem( "" ); ui.protocolCombo->addItem( "" );
ui.protocolCombo->addItem("HTTP", QVariant("http")); ui.protocolCombo->addItem("HTTP", QVariant("http"));
...@@ -446,7 +445,6 @@ void NetOpenPanel::updateProtocol( int idx_proto ) { ...@@ -446,7 +445,6 @@ void NetOpenPanel::updateProtocol( int idx_proto ) {
ui.timeShift->setEnabled( idx_proto == UDP_PROTO || ui.timeShift->setEnabled( idx_proto == UDP_PROTO ||
idx_proto == UDPM_PROTO ); idx_proto == UDPM_PROTO );
ui.ipv6->setEnabled( idx_proto == UDP_PROTO );
ui.addressText->setEnabled( idx_proto != UDP_PROTO ); ui.addressText->setEnabled( idx_proto != UDP_PROTO );
ui.portSpin->setEnabled( idx_proto == UDP_PROTO || ui.portSpin->setEnabled( idx_proto == UDP_PROTO ||
idx_proto == UDPM_PROTO ); idx_proto == UDPM_PROTO );
...@@ -505,10 +503,6 @@ void NetOpenPanel::updateMRL() { ...@@ -505,10 +503,6 @@ void NetOpenPanel::updateMRL() {
break; break;
case UDP_PROTO: case UDP_PROTO:
mrl = "udp://@"; mrl = "udp://@";
if( ui.ipv6->isEnabled() && ui.ipv6->isChecked() )
{
mrl += "[::]";
}
mrl += QString(":%1").arg( ui.portSpin->value() ); mrl += QString(":%1").arg( ui.portSpin->value() );
emit methodChanged("udp-caching"); emit methodChanged("udp-caching");
break; break;
......
...@@ -111,13 +111,6 @@ ...@@ -111,13 +111,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="ipv6" >
<property name="text" >
<string>_("Force IPv6")</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
...@@ -144,7 +137,6 @@ ...@@ -144,7 +137,6 @@
<tabstop>addressText</tabstop> <tabstop>addressText</tabstop>
<tabstop>portSpin</tabstop> <tabstop>portSpin</tabstop>
<tabstop>timeShift</tabstop> <tabstop>timeShift</tabstop>
<tabstop>ipv6</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment