Changeset 942 for XmlTools2/trunk

Timestamp:

Feb 6, 2014, 11:15:55 PM (11 years ago)

Author:

s10k

Message:

XmlTools

Location:

XmlTools2/trunk

Files:

• optionsparser.cpp (modified) (1 diff)
• util.cpp (modified) (3 diffs)
• util.h (modified) (3 diffs)

XmlTools2/trunk/optionsparser.cpp

@@ -97 +97 @@
 
                 if(line.startsWith('"')){ // Only read when starting with quotes
-                    temp=Util::substring(line," \""); // We need to use more than space, because if paths contains spaces...
+                    temp=line.split(" \""); // We need to use more than space, because if paths contains spaces...
                     patchFiles << temp[0].remove('"'); // remove the quotes, they are now not needed
                     targetXmlFiles << temp[1].remove('"');

XmlTools2/trunk/util.cpp

@@ -107 +107 @@
 }
 
-QStringList substring(const QString &myString,const QString &separator, Qt::CaseSensitivity cs){
-    QStringList result = QStringList();
-    int currIdx=0, nextIdx=0;
-
-    while(true){
-        nextIdx=myString.indexOf(separator,currIdx,cs);
-        result << myString.mid(currIdx,nextIdx-currIdx);
-        if(nextIdx==-1) break;
-        currIdx=nextIdx+1;
-    }
-
-    return result;
-}
+// Use qstring split
+//QStringList substring(const QString &myString,const QString &separator, Qt::CaseSensitivity cs){
+//    QStringList result = QStringList();
+//    int currIdx=0, nextIdx=0;
+
+//    while(true){
+//        nextIdx=myString.indexOf(separator,currIdx,cs);
+//        result << myString.mid(currIdx,nextIdx-currIdx);
+//        if(nextIdx==-1) break;
+//        currIdx=nextIdx+1;
+//    }
+
+//    return result;
+//}
 
 QStringList qStringListFromSpacedString(const QString &mySpacedString){
-    return Util::substring(mySpacedString," ");
+    return mySpacedString.split(" ");
 }
 
@@ -129 +130 @@
     QList<int> intList;
 
-    stringList = Util::substring(mySpacedString," ");
+    stringList = mySpacedString.split(" ");
 
     foreach(QString value, stringList){
@@ -142 +143 @@
     QList<double> doubleList;
 
-    stringList = Util::substring(mySpacedString," ");
+    stringList = mySpacedString.split(" ");
 
     foreach(QString value, stringList){

XmlTools2/trunk/util.h

@@ -6 +6 @@
 #include <QString>
 #include <QStringList>
-#include <QRegExp>
 #include <iostream> // cout, cin etc.
 
@@ -25 +24 @@
 QString fullTrim(QString str);
 QString normalizeDecimalSeparator(QString value);
-QStringList substring(const QString &myString, const QString &separator, Qt::CaseSensitivity cs = Qt::CaseSensitive);
+// Use qstring split
+// QStringList substring(const QString &myString, const QString &separator, Qt::CaseSensitivity cs = Qt::CaseSensitive);
 QStringList qStringListFromSpacedString(const QString &mySpacedString);
 QStringList getAllFilesByWildcard(const QString &wildcard);
@@ -51 +51 @@
 }
 
+// Needs optimization
 inline QStringList QStringToArgsArray(const QString &args){
     QStringList result;
-    result=Util::substring(args," ");
+    int startIdx=0, endIdx=0;
 
-    for(int i=0; i<result.size(); i++){
-        result[i].remove('"'); // remove quotes, they are not necessary as we had already splited the spaces
+    if(!args.isEmpty()){ // if non empty arguments
+
+        while(endIdx<args.length()){
+
+            startIdx=endIdx;
+
+            if(args.at(startIdx)==' '){ // Ignore spaces until a different char is found
+                endIdx++;
+                continue;
+            }
+            else if(args.at(startIdx)!='"'){ // if first character is different from quote it ends with space
+                endIdx=args.indexOf(' ',startIdx+1);
+            }
+            else{ // If is a quote try to get the all the string until next quote
+                endIdx=args.indexOf('"',startIdx+1);
+            }
+
+            if(endIdx==-1) break;
+
+            endIdx++;
+
+            result << args.mid(startIdx,endIdx-startIdx).replace("\"","").trimmed(); // remove quotes
+        }
+
     }