khotkeys: replace hardcoded config version number with global variable

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/khotkeys/libkhotkeysprivate/settings.cpp b/khotkeys/libkhotkeysprivate/settings.cpp
index 87b8236..2d1fda2 100644 (file)
--- a/khotkeys/libkhotkeysprivate/settings.cpp
+++ b/khotkeys/libkhotkeysprivate/settings.cpp
@@ -241,6 +241,7 @@ bool Settings::isConfigFileValid(KConfigBase const &config, ImportType ask)
             case 2:
             case 1:         // Version 1 and 2 files no longer supported
                 kDebug() << "Version 1 or 2 file encountered.";
+                valid = false;
                 break;
 
             case -1234576:  // No Version entry -> invalid file

diff --git a/khotkeys/libkhotkeysprivate/settings_writer.cpp b/khotkeys/libkhotkeysprivate/settings_writer.cpp
index da5dc0a..29f435e 100644 (file)
--- a/khotkeys/libkhotkeysprivate/settings_writer.cpp
+++ b/khotkeys/libkhotkeysprivate/settings_writer.cpp
@@ -226,7 +226,7 @@ void SettingsWriter::writeTo(KConfigBase &config)
 
     // Write the global settings
     KConfigGroup mainGroup(&config, "Main");
-    mainGroup.writeEntry("Version", 2);
+    mainGroup.writeEntry("Version", CurrentFileVersion);
     mainGroup.writeEntry("AlreadyImported", _settings->already_imported);
     mainGroup.writeEntry("Disabled", _settings->isDaemonDisabled());