diff --git a/src/musredit_qt5/musredit/PAdmin.cpp b/src/musredit_qt5/musredit/PAdmin.cpp index 19f5288d..1f53aa6b 100644 --- a/src/musredit_qt5/musredit/PAdmin.cpp +++ b/src/musredit_qt5/musredit/PAdmin.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * @@ -29,7 +29,6 @@ #include #include -using namespace std; #include #include @@ -800,7 +799,7 @@ int PAdmin::savePrefs(QString pref_fln) QVector data; QFile file(fln); if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { - cerr << endl << ">> PAdmin::savePrefs: **ERROR** Cannot open " << fln.toLatin1().data() << " for reading." << endl; + std::cerr << std::endl << ">> PAdmin::savePrefs: **ERROR** Cannot open " << fln.toLatin1().data() << " for reading." << std::endl; return 1; } QTextStream fin(&file); @@ -879,7 +878,7 @@ int PAdmin::savePrefs(QString pref_fln) // write prefs file.setFileName(pref_fln); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - cerr << endl << ">> PAdmin::savePrefs: **ERROR** Cannot open " << pref_fln.toLatin1().data() << " for writing." << endl; + std::cerr << std::endl << ">> PAdmin::savePrefs: **ERROR** Cannot open " << pref_fln.toLatin1().data() << " for writing." << std::endl; return 0; } fin.setDevice(&file); @@ -933,7 +932,7 @@ void PAdmin::saveRecentFiles() QVector data; QFile file(fln); if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { - cerr << endl << ">> PAdmin::saveRecentFile: **ERROR** Cannot open " << fln.toLatin1().data() << " for reading." << endl; + std::cerr << std::endl << ">> PAdmin::saveRecentFile: **ERROR** Cannot open " << fln.toLatin1().data() << " for reading." << std::endl; return; } QTextStream fin(&file); @@ -958,7 +957,7 @@ void PAdmin::saveRecentFiles() } if (i == data.size()) { - cerr << endl << ">> PAdmin::saveRecentFile: **ERROR** " << fln.toLatin1().data() << " seems to be corrupt." << endl; + std::cerr << std::endl << ">> PAdmin::saveRecentFile: **ERROR** " << fln.toLatin1().data() << " seems to be corrupt." << std::endl; return; } i++; @@ -968,7 +967,7 @@ void PAdmin::saveRecentFiles() } if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - cerr << endl << ">> PAdmin::saveRecentFile: **ERROR** Cannot open " << fln.toLatin1().data() << " for reading." << endl; + std::cerr << std::endl << ">> PAdmin::saveRecentFile: **ERROR** Cannot open " << fln.toLatin1().data() << " for reading." << std::endl; return; } fin.setDevice(&file); diff --git a/src/musredit_qt5/musredit/PAdmin.h b/src/musredit_qt5/musredit/PAdmin.h index 0368a90b..a05a72e7 100644 --- a/src/musredit_qt5/musredit/PAdmin.h +++ b/src/musredit_qt5/musredit/PAdmin.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PChangeDefaultPathsDialog.cpp b/src/musredit_qt5/musredit/PChangeDefaultPathsDialog.cpp index a69aa86f..1e84434e 100644 --- a/src/musredit_qt5/musredit/PChangeDefaultPathsDialog.cpp +++ b/src/musredit_qt5/musredit/PChangeDefaultPathsDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2017 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PChangeDefaultPathsDialog.h b/src/musredit_qt5/musredit/PChangeDefaultPathsDialog.h index f6603825..0eb73061 100644 --- a/src/musredit_qt5/musredit/PChangeDefaultPathsDialog.h +++ b/src/musredit_qt5/musredit/PChangeDefaultPathsDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2017 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PDumpOutputHandler.cpp b/src/musredit_qt5/musredit/PDumpOutputHandler.cpp index efe7af1f..2bddcea2 100644 --- a/src/musredit_qt5/musredit/PDumpOutputHandler.cpp +++ b/src/musredit_qt5/musredit/PDumpOutputHandler.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2012-2016 by Andreas Suter * + * Copyright (C) 2012-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PDumpOutputHandler.h b/src/musredit_qt5/musredit/PDumpOutputHandler.h index fa9813b4..99738b83 100644 --- a/src/musredit_qt5/musredit/PDumpOutputHandler.h +++ b/src/musredit_qt5/musredit/PDumpOutputHandler.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2012-2016 by Andreas Suter * + * Copyright (C) 2012-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PFindDialog.cpp b/src/musredit_qt5/musredit/PFindDialog.cpp index ef91999a..d8101ee6 100644 --- a/src/musredit_qt5/musredit/PFindDialog.cpp +++ b/src/musredit_qt5/musredit/PFindDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PFindDialog.h b/src/musredit_qt5/musredit/PFindDialog.h index 9b575ee2..b3348183 100644 --- a/src/musredit_qt5/musredit/PFindDialog.h +++ b/src/musredit_qt5/musredit/PFindDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PFitOutputHandler.cpp b/src/musredit_qt5/musredit/PFitOutputHandler.cpp index 63828b86..63953bf1 100644 --- a/src/musredit_qt5/musredit/PFitOutputHandler.cpp +++ b/src/musredit_qt5/musredit/PFitOutputHandler.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * @@ -83,7 +83,7 @@ PFitOutputHandler::PFitOutputHandler(QString workingDirectory, QVector if ( !fProc->waitForStarted() ) { // error handling QString msg(tr("Could not execute the output command: ")+cmd[0]); - QMessageBox::critical( 0, + QMessageBox::critical( nullptr, tr("Fatal error"), msg, tr("Quit") ); @@ -114,7 +114,7 @@ PFitOutputHandler::~PFitOutputHandler() } if (fProc) { delete fProc; - fProc = 0; + fProc = nullptr; } } diff --git a/src/musredit_qt5/musredit/PFitOutputHandler.h b/src/musredit_qt5/musredit/PFitOutputHandler.h index 1ece29bd..749558e1 100644 --- a/src/musredit_qt5/musredit/PFitOutputHandler.h +++ b/src/musredit_qt5/musredit/PFitOutputHandler.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetAsymmetryRunBlockDialog.cpp b/src/musredit_qt5/musredit/PGetAsymmetryRunBlockDialog.cpp index b4503eb8..14d74570 100644 --- a/src/musredit_qt5/musredit/PGetAsymmetryRunBlockDialog.cpp +++ b/src/musredit_qt5/musredit/PGetAsymmetryRunBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetAsymmetryRunBlockDialog.h b/src/musredit_qt5/musredit/PGetAsymmetryRunBlockDialog.h index 836274ab..c6c2cce3 100644 --- a/src/musredit_qt5/musredit/PGetAsymmetryRunBlockDialog.h +++ b/src/musredit_qt5/musredit/PGetAsymmetryRunBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetDefaultDialog.cpp b/src/musredit_qt5/musredit/PGetDefaultDialog.cpp index ae0da191..0c5ae759 100644 --- a/src/musredit_qt5/musredit/PGetDefaultDialog.cpp +++ b/src/musredit_qt5/musredit/PGetDefaultDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetDefaultDialog.h b/src/musredit_qt5/musredit/PGetDefaultDialog.h index 404021d2..8ef8f216 100644 --- a/src/musredit_qt5/musredit/PGetDefaultDialog.h +++ b/src/musredit_qt5/musredit/PGetDefaultDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetFourierBlockDialog.cpp b/src/musredit_qt5/musredit/PGetFourierBlockDialog.cpp index 8455fd78..3e7650fd 100644 --- a/src/musredit_qt5/musredit/PGetFourierBlockDialog.cpp +++ b/src/musredit_qt5/musredit/PGetFourierBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetFunctionsBlockDialog.cpp b/src/musredit_qt5/musredit/PGetFunctionsBlockDialog.cpp index 7d706578..ff144eb4 100644 --- a/src/musredit_qt5/musredit/PGetFunctionsBlockDialog.cpp +++ b/src/musredit_qt5/musredit/PGetFunctionsBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetFunctionsBlockDialog.h b/src/musredit_qt5/musredit/PGetFunctionsBlockDialog.h index ead1e2f0..c70427f6 100644 --- a/src/musredit_qt5/musredit/PGetFunctionsBlockDialog.h +++ b/src/musredit_qt5/musredit/PGetFunctionsBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetMusrFTOptionsDialog.cpp b/src/musredit_qt5/musredit/PGetMusrFTOptionsDialog.cpp index 3e63c666..f92114bb 100644 --- a/src/musredit_qt5/musredit/PGetMusrFTOptionsDialog.cpp +++ b/src/musredit_qt5/musredit/PGetMusrFTOptionsDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetMusrFTOptionsDialog.h b/src/musredit_qt5/musredit/PGetMusrFTOptionsDialog.h index e00366e3..bc2d5421 100644 --- a/src/musredit_qt5/musredit/PGetMusrFTOptionsDialog.h +++ b/src/musredit_qt5/musredit/PGetMusrFTOptionsDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetNonMusrRunBlockDialog.cpp b/src/musredit_qt5/musredit/PGetNonMusrRunBlockDialog.cpp index c8814c40..8c042fd9 100644 --- a/src/musredit_qt5/musredit/PGetNonMusrRunBlockDialog.cpp +++ b/src/musredit_qt5/musredit/PGetNonMusrRunBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetNonMusrRunBlockDialog.h b/src/musredit_qt5/musredit/PGetNonMusrRunBlockDialog.h index 7faa842d..9ed00d9f 100644 --- a/src/musredit_qt5/musredit/PGetNonMusrRunBlockDialog.h +++ b/src/musredit_qt5/musredit/PGetNonMusrRunBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetParameterBlockDialog.cpp b/src/musredit_qt5/musredit/PGetParameterBlockDialog.cpp index e5f4abbe..2cc64e4b 100644 --- a/src/musredit_qt5/musredit/PGetParameterBlockDialog.cpp +++ b/src/musredit_qt5/musredit/PGetParameterBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetParameterBlockDialog.h b/src/musredit_qt5/musredit/PGetParameterBlockDialog.h index c8c74ee6..6e235bef 100644 --- a/src/musredit_qt5/musredit/PGetParameterBlockDialog.h +++ b/src/musredit_qt5/musredit/PGetParameterBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetPlotBlockDialog.cpp b/src/musredit_qt5/musredit/PGetPlotBlockDialog.cpp index d2df92a4..ce10a31d 100644 --- a/src/musredit_qt5/musredit/PGetPlotBlockDialog.cpp +++ b/src/musredit_qt5/musredit/PGetPlotBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetPlotBlockDialog.h b/src/musredit_qt5/musredit/PGetPlotBlockDialog.h index cf662945..ba545cb9 100644 --- a/src/musredit_qt5/musredit/PGetPlotBlockDialog.h +++ b/src/musredit_qt5/musredit/PGetPlotBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetSingleHistoRunBlockDialog.cpp b/src/musredit_qt5/musredit/PGetSingleHistoRunBlockDialog.cpp index 9e9b369e..a28fe371 100644 --- a/src/musredit_qt5/musredit/PGetSingleHistoRunBlockDialog.cpp +++ b/src/musredit_qt5/musredit/PGetSingleHistoRunBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetSingleHistoRunBlockDialog.h b/src/musredit_qt5/musredit/PGetSingleHistoRunBlockDialog.h index 0fd094cd..5b2701a3 100644 --- a/src/musredit_qt5/musredit/PGetSingleHistoRunBlockDialog.h +++ b/src/musredit_qt5/musredit/PGetSingleHistoRunBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetTheoryBlockDialog.cpp b/src/musredit_qt5/musredit/PGetTheoryBlockDialog.cpp index 1683c78a..8c4d05e6 100644 --- a/src/musredit_qt5/musredit/PGetTheoryBlockDialog.cpp +++ b/src/musredit_qt5/musredit/PGetTheoryBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetTheoryBlockDialog.h b/src/musredit_qt5/musredit/PGetTheoryBlockDialog.h index 163893e8..f6d3c2d8 100644 --- a/src/musredit_qt5/musredit/PGetTheoryBlockDialog.h +++ b/src/musredit_qt5/musredit/PGetTheoryBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetTitleBlockDialog.cpp b/src/musredit_qt5/musredit/PGetTitleBlockDialog.cpp index 3ecf4a98..87956385 100644 --- a/src/musredit_qt5/musredit/PGetTitleBlockDialog.cpp +++ b/src/musredit_qt5/musredit/PGetTitleBlockDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PGetTitleBlockDialog.h b/src/musredit_qt5/musredit/PGetTitleBlockDialog.h index a9a6fd04..e9eb1853 100644 --- a/src/musredit_qt5/musredit/PGetTitleBlockDialog.h +++ b/src/musredit_qt5/musredit/PGetTitleBlockDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PHelp.cpp b/src/musredit_qt5/musredit/PHelp.cpp index ca233b28..facd7da8 100644 --- a/src/musredit_qt5/musredit/PHelp.cpp +++ b/src/musredit_qt5/musredit/PHelp.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PHelp.h b/src/musredit_qt5/musredit/PHelp.h index 4a45db25..19a276cc 100644 --- a/src/musredit_qt5/musredit/PHelp.h +++ b/src/musredit_qt5/musredit/PHelp.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PMsr2DataDialog.cpp b/src/musredit_qt5/musredit/PMsr2DataDialog.cpp index 6a1c66fc..94a4f89c 100644 --- a/src/musredit_qt5/musredit/PMsr2DataDialog.cpp +++ b/src/musredit_qt5/musredit/PMsr2DataDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PMsr2DataDialog.h b/src/musredit_qt5/musredit/PMsr2DataDialog.h index 28099740..88a05959 100644 --- a/src/musredit_qt5/musredit/PMsr2DataDialog.h +++ b/src/musredit_qt5/musredit/PMsr2DataDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PMusrEditAbout.cpp b/src/musredit_qt5/musredit/PMusrEditAbout.cpp index f918ed9e..40ba50d7 100644 --- a/src/musredit_qt5/musredit/PMusrEditAbout.cpp +++ b/src/musredit_qt5/musredit/PMusrEditAbout.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PMusrEditAbout.h b/src/musredit_qt5/musredit/PMusrEditAbout.h index f9456c60..a5915265 100644 --- a/src/musredit_qt5/musredit/PMusrEditAbout.h +++ b/src/musredit_qt5/musredit/PMusrEditAbout.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PPrefsDialog.cpp b/src/musredit_qt5/musredit/PPrefsDialog.cpp index 48ceca65..7660e885 100644 --- a/src/musredit_qt5/musredit/PPrefsDialog.cpp +++ b/src/musredit_qt5/musredit/PPrefsDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PPrefsDialog.h b/src/musredit_qt5/musredit/PPrefsDialog.h index ffaca305..f0f0c878 100644 --- a/src/musredit_qt5/musredit/PPrefsDialog.h +++ b/src/musredit_qt5/musredit/PPrefsDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2017 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PReplaceConfirmationDialog.cpp b/src/musredit_qt5/musredit/PReplaceConfirmationDialog.cpp index 9cf2cf42..20e7bea2 100644 --- a/src/musredit_qt5/musredit/PReplaceConfirmationDialog.cpp +++ b/src/musredit_qt5/musredit/PReplaceConfirmationDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PReplaceConfirmationDialog.h b/src/musredit_qt5/musredit/PReplaceConfirmationDialog.h index a213c830..86611ec1 100644 --- a/src/musredit_qt5/musredit/PReplaceConfirmationDialog.h +++ b/src/musredit_qt5/musredit/PReplaceConfirmationDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PReplaceDialog.cpp b/src/musredit_qt5/musredit/PReplaceDialog.cpp index 1ab29e5d..11a6322d 100644 --- a/src/musredit_qt5/musredit/PReplaceDialog.cpp +++ b/src/musredit_qt5/musredit/PReplaceDialog.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PReplaceDialog.h b/src/musredit_qt5/musredit/PReplaceDialog.h index 8f8ab8a5..b0534239 100644 --- a/src/musredit_qt5/musredit/PReplaceDialog.h +++ b/src/musredit_qt5/musredit/PReplaceDialog.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PSubTextEdit.cpp b/src/musredit_qt5/musredit/PSubTextEdit.cpp index 7c705d9d..542adf48 100644 --- a/src/musredit_qt5/musredit/PSubTextEdit.cpp +++ b/src/musredit_qt5/musredit/PSubTextEdit.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/PSubTextEdit.h b/src/musredit_qt5/musredit/PSubTextEdit.h index 0c774f50..5836800c 100644 --- a/src/musredit_qt5/musredit/PSubTextEdit.h +++ b/src/musredit_qt5/musredit/PSubTextEdit.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2009-2016 by Andreas Suter * + * Copyright (C) 2009-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/musredit_qt5/musredit/main.cpp b/src/musredit_qt5/musredit/main.cpp index c4132ab9..76dfe392 100644 --- a/src/musredit_qt5/musredit/main.cpp +++ b/src/musredit_qt5/musredit/main.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify * @@ -28,7 +28,6 @@ ***************************************************************************/ #include -using namespace std; #include @@ -49,12 +48,12 @@ int main( int argc, char ** argv ) if (argc == 2) { if (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) { - cout << endl << "usage: musredit [] | -h, --help | -v, --version"; - cout << endl << endl; + std::cout << std::endl << "usage: musredit [] | -h, --help | -v, --version"; + std::cout << std::endl << std::endl; return 0; } else if (!strcmp(argv[1], "--version") || !strcmp(argv[1], "-v")) { - cout << endl << "musredit git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1; - cout << endl << endl; + std::cout << std::endl << "musredit git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1; + std::cout << std::endl << std::endl; return 0; } } diff --git a/src/musredit_qt5/musredit/musredit.h b/src/musredit_qt5/musredit/musredit.h index 680b8e3c..8cdbb2f1 100644 --- a/src/musredit_qt5/musredit/musredit.h +++ b/src/musredit_qt5/musredit/musredit.h @@ -8,7 +8,7 @@ *****************************************************************************/ /*************************************************************************** - * Copyright (C) 2010-2016 by Andreas Suter * + * Copyright (C) 2010-2019 by Andreas Suter * * andreas.suter@psi.ch * * * * This program is free software; you can redistribute it and/or modify *