diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-16 14:30:28 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-07 17:45:31 +0200 |
| commit | 315257eabea010bf697415cdc0f6ec1e29b74d2b (patch) | |
| tree | e7462e36e2ea504a737d9aa09970a0756bef2a0a | |
| parent | 563a8d628f6c0d5e0ab2bd3305b020e225fb84ca (diff) | |
QSettings: purge deprecated API
Since 5.13: setSystemIniPath(), setUserIniPath()
Change-Id: Ie02fa96e652c10ac1a276016bd556474030fe0f5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 35 | ||||
| -rw-r--r-- | src/corelib/io/qsettings.h | 8 |
2 files changed, 1 insertions, 42 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index b9bb237544..e5ce2c6674 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -3322,41 +3322,6 @@ QSettings::Format QSettings::defaultFormat() return globalDefaultFormat; } -#if QT_DEPRECATED_SINCE(5, 13) -/*! - \obsolete - - Use setPath() instead. - - \oldcode - setSystemIniPath(path); - \newcode - setPath(QSettings::NativeFormat, QSettings::SystemScope, path); - setPath(QSettings::IniFormat, QSettings::SystemScope, path); - \endcode -*/ -void QSettings::setSystemIniPath(const QString &dir) -{ - setPath(IniFormat, SystemScope, dir); -#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) - setPath(NativeFormat, SystemScope, dir); -#endif -} - -/*! - \obsolete - - Use setPath() instead. -*/ - -void QSettings::setUserIniPath(const QString &dir) -{ - setPath(IniFormat, UserScope, dir); -#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) - setPath(NativeFormat, UserScope, dir); -#endif -} -#endif /*! \since 4.1 diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h index 0ca5c99432..8fde893c23 100644 --- a/src/corelib/io/qsettings.h +++ b/src/corelib/io/qsettings.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -181,12 +181,6 @@ public: static void setDefaultFormat(Format format); static Format defaultFormat(); -#if QT_DEPRECATED_SINCE(5, 13) - QT_DEPRECATED_X("Use QSettings::setPath() instead") - static void setSystemIniPath(const QString &dir); - QT_DEPRECATED_X("Use QSettings::setPath() instead") - static void setUserIniPath(const QString &dir); -#endif static void setPath(Format format, Scope scope, const QString &path); typedef QMap<QString, QVariant> SettingsMap; |