Changeset 935

Timestamp:

Feb 6, 2014, 2:05:39 PM (11 years ago)

Author:

s10k

Message:

XmlTools
Oni's Mac folder use a special character (U+0192), because of this I had to change all encoding transformations to UTF8

Location:

XmlTools2/trunk

Files:

• util.h (modified) (1 diff)
• utilxmltools.cpp (modified) (8 diffs)
• utilxmltools.h (modified) (2 diffs)
• xmlpatch.cpp (modified) (2 diffs)
• xmltools.cpp (modified) (8 diffs)

XmlTools2/trunk/util.h

@@ -44 +44 @@
 //// as the result will be always a.
 //inline const char* toCstr(const QString &myString){
-//    return myString.toLatin1().constData();
+//    return myString.toUtf8().constData();
 //}
 // Converts a std::string to QString

XmlTools2/trunk/utilxmltools.cpp

@@ -46 +46 @@
     if(!QFile::exists(file+".bak")){
         if(!Util::backupFile(file)){
-            std::cerr << "Couldn't backup file '" << file.toLatin1().constData() << "'. Aborting." << std::endl;
+            std::cerr << "Couldn't backup file '" << file.toUtf8().constData() << "'. Aborting." << std::endl;
             exit(1);
         }
@@ -52 +52 @@
     else{
         if(verboseEnabled){
-            std::cout << "Backup file '" << file.toLatin1().constData() << "'' already exists. Skipping..." << std::endl;
+            std::cout << "Backup file '" << file.toUtf8().constData() << "'' already exists. Skipping..." << std::endl;
         }
     }
@@ -64 +64 @@
     try
     {
-        selectedNodes = doc.select_nodes(xPathExpression.toLatin1().constData());
+        selectedNodes = doc.select_nodes(xPathExpression.toUtf8().constData());
     }
 
@@ -91 +91 @@
     try
     {
-        selectedNode = doc.select_single_node(xPathExpression.toLatin1().constData());
+        selectedNode = doc.select_single_node(xPathExpression.toUtf8().constData());
     }
 
@@ -108 +108 @@
         if ((*currNode).name() == filters.getElementName() && (filters.getParentElementName() == "" || filters.getParentElementName() == (*currNode).parent().name())
                 && (filters.getAttributeName() == "" ||
-                    Util::toQString((*currNode).attribute(filters.getAttributeName().toLatin1().constData()).value()) == filters.getAttributeValue()) ){ // Seems node attribute must be converted to qtsring to remove \r\n needs to check in future!
+                    Util::toQString((*currNode).attribute(filters.getAttributeName().toUtf8().constData()).value()) == filters.getAttributeValue()) ){ // Seems node attribute must be converted to qtsring to remove \r\n needs to check in future!
 
             result << *currNode;
@@ -125 +125 @@
         if ((*currNode).name() == filters.getElementName() && (filters.getParentElementName() == "" || filters.getParentElementName() == (*currNode).parent().name())
                 && (filters.getAttributeName() == "" ||
-                    Util::toQString((*currNode).attribute(filters.getAttributeName().toLatin1().constData()).value()) == filters.getAttributeValue()) ){
+                    Util::toQString((*currNode).attribute(filters.getAttributeName().toUtf8().constData()).value()) == filters.getAttributeValue()) ){
             return *currNode;
         }
@@ -142 +142 @@
 void displaySuccessMessage(const int numberOperations, const QString &operation){
     std::cout << "------------------------------------------------------------------------" << std::endl;
-    std::cout << numberOperations << " " << operation.toLatin1().constData() << " operation(s) completed with success!" << std::endl;
+    std::cout << numberOperations << " " << operation.toUtf8().constData() << " operation(s) completed with success!" << std::endl;
     std::cout << "------------------------------------------------------------------------" << std::endl;
 }
@@ -148 +148 @@
 void displayErrorMessage(const QString& operation, const QString &message, bool exitProgram){
     std::cerr << "************************************************************************" << std::endl;
-    std::cerr << operation.toLatin1().constData() << " operation failed!" << std::endl << std::endl;
-    std::cerr << message.toLatin1().constData() << std::endl << std::endl;
+    std::cerr << operation.toUtf8().constData() << " operation failed!" << std::endl << std::endl;
+    std::cerr << message.toUtf8().constData() << std::endl << std::endl;
     if(exitProgram) std::cerr << "Aborting..." << std::endl;
     std::cerr << "************************************************************************" << std::endl;

XmlTools2/trunk/utilxmltools.h

@@ -24 +24 @@
 inline void loadXmlFile(const QString &file, pugi::xml_document &document, pugi::xml_node &rootNode, bool backupsEnabled, bool verboseEnabled, const QString &operationForErrorMessage){
 
-    pugi::xml_parse_result result = document.load_file(file.toLatin1().constData());
+    pugi::xml_parse_result result = document.load_file(file.toUtf8().constData());
     rootNode=document.root();
 
     if(result.status==pugi::status_ok){
         if(verboseEnabled){
-            std::cout << "File '" << file.toLatin1().constData() << "' loaded with sucess." << std::endl;
+            std::cout << "File '" << file.toUtf8().constData() << "' loaded with sucess." << std::endl;
         }
     }
@@ -43 +43 @@
 
 inline void saveXmlFile(const QString &file, pugi::xml_document &document, const QString &operationForErrorMessage){
-    if(!document.save_file(file.toLatin1().constData(), "\t", pugi::format_indent | pugi::format_save_file_text | pugi::format_no_escapes)){ // output as the system new lines ending
+    if(!document.save_file(file.toUtf8().constData(), "\t", pugi::format_indent | pugi::format_save_file_text | pugi::format_no_escapes)){ // output as the system new lines ending
         UtilXmlTools::displayErrorMessage(operationForErrorMessage,"An error ocurred while saving '" + file + "' XML file");
     }

XmlTools2/trunk/xmlpatch.cpp

@@ -9 +9 @@
 
     if(forceTargetFilesWildcard!=""){
-        std::cout << "User forced patch in the target file(s): " << forceTargetFilesWildcard.toLatin1().constData() << std::endl;
+        std::cout << "User forced patch in the target file(s): " << forceTargetFilesWildcard.toUtf8().constData() << std::endl;
     }
 
@@ -58 +58 @@
     }
 
-    result=newNode.load(xmlString.toLatin1().constData()); // load xml to insert
+    result=newNode.load(xmlString.toUtf8().constData()); // load xml to insert
 
     if(result.status!=pugi::status_ok){

XmlTools2/trunk/xmltools.cpp

@@ -53 +53 @@
                 }
 
-                elements[j].text()=QString(Util::toQString(elements[j].text().as_string()) + " " + newValuesList[k]).toLatin1().constData(); // If it doesn't exists yet let's add it
+                elements[j].text()=QString(Util::toQString(elements[j].text().as_string()) + " " + newValuesList[k]).toUtf8().constData(); // If it doesn't exists yet let's add it
             }
         }
@@ -99 +99 @@
             if(elementChanged){ // If curr element changed update the XML
                 currValuesList.removeAll(""); // remove all files flagged to deletion
-                elements[j].text()=currValuesList.join(' ').toLatin1().constData();
+                elements[j].text()=currValuesList.join(' ').toUtf8().constData();
                 elementChanged=false;
             }
@@ -141 +141 @@
 
             if(elementChanged){ // If curr element changed update the XML
-                elements[j].text()=currValuesList.join(" ").toLatin1().constData();
+                elements[j].text()=currValuesList.join(" ").toUtf8().constData();
             }
             elementChanged=false;
@@ -174 +174 @@
         for(int j=0; j<elements.size(); j++){
             if(valuePositions!=""){
-                elements[j].text()=replaceSpecificPositions(value, Util::toQString(elements[j].text().as_string()),valuePositions).toLatin1().constData();
+                elements[j].text()=replaceSpecificPositions(value, Util::toQString(elements[j].text().as_string()),valuePositions).toUtf8().constData();
             }
             else{
-                elements[j].text()=value.toLatin1().constData();
+                elements[j].text()=value.toUtf8().constData();
             }
         }
@@ -215 +215 @@
             currXmlValue=MultiDimVar(Util::toQString(elements[1].text().as_string())); // the currXmlValue will begin to be the second one of the node
             newXmlValue=MultiDimVar::sub(lastXmlValue, MultiDimVar(diffBetweenOldAndNewValue));
-            elements[0].text() = newXmlValue.toString().toLatin1().constData(); // update the first eblement with the new one already
+            elements[0].text() = newXmlValue.toString().toUtf8().constData(); // update the first eblement with the new one already
         }
 
@@ -222 +222 @@
 
             newXmlValue=MultiDimVar::sum(newXmlValue,MultiDimVar::sub(currXmlValue,lastXmlValue));
-            elements[j].text() = newXmlValue.toString().toLatin1().constData(); // update element with the new value
+            elements[j].text() = newXmlValue.toString().toUtf8().constData(); // update element with the new value
             lastXmlValue=currXmlValue;
             currXmlValue=MultiDimVar(Util::toQString(elements[j+1].text().as_string()));
@@ -230 +230 @@
         // To update too last element (avoid out of bound because i+1)
         newXmlValue=MultiDimVar::sum(newXmlValue,MultiDimVar::sub(currXmlValue,lastXmlValue));
-        elements[elements.size()-1].text() = newXmlValue.toString().toLatin1().constData(); // update element with the new value
+        elements[elements.size()-1].text() = newXmlValue.toString().toUtf8().constData(); // update element with the new value
 
         UtilXmlTools::saveXmlFile(this->filesToProcess[i],this->document, "update-elements");
@@ -264 +264 @@
         // Override the tree with the inverted order
         for(int j=0; j<elements.size(); j++){
-            elements[j].text()= invertedElements[j].toLatin1().constData();
+            elements[j].text()= invertedElements[j].toUtf8().constData();
         }