LMU/musrfit
5
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 4 Activity

adjust to Qt 5.14.x; remove compiler warnings.

Browse Source
This commit is contained in:
suter_a
2020-12-22 22:36:07 +01:00
parent 04fff97704
commit daef50e35a
25 changed files with 948 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/musredit_qt5/musredit/PAdmin.cpp
View File

@@ -1017,8 +1017,13 @@ int PAdmin::savePrefs(QString pref_fln)
return 0;
}
fin.setDevice(&file);
for (int i=0; i<data.size(); i++)
for (int i=0; i<data.size(); i++) {
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
fin << data[i] << endl;
#else
fin << data[i] << Qt::endl;
#endif
}
file.close();
} else {
QString msg("Failed to write musredit_startup.xml. Neither a local nor a global copy found.");
@@ -1106,8 +1111,13 @@ void PAdmin::saveRecentFiles()
return;
}
fin.setDevice(&file);
for (int i=0; i<data.size(); i++)
for (int i=0; i<data.size(); i++) {
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
fin << data[i] << endl;
#else
fin << data[i] << Qt::endl;
#endif
}
file.close();
} else {
QString msg("Failed to write musredit_startup.xml. Neither a local nor a global copy found.");
@@ -1176,7 +1186,11 @@ void PAdmin::createMusreditStartupFile()
line.replace("12", "16");
}
}
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
fout << line << endl;
#else
fout << line << Qt::endl;
#endif
}
file.close();

15
src/musredit_qt5/musredit/PChangeDefaultPathsDialog.cpp
View File

@@ -318,15 +318,28 @@ void PChangeDefaultPathsDialog::saveDefaultPathList()
if (!str.trimmed().startsWith("<data_path>")) {
// if not data_path was present, add the new data_paths just before the end of the musrfit_start.xml close tag
if ((dataPathPresent == false) && (str.trimmed().startsWith("</musrfit>"))) {
for (int j=0; j<fSearchPath_listWidget->count(); j++)
for (int j=0; j<fSearchPath_listWidget->count(); j++) {
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
out << " <data_path>" << fSearchPath_listWidget->item(j)->text() << "</data_path>" << endl;
#else
out << " <data_path>" << fSearchPath_listWidget->item(j)->text() << "</data_path>" << Qt::endl;
#endif
}
}
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
out << fileContent[i] << endl;
#else
out << fileContent[i] << Qt::endl;
#endif
} else {
if (first) {
first = false;
for (int j=0; j<fSearchPath_listWidget->count(); j++)
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
out << " <data_path>" << fSearchPath_listWidget->item(j)->text() << "</data_path>" << endl;
#else
out << " <data_path>" << fSearchPath_listWidget->item(j)->text() << "</data_path>" << Qt::endl;
#endif
}
}
}

13
src/musredit_qt5/musredit/PDumpOutputHandler.cpp
View File

@@ -85,7 +85,12 @@ PDumpOutputHandler::PDumpOutputHandler(QVector<QString> &cmd)
tr("Quit") );
done(0);
}
#if (QT_VERSION < QT_VERSION_CHECK(5, 2, 0))
fProcPID = fProc->pid();
#else
fProcPID = fProc->processId();
#endif
}
//----------------------------------------------------------------------------------------------------
@@ -97,7 +102,11 @@ PDumpOutputHandler::~PDumpOutputHandler()
if (fProc->state() == QProcess::Running) {
fProc->terminate();
if (!fProc->waitForFinished()) {
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
qDebug() << "fProc still running, will call kill." << endl;
#else
qDebug() << "fProc still running, will call kill." << Qt::endl;
#endif
fProc->kill();
}
fProc->waitForFinished();
@@ -105,7 +114,11 @@ PDumpOutputHandler::~PDumpOutputHandler()
if (fProc->state() == QProcess::Running) {
QString cmd = "kill -9 "+ QString("%1").arg(fProcPID);
QString msg = "fProc still running even after Qt kill, will try system kill cmd: "+cmd;
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
qDebug() << msg << endl;
#else
qDebug() << msg << Qt::endl;
#endif
system(cmd.toLatin1());
}
if (fProc) {

4
src/musredit_qt5/musredit/PFindDialog.cpp
View File

@@ -44,8 +44,8 @@
* \param parent pointer to the parent object
* \param f qt specific window flags
*/
PFindDialog::PFindDialog(PFindReplaceData *data, const bool selection, QWidget *parent, Qt::WindowFlags f) :
QDialog(parent, f), fData(data)
PFindDialog::PFindDialog(PFindReplaceData *data, const bool selection, QWidget *parent) :
QDialog(parent), fData(data)
{
setupUi(this);

2
src/musredit_qt5/musredit/PFindDialog.h
View File

@@ -42,7 +42,7 @@ class PFindDialog : public QDialog, private Ui::PFindDialog
Q_OBJECT
public:
PFindDialog(PFindReplaceData *data, const bool selection, QWidget *parent = 0, Qt::WindowFlags f = 0);
PFindDialog(PFindReplaceData *data, const bool selection, QWidget *parent = nullptr);
virtual ~PFindDialog() {}
virtual PFindReplaceData *getData();

19
src/musredit_qt5/musredit/PFitOutputHandler.cpp
View File

@@ -89,7 +89,11 @@ PFitOutputHandler::PFitOutputHandler(QString workingDirectory, QVector<QString>
tr("Quit") );
done(0);
}
#if (QT_VERSION < QT_VERSION_CHECK(5, 2, 0))
fProcPID = fProc->pid();
#else
fProcPID = fProc->processId();
#endif
}
//----------------------------------------------------------------------------------------------------
@@ -101,7 +105,11 @@ PFitOutputHandler::~PFitOutputHandler()
if (fProc->state() == QProcess::Running) {
fProc->terminate();
if (!fProc->waitForFinished()) {
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
qDebug() << "fProc still running, will call kill." << endl;
#else
qDebug() << "fProc still running, will call kill." << Qt::endl;
#endif
fProc->kill();
}
fProc->waitForFinished();
@@ -109,7 +117,11 @@ PFitOutputHandler::~PFitOutputHandler()
if (fProc->state() == QProcess::Running) {
QString cmd = "kill -9 "+ QString("%1").arg(fProcPID);
QString msg = "fProc still running even after Qt kill, will try system kill cmd: "+cmd;
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
qDebug() << msg << endl;
#else
qDebug() << msg << Qt::endl;
#endif
system(cmd.toLatin1());
}
if (fProc) {
@@ -149,8 +161,13 @@ void PFitOutputHandler::readFromStdErr()
*/
void PFitOutputHandler::processDone(int exitCode, QProcess::ExitStatus exitStatus)
{
if ((exitStatus == QProcess::CrashExit) && (exitCode != 0))
if ((exitStatus == QProcess::CrashExit) && (exitCode != 0)) {
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
qDebug() << "**ERROR** PFitOutputHandler::processDone: exitCode = " << exitCode << endl;
#else
qDebug() << "**ERROR** PFitOutputHandler::processDone: exitCode = " << exitCode << Qt::endl;
#endif
}
fQuitButton->setText("Done");
}

8
src/musredit_qt5/musredit/PGetMusrFTOptionsDialog.cpp
View File

@@ -331,7 +331,11 @@ QStringList PGetMusrFTOptionsDialog::getMusrFTOptions()
// histo list
if (fHistoList_lineEdit->text().length() > 0) {
cmd << "--histo";
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
strList = fHistoList_lineEdit->text().split(" ", QString::SkipEmptyParts);
#else
strList = fHistoList_lineEdit->text().split(" ", Qt::SkipEmptyParts);
#endif
for (int i=0; i<strList.size(); i++)
cmd << strList[i];
}
@@ -347,7 +351,11 @@ QStringList PGetMusrFTOptionsDialog::getMusrFTOptions()
// t0 list
if (fT0_lineEdit->text().length() > 0) {
cmd << "--t0";
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
strList = fT0_lineEdit->text().split(" ", QString::SkipEmptyParts);
#else
strList = fT0_lineEdit->text().split(" ", Qt::SkipEmptyParts);
#endif
for (int i=0; i<strList.size(); i++)
cmd << strList[i];
}

2
src/musredit_qt5/musredit/PMusrEditAbout.cpp
View File

@@ -34,7 +34,7 @@
/**
* <p>Handles the musredit about popup.
*/
PMusrEditAbout::PMusrEditAbout(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f)
PMusrEditAbout::PMusrEditAbout(QWidget *parent) : QDialog(parent)
{
setupUi(this);

2
src/musredit_qt5/musredit/PMusrEditAbout.h
View File

@@ -38,7 +38,7 @@ class PMusrEditAbout : public QDialog, private Ui::PMusrEditAbout
Q_OBJECT
public:
PMusrEditAbout(QWidget *parent = 0, Qt::WindowFlags f = 0);
PMusrEditAbout(QWidget *parent = nullptr);
virtual ~PMusrEditAbout() {}
};

2
src/musredit_qt5/musredit/PReplaceConfirmationDialog.cpp
View File

@@ -36,7 +36,7 @@
* \param parent pointer to the parent object
* \param f qt windows flags
*/
PReplaceConfirmationDialog::PReplaceConfirmationDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f)
PReplaceConfirmationDialog::PReplaceConfirmationDialog(QWidget *parent) : QDialog(parent)
{
setupUi(this);

2
src/musredit_qt5/musredit/PReplaceConfirmationDialog.h
View File

@@ -40,7 +40,7 @@ class PReplaceConfirmationDialog : public QDialog, public Ui::PReplaceConfirmati
Q_OBJECT
public:
PReplaceConfirmationDialog(QWidget *parent = 0, Qt::WindowFlags f = 0);
PReplaceConfirmationDialog(QWidget *parent = nullptr);
virtual ~PReplaceConfirmationDialog() {}
};

4
src/musredit_qt5/musredit/PReplaceDialog.cpp
View File

@@ -42,8 +42,8 @@
* \param parent pointer to the parent object
* \param f qt windows flag
*/
PReplaceDialog::PReplaceDialog(PFindReplaceData *data, const bool selection, QWidget *parent, Qt::WindowFlags f) :
QDialog(parent, f), fData(data)
PReplaceDialog::PReplaceDialog(PFindReplaceData *data, const bool selection, QWidget *parent) :
QDialog(parent), fData(data)
{
setupUi(this);

2
src/musredit_qt5/musredit/PReplaceDialog.h
View File

@@ -38,7 +38,7 @@ class PReplaceDialog : public QDialog, private Ui::PReplaceDialog
Q_OBJECT
public:
PReplaceDialog(PFindReplaceData *data, const bool selection, QWidget *parent = 0, Qt::WindowFlags f = 0);
PReplaceDialog(PFindReplaceData *data, const bool selection, QWidget *parent = nullptr);
virtual ~PReplaceDialog() {}
virtual PFindReplaceData *getData();

24
src/musredit_qt5/musredit/PTextEdit.cpp
View File

@@ -84,8 +84,8 @@
* \param parent pointer to the parent object
* \param f qt windows flags
*/
PTextEdit::PTextEdit( QWidget *parent, Qt::WindowFlags f )
: QMainWindow( parent, f )
PTextEdit::PTextEdit( QWidget *parent )
: QMainWindow( parent )
{
bool gotTheme = getTheme();
@@ -1743,7 +1743,7 @@ void PTextEdit::editFind()
if (!fFindReplaceData->fromCursor)
currentEditor()->textCursor().setPosition(0);
QTextDocument::FindFlags flags = nullptr;
QTextDocument::FindFlags flags;
if (fFindReplaceData->caseSensitive)
flags |= QTextDocument::FindCaseSensitively;
else if (fFindReplaceData->findBackwards)
@@ -1760,7 +1760,7 @@ void PTextEdit::editFind()
*/
void PTextEdit::editFindNext()
{
QTextDocument::FindFlags flags = nullptr;
QTextDocument::FindFlags flags;
if (fFindReplaceData->caseSensitive)
flags |= QTextDocument::FindCaseSensitively;
else if (fFindReplaceData->wholeWordsOnly)
@@ -1775,7 +1775,7 @@ void PTextEdit::editFindNext()
*/
void PTextEdit::editFindPrevious()
{
QTextDocument::FindFlags flags = nullptr;
QTextDocument::FindFlags flags;
if (fFindReplaceData->caseSensitive)
flags |= QTextDocument::FindCaseSensitively;
else if (fFindReplaceData->wholeWordsOnly)
@@ -2936,6 +2936,8 @@ void PTextEdit::mupp()
cmd = QString("/Applications/mupp.app/Contents/MacOS/mupp");
#endif
QStringList arg;
QProcess *proc = new QProcess(this);
QString workDir = QFileInfo(*fFilenames.find( currentEditor() )).absolutePath();
@@ -2945,7 +2947,7 @@ void PTextEdit::mupp()
env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
proc->setProcessEnvironment(env);
proc->setWorkingDirectory(workDir);
proc->start(cmd);
proc->start(cmd, arg);
if (!proc->waitForStarted()) {
// error handling
QString msg(tr("Could not execute the output command: ")+cmd);
@@ -3186,7 +3188,7 @@ void PTextEdit::replaceAll()
currentEditor()->moveCursor(QTextCursor::Start);
// construct search flags
QTextDocument::FindFlags flags = 0;
QTextDocument::FindFlags flags;
if (fFindReplaceData->caseSensitive)
flags |= QTextDocument::FindCaseSensitively;
else if (fFindReplaceData->findBackwards)
@@ -3357,10 +3359,18 @@ QStringList PTextEdit::getRunList(QString runListStr, bool &ok)
ok = true;
// first split space separated parts
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
QStringList tok = runListStr.split(' ', QString::SkipEmptyParts);
#else
QStringList tok = runListStr.split(' ', Qt::SkipEmptyParts);
#endif
for (int i=0; i<tok.size(); i++) {
if (tok[i].contains('-')) { // list given, hence need to expand
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
QStringList runListTok = tok[i].split('-', QString::SkipEmptyParts);
#else
QStringList runListTok = tok[i].split('-', Qt::SkipEmptyParts);
#endif
if (runListTok.size() != 2) { // error
ok = false;
result.clear();

2
src/musredit_qt5/musredit/PTextEdit.h
View File

@@ -64,7 +64,7 @@ class PTextEdit : public QMainWindow
Q_OBJECT
public:
PTextEdit( QWidget *parent = nullptr, Qt::WindowFlags f = nullptr );
PTextEdit( QWidget *parent = nullptr );
virtual ~PTextEdit() {}
public slots: