diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2014-12-26 21:13:18 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-07-14 20:01:11 (GMT) |
commit | 333c7c44f1aa3c62f9401b190e45eaff15056d5c (patch) | |
tree | 254eee541a9f98d560667a05a3222d2f0a921e3e /addon/doxywizard/doxywizard.cpp | |
parent | c33e03f3cb9f0ae1c00b7e785964c915f4085fe0 (diff) | |
download | Doxygen-333c7c44f1aa3c62f9401b190e45eaff15056d5c.zip Doxygen-333c7c44f1aa3c62f9401b190e45eaff15056d5c.tar.gz Doxygen-333c7c44f1aa3c62f9401b190e45eaff15056d5c.tar.bz2 |
Make doxywizard compatible with Qt5
Diffstat (limited to 'addon/doxywizard/doxywizard.cpp')
-rw-r--r-- | addon/doxywizard/doxywizard.cpp | 97 |
1 files changed, 58 insertions, 39 deletions
diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp index 4c577cd..e292d0c 100644 --- a/addon/doxywizard/doxywizard.cpp +++ b/addon/doxywizard/doxywizard.cpp @@ -1,9 +1,28 @@ -#include <QtGui> #include "doxywizard.h" #include "version.h" #include "expert.h" #include "wizard.h" +#include <QMenu> +#include <QMenuBar> +#include <QPushButton> +#include <QMessageBox> +#include <QVBoxLayout> +#include <QLineEdit> +#include <QLabel> +#include <QTextEdit> +#include <QStatusBar> +#include <QProcess> +#include <QTimer> +#include <QCloseEvent> +#include <QApplication> +#include <QDir> +#include <QFileDialog> +#include <QDesktopServices> +#include <QUrl> +#include <QTextStream> +#include <QDebug> + #ifdef WIN32 #include <windows.h> #endif @@ -19,7 +38,7 @@ MainWindow &MainWindow::instance() } MainWindow::MainWindow() - : m_settings(QString::fromAscii("Doxygen.org"), QString::fromAscii("Doxywizard")) + : m_settings(QString::fromLatin1("Doxygen.org"), QString::fromLatin1("Doxywizard")) { QMenu *file = menuBar()->addMenu(tr("File")); file->addAction(tr("Open..."), @@ -84,7 +103,7 @@ MainWindow::MainWindow() QGridLayout *grid = new QGridLayout; m_outputLog = new QTextEdit; m_outputLog->setReadOnly(true); - m_outputLog->setFontFamily(QString::fromAscii("courier")); + m_outputLog->setFontFamily(QString::fromLatin1("courier")); m_outputLog->setMinimumWidth(600); grid->addWidget(m_outputLog,0,0); grid->setColumnStretch(0,1); @@ -183,16 +202,16 @@ void MainWindow::updateWorkingDir() void MainWindow::manual() { - QDesktopServices::openUrl(QUrl(QString::fromAscii("http://www.doxygen.org/manual.html"))); + QDesktopServices::openUrl(QUrl(QString::fromLatin1("http://www.doxygen.org/manual.html"))); } void MainWindow::about() { QString msg; QTextStream t(&msg,QIODevice::WriteOnly); - t << QString::fromAscii("<qt><center>A tool to configure and run doxygen version ")+ - QString::fromAscii(versionString)+ - QString::fromAscii(" on your source files.</center><p><br>" + t << QString::fromLatin1("<qt><center>A tool to configure and run doxygen version ")+ + QString::fromLatin1(versionString)+ + QString::fromLatin1(" on your source files.</center><p><br>" "<center>Written by<br> Dimitri van Heesch<br>© 2000-2015</center><p>" "</qt>"); QMessageBox::about(this,tr("Doxygen GUI"),msg); @@ -273,7 +292,7 @@ bool MainWindow::saveConfig() bool MainWindow::saveConfigAs() { QString fileName = QFileDialog::getSaveFileName(this, QString(), - m_workingDir->text()+QString::fromAscii("/Doxyfile")); + m_workingDir->text()+QString::fromLatin1("/Doxyfile")); if (fileName.isEmpty()) return false; saveConfig(fileName); return true; @@ -289,7 +308,7 @@ void MainWindow::makeDefaults() { //printf("MainWindow:makeDefaults()\n"); m_expert->saveSettings(&m_settings); - m_settings.setValue(QString::fromAscii("wizard/loadsettings"), true); + m_settings.setValue(QString::fromLatin1("wizard/loadsettings"), true); m_settings.sync(); } } @@ -306,7 +325,7 @@ 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::fromAscii("")); + m_settings.setValue(QString().sprintf("recent/config%d",i++),QString::fromLatin1("")); } m_settings.sync(); } @@ -323,7 +342,7 @@ void MainWindow::resetToDefaults() { //printf("MainWindow:resetToDefaults()\n"); m_expert->resetToDefaults(); - m_settings.setValue(QString::fromAscii("wizard/loadsettings"), false); + m_settings.setValue(QString::fromLatin1("wizard/loadsettings"), false); m_settings.sync(); m_wizard->refresh(); } @@ -331,11 +350,11 @@ void MainWindow::resetToDefaults() void MainWindow::loadSettings() { - QVariant geometry = m_settings.value(QString::fromAscii("main/geometry"), QVariant::Invalid); - QVariant state = m_settings.value(QString::fromAscii("main/state"), QVariant::Invalid); - QVariant wizState = m_settings.value(QString::fromAscii("wizard/state"), QVariant::Invalid); - QVariant loadSettings = m_settings.value(QString::fromAscii("wizard/loadsettings"), QVariant::Invalid); - QVariant workingDir = m_settings.value(QString::fromAscii("wizard/workingdir"), QVariant::Invalid); + QVariant geometry = m_settings.value(QString::fromLatin1("main/geometry"), QVariant::Invalid); + QVariant state = m_settings.value(QString::fromLatin1("main/state"), QVariant::Invalid); + QVariant wizState = m_settings.value(QString::fromLatin1("wizard/state"), QVariant::Invalid); + QVariant loadSettings = m_settings.value(QString::fromLatin1("wizard/loadsettings"), QVariant::Invalid); + QVariant workingDir = m_settings.value(QString::fromLatin1("wizard/workingdir"), QVariant::Invalid); if (geometry !=QVariant::Invalid) restoreGeometry(geometry.toByteArray()); if (state !=QVariant::Invalid) restoreState (state.toByteArray()); @@ -362,12 +381,12 @@ void MainWindow::loadSettings() void MainWindow::saveSettings() { - QSettings settings(QString::fromAscii("Doxygen.org"), QString::fromAscii("Doxywizard")); + QSettings settings(QString::fromLatin1("Doxygen.org"), QString::fromLatin1("Doxywizard")); - m_settings.setValue(QString::fromAscii("main/geometry"), saveGeometry()); - m_settings.setValue(QString::fromAscii("main/state"), saveState()); - m_settings.setValue(QString::fromAscii("wizard/state"), m_wizard->saveState()); - m_settings.setValue(QString::fromAscii("wizard/workingdir"), m_workingDir->text()); + m_settings.setValue(QString::fromLatin1("main/geometry"), saveGeometry()); + m_settings.setValue(QString::fromLatin1("main/state"), saveState()); + m_settings.setValue(QString::fromLatin1("wizard/state"), m_wizard->saveState()); + m_settings.setValue(QString::fromLatin1("wizard/workingdir"), m_workingDir->text()); } void MainWindow::selectTab(int id) @@ -405,7 +424,7 @@ void MainWindow::addRecentFile(const QString &fileName) } for (;i<MAX_RECENT_FILES;i++) { - m_settings.setValue(QString().sprintf("recent/config%d",i++),QString::fromAscii("")); + m_settings.setValue(QString().sprintf("recent/config%d",i++),QString::fromLatin1("")); } } @@ -423,19 +442,19 @@ void MainWindow::runDoxygen() { QString doxygenPath; #if defined(Q_OS_MACX) - doxygenPath = qApp->applicationDirPath()+QString::fromAscii("/../Resources/"); + doxygenPath = qApp->applicationDirPath()+QString::fromLatin1("/../Resources/"); qDebug() << tr("Doxygen path: ") << doxygenPath; - if ( !QFile(doxygenPath + QString::fromAscii("doxygen")).exists() ) + if ( !QFile(doxygenPath + QString::fromLatin1("doxygen")).exists() ) { // No Doxygen binary in the resources, if there is a system Doxygen binary, use that instead - if ( QFile(QString::fromAscii("/usr/local/bin/doxygen")).exists() ) + if ( QFile(QString::fromLatin1("/usr/local/bin/doxygen")).exists() ) { - doxygenPath = QString::fromAscii("/usr/local/bin/"); + doxygenPath = QString::fromLatin1("/usr/local/bin/"); } else { qDebug() << tr("Can't find the doxygen command, make sure it's in your $$PATH"); - doxygenPath = QString::fromAscii(""); + doxygenPath = QString::fromLatin1(""); } } qDebug() << tr("Getting doxygen from: ") << doxygenPath; @@ -446,20 +465,20 @@ void MainWindow::runDoxygen() m_runProcess->setWorkingDirectory(m_workingDir->text()); QStringList env=QProcess::systemEnvironment(); // set PWD environment variable to m_workingDir - env.replaceInStrings(QRegExp(QString::fromAscii("^PWD=(.*)"),Qt::CaseInsensitive), - QString::fromAscii("PWD=")+m_workingDir->text()); + env.replaceInStrings(QRegExp(QString::fromLatin1("^PWD=(.*)"),Qt::CaseInsensitive), + QString::fromLatin1("PWD=")+m_workingDir->text()); m_runProcess->setEnvironment(env); QStringList args; - args << QString::fromAscii("-b"); // make stdout unbuffered - args << QString::fromAscii("-"); // read config from stdin + args << QString::fromLatin1("-b"); // make stdout unbuffered + args << QString::fromLatin1("-"); // read config from stdin m_outputLog->clear(); - m_runProcess->start(doxygenPath + QString::fromAscii("doxygen"), args); + m_runProcess->start(doxygenPath + QString::fromLatin1("doxygen"), args); if (!m_runProcess->waitForStarted()) { - m_outputLog->append(QString::fromAscii("*** Failed to run doxygen\n")); + m_outputLog->append(QString::fromLatin1("*** Failed to run doxygen\n")); return; } QTextStream t(m_runProcess); @@ -468,7 +487,7 @@ void MainWindow::runDoxygen() if (m_runProcess->state() == QProcess::NotRunning) { - m_outputLog->append(QString::fromAscii("*** Failed to run doxygen\n")); + m_outputLog->append(QString::fromLatin1("*** Failed to run doxygen\n")); } else { @@ -536,10 +555,10 @@ void MainWindow::showHtmlOutput() QFileInfo fi(indexFile); // TODO: the following doesn't seem to work with IE #ifdef WIN32 - //QString indexUrl(QString::fromAscii("file:///")); + //QString indexUrl(QString::fromLatin1("file:///")); ShellExecute(NULL, L"open", (LPCWSTR)fi.absoluteFilePath().utf16(), NULL, NULL, SW_SHOWNORMAL); #else - QString indexUrl(QString::fromAscii("file://")); + QString indexUrl(QString::fromLatin1("file://")); indexUrl+=fi.absoluteFilePath(); QDesktopServices::openUrl(QUrl(indexUrl)); #endif @@ -549,7 +568,7 @@ void MainWindow::saveLog() { QString fn = QFileDialog::getSaveFileName(this, tr("Save log file"), m_workingDir->text()+ - QString::fromAscii("/doxygen_log.txt")); + QString::fromLatin1("/doxygen_log.txt")); if (!fn.isEmpty()) { QFile f(fn); @@ -589,11 +608,11 @@ void MainWindow::updateTitle() QString title = tr("Doxygen GUI frontend"); if (m_modified) { - title+=QString::fromAscii(" +"); + title+=QString::fromLatin1(" +"); } if (!m_fileName.isEmpty()) { - title+=QString::fromAscii(" (")+m_fileName+QString::fromAscii(")"); + title+=QString::fromLatin1(" (")+m_fileName+QString::fromLatin1(")"); } setWindowTitle(title); } |