1 files changed, 10 insertions, 16 deletions

diff --git a/programconfigurator.cpp b/programconfigurator.cpp
index 691c4aa..2edc884 100644
--- a/programconfigurator.cpp
+++ b/programconfigurator.cpp
@@ -16,7 +16,7 @@
 #include <QSettings>
 #include <QFileSystemModel>
 #include <QMessageBox>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QFileInfo>
 
 #include "programconfigurator.h"
@@ -59,12 +59,6 @@ ProgramConfigurator::ProgramConfigurator(const QString &prefix, const QString &d
 	buttonLayout->addWidget(mDefault);
 	buttonLayout->addStretch();
     mainLayout->addLayout(buttonLayout, 5, 0, 1, 2, Qt::AlignCenter);
-    mInternalViewer = new QCheckBox(tr("Use internal Viewer"));
-    QHBoxLayout *intViewerL = new QHBoxLayout;
-    intViewerL->addStretch();
-    intViewerL->addWidget(mInternalViewer);
-    intViewerL->addStretch();
-    mainLayout->addLayout(intViewerL, 6, 0, 1, 2, Qt::AlignCenter);
 	QVBoxLayout *stretchLayout = new QVBoxLayout;
 	stretchLayout->addStretch();
 	mainLayout->addLayout(stretchLayout, 6, 0, 1, 2);
@@ -84,7 +78,6 @@ void ProgramConfigurator::writeSettings(){
 	QSettings s;
 	s.setValue(defaultString, mDefautProg);
 	s.setValue(dataString, mData);
-    s.setValue("vw/internal", mInternalViewer->isChecked());
 }
 
 void ProgramConfigurator::programChanged(const QString &program){
@@ -100,7 +93,7 @@ void ProgramConfigurator::programChanged(const QString &program){
 
 void ProgramConfigurator::addProgram(){
 	QString name = mNameEdit->text();
-	if(mData.keys().contains(name)){
+    if(mData.contains(name)){
 		QString message = QString(tr("Already have a program with name %1.")).arg(name);
 		QMessageBox::critical(this, tr("Error"), message);
 		return;
@@ -122,7 +115,7 @@ void ProgramConfigurator::addProgram(){
 
 void ProgramConfigurator::removeProgram(){
 	QString name = mProgramSelector->currentText();
-	if(mData.keys().contains(name)){
+    if(mData.find(name) != mData.end()){
 		QString message = QString(tr("Really remove %1 from program list?")).arg(name);
 		int retval = QMessageBox::question(this, tr("Question"), message, QMessageBox::Yes | QMessageBox::No);
 		if(retval == QMessageBox::Yes){
@@ -171,16 +164,17 @@ void ProgramConfigurator::readSettings(){
 	QSettings s;
 	mData = s.value(dataString).toHash();
 	QStringList progs;
-    for(QString p : mData.keys()){
-		progs << p;
-	}
-	mProgramSelector->addItems(progs);
+    auto it = mData.constBegin();
+    while(it != mData.constEnd()) {
+        progs << it.key();
+        ++it;
+    }
+    mProgramSelector->addItems(progs);
 	mDefautProg = s.value(defaultString, tr("[None]")).toString();
 	int idx = mProgramSelector->findText(mDefautProg);
 	if(idx != -1){
 		mProgramSelector->setCurrentIndex(idx);
 	}
-    mInternalViewer->setChecked(s.value("vw/internal").toBool());
 	setDefault();
 }
 
@@ -203,6 +197,6 @@ QStringList ProgramConfigurator::args(const QString &argString){
 	if(argString.isEmpty()){
 		return QStringList();
 	}
-	QRegExp splitter("\\s+");
+    QRegularExpression splitter("\\s+");
     return argString.split(splitter, Qt::SkipEmptyParts);
 }