AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uic: Avoid use of Q_UNUSED in the generated code

Browse Source 
Instead, use (void)x; directly.

The current use of Q_UNUSED(x); generates warnings for an
empty statement the expansion of Q_UNUSED contains a semicolon
already.

Emitting Q_UNUSED(x) without the extra semicolon would be
an option, too, but as the future of Q_UNUSED's embedded
semicolon seems unclear right now, avoid its use altogether.

The change affects only generated code that's barely ever
read by a human, so the overall utility of "improved readability"
of Q_UNUSED in that place is questionable anyway.

Change-Id: I332527ed7c202f779bd82290517837e3ecf09a08
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk 2019-07-23 12:03:27 +02:00
parent 31753adebe
commit 4fa0b41523
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/uic/cpp/cppwriteinitialization.cpp
View File

@ -547,10 +547,11 @@ void WriteInitialization::acceptUI(DomUI *node)
m_output << m_option.indent << language::endFunctionDefinition("setupUi"); m_output << m_option.indent << language::endFunctionDefinition("setupUi");
if (!m_mainFormUsedInRetranslateUi && language::language() == Language::Cpp) { if (!m_mainFormUsedInRetranslateUi && language::language() == Language::Cpp) {
// Mark varName as unused to avoid compiler warnings.
m_refreshInitialization += m_indent; m_refreshInitialization += m_indent;
m_refreshInitialization += QLatin1String("Q_UNUSED("); m_refreshInitialization += QLatin1String("(void)");
m_refreshInitialization += varName ; m_refreshInitialization += varName ;
m_refreshInitialization += QLatin1String(");\n"); m_refreshInitialization += QLatin1String(";\n");
} }
m_output << m_option.indent m_output << m_option.indent

2
tests/auto/tools/uic/baseline/qfiledialog.ui.h
View File

@ -291,7 +291,7 @@ public:
detailModeButton->setToolTip(QCoreApplication::translate("QFileDialog", "Detail View", nullptr)); detailModeButton->setToolTip(QCoreApplication::translate("QFileDialog", "Detail View", nullptr));
#endif // QT_CONFIG(tooltip) #endif // QT_CONFIG(tooltip)
fileTypeLabel->setText(QCoreApplication::translate("QFileDialog", "Files of type:", nullptr)); fileTypeLabel->setText(QCoreApplication::translate("QFileDialog", "Files of type:", nullptr));
Q_UNUSED(QFileDialog); (void)QFileDialog;
} // retranslateUi } // retranslateUi
}; };