Changeset 23

Timestamp:

Jun 8, 2009, 11:33:03 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Implemented OS/2 version of QSettings.

Location:

trunk

Files:

• qmake/Makefile.os2-g++ (modified) (2 diffs)
• src/corelib/io/qsettings_os2.cpp (copied) (copied from trunk/src/corelib/io/qsettings_win.cpp ) (5 diffs)

trunk/qmake/Makefile.os2-g++

@@ -79 +79 @@
         qurl.obj \
         qsettings.obj \
-        qsettings_pm.obj \
+        qsettings_.obj \
         qvariant.obj \
         qmetatype.obj \
@@ -145 +145 @@
         $(CXX) $(CXXFLAGS) $(BUILD_PATH)/src/corelib/global/qconfig.cpp
 
-qsettings_pm.obj: $(SOURCE_PATH)/src/corelib/io/qsettings_pm.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qsettings_pm.cpp
+qsettings_.cpp
+        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qsettings_.cpp
 
 qsettings.obj: $(SOURCE_PATH)/src/corelib/io/qsettings.cpp

trunk/src/corelib/io/qsettings_os2.cpp

@@ -3 +3 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information ([email protected])
+
+
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -47 +49 @@
 #include "qvector.h"
 #include "qmap.h"
-#include "qt_windows.h"
 #include "qdebug.h"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 QT_BEGIN_NAMESPACE
@@ -132 +272 @@
 {
     QString result;
-        QT_WA({
-                wchar_t *data = 0;
-                FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                        0, errorCode, 0,
-                        data, 0, 0);
-                result = QString::fromUtf16(reinterpret_cast<const ushort *> (data));
-                if (data != 0)
-                        LocalFree(data);
-        },      {
-                char *data = 0;
-                FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                        0, errorCode, 0,
-                        (char *)&data, 0, 0);
-                result = QString::fromLocal8Bit(data);
-                if (data != 0)
-                        LocalFree(data);
-        })
-    if (result.endsWith(QLatin1String("\n")))
-        result.truncate(result.length() - 1);
+    switch (errorCode) {
+        case ERROR_FILE_NOT_FOUND:
+            result = "ERROR_FILE_NOT_FOUND"; break;
+        case ERROR_ACCESS_DENIED:
+            result = "ERROR_ACCESS_DENIED"; break;
+        case ERROR_NO_MORE_ITEMS:
+            result = "ERROR_NO_MORE_ITEMS"; break;
+    default:
+        result = QString().sprintf("Error %lu", errorCode);
+            break;
+    }
 
     return result;
@@ -634 +766 @@
     if (deleteWriteHandleOnExit && writeHandle() != 0) {
 #if defined(Q_OS_WINCE)
-        remove(regList.at(0).key()); 
+        remove(regList.at(0).key());
 #else
         DWORD res;
@@ -795 +927 @@
 
         case QVariant::ByteArray:
-            // On Win95/98/Me QString::toLocal8Bit() fails to handle chars > 0x7F. So we don't go through variantToString() at all.
-            if (QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based) {
-                QByteArray ba = value.toByteArray();
-                regValueBuff = "@ByteArray(";
-                regValueBuff += ba;
-                regValueBuff += ')';
-                if (ba.contains('\0')) {
-                    type = REG_BINARY;
-                } else {
-                    type = REG_SZ;
-                    regValueBuff += '\0';
-                }
-                    
-                break;
-            }
             // fallthrough intended