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

List:       kde-commits
Subject:    KDE/kdelibs/kdecore/kconfig_compiler
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2009-03-04 20:19:03
Message-ID: 1236197943.183884.15323.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 935303 by apaku:

Properly support default values for Url and UrlList


 M  +12 -4     kconfig_compiler.cpp  


--- trunk/KDE/kdelibs/kdecore/kconfig_compiler/kconfig_compiler.cpp #935302:935303
@@ -442,8 +442,9 @@
 
     } else if ( type == "Path" && !defaultValue.isEmpty() ) {
       defaultValue = literalString( defaultValue );
-
-    } else if ( (type == "StringList" || type == "PathList") && \
!defaultValue.isEmpty() ) { +    } else if ( type == "Url" && !defaultValue.isEmpty() \
) { +      defaultValue = "KUrl( " + literalString(defaultValue) + ")";
+    } else if ( ( type == "UrlList" || type == "StringList" || type == "PathList") \
&& !defaultValue.isEmpty() ) {  QTextStream cpp( &code, QIODevice::WriteOnly | \
QIODevice::Append );  if (!code.isEmpty())
          cpp << endl;
@@ -452,8 +453,15 @@
       const QStringList defaults = defaultValue.split( ',' );
       QStringList::ConstIterator it;
       for( it = defaults.constBegin(); it != defaults.constEnd(); ++it ) {
-        cpp << "  default" << name << ".append( QString::fromUtf8( \"" << *it << "\" \
                ) );"
-            << endl;
+        cpp << "  default" << name << ".append( ";
+        if( type == "UrlList" ) {
+          cpp << "KUrl(";       
+        }
+        cpp << "QString::fromUtf8( \"" << *it << "\" ) ";
+        if( type == "UrlList" ) {
+          cpp << ") ";
+        }
+        cpp << ");" << endl;
       }
       defaultValue = "default" + name;
 


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