Hello community, here is the log from the commit of package qimgv for openSUSE:Factory checked in at 2018-09-18 11:50:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qimgv (Old) and /work/SRC/openSUSE:Factory/.qimgv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qimgv" Tue Sep 18 11:50:53 2018 rev:4 rq:636282 version:0.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qimgv/qimgv.changes 2018-08-10 09:50:17.174319099 +0200 +++ /work/SRC/openSUSE:Factory/.qimgv.new/qimgv.changes 2018-09-18 11:50:59.707441351 +0200 @@ -1,0 +2,7 @@ +Tue Sep 18 07:06:53 UTC 2018 - Luigi Baldoni <[email protected]> + +- Update to version 0.7.1 + * Fix build with Qt 5.9 + * Fix build with musl libc + +------------------------------------------------------------------- Old: ---- qimgv-0.7.tar.gz New: ---- qimgv-0.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qimgv.spec ++++++ --- /var/tmp/diff_new_pack.7eRMNn/_old 2018-09-18 11:51:00.583440452 +0200 +++ /var/tmp/diff_new_pack.7eRMNn/_new 2018-09-18 11:51:00.587440449 +0200 @@ -17,7 +17,7 @@ Name: qimgv -Version: 0.7 +Version: 0.7.1 Release: 0 Summary: Qt5 image viewer License: GPL-3.0-only @@ -28,8 +28,8 @@ BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: pkgconfig -BuildRequires: pkgconfig(Qt5Concurrent) >= 5.10 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.10 +BuildRequires: pkgconfig(Qt5Concurrent) >= 5.9 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.9 BuildRequires: pkgconfig(mpv) >= 1.22.0 %description ++++++ qimgv-0.7.tar.gz -> qimgv-0.7.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-0.7/components/scriptmanager/scriptmanager.cpp new/qimgv-0.7.1/components/scriptmanager/scriptmanager.cpp --- old/qimgv-0.7/components/scriptmanager/scriptmanager.cpp 2018-08-08 21:43:41.000000000 +0200 +++ new/qimgv-0.7.1/components/scriptmanager/scriptmanager.cpp 2018-09-17 18:04:41.000000000 +0200 @@ -25,19 +25,15 @@ if(scripts.contains(scriptName)) { Script script = scripts.value(scriptName); QProcess exec(this); - QStringList command = splitCommandLine(script.command); processArguments(command, img); - exec.setProgram(command.takeAt(0)); - exec.setArguments(command); - if(script.blocking) { - exec.start(); + exec.start(command.takeAt(0), command); if(!exec.waitForStarted()) qDebug() << "[ScriptManager] Unable not start:" << exec.program() << " Make sure it is an executable."; exec.waitForFinished(10000); } else { - if(!exec.startDetached()) { + if(!exec.startDetached(command.takeAt(0), command)) { qWarning() << "[ScriptManager] Unable not start:" << exec.program() << " Make sure it is an executable."; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-0.7/core.cpp new/qimgv-0.7.1/core.cpp --- old/qimgv-0.7/core.cpp 2018-08-08 21:43:41.000000000 +0200 +++ new/qimgv-0.7.1/core.cpp 2018-09-17 18:04:41.000000000 +0200 @@ -16,7 +16,7 @@ scaler(nullptr), thumbnailer(nullptr) { -#ifdef __linux__ +#ifdef __GLIBC__ // default value of 128k causes memory fragmentation issues // finding this took 3 days of my life mallopt(M_MMAP_THRESHOLD, 64000); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-0.7/qimgv.pro new/qimgv-0.7.1/qimgv.pro --- old/qimgv-0.7/qimgv.pro 2018-08-08 21:43:41.000000000 +0200 +++ new/qimgv-0.7.1/qimgv.pro 2018-09-17 18:04:41.000000000 +0200 @@ -21,8 +21,9 @@ QMAKE_CXXFLAGS_RELEASE -= -O2 QMAKE_CXXFLAGS_RELEASE *= -O3 -CONFIG += WITH_MPV +#CONFIG += WITH_MPV CONFIG += WITH_KDE_BLUR +CONFIG += PORTABLE # video support WITH_MPV { @@ -53,6 +54,12 @@ } } +PORTABLE { + windows { + DEFINES += IS_PORTABLE + } +} + SOURCES += \ main.cpp \ core.cpp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-0.7/settings.cpp new/qimgv-0.7.1/settings.cpp --- old/qimgv-0.7/settings.cpp 2018-08-08 21:43:41.000000000 +0200 +++ new/qimgv-0.7.1/settings.cpp 2018-09-17 18:04:41.000000000 +0200 @@ -3,16 +3,26 @@ Settings *settings = nullptr; Settings::Settings(QObject *parent) : QObject(parent) { +#ifdef IS_PORTABLE + cacheDirectory = new QDir(QApplication::applicationDirPath() + "/cache"); + cacheDirectory->mkpath(cacheDirectory->absolutePath()); + thumbnailDirectory = new QDir(QApplication::applicationDirPath() + "/thumbnails"); + thumbnailDirectory->mkpath(thumbnailDirectory->absolutePath()); + s = new QSettings(QApplication::applicationDirPath() + "/qimgv.ini", QSettings::IniFormat); +#else cacheDirectory = new QDir(QDir::homePath() + "/.cache/qimgv"); cacheDirectory->mkpath(cacheDirectory->absolutePath()); - thumbnailDirectory = new QDir(QDir::homePath() + "/.cache/qimgv/thumbnails"); thumbnailDirectory->mkpath(thumbnailDirectory->absolutePath()); + QSettings::setDefaultFormat(QSettings::NativeFormat); + s = new QSettings(); +#endif } Settings::~Settings() { delete thumbnailDirectory; delete cacheDirectory; + delete s; } Settings *Settings::getInstance() { @@ -26,15 +36,15 @@ void Settings::validate() { if(settings) { bool ok = true; - if(settings->s.value("lastDir") == "") { - settings->s.setValue("lastDir", + if(settings->s->value("lastDir") == "") { + settings->s->setValue("lastDir", QDir::homePath()); } if(!ok) { qDebug() << "Settings: error reading thumbnail size (int conversion failed)."; qDebug() << "Settings: setting default size."; ok = true; - settings->s.setValue("mainPanelSize", 160); + settings->s->setValue("mainPanelSize", 160); } } } @@ -48,7 +58,7 @@ } //------------------------------------------------------------------------------ QString Settings::mpvBinary() { - QString mpvPath = settings->s.value("mpvBinary", "").toString(); + QString mpvPath = settings->s->value("mpvBinary", "").toString(); if(!QFile::exists(mpvPath)) { #ifdef _WIN32 mpvPath = QCoreApplication::applicationDirPath() + "/mpv.exe"; @@ -65,7 +75,7 @@ void Settings::setMpvBinary(QString path) { if(QFile::exists(path)) { - settings->s.setValue("mpvBinary", path); + settings->s->setValue("mpvBinary", path); } } //------------------------------------------------------------------------------ @@ -123,52 +133,52 @@ //------------------------------------------------------------------------------ bool Settings::playWebm() { #ifdef USE_MPV - return settings->s.value("playWebm", true).toBool(); + return settings->s->value("playWebm", true).toBool(); #else return false; #endif } void Settings::setPlayWebm(bool mode) { - settings->s.setValue("playWebm", mode); + settings->s->setValue("playWebm", mode); } //------------------------------------------------------------------------------ bool Settings::playMp4() { #ifdef USE_MPV - return settings->s.value("playMp4", false).toBool(); + return settings->s->value("playMp4", false).toBool(); #else return false; #endif } void Settings::setPlayMp4(bool mode) { - settings->s.setValue("playMp4", mode); + settings->s->setValue("playMp4", mode); } //------------------------------------------------------------------------------ QVersionNumber Settings::lastVersion() { - int vmajor = settings->s.value("lastVerMajor", 0).toInt(); - int vminor = settings->s.value("lastVerMinor", 0).toInt(); - int vmicro = settings->s.value("lastVerMicro", 0).toInt(); + int vmajor = settings->s->value("lastVerMajor", 0).toInt(); + int vminor = settings->s->value("lastVerMinor", 0).toInt(); + int vmicro = settings->s->value("lastVerMicro", 0).toInt(); return QVersionNumber(vmajor, vminor, vmicro); } void Settings::setLastVersion(QVersionNumber &ver) { - settings->s.setValue("lastVerMajor", ver.majorVersion()); - settings->s.setValue("lastVerMinor", ver.minorVersion()); - settings->s.setValue("lastVerMicro", ver.microVersion()); + settings->s->setValue("lastVerMajor", ver.majorVersion()); + settings->s->setValue("lastVerMinor", ver.minorVersion()); + settings->s->setValue("lastVerMicro", ver.microVersion()); } //------------------------------------------------------------------------------ void Settings::setShowChangelogs(bool mode) { - settings->s.setValue("showChangelogs", mode); + settings->s->setValue("showChangelogs", mode); } bool Settings::showChangelogs() { - return settings->s.value("showChangelogs", true).toBool(); + return settings->s->value("showChangelogs", true).toBool(); } //------------------------------------------------------------------------------ qreal Settings::backgroundOpacity() { bool ok = false; - qreal value = settings->s.value("backgroundOpacity", 1.0).toReal(&ok); + qreal value = settings->s->value("backgroundOpacity", 1.0).toReal(&ok); if(!ok) return 0.0; if(value > 1.0) @@ -183,60 +193,60 @@ value = 1.0; else if(value < 0.0) value = 0.0; - settings->s.setValue("backgroundOpacity", value); + settings->s->setValue("backgroundOpacity", value); } //------------------------------------------------------------------------------ bool Settings::blurBackground() { #ifndef USE_KDE_BLUR return false; #endif - return settings->s.value("blurBackground", true).toBool(); + return settings->s->value("blurBackground", true).toBool(); } void Settings::setBlurBackground(bool mode) { - settings->s.setValue("blurBackground", mode); + settings->s->setValue("blurBackground", mode); } //------------------------------------------------------------------------------ void Settings::setSortingMode(SortingMode mode) { if(mode >= 6) mode = SortingMode::NAME_ASC; - settings->s.setValue("sortingMode", mode); + settings->s->setValue("sortingMode", mode); } SortingMode Settings::sortingMode() { - int mode = settings->s.value("sortingMode", 0).toInt(); + int mode = settings->s->value("sortingMode", 0).toInt(); if(mode < 0 || mode >= 6) mode = 0; return static_cast<SortingMode>(mode); } //------------------------------------------------------------------------------ bool Settings::playVideoSounds() { - return settings->s.value("playVideoSounds", false).toBool(); + return settings->s->value("playVideoSounds", false).toBool(); } void Settings::setPlayVideoSounds(bool mode) { - settings->s.setValue("playVideoSounds", mode); + settings->s->setValue("playVideoSounds", mode); } //------------------------------------------------------------------------------ bool Settings::useFastScale() { - return settings->s.value("useFastScale", "true").toBool(); + return settings->s->value("useFastScale", "true").toBool(); } void Settings::setUseFastScale(bool mode) { - settings->s.setValue("useFastScale", mode); + settings->s->setValue("useFastScale", mode); } //------------------------------------------------------------------------------ QString Settings::lastDirectory() { - return settings->s.value("lastDir", QDir::homePath()).toString(); + return settings->s->value("lastDir", QDir::homePath()).toString(); } void Settings::setLastDirectory(QString path) { - settings->s.setValue("lastDir", path); + settings->s->setValue("lastDir", path); } //------------------------------------------------------------------------------ unsigned int Settings::lastFilePosition() { bool ok = true; - unsigned int pos = settings->s.value("lastFilePosition", "0").toUInt(&ok); + unsigned int pos = settings->s->value("lastFilePosition", "0").toUInt(&ok); if(!ok) { qDebug() << "Settings: Invalid lastFilePosition. Resetting to 0."; pos = 0; @@ -245,12 +255,12 @@ } void Settings::setLastFilePosition(unsigned int pos) { - settings->s.setValue("lastFilePosition", pos); + settings->s->setValue("lastFilePosition", pos); } //------------------------------------------------------------------------------ unsigned int Settings::mainPanelSize() { bool ok = true; - unsigned int size = settings->s.value("mainPanelSize", mainPanelSizeDefault).toUInt(&ok); + unsigned int size = settings->s->value("mainPanelSize", mainPanelSizeDefault).toUInt(&ok); if(!ok) { size = mainPanelSizeDefault; } @@ -258,67 +268,67 @@ } void Settings::setMainPanelSize(unsigned int size) { - settings->s.setValue("mainPanelSize", size); + settings->s->setValue("mainPanelSize", size); } //------------------------------------------------------------------------------ bool Settings::usePreloader() { - return settings->s.value("usePreloader", true).toBool(); + return settings->s->value("usePreloader", true).toBool(); } void Settings::setUsePreloader(bool mode) { - settings->s.setValue("usePreloader", mode); + settings->s->setValue("usePreloader", mode); } //------------------------------------------------------------------------------ QColor Settings::backgroundColor() { - return settings->s.value("bgColor", QColor(27, 27, 28)).value<QColor>(); + return settings->s->value("bgColor", QColor(27, 27, 28)).value<QColor>(); } void Settings::setBackgroundColor(QColor color) { - settings->s.setValue("bgColor", color); + settings->s->setValue("bgColor", color); } //------------------------------------------------------------------------------ QColor Settings::accentColor() { - return settings->s.value("accentColor", QColor(17, 121, 100)).value<QColor>(); + return settings->s->value("accentColor", QColor(17, 121, 100)).value<QColor>(); } void Settings::setAccentColor(QColor color) { - settings->s.setValue("accentColor", color); + settings->s->setValue("accentColor", color); } //------------------------------------------------------------------------------ bool Settings::fullscreenMode() { - return settings->s.value("openInFullscreen", true).toBool(); + return settings->s->value("openInFullscreen", true).toBool(); } void Settings::setFullscreenMode(bool mode) { - settings->s.setValue("openInFullscreen", mode); + settings->s->setValue("openInFullscreen", mode); } //------------------------------------------------------------------------------ bool Settings::panelEnabled() { - return settings->s.value("panelEnabled", true).toBool(); + return settings->s->value("panelEnabled", true).toBool(); } void Settings::setPanelEnabled(bool mode) { - settings->s.setValue("panelEnabled", mode); + settings->s->setValue("panelEnabled", mode); } //------------------------------------------------------------------------------ bool Settings::panelFullscreenOnly() { - return settings->s.value("panelFullscreenOnly", false).toBool(); + return settings->s->value("panelFullscreenOnly", false).toBool(); } void Settings::setPanelFullscreenOnly(bool mode) { - settings->s.setValue("panelFullscreenOnly", mode); + settings->s->setValue("panelFullscreenOnly", mode); } //------------------------------------------------------------------------------ int Settings::lastDisplay() { - return settings->s.value("lastDisplay", 0).toInt(); + return settings->s->value("lastDisplay", 0).toInt(); } void Settings::setLastDisplay(int display) { - settings->s.setValue("lastDisplay", display); + settings->s->setValue("lastDisplay", display); } //------------------------------------------------------------------------------ PanelHPosition Settings::panelPosition() { - QString posString = settings->s.value("panelPosition", "top").toString(); + QString posString = settings->s->value("panelPosition", "top").toString(); if(posString == "top") { return PanelHPosition::PANEL_TOP; } else { @@ -336,7 +346,7 @@ posString = "bottom"; break; } - settings->s.setValue("panelPosition", posString); + settings->s->setValue("panelPosition", posString); } //------------------------------------------------------------------------------ /* @@ -345,7 +355,7 @@ * 2: orginal size */ ImageFitMode Settings::imageFitMode() { - int mode = settings->s.value("defaultFitMode", 0).toInt(); + int mode = settings->s->value("defaultFitMode", 0).toInt(); if(mode < 0 || mode > 2) { qDebug() << "Settings: Invalid fit mode ( " + QString::number(mode) + " ). Resetting to default."; mode = 0; @@ -359,26 +369,26 @@ qDebug() << "Settings: Invalid fit mode ( " + QString::number(modeInt) + " ). Resetting to default."; modeInt = 0; } - settings->s.setValue("defaultFitMode", modeInt); + settings->s->setValue("defaultFitMode", modeInt); } //------------------------------------------------------------------------------ QRect Settings::windowGeometry() { - QRect savedRect = settings->s.value("windowGeometry").toRect(); + QRect savedRect = settings->s->value("windowGeometry").toRect(); if(savedRect.size().isEmpty()) savedRect.setRect(100, 100, 900, 600); return savedRect; } void Settings::setWindowGeometry(QRect geometry) { - settings->s.setValue("windowGeometry", geometry); + settings->s->setValue("windowGeometry", geometry); } //------------------------------------------------------------------------------ bool Settings::infiniteScrolling() { - return settings->s.value("infiniteScrolling", false).toBool(); + return settings->s->value("infiniteScrolling", false).toBool(); } void Settings::setInfiniteScrolling(bool mode) { - settings->s.setValue("infiniteScrolling", mode); + settings->s->setValue("infiniteScrolling", mode); } //------------------------------------------------------------------------------ void Settings::sendChangeNotification() { @@ -386,188 +396,188 @@ } //------------------------------------------------------------------------------ void Settings::readShortcuts(QMap<QString, QString> &shortcuts) { - settings->s.beginGroup("Controls"); + settings->s->beginGroup("Controls"); QStringList in, pair; - in = settings->s.value("shortcuts").toStringList(); + in = settings->s->value("shortcuts").toStringList(); for(int i = 0; i < in.count(); i++) { pair = in[i].split("="); if(!pair[0].isEmpty() && !pair[1].isEmpty()) { shortcuts.insert(pair[1], pair[0]); } } - settings->s.endGroup(); + settings->s->endGroup(); } void Settings::saveShortcuts(const QMap<QString, QString> &shortcuts) { - settings->s.beginGroup("Controls"); + settings->s->beginGroup("Controls"); QMapIterator<QString, QString> i(shortcuts); QStringList out; while(i.hasNext()) { i.next(); out << i.value() + "=" + i.key(); } - settings->s.setValue("shortcuts", out); - settings->s.endGroup(); + settings->s->setValue("shortcuts", out); + settings->s->endGroup(); } //------------------------------------------------------------------------------ void Settings::readScripts(QMap<QString, Script> &scripts) { scripts.clear(); - settings->s.beginGroup("Scripts"); - int size = settings->s.beginReadArray("script"); + settings->s->beginGroup("Scripts"); + int size = settings->s->beginReadArray("script"); for(int i=0; i < size; i++) { - settings->s.setArrayIndex(i); - QString name = settings->s.value("name").toString(); - QVariant value = settings->s.value("value"); + settings->s->setArrayIndex(i); + QString name = settings->s->value("name").toString(); + QVariant value = settings->s->value("value"); Script scr = value.value<Script>(); scripts.insert(name, scr); } - settings->s.endArray(); - settings->s.endGroup(); + settings->s->endArray(); + settings->s->endGroup(); } void Settings::saveScripts(const QMap<QString, Script> &scripts) { - settings->s.beginGroup("Scripts"); - settings->s.beginWriteArray("script"); + settings->s->beginGroup("Scripts"); + settings->s->beginWriteArray("script"); QMapIterator<QString, Script> i(scripts); int counter = 0; while(i.hasNext()) { i.next(); - settings->s.setArrayIndex(counter); - settings->s.setValue("name", i.key()); - settings->s.setValue("value", QVariant::fromValue(i.value())); + settings->s->setArrayIndex(counter); + settings->s->setValue("name", i.key()); + settings->s->setValue("value", QVariant::fromValue(i.value())); counter++; } - settings->s.endArray(); - settings->s.endGroup(); + settings->s->endArray(); + settings->s->endGroup(); } //------------------------------------------------------------------------------ bool Settings::mouseWrapping() { - return settings->s.value("mouseWrapping", false).toBool(); + return settings->s->value("mouseWrapping", false).toBool(); } void Settings::setMouseWrapping(bool mode) { - settings->s.setValue("mouseWrapping", mode); + settings->s->setValue("mouseWrapping", mode); } //------------------------------------------------------------------------------ bool Settings::squareThumbnails() { - return settings->s.value("squareThumbnails", true).toBool(); + return settings->s->value("squareThumbnails", true).toBool(); } void Settings::setSquareThumbnails(bool mode) { - settings->s.setValue("squareThumbnails", mode); + settings->s->setValue("squareThumbnails", mode); } //------------------------------------------------------------------------------ bool Settings::transparencyGrid() { - return settings->s.value("drawTransparencyGrid", false).toBool(); + return settings->s->value("drawTransparencyGrid", false).toBool(); } void Settings::setTransparencyGrid(bool mode) { - settings->s.setValue("drawTransparencyGrid", mode); + settings->s->setValue("drawTransparencyGrid", mode); } //------------------------------------------------------------------------------ bool Settings::forceSmoothScroll() { - return settings->s.value("forceSmoothScroll", false).toBool(); + return settings->s->value("forceSmoothScroll", false).toBool(); } void Settings::setForceSmoothScroll(bool mode) { - settings->s.setValue("forceSmoothScroll", mode); + settings->s->setValue("forceSmoothScroll", mode); } //------------------------------------------------------------------------------ bool Settings::useThumbnailCache() { - return settings->s.value("thumbnailCache", true).toBool(); + return settings->s->value("thumbnailCache", true).toBool(); } void Settings::setUseThumbnailCache(bool mode) { - settings->s.setValue("thumbnailCache", mode); + settings->s->setValue("thumbnailCache", mode); } //------------------------------------------------------------------------------ QStringList Settings::savedPaths() { - return settings->s.value("savedPaths").toStringList(); + return settings->s->value("savedPaths").toStringList(); } void Settings::setSavedPaths(QStringList paths) { - settings->s.setValue("savedPaths", paths); + settings->s->setValue("savedPaths", paths); } //------------------------------------------------------------------------------ int Settings::thumbnailerThreadCount() { - int count = settings->s.value("thumbnailerThreads", 2).toInt(); + int count = settings->s->value("thumbnailerThreads", 2).toInt(); if(count < 1) count = 1; return count; } void Settings::setThumbnailerThreadCount(int count) { - settings->s.setValue("thumbnailerThreads", count); + settings->s->setValue("thumbnailerThreads", count); } //------------------------------------------------------------------------------ bool Settings::smoothUpscaling() { - return settings->s.value("smoothUpscaling", true).toBool(); + return settings->s->value("smoothUpscaling", true).toBool(); } void Settings::setSmoothUpscaling(bool mode) { - settings->s.setValue("smoothUpscaling", mode); + settings->s->setValue("smoothUpscaling", mode); } //------------------------------------------------------------------------------ int Settings::maxZoomedResolution() { - return settings->s.value("maximumZoomResolution", 75).toInt(); + return settings->s->value("maximumZoomResolution", 75).toInt(); } void Settings::setMaxZoomedResolution(int value) { - settings->s.setValue("maximumZoomResolution", value); + settings->s->setValue("maximumZoomResolution", value); } //------------------------------------------------------------------------------ int Settings::maximumZoom() { - return settings->s.value("maximumZoom", 8).toInt(); + return settings->s->value("maximumZoom", 8).toInt(); } void Settings::setMaximumZoom(int value) { - settings->s.setValue("maximumZoom", value); + settings->s->setValue("maximumZoom", value); } //------------------------------------------------------------------------------ bool Settings::expandImage() { - return settings->s.value("expandImage", false).toBool(); + return settings->s->value("expandImage", false).toBool(); } void Settings::setExpandImage(bool mode) { - settings->s.setValue("expandImage", mode); + settings->s->setValue("expandImage", mode); } //------------------------------------------------------------------------------ /* 0: nearest * 1: bilinear */ int Settings::scalingFilter() { - int mode = settings->s.value("scalingFilter", 1).toInt(); + int mode = settings->s->value("scalingFilter", 1).toInt(); if(mode < 0 || mode > 1) mode = 1; return mode; } void Settings::setScalingFilter(int mode) { - settings->s.setValue("scalingFilter", mode); + settings->s->setValue("scalingFilter", mode); } //------------------------------------------------------------------------------ bool Settings::smoothAnimatedImages() { - return settings->s.value("smoothAnimatedImages", true).toBool(); + return settings->s->value("smoothAnimatedImages", true).toBool(); } void Settings::setSmoothAnimatedImages(bool mode) { - settings->s.setValue("smoothAnimatedImages", mode); + settings->s->setValue("smoothAnimatedImages", mode); } //------------------------------------------------------------------------------ bool Settings::showInfoOverlay() { - return settings->s.value("showInfoOverlay", true).toBool(); + return settings->s->value("showInfoOverlay", true).toBool(); } void Settings::setShowInfoOverlay(bool mode) { - settings->s.setValue("showInfoOverlay", mode); + settings->s->setValue("showInfoOverlay", mode); } //------------------------------------------------------------------------------ bool Settings::firstRun() { - return settings->s.value("firstRun", true).toBool(); + return settings->s->value("firstRun", true).toBool(); } void Settings::setFirstRun(bool mode) { - settings->s.setValue("firstRun", mode); + settings->s->setValue("firstRun", mode); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimgv-0.7/settings.h new/qimgv-0.7.1/settings.h --- old/qimgv-0.7/settings.h 2018-08-08 21:43:41.000000000 +0200 +++ new/qimgv-0.7.1/settings.h 2018-09-17 18:04:41.000000000 +0200 @@ -4,6 +4,7 @@ #include <QObject> #include <QSettings> #include <QApplication> +#include <QStandardPaths> #include <QDebug> #include <QImageReader> #include <QStringList> @@ -143,10 +144,11 @@ void setShowInfoOverlay(bool mode); bool firstRun(); void setFirstRun(bool mode); + private: explicit Settings(QObject *parent = nullptr); const unsigned int mainPanelSizeDefault = 210; - QSettings s; + QSettings *s; QDir *cacheDirectory, *thumbnailDirectory; signals:
