Changeset 25

Timestamp:

Jun 11, 2009, 2:40:50 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: More OS/2 bits for QSettings.

Location:

trunk/src/corelib/io

Files:

• qsettings.cpp (modified) (22 diffs)
• qsettings_os2.cpp (modified) (15 diffs)

trunk/src/corelib/io/qsettings.cpp

@@ -350 +350 @@
 // see also qsettings_win.cpp and qsettings_mac.cpp
 
-#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
 QSettingsPrivate *QSettingsPrivate::create(QSettings::Format format, QSettings::Scope scope,
                                            const QString &organization, const QString &application)
@@ -358 +358 @@
 #endif
 
-#if !defined(Q_OS_WIN)
+#if !defined(Q_OS_WIN)
 QSettingsPrivate *QSettingsPrivate::create(const QString &fileName, QSettings::Format format)
 {
@@ -1130 +1130 @@
            Windows registry and the Mac CFPreferences.)
        */
-#ifdef Q_OS_WIN
+#if
         pathHash->insert(pathHashKey(QSettings::IniFormat, QSettings::UserScope),
                          windowsConfigPath(CSIDL_APPDATA) + QDir::separator());
         pathHash->insert(pathHashKey(QSettings::IniFormat, QSettings::SystemScope),
                          windowsConfigPath(CSIDL_COMMON_APPDATA) + QDir::separator());
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #else
         QString userPath;
@@ -1898 +1920 @@
     IniMap::const_iterator i;
 
-#ifdef Q_OS_WIN
+#if
     const char * const eol = "\r\n";
 #else
@@ -2032 +2054 @@
     Users normally expect an application to remember its settings
     (window sizes and positions, options, etc.) across sessions. This
-    information is often stored in the system registry on Windows,
+    information is often stored in the system registry on Windows,
     and in XML preferences files on Mac OS X. On Unix systems, in the
     absence of a standard, many applications (including the KDE
@@ -2135 +2157 @@
     \section1 Key Syntax
 
-    Setting keys can contain any Unicode characters. The Windows
+    Setting keys can contain any Unicode characters. The Windows
     registry and INI files use case-insensitive keys, whereas the
     Carbon Preferences API on Mac OS X uses case-sensitive keys. To
@@ -2321 +2343 @@
     \endlist
 
-    On Windows, NativeFormat settings are stored in the following
+    On Windows, NativeFormat settings are stored in the following
     registry paths:
 
@@ -2359 +2381 @@
     Settings\\All Users\\Application Data}.
 
+
+
+
+
+
+
+
+
+
     The paths for the \c .ini and \c .conf files can be changed using
-    setPath(). On Unix and Mac OS X, the user can override them by by
-    setting the \c XDG_CONFIG_HOME environment variable; see
-    setPath() for details.
+    setPath(). On Unix, Mac OS X and OS/2, the user can override them by setting
+    the \c XDG_CONFIG_HOME environment variable; see setPath() for details.
 
     \section2 Accessing INI and .plist Files Directly
@@ -2382 +2412 @@
     \snippet doc/src/snippets/code/src_corelib_io_qsettings.cpp 3
 
-    \section2 Accessing the Windows Registry Directly
-
-    On Windows, QSettings lets you access settings that have been
+    \section2 Accessing the Windows Registry Directly
+
+    On Windows, QSettings lets you access settings that have been
     written with QSettings (or settings in a supported format, e.g., string
     data) in the system registry. This is done by constructing a QSettings
@@ -2405 +2435 @@
     so.
 
-    \section2 Accessing Common Registry Settings on Windows
-
-    On Windows, it is possible for a key to have both a value and subkeys.
-    Its default value is accessed by using "Default" or "." in
+    \section2 Accessing Common Registry Settings on Windows
+
+    On Windows
+    Its default value is accessed by using "Default" or "." in
     place of a subkey:
 
     \snippet doc/src/snippets/code/src_corelib_io_qsettings.cpp 6
 
-    On other platforms than Windows, "Default" and "." would be
+    On other platforms than Windows, "Default" and "." would be
     treated as regular subkeys.
 
@@ -2424 +2454 @@
 
     \list
-    \o  The Windows system registry has the following limitations: A
+    \o  The Windows system registry has the following limitations: A
         subkey may not exceed 255 characters, an entry's value may
         not exceed 16,383 characters, and all the values of a key may
@@ -2482 +2512 @@
     \value NativeFormat  Store the settings using the most
                          appropriate storage format for the platform.
-                         On Windows, this means the system registry;
+                         On Windows, this means the system registry;
                          on Mac OS X, this means the CFPreferences
                          API; on Unix, this means textual
@@ -2647 +2677 @@
     fileName depends on the platform. On Unix, \a fileName is the
     name of an INI file. On Mac OS X, \a fileName is the name of a
-    \c .plist file. On Windows, \a fileName is a path in the system
+    \c .plist file. On Windows, \a fileName is a path in the system
     registry.
 
@@ -2806 +2836 @@
     object are stored.
 
-    On Windows, if the format is QSettings::NativeFormat, the return value
-    is a system registry path, not a file path.
+    On Windows
+    is a system registry path, not a file path.
 
     \sa isWritable(), format()
@@ -3206 +3236 @@
 
 /*!
-  
+
   Sets the value of setting \a key to \a value. If the \a key already
   exists, the previous value is overwritten.
 
-  Note that the Windows registry and INI files use case-insensitive
+  Note that the Windows registry and INI files use case-insensitive
   keys, whereas the Carbon Preferences API on Mac OS X uses
   case-sensitive keys. To avoid portability problems, see the \l{Key
@@ -3245 +3275 @@
     \snippet doc/src/snippets/code/src_corelib_io_qsettings.cpp 25
 
-    Note that the Windows registry and INI files use case-insensitive
-    keys, whereas the Carbon Preferences API on Mac OS X uses
-    case-sensitive keys. To avoid portability problems, see the \l{Key
-    Syntax} rules.
+    Note that the Windows and OS/2 registry and INI files use case-insensitive
+    keys, whereas the Carbon Preferences API on Mac OS X uses case-sensitive
+    keys. To avoid portability problems, see the \l{Key Syntax} rules.
 
     \sa setValue(), value(), contains()
@@ -3280 +3309 @@
     relative to that group.
 
-    Note that the Windows registry and INI files use case-insensitive
-    keys, whereas the Carbon Preferences API on Mac OS X uses
-    case-sensitive keys. To avoid portability problems, see the \l{Key
-    Syntax} rules.
+    Note that the Windows and OS/2 registry and INI files use case-insensitive
+    keys, whereas the Carbon Preferences API on Mac OS X uses case-sensitive
+    keys. To avoid portability problems, see the \l{Key Syntax} rules.
 
     \sa value(), setValue()
@@ -3342 +3370 @@
     returned.
 
-    Note that the Windows registry and INI files use case-insensitive
+    Note that the Windows registry and INI files use case-insensitive
     keys, whereas the Carbon Preferences API on Mac OS X uses
     case-sensitive keys. To avoid portability problems, see the \l{Key
@@ -3405 +3433 @@
 {
     setPath(IniFormat, SystemScope, dir);
-#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
     setPath(NativeFormat, SystemScope, dir);
 #endif
@@ -3419 +3447 @@
 {
     setPath(IniFormat, UserScope, dir);
-#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
     setPath(NativeFormat, UserScope, dir);
 #endif
@@ -3442 +3470 @@
     \row    \o{1,2} Mac OS X    \o{1,2} IniFormat               \o UserScope   \o \c $HOME/.config
     \row                                                        \o SystemScope \o \c /etc/xdg
+
+
     \endtable
 
-    The default UserScope paths on Unix and Mac OS X (\c
-    $HOME/.config or $HOME/Settings) can be overridden by the user by setting the
+    The default UserScope paths on Unix
+    $HOME/Settings) can be overridden by the user by setting the
     \c XDG_CONFIG_HOME environment variable. The default SystemScope
-    paths on Unix and Mac OS X (\c /etc/xdg) can be overridden when
-    building the Qt library using the \c configure script's \c
+    paths on Unix, Mac OS X (\c /etc/xdg) and OS/2 (\c <boot_drv>:\OS2\xdg) can
+    be overridden when building the Qt library using the \c configure script's
+    \c
     --sysconfdir flag (see QLibraryInfo for details).
 
-    Setting the NativeFormat paths on Windows and Mac OS X has no
-    effect.
+    Setting the NativeFormat paths on Windows, Mac OS X and OS/2 has no effect.
 
     \warning This function doesn't affect existing QSettings objects.
@@ -3723 +3753 @@
 
     \value Unix Unix systems (X11 and Embedded Linux)
-    \value Windows Microsoft Windows systems
+    \value Windows Microsoft Windows systems
     \value Mac Mac OS X systems
 

trunk/src/corelib/io/qsettings_os2.cpp

@@ -555 +555 @@
 
 /*******************************************************************************
-** class QWinSettingsPrivate
+** class QSettingsPrivate
 */
 
-class QWinSettingsPrivate : public QSettingsPrivate
+class QSettingsPrivate : public QSettingsPrivate
 {
 public:
-    QWinSettingsPrivate(QSettings::Scope scope, const QString &organization,
+    QSettingsPrivate(QSettings::Scope scope, const QString &organization,
                         const QString &application);
-    QWinSettingsPrivate(QString rKey);
-    ~QWinSettingsPrivate();
+    QSettingsPrivate(QString rKey);
+    ~QSettingsPrivate();
 
     void remove(const QString &uKey);
@@ -583 +583 @@
 };
 
-QWinSettingsPrivate::QWinSettingsPrivate(QSettings::Scope scope, const QString &organization,
+QSettingsPrivate(QSettings::Scope scope, const QString &organization,
                                          const QString &application)
     : QSettingsPrivate(QSettings::NativeFormat, scope, organization, application)
@@ -611 +611 @@
 }
 
-QWinSettingsPrivate::QWinSettingsPrivate(QString rPath)
+QSettingsPrivate(QString rPath)
     : QSettingsPrivate(QSettings::NativeFormat)
 {
@@ -639 +639 @@
 }
 
-bool QWinSettingsPrivate::readKey(HKEY parentHandle, const QString &rSubKey, QVariant *value) const
+bool QSettingsPrivate::readKey(HKEY parentHandle, const QString &rSubKey, QVariant *value) const
 {
     QString rSubkeyName = keyName(rSubKey);
@@ -752 +752 @@
 }
 
-HKEY QWinSettingsPrivate::writeHandle() const
+HKEY QSettingsPrivate::writeHandle() const
 {
     if (regList.isEmpty())
@@ -762 +762 @@
 }
 
-QWinSettingsPrivate::~QWinSettingsPrivate()
+QSettingsPrivate()
 {
     if (deleteWriteHandleOnExit && writeHandle() != 0) {
@@ -786 +786 @@
 }
 
-void QWinSettingsPrivate::remove(const QString &uKey)
+void QSettingsPrivate::remove(const QString &uKey)
 {
     if (writeHandle() == 0) {
@@ -858 +858 @@
 }
 
-void QWinSettingsPrivate::set(const QString &uKey, const QVariant &value)
+void QSettingsPrivate::set(const QString &uKey, const QVariant &value)
 {
     if (writeHandle() == 0) {
@@ -974 +974 @@
 }
 
-bool QWinSettingsPrivate::get(const QString &uKey, QVariant *value) const
+bool QSettingsPrivate::get(const QString &uKey, QVariant *value) const
 {
     QString rKey = escapedKey(uKey);
@@ -990 +990 @@
 }
 
-QStringList QWinSettingsPrivate::children(const QString &uKey, ChildSpec spec) const
+QStringList QSettingsPrivate::children(const QString &uKey, ChildSpec spec) const
 {
     NameSet result;
@@ -1021 +1021 @@
 }
 
-void QWinSettingsPrivate::clear()
+void QSettingsPrivate::clear()
 {
     remove(QString());
@@ -1027 +1027 @@
 }
 
-void QWinSettingsPrivate::sync()
+void QSettingsPrivate::sync()
 {
     RegFlushKey(writeHandle());
 }
 
-void QWinSettingsPrivate::flush()
-{
-    // Windows does this for us.
-}
-
-QString QWinSettingsPrivate::fileName() const
+void QSettingsPrivate::flush()
+{
+    //  does this for us.
+}
+
+QString QSettingsPrivate::fileName() const
 {
     if (regList.isEmpty())
@@ -1052 +1052 @@
 }
 
-bool QWinSettingsPrivate::isWritable() const
+bool QSettingsPrivate::isWritable() const
 {
     return writeHandle() != 0;
@@ -1061 +1061 @@
 {
     if (format == QSettings::NativeFormat) {
-        return new QWinSettingsPrivate(scope, organization, application);
+        return new QSettingsPrivate(scope, organization, application);
     } else {
         return new QConfFileSettingsPrivate(format, scope, organization, application);
@@ -1070 +1070 @@
 {
     if (format == QSettings::NativeFormat) {
-        return new QWinSettingsPrivate(fileName);
+        return new QSettingsPrivate(fileName);
     } else {
         return new QConfFileSettingsPrivate(fileName, format);