Qt4: add toURI() helper

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index b3616779b61eef6308ba9cb47bc0f94f2e96ee97..3d500fefab613a1f39bc15d5ac299325f0842086 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -275,6 +275,7 @@ SOURCES_qt4 =       qt4.cpp \
                util/input_slider.cpp \
                util/customwidgets.cpp \
                util/registry.cpp \
+               util/qt_dirs.cpp \
                util/pictureflow.cpp
 
 noinst_HEADERS = \

diff --git a/modules/gui/qt4/util/qt_dirs.cpp b/modules/gui/qt4/util/qt_dirs.cpp
new file mode 100644 (file)
index 0000000..5656941
--- /dev/null
+++ b/modules/gui/qt4/util/qt_dirs.cpp
@@ -0,0 +1,40 @@
+/*****************************************************************************
+ * dirs.cpp : file path helpers
+ ****************************************************************************
+ * Copyright (C) 2010 the VideoLAN team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "qt4.hpp"
+#include "qt_dirs.hpp"
+#include <vlc_url.h>
+
+QString toURI( const QString& s )
+{
+    QString path = toNativeSeparators( s );
+
+    char *psz = make_URI( qtu(path), NULL );
+    if( psz == NULL )
+        return qfu("");
+
+    QString uri = qfu( psz );
+    free( psz );
+    return uri;
+}

diff --git a/modules/gui/qt4/util/qt_dirs.hpp b/modules/gui/qt4/util/qt_dirs.hpp
index 08cad1cae7c9d9900bf2f31599268db12cd0250e..a6ea07cea116e79d8f3abf73ee7c6bf0527b4564 100644 (file)
--- a/modules/gui/qt4/util/qt_dirs.hpp
+++ b/modules/gui/qt4/util/qt_dirs.hpp
@@ -47,5 +47,6 @@ static inline QString colon_unescape( QString s )
 {
     return s.replace( "\\:", ":" ).trimmed();
 }
-#endif
 
+QString toURI( const QString& s );
+#endif