summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-12-27 14:08:46 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2020-12-27 17:59:27 (GMT)
commit3563280692e46c64e20ebb264e06a9c9fe8d2cd2 (patch)
tree19aab2b90fa9159437ec1c76b8643923578247dd
parent8abb5ab5f1c890099120f19bfb183e95dc611221 (diff)
downloadDoxygen-3563280692e46c64e20ebb264e06a9c9fe8d2cd2.zip
Doxygen-3563280692e46c64e20ebb264e06a9c9fe8d2cd2.tar.gz
Doxygen-3563280692e46c64e20ebb264e06a9c9fe8d2cd2.tar.bz2
Workaround for older versions of Qt
That don't support QByteArray::toStdString()
-rw-r--r--addon/doxywizard/config_doxyw.l7
1 files changed, 4 insertions, 3 deletions
diff --git a/addon/doxywizard/config_doxyw.l b/addon/doxywizard/config_doxyw.l
index 1293705..6b487ee 100644
--- a/addon/doxywizard/config_doxyw.l
+++ b/addon/doxywizard/config_doxyw.l
@@ -173,7 +173,7 @@ static void processString()
{
if (!warned)
{
- std::string str = g_str.trimmed().toStdString();
+ std::string str = g_str.trimmed().data();
config_warn("Invalid value for '%s' tag at line %d, file %s: Value '%s' is not properly quoted\n",
qPrintable(g_cmd),yylineno-1,qPrintable(g_yyFileName),str.c_str());
}
@@ -267,7 +267,7 @@ static void processList()
{
if (!warned)
{
- std::string str = g_str.trimmed().toStdString();
+ std::string str = g_str.trimmed().data();
config_warn("Invalid value for '%s' tag at line %d, file %s: Values in list '%s' are not properly space %sseparated\n",
qPrintable(g_cmd),yylineno-1,qPrintable(g_yyFileName),str.c_str(),allowCommaAsSeparator?"or comma ":"");
warned=true;
@@ -286,7 +286,7 @@ static void processList()
addElem();
if (insideQuote)
{
- std::string str = g_str.trimmed().toStdString();
+ std::string str = g_str.trimmed().data();
config_warn("Invalid value for '%s' tag at line %d, file %s: Values in list '%s' are not properly quoted\n",
qPrintable(g_cmd),yylineno-1,qPrintable(g_yyFileName),str.c_str());
}
@@ -411,6 +411,7 @@ static void readIncludeFile(const QString &incName)
{
g_arg = &g_curOption->value();
g_str = QByteArray();
+ g_isEnum = false;
switch(g_curOption->kind())
{
case Input::StrList: