Rename the header qenvironmentvariables.h -> qtenvironmentvariables.h

Change-Id: I8153c856c2cd93ec6932cd7dd5e9d7273d5712dd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Sona Kurazyan 2022-09-22 20:48:41 +02:00 committed by Ivan Solovev
parent 7e58cd0ce2
commit fce36ac866
6 changed files with 16 additions and 16 deletions

View File

@ -55,7 +55,6 @@ qt_internal_add_module(Core
global/qcontainerinfo.h global/qcontainerinfo.h
global/qdarwinhelpers.h global/qdarwinhelpers.h
global/qendian.cpp global/qendian.h global/qendian_p.h global/qendian.cpp global/qendian.h global/qendian_p.h
global/qenvironmentvariables.cpp global/qenvironmentvariables.h
global/qexceptionhandling.cpp global/qexceptionhandling.h global/qexceptionhandling.cpp global/qexceptionhandling.h
global/qflags.h global/qflags.h
global/qfloat16.cpp global/qfloat16.h global/qfloat16.cpp global/qfloat16.h
@ -80,6 +79,7 @@ qt_internal_add_module(Core
global/qtclasshelpermacros.h global/qtclasshelpermacros.h
global/qtconfigmacros.h global/qtconfigmacros.h
global/qtdeprecationmarkers.h global/qtdeprecationmarkers.h
global/qtenvironmentvariables.cpp global/qtenvironmentvariables.h
global/qtrace_p.h global/qtrace_p.h
global/qtranslation.h global/qtranslation.h
global/qtresource.h global/qtresource.h

View File

@ -295,7 +295,7 @@ QString QDir::operator[](int i) const
} }
#endif #endif
#include "qenvironmentvariables.h" #include "qtenvironmentvariables.h"
bool qputenv(const char *varName, const QByteArray &value) bool qputenv(const char *varName, const QByteArray &value)
{ {

View File

@ -90,7 +90,6 @@ QT_END_NAMESPACE
#include <QtCore/qatomic.h> #include <QtCore/qatomic.h>
#include <QtCore/qconstructormacros.h> #include <QtCore/qconstructormacros.h>
#include <QtCore/qdarwinhelpers.h> #include <QtCore/qdarwinhelpers.h>
#include <QtCore/qenvironmentvariables.h>
#include <QtCore/qexceptionhandling.h> #include <QtCore/qexceptionhandling.h>
#include <QtCore/qforeach.h> #include <QtCore/qforeach.h>
#include <QtCore/qglobalstatic.h> #include <QtCore/qglobalstatic.h>
@ -100,6 +99,7 @@ QT_END_NAMESPACE
#include <QtCore/qoverload.h> #include <QtCore/qoverload.h>
#include <QtCore/qswap.h> #include <QtCore/qswap.h>
#include <QtCore/qtdeprecationmarkers.h> #include <QtCore/qtdeprecationmarkers.h>
#include <QtCore/qtenvironmentvariables.h>
#include <QtCore/qtranslation.h> #include <QtCore/qtranslation.h>
#include <QtCore/qtresource.h> #include <QtCore/qtresource.h>
#include <QtCore/qtypetraits.h> #include <QtCore/qtypetraits.h>

View File

@ -1,7 +1,7 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2022 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#include "qenvironmentvariables.h" #include "qtenvironmentvariables.h"
#include <qplatformdefs.h> #include <qplatformdefs.h>
#include <QtCore/qbytearray.h> #include <QtCore/qbytearray.h>
@ -18,7 +18,7 @@ QT_BEGIN_NAMESPACE
Q_CONSTINIT static QBasicMutex environmentMutex; Q_CONSTINIT static QBasicMutex environmentMutex;
/*! /*!
\relates <QEnvironmentVariables> \relates <QtEnvironmentVariables>
\threadsafe \threadsafe
Returns the value of the environment variable with name \a varName as a Returns the value of the environment variable with name \a varName as a
@ -63,7 +63,7 @@ QByteArray qgetenv(const char *varName)
\fn QString qEnvironmentVariable(const char *varName, const QString &defaultValue) \fn QString qEnvironmentVariable(const char *varName, const QString &defaultValue)
\fn QString qEnvironmentVariable(const char *varName) \fn QString qEnvironmentVariable(const char *varName)
\relates <QEnvironmentVariables> \relates <QtEnvironmentVariables>
\since 5.10 \since 5.10
These functions return the value of the environment variable, \a varName, as a These functions return the value of the environment variable, \a varName, as a
@ -143,7 +143,7 @@ QString qEnvironmentVariable(const char *varName)
} }
/*! /*!
\relates <QEnvironmentVariables> \relates <QtEnvironmentVariables>
\since 5.1 \since 5.1
Returns whether the environment variable \a varName is empty. Returns whether the environment variable \a varName is empty.
@ -171,7 +171,7 @@ bool qEnvironmentVariableIsEmpty(const char *varName) noexcept
} }
/*! /*!
\relates <QEnvironmentVariables> \relates <QtEnvironmentVariables>
\since 5.5 \since 5.5
Returns the numerical value of the environment variable \a varName. Returns the numerical value of the environment variable \a varName.
@ -219,7 +219,7 @@ int qEnvironmentVariableIntValue(const char *varName, bool *ok) noexcept
} }
/*! /*!
\relates <QEnvironmentVariables> \relates <QtEnvironmentVariables>
\since 5.1 \since 5.1
Returns whether the environment variable \a varName is set. Returns whether the environment variable \a varName is set.
@ -244,7 +244,7 @@ bool qEnvironmentVariableIsSet(const char *varName) noexcept
/*! /*!
\fn bool qputenv(const char *varName, QByteArrayView value) \fn bool qputenv(const char *varName, QByteArrayView value)
\relates <QEnvironmentVariables> \relates <QtEnvironmentVariables>
This function sets the \a value of the environment variable named This function sets the \a value of the environment variable named
\a varName. It will create the variable if it does not exist. It \a varName. It will create the variable if it does not exist. It
@ -294,7 +294,7 @@ bool qputenv(const char *varName, QByteArrayView raw)
} }
/*! /*!
\relates <QEnvironmentVariables> \relates <QtEnvironmentVariables>
This function deletes the variable \a varName from the environment. This function deletes the variable \a varName from the environment.

View File

@ -1,14 +1,14 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2022 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#ifndef QENVIRONMENTVARIABLES_H #ifndef QTENVIRONMENTVARIABLES_H
#define QENVIRONMENTVARIABLES_H #define QTENVIRONMENTVARIABLES_H
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#include <QtCore/qtdeprecationmarkers.h> #include <QtCore/qtdeprecationmarkers.h>
#if 0 #if 0
#pragma qt_class(QEnvironmentVariables) #pragma qt_class(QtEnvironmentVariables)
#pragma qt_sync_stop_processing #pragma qt_sync_stop_processing
#endif #endif
@ -33,4 +33,4 @@ Q_CORE_EXPORT int qEnvironmentVariableIntValue(const char *varName, bool *ok=nu
QT_END_NAMESPACE QT_END_NAMESPACE
#endif /* QENVIRONMENTVARIABLES_H */ #endif /* QTENVIRONMENTVARIABLES_H */

View File

@ -19,7 +19,6 @@ qt_internal_extend_target(Bootstrap
SOURCES SOURCES
../../corelib/global/qassert.cpp ../../corelib/global/qassert.cpp
../../corelib/global/qendian.cpp ../../corelib/global/qendian.cpp
../../corelib/global/qenvironmentvariables.cpp
../../corelib/global/qfloat16.cpp ../../corelib/global/qfloat16.cpp
../../corelib/global/qglobal.cpp ../../corelib/global/qglobal.cpp
../../corelib/global/qlogging.cpp ../../corelib/global/qlogging.cpp
@ -27,6 +26,7 @@ qt_internal_extend_target(Bootstrap
../../corelib/global/qnumeric.cpp ../../corelib/global/qnumeric.cpp
../../corelib/global/qoperatingsystemversion.cpp ../../corelib/global/qoperatingsystemversion.cpp
../../corelib/global/qrandom.cpp ../../corelib/global/qrandom.cpp
../../corelib/global/qtenvironmentvariables.cpp
../../corelib/io/qabstractfileengine.cpp ../../corelib/io/qabstractfileengine.cpp
../../corelib/io/qbuffer.cpp ../../corelib/io/qbuffer.cpp
../../corelib/io/qdebug.cpp ../../corelib/io/qdebug.cpp