[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/lib/geodata/handlers/dgml
From:       Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date:       2010-05-23 19:46:06
Message-ID: 20100523194606.3B801AC8BE () svn ! kde ! org
[Download RAW message or body]

SVN commit 1129800 by beschow:

add query attribute to download url tag

 M  +1 -0      DgmlAttributeDictionary.cpp  
 M  +1 -0      DgmlAttributeDictionary.h  
 M  +5 -0      DgmlDownloadUrlTagHandler.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DgmlAttributeDictionary.cpp #1129799:1129800
@@ -52,6 +52,7 @@
 const char* dgmlAttr_pixmap           = "pixmap";
 const char* dgmlAttr_port             = "port";
 const char* dgmlAttr_protocol         = "protocol";
+const char* dgmlAttr_query            = "query";
 const char* dgmlAttr_role             = "role";
 const char* dgmlAttr_spacing          = "spacing";
 const char* dgmlAttr_style            = "style";
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DgmlAttributeDictionary.h #1129799:1129800
@@ -54,6 +54,7 @@
     extern const char* dgmlAttr_pixmap;
     extern const char* dgmlAttr_port;
     extern const char* dgmlAttr_protocol;
+    extern const char *dgmlAttr_query;
     extern const char* dgmlAttr_role;
     extern const char* dgmlAttr_spacing;
     extern const char* dgmlAttr_style;
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DgmlDownloadUrlTagHandler.cpp #1129799:1129800
@@ -79,6 +79,11 @@
     if ( !pathStr.isEmpty() )
         url.setPath( pathStr );
 
+    // Attribute query, optional
+    const QString queryStr = parser.attribute( dgmlAttr_query ).trimmed();
+    if ( !queryStr.isEmpty() )
+        url.setEncodedQuery( queryStr.toLatin1() );
+
     parentItem.nodeAs<GeoSceneTexture>()->addDownloadUrl( url );
     return 0;
 }
[prev in list] [next in list] [prev in thread] [next in thread]