Changeset 935 for XmlTools2/trunk/utilxmltools.cpp

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

File:

• XmlTools2/trunk/utilxmltools.cpp (modified) (8 diffs)

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;