whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QSettings: purge deprecated API 

Since 5.13: setSystemIniPath(), setUserIniPath()

Change-Id: Ie02fa96e652c10ac1a276016bd556474030fe0f5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
bb10
Edward Welbourne 2020-07-16 14:30:28 +02:00
parent 563a8d628f
commit 315257eabe
2 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/corelib/io/qsettings.cpp
View File

@ -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

8
src/corelib/io/qsettings.h
View File

@ -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;