From 39133ab0ea393b6acbd1552b14f6b40a7c2d5e17 Mon Sep 17 00:00:00 2001 From: Colin Wallace Date: Sat, 5 Sep 2015 21:38:36 -0700 Subject: [PATCH] Move update_1_2_0() functionality into upgrade_1_1_90(); Next release candidate will be named 1.1.90 --- include/ConfigManager.h | 1 - src/core/ConfigManager.cpp | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/include/ConfigManager.h b/include/ConfigManager.h index 0e73ebc2e..7e5b73c3d 100644 --- a/include/ConfigManager.h +++ b/include/ConfigManager.h @@ -258,7 +258,6 @@ private: ~ConfigManager(); void upgrade_1_1_90(); - void upgrade_1_2_0(); void upgrade(); const QString m_lmmsRcFile; diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp index 523e0748c..692489bf3 100644 --- a/src/core/ConfigManager.cpp +++ b/src/core/ConfigManager.cpp @@ -111,10 +111,7 @@ void ConfigManager::upgrade_1_1_90() { setValue("mixer", "audiodev", "PulseAudio"); } -} -void ConfigManager::upgrade_1_2_0() -{ // MidiAlsaRaw used to store the device info as "Device" instead of "device" if ( value( "MidiAlsaRaw", "device" ).isNull() ) { @@ -130,6 +127,7 @@ void ConfigManager::upgrade_1_2_0() } } + void ConfigManager::upgrade() { // Skip the upgrade if versions match @@ -144,11 +142,6 @@ void ConfigManager::upgrade() { upgrade_1_1_90(); } - - if ( createdWith.setCompareType(Build) < "1.2.0" ) - { - upgrade_1_2_0(); - } // Don't use old themes as they break the UI (i.e. 0.4 != 1.0, etc) if ( createdWith.setCompareType(Minor) != LMMS_VERSION )