feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Hide GccToolChain::WarningFlagAdder declaration

Browse Source 
It's only used in the .cpp.

Change-Id: Ib9ce5ca49dfe2440d553c98cf688dcd6d31ac084
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2023-09-05 11:25:04 +02:00
parent 30ac04bffd
commit 64b6f0f02b
2 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -48,6 +48,49 @@ using namespace Utils;
namespace ProjectExplorer {
namespace Internal {
class WarningFlagAdder
{
public:
WarningFlagAdder(const QString &flag, WarningFlags &flags) :
m_flags(flags)
{
if (!flag.startsWith("-W")) {
m_triggered = true;
return;
}
m_doesEnable = !flag.startsWith("-Wno-");
if (m_doesEnable)
m_flagUtf8 = flag.mid(2).toUtf8();
else
m_flagUtf8 = flag.mid(5).toUtf8();
}
void operator()(const char name[], WarningFlags flagsSet)
{
if (m_triggered)
return;
if (0 == strcmp(m_flagUtf8.data(), name)) {
m_triggered = true;
if (m_doesEnable)
m_flags |= flagsSet;
else
m_flags &= ~flagsSet;
}
}
bool triggered() const
{
return m_triggered;
}
private:
QByteArray m_flagUtf8;
WarningFlags &m_flags;
bool m_doesEnable = false;
bool m_triggered = false;
};
static const QStringList languageOption(Id languageId)
{
if (languageId == Constants::C_LANGUAGE_ID)
@@ -1975,40 +2018,6 @@ void GccToolChainConfigWidget::updateParentToolChainComboBox()
}
}
GccToolChain::WarningFlagAdder::WarningFlagAdder(const QString &flag, WarningFlags &flags) :
m_flags(flags)
{
if (!flag.startsWith("-W")) {
m_triggered = true;
return;
}
m_doesEnable = !flag.startsWith("-Wno-");
if (m_doesEnable)
m_flagUtf8 = flag.mid(2).toUtf8();
else
m_flagUtf8 = flag.mid(5).toUtf8();
}
void GccToolChain::WarningFlagAdder::operator ()(const char name[], WarningFlags flagsSet)
{
if (m_triggered)
return;
if (0 == strcmp(m_flagUtf8.data(), name))
{
m_triggered = true;
if (m_doesEnable)
m_flags |= flagsSet;
else
m_flags &= ~flagsSet;
}
}
bool GccToolChain::WarningFlagAdder::triggered() const
{
return m_triggered;
}
} // namespace ProjectExplorer
// Unit tests:

14
src/plugins/projectexplorer/gcctoolchain.h
View File

@@ -127,20 +127,6 @@ protected:
int priority() const override { return m_priority; }
class WarningFlagAdder
{
public:
WarningFlagAdder(const QString &flag, Utils::WarningFlags &flags);
void operator ()(const char name[], Utils::WarningFlags flagsSet);
bool triggered() const;
private:
QByteArray m_flagUtf8;
Utils::WarningFlags &m_flags;
bool m_doesEnable = false;
bool m_triggered = false;
};
QString sysRoot() const override;
private: