From b0e7562579ad00d5215dfa0a9d9421c9a3cdf2a8 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Fri, 7 Sep 2018 10:59:45 +0200
Subject: [PATCH] Rename VersionUpgrade plug-in from 40 to 35

Because the next version is going to be called 3.5, not 4.0.
---
 .../VersionUpgrade34to35.py}                                  | 4 ++--
 .../__init__.py                                               | 4 ++--
 .../plugin.json                                               | 4 ++--
 .../tests/TestVersionUpgrade34to35.py}                        | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename plugins/VersionUpgrade/{VersionUpgrade34to40/VersionUpgrade34to40.py => VersionUpgrade34to35/VersionUpgrade34to35.py} (99%)
 rename plugins/VersionUpgrade/{VersionUpgrade34to40 => VersionUpgrade34to35}/__init__.py (95%)
 rename plugins/VersionUpgrade/{VersionUpgrade34to40 => VersionUpgrade34to35}/plugin.json (76%)
 rename plugins/VersionUpgrade/{VersionUpgrade34to40/tests/TestVersionUpgrade34to40.py => VersionUpgrade34to35/tests/TestVersionUpgrade34to35.py} (85%)

diff --git a/plugins/VersionUpgrade/VersionUpgrade34to40/VersionUpgrade34to40.py b/plugins/VersionUpgrade/VersionUpgrade34to35/VersionUpgrade34to35.py
similarity index 99%
rename from plugins/VersionUpgrade/VersionUpgrade34to40/VersionUpgrade34to40.py
rename to plugins/VersionUpgrade/VersionUpgrade34to35/VersionUpgrade34to35.py
index a61aae06bb..9e3ea03c55 100644
--- a/plugins/VersionUpgrade/VersionUpgrade34to40/VersionUpgrade34to40.py
+++ b/plugins/VersionUpgrade/VersionUpgrade34to35/VersionUpgrade34to35.py
@@ -60,8 +60,8 @@ _RENAMED_MATERIAL_PROFILES = {
 }
 
 ##  Upgrades configurations from the state they were in at version 3.4 to the
-#   state they should be in at version 4.0.
-class VersionUpgrade34to40(VersionUpgrade):
+#   state they should be in at version 3.5.
+class VersionUpgrade34to35(VersionUpgrade):
 
     ##  Gets the version number from a CFG file in Uranium's 3.3 format.
     #
diff --git a/plugins/VersionUpgrade/VersionUpgrade34to40/__init__.py b/plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py
similarity index 95%
rename from plugins/VersionUpgrade/VersionUpgrade34to40/__init__.py
rename to plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py
index ad7a33b61a..9d3410e40d 100644
--- a/plugins/VersionUpgrade/VersionUpgrade34to40/__init__.py
+++ b/plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py
@@ -1,9 +1,9 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
-from . import VersionUpgrade34to40
+from . import VersionUpgrade34to35
 
-upgrade = VersionUpgrade34to40.VersionUpgrade34to40()
+upgrade = VersionUpgrade34to35.VersionUpgrade34to35()
 
 
 def getMetaData():
diff --git a/plugins/VersionUpgrade/VersionUpgrade34to40/plugin.json b/plugins/VersionUpgrade/VersionUpgrade34to35/plugin.json
similarity index 76%
rename from plugins/VersionUpgrade/VersionUpgrade34to40/plugin.json
rename to plugins/VersionUpgrade/VersionUpgrade34to35/plugin.json
index c07ae31c0a..b73001b683 100644
--- a/plugins/VersionUpgrade/VersionUpgrade34to40/plugin.json
+++ b/plugins/VersionUpgrade/VersionUpgrade34to35/plugin.json
@@ -1,8 +1,8 @@
  {
-    "name": "Version Upgrade 3.4 to 4.0",
+    "name": "Version Upgrade 3.4 to 3.5",
     "author": "Ultimaker B.V.",
     "version": "1.0.0",
-    "description": "Upgrades configurations from Cura 3.4 to Cura 4.0.",
+    "description": "Upgrades configurations from Cura 3.4 to Cura 3.5.",
     "api": 5,
     "i18n-catalog": "cura"
 }
diff --git a/plugins/VersionUpgrade/VersionUpgrade34to40/tests/TestVersionUpgrade34to40.py b/plugins/VersionUpgrade/VersionUpgrade34to35/tests/TestVersionUpgrade34to35.py
similarity index 85%
rename from plugins/VersionUpgrade/VersionUpgrade34to40/tests/TestVersionUpgrade34to40.py
rename to plugins/VersionUpgrade/VersionUpgrade34to35/tests/TestVersionUpgrade34to35.py
index 22df0d6487..90b2cb5dea 100644
--- a/plugins/VersionUpgrade/VersionUpgrade34to40/tests/TestVersionUpgrade34to40.py
+++ b/plugins/VersionUpgrade/VersionUpgrade34to35/tests/TestVersionUpgrade34to35.py
@@ -4,12 +4,12 @@
 import configparser #To parse the resulting config files.
 import pytest #To register tests with.
 
-import VersionUpgrade34to40 #The module we're testing.
+import VersionUpgrade34to35 #The module we're testing.
 
 ##  Creates an instance of the upgrader to test with.
 @pytest.fixture
 def upgrader():
-    return VersionUpgrade34to40.VersionUpgrade34to40()
+    return VersionUpgrade34to35.VersionUpgrade34to35()
 
 test_upgrade_version_nr_data = [
     ("Empty config file",