Changeset 399 for trunk/src/corelib

Timestamp:

Dec 7, 2009, 4:29:57 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Fixed qWarning messages in QSettings.

File:

• trunk/src/corelib/io/qsettings_os2.cpp (modified) (9 diffs)

trunk/src/corelib/io/qsettings_os2.cpp

@@ -269 +269 @@
 */
 
-static QString errorCodeToString(DWORD errorCode)
-{
-    QString result;
+static Q errorCodeToString(DWORD errorCode)
+{
+    Q result;
     switch (errorCode) {
         case ERROR_FILE_NOT_FOUND:
-            result = QLatin1String("ERROR_FILE_NOT_FOUND"); break;
+            result = ; break;
         case ERROR_ACCESS_DENIED:
-            result = QLatin1String("ERROR_ACCESS_DENIED"); break;
+            result = ; break;
         case ERROR_NO_MORE_ITEMS:
-            result = QLatin1String("ERROR_NO_MORE_ITEMS"); break;
+            result = ; break;
     default:
-        result = QString().sprintf("Error %lu", errorCode);
+        result = QString().sprintf("Error %lu", errorCode);
             break;
     }
@@ -328 +328 @@
         return resultHandle;
 
-    //qWarning("QSettings: Failed to create subkey \"%s\": %s",
-    //        rSubKey.toLatin1().data(), errorCodeToString(res).toLatin1().data());
+     %s",
+    ).data());
 
     return 0;
@@ -374 +374 @@
 
     if (res != ERROR_SUCCESS) {
-        qWarning("QSettings: RegQueryInfoKey() failed: %s", errorCodeToString(res).toLatin1().data());
+        qWarning("QSettings: RegQueryInfoKey() failed).data());
         return result;
     }
@@ -423 +423 @@
 
         if (res != ERROR_SUCCESS) {
-            qWarning("QSettings: RegEnumValue failed: %s", errorCodeToString(res).toLatin1().data());
+            qWarning("QSettings: RegEnumValue).data());
             continue;
         }
@@ -482 +482 @@
         } );
         if (res != ERROR_SUCCESS) {
-            qWarning("QSettings: RegDeleteKey failed on subkey \"%s\": %s",
-                      group.toLatin1().data(), errorCodeToString(res).toLatin1().data());
+            qWarning("QSettings: RegDeleteKey,
+                     ).data());
             return;
         }
@@ -784 +784 @@
         } );
         if (res != ERROR_SUCCESS) {
-            qWarning("QSettings: Failed to delete key \"%s\": %s",
-                    regList.at(0).key().toLatin1().data(), errorCodeToString(res).toLatin1().data());
+            qWarning("QSettings:  %s",
+                    ).data());
         }
 #endif
@@ -833 +833 @@
                 } );
                 if (res != ERROR_SUCCESS) {
-                    qWarning("QSettings: RegDeleteValue failed on subkey \"%s\": %s",
-                              group.toLatin1().data(), errorCodeToString(res).toLatin1().data());
+                    qWarning("QSettings: RegDeleteValue %s",
+                              group.to).data());
                 }
             }
@@ -849 +849 @@
 
             if (res != ERROR_SUCCESS) {
-                qWarning("QSettings: RegDeleteKey failed on key \"%s\": %s",
-                            rKey.toLatin1().data(), errorCodeToString(res).toLatin1().data());
+                qWarning("QSettings: RegDeleteKey %s",
+                            rKey.to).data());
             }
         }
@@ -979 +979 @@
         deleteWriteHandleOnExit = false;
     } else {
-        qWarning("QSettings: failed to set subkey \"%s\": %s",
-                rKey.toLatin1().data(), errorCodeToString(res).toLatin1().data());
+        qWarning("QSettings:  %s",
+                rKey.to).data());
         setStatus(QSettings::AccessError);
     }