Skip to content

Commit 922c162

Browse files
authored
Merge pull request doxygen#12163 from albert-github/feature/bug_dw_doxyfile
Create possibility to dump Doxyfile from doxywizard
2 parents 0f52f5b + b0ddaa5 commit 922c162

2 files changed

Lines changed: 15 additions & 2 deletions

File tree

addon/doxywizard/doxywizard.cpp

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -942,7 +942,7 @@ static void usage(const char *exeName, const QString txt)
942942
{
943943
QMessageBox msgBox;
944944
QString fullText = txt;
945-
fullText += QString::fromLatin1("Usage: %1 [--debug] [--dump] [--language [lang]] [config file]\n").arg(QString::fromLatin1(exeName));
945+
fullText += QString::fromLatin1("Usage: %1 [--debug] [--dump] [--doxyfile] [--language [lang]] [config file]\n").arg(QString::fromLatin1(exeName));
946946
fullText += QString::fromLatin1("Usage: %1 --help\n").arg(QString::fromLatin1(exeName));
947947
fullText += QString::fromLatin1("Usage: %1 --version\n").arg(QString::fromLatin1(exeName));
948948
msgBox.setText(fullText);
@@ -968,6 +968,7 @@ int main(int argc,char **argv)
968968
int optInd=1;
969969
bool langSet = false;
970970
bool dumpFlag = false;
971+
bool doxyfileFlag = false;
971972
QString langSel;
972973
while (optInd<argc && argv[optInd][0]=='-' && argv[optInd][1]=='-')
973974
{
@@ -1000,6 +1001,10 @@ int main(int argc,char **argv)
10001001
{
10011002
dumpFlag = true;
10021003
}
1004+
else if (!qstrcmp(argv[optInd],"--doxyfile"))
1005+
{
1006+
doxyfileFlag = true;
1007+
}
10031008
else if (!qstrcmp(argv[optInd],"--debug"))
10041009
{
10051010
DoxygenWizard::debugFlag = true;
@@ -1071,10 +1076,18 @@ int main(int argc,char **argv)
10711076
newArgs.push_back(QString::fromLatin1(argv[argc-1]));
10721077
main.loadConfigFromFile(QString::fromLocal8Bit(argv[argc-1]));
10731078
}
1079+
10741080
if (dumpFlag)
10751081
{
10761082
main.dump();
10771083
}
1084+
if (doxyfileFlag)
1085+
{
1086+
QString fn = QString::fromLatin1("Doxyfile_%1").arg(DoxygenWizard::langCode);
1087+
main.saveConfig(fn);
1088+
}
1089+
if (dumpFlag ||doxyfileFlag) exit(0);
1090+
10781091
main.show();
10791092
return a.exec();
10801093
}

addon/doxywizard/doxywizard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ class MainWindow : public QMainWindow
5151
m_settings.setValue(QString::fromLatin1("language/code"), langCode);
5252
m_settings.sync();
5353
}
54+
void saveConfig(const QString &fileName);
5455

5556
public slots:
5657
void manual();
@@ -81,7 +82,6 @@ class MainWindow : public QMainWindow
8182

8283
private:
8384
MainWindow();
84-
void saveConfig(const QString &fileName);
8585
void addRecentFile(const QString &fileName);
8686
void addRecentFileList(const QString &fileName);
8787
void updateRecentFile(void);

0 commit comments

Comments
 (0)