Index: Tests/kstars_ui/kstars_ui_tests.cpp =================================================================== --- Tests/kstars_ui/kstars_ui_tests.cpp +++ Tests/kstars_ui/kstars_ui_tests.cpp @@ -146,7 +146,7 @@ QThread::msleep(500); QCOMPARE(ccdCBox->currentIndex() != 0, true); // Save the profile - buttons->accepted(); + emit buttons->accepted(); QThread::msleep(2000); // Hide Ekos Manager by clicking on the toolbar icon action->trigger(); Index: kstars/auxiliary/fov.cpp =================================================================== --- kstars/auxiliary/fov.cpp +++ kstars/auxiliary/fov.cpp @@ -16,23 +16,24 @@ ***************************************************************************/ #include "fov.h" -#include "Options.h" + +#include "geolocation.h" +#include "kspaths.h" #ifndef KSTARS_LITE #include "kstars.h" #endif #include "kstarsdata.h" -#include "geolocation.h" +#include "Options.h" #include "skymap.h" #include "projections/projector.h" -#include - #include #include #include #include #include -#include "kspaths.h" + +#include QList FOVManager::m_FOVs; @@ -262,7 +263,7 @@ p.drawText(nameRect, Qt::AlignCenter, name()); QRect sizeRect(targetRect.center().x(), targetRect.topLeft().y()-(pixelSizeY/8), targetRect.width()/2, pixelSizeX / 10); - p.drawText(sizeRect, Qt::AlignCenter, QString("%1'x%2'").arg(QString::number(m_sizeX, 'f', 1)).arg(QString::number(m_sizeY, 'f', 1))); + p.drawText(sizeRect, Qt::AlignCenter, QString("%1'x%2'").arg(QString::number(m_sizeX, 'f', 1), QString::number(m_sizeY, 'f', 1))); } break; case CIRCLE: Index: kstars/dialogs/locationdialog.h =================================================================== --- kstars/dialogs/locationdialog.h +++ kstars/dialogs/locationdialog.h @@ -155,7 +155,7 @@ * @param operation Add, update, or remove city * @return true on success */ - bool updateCity(CityOperation operation); + bool updateCity(LocationDialog::CityOperation operation); /** * @brief getNameFromCoordinates Given the current latitude and longitude, use Google Location API services to reverse lookup Index: kstars/ekos/align/offlineastrometryparser.h =================================================================== --- kstars/ekos/align/offlineastrometryparser.h +++ kstars/ekos/align/offlineastrometryparser.h @@ -35,11 +35,11 @@ OfflineAstrometryParser(); virtual ~OfflineAstrometryParser() override = default; - virtual void setAlign(Align *_align) { align = _align; } - virtual bool init(); - virtual void verifyIndexFiles(double fov_x, double fov_y); - virtual bool startSovler(const QString &filename, const QStringList &args, bool generated = true); - virtual bool stopSolver(); + virtual void setAlign(Align *_align) override { align = _align; } + virtual bool init() override; + virtual void verifyIndexFiles(double fov_x, double fov_y) override; + virtual bool startSovler(const QString &filename, const QStringList &args, bool generated = true) override; + virtual bool stopSolver() override; public slots: void solverComplete(int exist_status); Index: kstars/ekos/align/opsastrometry.h =================================================================== --- kstars/ekos/align/opsastrometry.h +++ kstars/ekos/align/opsastrometry.h @@ -36,7 +36,7 @@ virtual ~OpsAstrometry() override = default; protected: - void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; private slots: void slotUpdatePosition(); Index: kstars/ekos/align/opsastrometryindexfiles.h =================================================================== --- kstars/ekos/align/opsastrometryindexfiles.h +++ kstars/ekos/align/opsastrometryindexfiles.h @@ -26,7 +26,7 @@ virtual ~OpsAstrometryIndexFiles() override = default; protected: - void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; public slots: void slotUpdate(); Index: kstars/ekos/auxiliary/filtermanager.h =================================================================== --- kstars/ekos/auxiliary/filtermanager.h +++ kstars/ekos/auxiliary/filtermanager.h @@ -9,18 +9,17 @@ #pragma once -#include -#include -#include -#include +#include "ui_filtersettings.h" +#include "ekos/ekos.h" #include #include #include -#include "ekos/ekos.h" - -#include "ui_filtersettings.h" +#include +#include +#include +#include class QSqlTableModel; class LockDelegate; @@ -90,7 +89,7 @@ public slots: // Position. if applyPolicy is true then all filter offsets and autofocus & lock policies are applied. - bool setFilterPosition(uint8_t position, FilterPolicy policy = ALL_POLICIES); + bool setFilterPosition(uint8_t position, Ekos::FilterManager::FilterPolicy policy = ALL_POLICIES); // Offset Request completed void setFocusOffsetComplete(); // Remove Device @@ -114,7 +113,7 @@ // Emitted when operation fails void failed(); // Status signal - void newStatus(FilterState state); + void newStatus(Ekos::FilterState state); // Check Focus void checkFocus(double); // New Focus offset requested Index: kstars/ekos/auxiliary/filtermanager.cpp =================================================================== --- kstars/ekos/auxiliary/filtermanager.cpp +++ kstars/ekos/auxiliary/filtermanager.cpp @@ -9,21 +9,21 @@ #include "filtermanager.h" -#include -#include -#include -#include - -#include - +#include "indi_debug.h" #include "kstarsdata.h" #include "kstars.h" +#include "Options.h" #include "auxiliary/kspaths.h" #include "ekos/auxiliary/filterdelegate.h" -#include "indi_debug.h" -#include "Options.h" +#include +#include +#include + +#include + +#include namespace Ekos { @@ -111,7 +111,7 @@ // If it is first time, let's populate data if (filterModel->rowCount() == 0) { - for (QString filter : m_currentFilterLabels) + for (QString &filter : m_currentFilterLabels) KStarsData::Instance()->userdb()->AddFilter(vendor, "", "", filter, 0, 1.0, false, "--", 0); filterModel->select(); Index: kstars/ekos/auxiliary/opslogs.cpp =================================================================== --- kstars/ekos/auxiliary/opslogs.cpp +++ kstars/ekos/auxiliary/opslogs.cpp @@ -9,20 +9,20 @@ #include "opslogs.h" -#include -#include -#include +#include "kstars.h" +#include "Options.h" +#include "auxiliary/kspaths.h" +#include "indi/indilistener.h" #include #include #include -#include +#include +#include +#include -#include "kstars.h" -#include "auxiliary/kspaths.h" -#include "indi/indilistener.h" -#include "Options.h" +#include namespace Ekos { @@ -130,16 +130,19 @@ qint64 size = 0; QDir dir(dirPath); - QDir::Filters fileFilters = QDir::Files|QDir::System|QDir::Hidden; - for(QString filePath : dir.entryList(fileFilters)) + QDir::Filters fileFilters = QDir::Files | QDir::System | QDir::Hidden; + + for (QString &filePath : dir.entryList(fileFilters)) { QFileInfo fi(dir, filePath); - size+= fi.size(); + + size += fi.size(); } - QDir::Filters dirFilters = QDir::Dirs|QDir::NoDotAndDotDot|QDir::System|QDir::Hidden; - for(QString childDirPath : dir.entryList(dirFilters)) - size+= getDirSize(dirPath + QDir::separator() + childDirPath); + QDir::Filters dirFilters = QDir::Dirs | QDir::NoDotAndDotDot | QDir::System | QDir::Hidden; + + for (QString &childDirPath : dir.entryList(dirFilters)) + size += getDirSize(dirPath + QDir::separator() + childDirPath); return size; } Index: kstars/ekos/ekosmanager.cpp =================================================================== --- kstars/ekos/ekosmanager.cpp +++ kstars/ekos/ekosmanager.cpp @@ -1854,7 +1854,7 @@ focusProcess->setFilterManager(filterManager); connect(filterManager.data(), SIGNAL(checkFocus(double)), focusProcess.get(), SLOT(checkFocus(double)), Qt::UniqueConnection); connect(focusProcess.get(), SIGNAL(newStatus(Ekos::FocusState)), filterManager.data(), SLOT(setFocusStatus(Ekos::FocusState)), Qt::UniqueConnection); - connect(filterManager.data(), SIGNAL(newFocusOffset(int, bool)), focusProcess.get(), SLOT(adjustFocusOffset(int,bool)), + connect(filterManager.data(), SIGNAL(newFocusOffset(int,bool)), focusProcess.get(), SLOT(adjustFocusOffset(int,bool)), Qt::UniqueConnection); connect(focusProcess.get(), SIGNAL(focusPositionAdjusted()), filterManager.data(), SLOT(setFocusOffsetComplete()), Qt::UniqueConnection); Index: kstars/ekos/guide/guide.cpp =================================================================== --- kstars/ekos/guide/guide.cpp +++ kstars/ekos/guide/guide.cpp @@ -24,10 +24,9 @@ #include "fitsviewer/fitsviewer.h" #include "internalguide/internalguider.h" -#include - #include +#include #include #define CAPTURE_TIMEOUT_THRESHOLD 30000 @@ -1435,7 +1434,7 @@ break; } - newStarPixmap(guideView->getTrackingBoxPixmap()); + emit newStarPixmap(guideView->getTrackingBoxPixmap()); } void Guide::appendLogText(const QString &text) @@ -2121,7 +2120,7 @@ connect(internalGuider, SIGNAL(newPulse(GuideDirection,int,GuideDirection,int)), this, SLOT(sendPulse(GuideDirection,int,GuideDirection,int))); connect(internalGuider, SIGNAL(DESwapChanged(bool)), swapCheck, SLOT(setChecked(bool))); - connect(internalGuider, SIGNAL(newStarPixmap(QPixmap &)), this, SIGNAL(newStarPixmap(QPixmap&))); + connect(internalGuider, SIGNAL(newStarPixmap(QPixmap&)), this, SIGNAL(newStarPixmap(QPixmap&))); guider = internalGuider; @@ -2175,7 +2174,7 @@ guider = phd2Guider; phd2Guider->setGuideView(guideView); - connect(phd2Guider, SIGNAL(newStarPixmap(QPixmap &)), this, SIGNAL(newStarPixmap(QPixmap&))); + connect(phd2Guider, SIGNAL(newStarPixmap(QPixmap&)), this, SIGNAL(newStarPixmap(QPixmap&))); clearCalibrationB->setEnabled(true); captureB->setEnabled(false); Index: kstars/ekos/guide/opscalibration.h =================================================================== --- kstars/ekos/guide/opscalibration.h +++ kstars/ekos/guide/opscalibration.h @@ -33,7 +33,7 @@ virtual ~OpsCalibration() override = default; protected: - void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; private slots: Index: kstars/ekos/scheduler/scheduler.cpp =================================================================== --- kstars/ekos/scheduler/scheduler.cpp +++ kstars/ekos/scheduler/scheduler.cpp @@ -190,13 +190,13 @@ connect(shutdownScript, SIGNAL(editingFinished()), this, SLOT(setDirty())); connect(schedulerProfileCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setDirty())); - connect(stepsButtonGroup, SIGNAL(buttonToggled(int, bool)), this, SLOT(setDirty())); - connect(startupButtonGroup, SIGNAL(buttonToggled(int, bool)), this, SLOT(setDirty())); - connect(constraintButtonGroup, SIGNAL(buttonToggled(int, bool)), this, SLOT(setDirty())); - connect(completionButtonGroup, SIGNAL(buttonToggled(int, bool)), this, SLOT(setDirty())); + connect(stepsButtonGroup, SIGNAL(buttonToggled(int,bool)), this, SLOT(setDirty())); + connect(startupButtonGroup, SIGNAL(buttonToggled(int,bool)), this, SLOT(setDirty())); + connect(constraintButtonGroup, SIGNAL(buttonToggled(int,bool)), this, SLOT(setDirty())); + connect(completionButtonGroup, SIGNAL(buttonToggled(int,bool)), this, SLOT(setDirty())); - connect(startupProcedureButtonGroup, SIGNAL(buttonToggled(int, bool)), this, SLOT(setDirty())); - connect(shutdownProcedureGroup, SIGNAL(buttonToggled(int, bool)), this, SLOT(setDirty())); + connect(startupProcedureButtonGroup, SIGNAL(buttonToggled(int,bool)), this, SLOT(setDirty())); + connect(shutdownProcedureGroup, SIGNAL(buttonToggled(int,bool)), this, SLOT(setDirty())); connect(culminationOffset, SIGNAL(valueChanged(int)), this, SLOT(setDirty())); connect(startupTimeEdit, SIGNAL(editingFinished()), this, SLOT(setDirty())); @@ -217,13 +217,13 @@ disconnect(shutdownScript, SIGNAL(editingFinished()), this, SLOT(setDirty())); disconnect(schedulerProfileCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setDirty())); - disconnect(stepsButtonGroup, SIGNAL(buttonToggled(int, bool)), this, SLOT(setDirty())); - disconnect(startupButtonGroup, SIGNAL(buttonToggled(int, bool)), this, SLOT(setDirty())); - disconnect(constraintButtonGroup, SIGNAL(buttonToggled(int, bool)), this, SLOT(setDirty())); - disconnect(completionButtonGroup, SIGNAL(buttonToggled(int, bool)), this, SLOT(setDirty())); + disconnect(stepsButtonGroup, SIGNAL(buttonToggled(int,bool)), this, SLOT(setDirty())); + disconnect(startupButtonGroup, SIGNAL(buttonToggled(int,bool)), this, SLOT(setDirty())); + disconnect(constraintButtonGroup, SIGNAL(buttonToggled(int,bool)), this, SLOT(setDirty())); + disconnect(completionButtonGroup, SIGNAL(buttonToggled(int,bool)), this, SLOT(setDirty())); - disconnect(startupProcedureButtonGroup, SIGNAL(buttonToggled(int, bool)), this, SLOT(setDirty())); - disconnect(shutdownProcedureGroup, SIGNAL(buttonToggled(int, bool)), this, SLOT(setDirty())); + disconnect(startupProcedureButtonGroup, SIGNAL(buttonToggled(int,bool)), this, SLOT(setDirty())); + disconnect(shutdownProcedureGroup, SIGNAL(buttonToggled(int,bool)), this, SLOT(setDirty())); disconnect(culminationOffset, SIGNAL(valueChanged(int)), this, SLOT(setDirty())); disconnect(startupTimeEdit, SIGNAL(editingFinished()), this, SLOT(setDirty())); @@ -3812,7 +3812,7 @@ if (slewModeReply.error().type() != QDBusError::NoError) { /* FIXME: manage error */ - qCCritical(KSTARS_EKOS_SCHEDULER) << QString("Warning! Job '%1' slew request received DBUS error: %2").arg(currentJob->getName()).arg(QDBusError::errorString(slewModeReply.error().type())); + qCCritical(KSTARS_EKOS_SCHEDULER) << QString("Warning! Job '%1' slew request received DBUS error: %2").arg(currentJob->getName(), QDBusError::errorString(slewModeReply.error().type())); return; } @@ -3841,7 +3841,7 @@ if (focusModeReply.error().type() != QDBusError::NoError) { - qCCritical(KSTARS_EKOS_SCHEDULER) << QString("Warning! Job '%1' canAutoFocus request received DBUS error: %2").arg(currentJob->getName()).arg(QDBusError::errorString(focusModeReply.error().type())); + qCCritical(KSTARS_EKOS_SCHEDULER) << QString("Warning! Job '%1' canAutoFocus request received DBUS error: %2").arg(currentJob->getName(), QDBusError::errorString(focusModeReply.error().type())); return; } @@ -3863,7 +3863,7 @@ // We always need to reset frame first if ((reply = focusInterface->call(QDBus::AutoDetect, "resetFrame")).type() == QDBusMessage::ErrorMessage) { - qCCritical(KSTARS_EKOS_SCHEDULER) << QString("Warning! Job '%1' resetFrame request received DBUS error: %2").arg(currentJob->getName()).arg(reply.errorMessage()); + qCCritical(KSTARS_EKOS_SCHEDULER) << QString("Warning! Job '%1' resetFrame request received DBUS error: %2").arg(currentJob->getName(), reply.errorMessage()); return; } @@ -3875,7 +3875,7 @@ if ((reply = focusInterface->callWithArgumentList(QDBus::AutoDetect, "setAutoStarEnabled", autoStar)).type() == QDBusMessage::ErrorMessage) { - qCCritical(KSTARS_EKOS_SCHEDULER) << QString("Warning! Job '%1' setAutoFocusStar request received DBUS error: %1").arg(currentJob->getName()).arg(reply.errorMessage()); + qCCritical(KSTARS_EKOS_SCHEDULER) << QString("Warning! Job '%1' setAutoFocusStar request received DBUS error: %1").arg(currentJob->getName(), reply.errorMessage()); return; } } @@ -3883,7 +3883,7 @@ // Start auto-focus if ((reply = focusInterface->call(QDBus::AutoDetect, "start")).type() == QDBusMessage::ErrorMessage) { - qCCritical(KSTARS_EKOS_SCHEDULER) << QString("Warning! Job '%1' startFocus request received DBUS error: %2").arg(currentJob->getName()).arg(reply.errorMessage()); + qCCritical(KSTARS_EKOS_SCHEDULER) << QString("Warning! Job '%1' startFocus request received DBUS error: %2").arg(currentJob->getName(), reply.errorMessage()); return; } @@ -4081,7 +4081,7 @@ if ((reply = alignInterface->callWithArgumentList(QDBus::AutoDetect, "loadAndSlew", solveArgs)).type() == QDBusMessage::ErrorMessage) { - qCCritical(KSTARS_EKOS_SCHEDULER) << QString("Warning! Job '%1' loadAndSlew request received DBUS error: %2").arg(currentJob->getName()).arg(reply.errorMessage()); + qCCritical(KSTARS_EKOS_SCHEDULER) << QString("Warning! Job '%1' loadAndSlew request received DBUS error: %2").arg(currentJob->getName(), reply.errorMessage()); return; } @@ -4092,7 +4092,7 @@ { if ((reply = alignInterface->call(QDBus::AutoDetect, "captureAndSolve")).type() == QDBusMessage::ErrorMessage) { - qCCritical(KSTARS_EKOS_SCHEDULER) << QString("Warning! Job '%1' captureAndSolve request received DBUS error: %2").arg(currentJob->getName()).arg(reply.errorMessage()); + qCCritical(KSTARS_EKOS_SCHEDULER) << QString("Warning! Job '%1' captureAndSolve request received DBUS error: %2").arg(currentJob->getName(), reply.errorMessage()); return; } @@ -4144,16 +4144,17 @@ QMap fMap = currentJob->getCapturedFramesMap(); - for (auto e : fMap.keys()) + for (auto &e : fMap.keys()) { QList dbusargs; QDBusMessage reply; + dbusargs.append(e); dbusargs.append(fMap.value(e)); if ((reply = captureInterface->callWithArgumentList(QDBus::AutoDetect, "setCapturedFramesMap", dbusargs)).type() == QDBusMessage::ErrorMessage) { - qCCritical(KSTARS_EKOS_SCHEDULER) << QString("Warning! Job '%1' setCapturedFramesCount request received DBUS error: %1").arg(currentJob->getName()).arg(reply.errorMessage()); + qCCritical(KSTARS_EKOS_SCHEDULER) << QString("Warning! Job '%1' setCapturedFramesCount request received DBUS error: %1").arg(currentJob->getName(), reply.errorMessage()); return; } } @@ -4513,7 +4514,7 @@ dms estimatedTime; estimatedTime.setH(totalImagingTime / 3600.0); - qCInfo(KSTARS_EKOS_SCHEDULER) << QString("Job '%1' estimated to take %2 to complete.").arg(schedJob->getName()).arg(estimatedTime.toHMSString()); + qCInfo(KSTARS_EKOS_SCHEDULER) << QString("Job '%1' estimated to take %2 to complete.").arg(schedJob->getName(), estimatedTime.toHMSString()); schedJob->setEstimatedTime(totalImagingTime); } @@ -5067,7 +5068,7 @@ if (createJobSequence(root, prefix, outputDir) == false) return; - QString filename = QString("%1/%2.esq").arg(outputDir).arg(prefix); + QString filename = QString("%1/%2.esq").arg(outputDir, prefix); sequenceEdit->setText(filename); sequenceURL = QUrl::fromLocalFile(filename); @@ -5086,7 +5087,7 @@ queueTable->removeRow(0); } - QUrl mosaicURL = QUrl::fromLocalFile((QString("%1/%2_mosaic.esl").arg(outputDir).arg(targetName))); + QUrl mosaicURL = QUrl::fromLocalFile((QString("%1/%2_mosaic.esl").arg(outputDir, targetName))); if (saveScheduler(mosaicURL)) { @@ -5160,7 +5161,7 @@ } else if (!strcmp(tagXMLEle(subEP), "FITSDirectory")) { - editXMLEle(subEP, QString("%1/%2").arg(outputDir).arg(prefix).toLatin1().constData()); + editXMLEle(subEP, QString("%1/%2").arg(outputDir, prefix).toLatin1().constData()); } } } @@ -5168,7 +5169,7 @@ QDir().mkpath(outputDir); - QString filename = QString("%1/%2.esq").arg(outputDir).arg(prefix); + QString filename = QString("%1/%2.esq").arg(outputDir, prefix); FILE *outputFile = fopen(filename.toLatin1().constData(), "w"); if (outputFile == nullptr) @@ -5557,7 +5558,7 @@ { int seqFileCount = 0; - qCDebug(KSTARS_EKOS_SCHEDULER) << QString("Searching in '%1' for prefix '%2'...").arg(path).arg(seqPrefix); + qCDebug(KSTARS_EKOS_SCHEDULER) << QString("Searching in '%1' for prefix '%2'...").arg(path, seqPrefix); QDirIterator it(path, QDir::Files); /* FIXME: this counts all files with prefix in the storage location, not just captures. DSS analysis files are counted in, for instance. */ Index: kstars/ekos/scheduler/schedulerjob.cpp =================================================================== --- kstars/ekos/scheduler/schedulerjob.cpp +++ kstars/ekos/scheduler/schedulerjob.cpp @@ -8,10 +8,10 @@ */ #include "schedulerjob.h" -#include "scheduler.h" #include "dms.h" #include "kstarsdata.h" +#include "scheduler.h" #include @@ -385,7 +385,7 @@ } if (stageLabel) { - stageLabel->setText(QString("%1: %2").arg(name).arg(stageStrings.value(stage, stageStringUnknown))); + stageLabel->setText(QString("%1: %2").arg(name, stageStrings.value(stage, stageStringUnknown))); } } Index: kstars/fitsviewer/fitsview.cpp =================================================================== --- kstars/fitsviewer/fitsview.cpp +++ kstars/fitsviewer/fitsview.cpp @@ -429,7 +429,7 @@ if (imageData->getNumOfChannels() == 1) { - QList> futures; + QVector> futures; /* Fill in pixel values using indexed map, linear scale */ for (uint32_t j = 0; j < image_height; j++) @@ -451,7 +451,8 @@ } else { - QList> futures; + QVector> futures; + /* Fill in pixel values using indexed map, linear scale */ for (uint32_t j = 0; j < image_height; j++) { Index: kstars/indi/indistd.cpp =================================================================== --- kstars/indi/indistd.cpp +++ kstars/indi/indistd.cpp @@ -240,7 +240,7 @@ geo->setLat(lat); } - qCInfo(KSTARS_INDI) << "Setting location from device:" << getDeviceName() << "Longitude:" << lng.toDMSString() << "Latitude:" << lat.toDMSString(); + qCInfo(KSTARS_INDI) << "Setting location from device:" << deviceName << "Longitude:" << lng.toDMSString() << "Latitude:" << lat.toDMSString(); KStars::Instance()->data()->setLocation(*geo); } Index: kstars/indi/indiwebmanager.cpp =================================================================== --- kstars/indi/indiwebmanager.cpp +++ kstars/indi/indiwebmanager.cpp @@ -149,7 +149,7 @@ } // Make sure all the profile drivers are running there - for (auto oneDriverExec : piExecDrivers) + for (auto &oneDriverExec : piExecDrivers) { if (webManagerDrivers.contains(oneDriverExec) == false) { Index: kstars/indi/servermanager.cpp =================================================================== --- kstars/indi/servermanager.cpp +++ kstars/indi/servermanager.cpp @@ -137,7 +137,7 @@ void ServerManager::insertEnvironmentPath(QProcessEnvironment *env, QString variable, QString relativePath) { QString environmentPath = QCoreApplication::applicationDirPath() + relativePath; - if (QFileInfo(environmentPath).exists() && Options::indiDriversAreInternal()) + if (QFileInfo::exists(environmentPath) && Options::indiDriversAreInternal()) env->insert(variable, QDir(environmentPath).absolutePath()); } Index: kstars/kstarsinit.cpp =================================================================== --- kstars/kstarsinit.cpp +++ kstars/kstarsinit.cpp @@ -16,11 +16,11 @@ ***************************************************************************/ #include "kstars.h" -#include "kstars_debug.h" #include "fov.h" #include "kspaths.h" #include "kstarsdata.h" +#include "kstars_debug.h" #include "Options.h" #include "skymap.h" #include "texturemanager.h" @@ -682,8 +682,12 @@ void KStars::repopulateHIPS() { // Iterate through actions - hipsActionMenu->menu()->clear(); - hipsGroup->actions().clear(); + hipsActionMenu->menu()->clear(); + // Remove all actions + QList actions = hipsGroup->actions(); + + for (auto &action : actions) + hipsGroup->removeAction(action); QAction *ka = actionCollection()->addAction(i18n("None"), this, SLOT(slotHIPSSource())) << i18n("None") << AddToGroup(hipsGroup) Index: tools/run_clazy_static_code_analysis.sh =================================================================== --- tools/run_clazy_static_code_analysis.sh +++ tools/run_clazy_static_code_analysis.sh @@ -2,8 +2,8 @@ rm -rf clazy_build mkdir -p clazy_build # Configure CMake -export CLANGXX=clang++-3.9 -export CLAZY_CHECKS="level0,level1,no-non-pod-global-static,no-container-anti-pattern" -cmake -Bclazy_build -H.. -DCMAKE_C_COMPILER=clang-3.9 -DCMAKE_CXX_COMPILER=clazy -DCCACHE_SUPPORT=OFF -DCMAKE_BUILD_TYPE=Debug +export CLANGXX=clang++-6.0 +export CLAZY_CHECKS="level0,level1,no-non-pod-global-static,no-container-anti-pattern,no-qproperty-without-notify,no-connect-3arg-lambda" +cmake -Bclazy_build -H.. -DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clazy -DCCACHE_SUPPORT=OFF -DCMAKE_BUILD_TYPE=Debug # Do a Clang build with Clazy static analyzer make -C clazy_build -j4