From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Mon, 7 Jul 2008 16:11:09 +0000 (-0700)
Subject: Revert "Fixed open network panel."
X-Git-Tag: 0.9.0-test2~126
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=dd11b53113b073ef7879fffc5d28b58152dd50bf;p=vlc

Revert "Fixed open network panel."

This reverts commit 000f1e1fb9253dca219253ee54702cf044aff213.
---

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 88e5ad6a8f..6e6a36b5c1 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -420,21 +420,15 @@ NetOpenPanel::NetOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     CONNECT( ui.timeShift, clicked(), this, updateMRL());
     CONNECT( ui.ipv6, clicked(), this, updateMRL());
 
-    typedef QPair<QString,QString> QPairString;
-    QMap<int, QPairString> protocols;
-#define P(value,name,dsc) do { protocols[value] = QPairString( QString(dsc), QString(name) );} while(0)
-    P( NO_PROTO,    "",         "" );
-    P( UDPM_PROTO,  "udp",      "UDP/RTP (multicast)" );
-    P( HTTP_PROTO,  "http",     "HTTP" );
-    P( HTTPS_PROTO, "https",    "HTTPS" );
-    P( MMS_PROTO,   "mms",      "MMS" );
-    P( FTP_PROTO,   "ftp",      "FTP" );
-    P( RTSP_PROTO,  "rtsp",     "RTSP" );
-    P( UDP_PROTO,   "udp",      "UDP/RTP (unicast)" );
-    P( RTMP_PROTO,  "rtmp",     "RTMP" );
-#undef P
-    foreach( QPairString e, protocols ) /* Sorted by key, exactly what we need */
-        ui.protocolCombo->addItem( e.first, QVariant(e.second.isEmpty() ) );
+    ui.protocolCombo->addItem( "" );
+    ui.protocolCombo->addItem("HTTP", QVariant("http"));
+    ui.protocolCombo->addItem("HTTPS", QVariant("https"));
+    ui.protocolCombo->addItem("FTP", QVariant("ftp"));
+    ui.protocolCombo->addItem("MMS", QVariant("mms"));
+    ui.protocolCombo->addItem("RTSP", QVariant("rtsp"));
+    ui.protocolCombo->addItem("UDP/RTP (unicast)", QVariant("udp"));
+    ui.protocolCombo->addItem("UDP/RTP (multicast)", QVariant("udp"));
+    ui.protocolCombo->addItem("RTMP", QVariant("rtmp"));
 }
 
 NetOpenPanel::~NetOpenPanel()
@@ -526,7 +520,6 @@ void NetOpenPanel::updateMRL() {
             else mrl += addr;
             mrl += QString(":%1").arg( ui.portSpin->value() );
             emit methodChanged("udp-caching");
-            break;
         case RTMP_PROTO:
             mrl = "rtmp://" + addr;
             emit methodChanged("rtmp-caching");