summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-12-18 17:33:00 (GMT)
committerGitHub <noreply@github.com>2020-12-18 17:33:00 (GMT)
commit77a37d141d3603c0089bc4a231c9381c1bb7d707 (patch)
tree6327700378f69d9070f6339de85acb2cab824f0b
parent05b86a783ab8a17ad695f515fb7eac9c6a9f1d30 (diff)
parent92f9149ecf34dd1a7f19204ae7aff39c08dacc93 (diff)
downloadDoxygen-77a37d141d3603c0089bc4a231c9381c1bb7d707.zip
Doxygen-77a37d141d3603c0089bc4a231c9381c1bb7d707.tar.gz
Doxygen-77a37d141d3603c0089bc4a231c9381c1bb7d707.tar.bz2
Merge pull request #8257 from albert-github/feature/bug_doxyw_warn_2
Show configuration warnings unconditionally in the doxywizard
-rw-r--r--addon/doxywizard/config_msg.cpp49
1 files changed, 11 insertions, 38 deletions
diff --git a/addon/doxywizard/config_msg.cpp b/addon/doxywizard/config_msg.cpp
index f30e677..fc84206 100644
--- a/addon/doxywizard/config_msg.cpp
+++ b/addon/doxywizard/config_msg.cpp
@@ -12,16 +12,9 @@ void config_err(const char *fmt, ...)
msg.append(QString::fromLatin1(fmt));
va_list args;
va_start(args, fmt);
- if (DoxygenWizard::debugFlag)
- {
- char debugOut[1000]; // this size should be sufficient
- vsnprintf(debugOut, 1000,qPrintable(msg), args);
- MainWindow::instance().outputLogText(QString::fromLatin1(debugOut));
- }
- else
- {
- vfprintf(stderr, qPrintable(msg), args);
- }
+ char debugOut[1000]; // this size should be sufficient
+ vsnprintf(debugOut, 1000,qPrintable(msg), args);
+ MainWindow::instance().outputLogText(QString::fromLatin1(debugOut));
va_end(args);
}
@@ -32,16 +25,9 @@ void config_term(const char *fmt, ...)
msg.append(QString::fromLatin1(fmt));
va_list args;
va_start(args, fmt);
- if (DoxygenWizard::debugFlag)
- {
- char debugOut[1000]; // this size should be sufficient
- vsnprintf(debugOut, 1000,qPrintable(msg), args);
- MainWindow::instance().outputLogText(QString::fromLatin1(debugOut));
- }
- else
- {
- vfprintf(stderr, qPrintable(msg), args);
- }
+ char debugOut[1000]; // this size should be sufficient
+ vsnprintf(debugOut, 1000,qPrintable(msg), args);
+ MainWindow::instance().outputLogText(QString::fromLatin1(debugOut));
va_end(args);
exit(1);
}
@@ -53,31 +39,18 @@ void config_warn(const char *fmt, ...)
msg.append(QString::fromLatin1(fmt));
va_list args;
va_start(args, fmt);
- if (DoxygenWizard::debugFlag)
- {
- char debugOut[1000];
- vsnprintf(debugOut, 1000,qPrintable(msg), args);
- MainWindow::instance().outputLogText(QString::fromLatin1(debugOut));
- }
- else
- {
- vfprintf(stderr, qPrintable(msg), args);
- }
+ char debugOut[1000];
+ vsnprintf(debugOut, 1000,qPrintable(msg), args);
+ MainWindow::instance().outputLogText(QString::fromLatin1(debugOut));
va_end(args);
}
void config_open()
{
- if (DoxygenWizard::debugFlag)
- {
- MainWindow::instance().outputLogStart();
- }
+ MainWindow::instance().outputLogStart();
}
void config_finish()
{
- if (DoxygenWizard::debugFlag)
- {
- MainWindow::instance().outputLogFinish();
- }
+ MainWindow::instance().outputLogFinish();
}