[rkward-cvs] [rkward] rkward/settings: Move RKWard R repository

[Thomas Friedrichsmeier]

Git commit 75bbe00d9bc793a29d6a95287601214216d6832c by Thomas Friedrichsmeier.
Committed on 10/12/2014 at 20:28.
Pushed by tfry into branch 'master'.

Move RKWard R repository

M  +1    -0    rkward/settings/rksettingsmodulegeneral.h
M  +4    -1    rkward/settings/rksettingsmoduler.cpp

http://commits.kde.org/rkward/75bbe00d9bc793a29d6a95287601214216d6832c

diff --git a/rkward/settings/rksettingsmodulegeneral.h b/rkward/settings/rksettingsmodulegeneral.h
index 65d1e01..3a3e2cd 100644
--- a/rkward/settings/rksettingsmodulegeneral.h
+++ b/rkward/settings/rksettingsmodulegeneral.h
@@ -87,6 +87,7 @@ public:
 		RKWardConfig_Pre0_5_7,
 		RKWardConfig_0_5_7,
 		RKWardConfig_0_6_1,
+		RKWardConfig_0_6_3,
 		RKWardConfig_Next,		/**< add new configuration versions above / before this entry */
 		RKWardConfig_Latest = RKWardConfig_Next - 1
 	};
diff --git a/rkward/settings/rksettingsmoduler.cpp b/rkward/settings/rksettingsmoduler.cpp
index 7eeb9f4..7074522 100644
--- a/rkward/settings/rksettingsmoduler.cpp
+++ b/rkward/settings/rksettingsmoduler.cpp
@@ -559,11 +559,14 @@ void RKSettingsModuleRPackages::loadSettings (KConfig *config) {
 	KConfigGroup cg = config->group ("R Settings");
 
 	cran_mirror_url = cg.readEntry ("CRAN mirror url", "@CRAN@");
-	const QString rkward_repo ("http://rkward.sf.net/R/");
+	const QString rkward_repo ("http://files.kde.org/rkward/R/");
 	package_repositories = cg.readEntry ("Repositories", QStringList (rkward_repo));
 	if (RKSettingsModuleGeneral::storedConfigVersion () <= RKSettingsModuleGeneral::RKWardConfig_Pre0_5_7) {
 		package_repositories.removeAll ("@CRAN@");	// COMPAT: Cran mirror was part of this list before 0.5.3
 		package_repositories.append (rkward_repo);
+	} else if (RKSettingsModuleGeneral::storedConfigVersion () < RKSettingsModuleGeneral::RKWardConfig_0_6_3) {
+		package_repositories.removeAll ("http://rkward.sf.net/R");
+		package_repositories.append (rkward_repo);
 	}
 
 	liblocs = cg.readEntry ("LibraryLocations", QStringList ());