diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2020-03-17 19:43:07 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-03-17 19:43:07 (GMT) |
commit | 4db68bb500d6f4fe1d810a411d4c8713f99e4231 (patch) | |
tree | c56c5110ac8a35db59d2c0bd4354b041c8dd35a2 /addon/doxywizard | |
parent | 39ba759f4dba837818f07451314b3612d438a1bd (diff) | |
parent | 79745c1110f973ac14b4087f7c199f7c8fd02469 (diff) | |
download | Doxygen-4db68bb500d6f4fe1d810a411d4c8713f99e4231.zip Doxygen-4db68bb500d6f4fe1d810a411d4c8713f99e4231.tar.gz Doxygen-4db68bb500d6f4fe1d810a411d4c8713f99e4231.tar.bz2 |
Merge branch 'feature/bug_doxywizard_warnings' of https://github.com/albert-github/doxygen into albert-github-feature/bug_doxywizard_warnings
Diffstat (limited to 'addon/doxywizard')
-rwxr-xr-x | addon/doxywizard/doxywizard.cpp | 30 | ||||
-rw-r--r-- | addon/doxywizard/wizard.cpp | 4 |
2 files changed, 26 insertions, 8 deletions
diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp index d0811d4..c574c05 100755 --- a/addon/doxywizard/doxywizard.cpp +++ b/addon/doxywizard/doxywizard.cpp @@ -343,7 +343,10 @@ void MainWindow::clearRecent() m_recentFiles.clear(); for (int i=0;i<MAX_RECENT_FILES;i++) { - m_settings.setValue(QString().sprintf("recent/config%d",i++),QString::fromLatin1("")); + QString res; + QTextStream out(&res); + out << "recent/config" << i++; + m_settings.setValue(res,QString::fromLatin1("")); } m_settings.sync(); } @@ -389,7 +392,10 @@ void MainWindow::loadSettings() /* due to prepend use list in reversed order */ for (int i=MAX_RECENT_FILES;i>=0;i--) { - QString entry = m_settings.value(QString().sprintf("recent/config%d",i)).toString(); + QString res; + QTextStream out(&res); + out << "recent/config" << i; + QString entry = m_settings.value(res).toString(); if (!entry.isEmpty() && QFileInfo(entry).exists()) { addRecentFileList(entry); @@ -447,12 +453,18 @@ void MainWindow::updateRecentFile(void) int i=0; foreach( QString str, m_recentFiles ) { + QString res; + QTextStream out(&res); + out << "recent/config" << i++; m_recentMenu->addAction(str); - m_settings.setValue(QString().sprintf("recent/config%d",i++),str); + m_settings.setValue(res,str); } for (;i<MAX_RECENT_FILES;i++) { - m_settings.setValue(QString().sprintf("recent/config%d",i++),QString::fromLatin1("")); + QString res; + QTextStream out(&res); + out << "recent/config" << i; + m_settings.setValue(res,QString::fromLatin1("")); } } @@ -689,16 +701,22 @@ int main(int argc,char **argv) { if (!qstrcmp(argv[1],"--help")) { + QString res; + QTextStream out(&res); + out << "Usage: " << argv[0] << " [config file]"; QMessageBox msgBox; - msgBox.setText(QString().sprintf("Usage: %s [config file]",argv[0])); + msgBox.setText(res); msgBox.exec(); exit(0); } } if (argc > 2) { + QString res; + QTextStream out(&res); + out << "Too many arguments specified\n\nUsage: " << argv[0] << " [config file]"; QMessageBox msgBox; - msgBox.setText(QString().sprintf("Too many arguments specified\n\nUsage: %s [config file]",argv[0])); + msgBox.setText(res); msgBox.exec(); exit(1); } diff --git a/addon/doxywizard/wizard.cpp b/addon/doxywizard/wizard.cpp index 2233379..c3c1b57 100644 --- a/addon/doxywizard/wizard.cpp +++ b/addon/doxywizard/wizard.cpp @@ -369,8 +369,8 @@ void ColorPicker::paintEvent(QPaintEvent*) p.drawPixmap(1, coff, *m_pix); const QPalette &g = palette(); qDrawShadePanel(&p, r, g, true); - p.setPen(g.foreground().color()); - p.setBrush(g.foreground()); + p.setPen(g.windowText().color()); + p.setBrush(g.windowText()); QPolygon a; int y = m_mode==Hue ? hue2y(m_hue) : m_mode==Saturation ? sat2y(m_sat) : |