[rkward-cvs] SF.net SVN: rkward-code:[4518] trunk/rkward/rkward

[tfry at users.sf.net]

Revision: 4518
          http://sourceforge.net/p/rkward/code/4518
Author:   tfry
Date:     2013-01-29 18:39:47 +0000 (Tue, 29 Jan 2013)
Log Message:
-----------
If a plugin map was loaded, successfully, clear broken / quirky flags.

Modified Paths:
--------------
    trunk/rkward/rkward/rkward.cpp
    trunk/rkward/rkward/settings/rksettingsmoduleplugins.cpp
    trunk/rkward/rkward/settings/rksettingsmoduleplugins.h

Modified: trunk/rkward/rkward/rkward.cpp
===================================================================
--- trunk/rkward/rkward/rkward.cpp	2013-01-29 08:45:39 UTC (rev 4517)
+++ trunk/rkward/rkward/rkward.cpp	2013-01-29 18:39:47 UTC (rev 4518)
@@ -295,6 +295,8 @@
 				somewhat_broken_maps.append (map);
 				somewhat_broken_maps_details.append (result.detailed_problems);
 			}
+		} else {
+			RKSettingsModulePlugins::markPluginMapAsWorking (map);
 		}
 	}
 

Modified: trunk/rkward/rkward/settings/rksettingsmoduleplugins.cpp
===================================================================
--- trunk/rkward/rkward/settings/rksettingsmoduleplugins.cpp	2013-01-29 08:45:39 UTC (rev 4517)
+++ trunk/rkward/rkward/settings/rksettingsmoduleplugins.cpp	2013-01-29 18:39:47 UTC (rev 4518)
@@ -250,6 +250,18 @@
 	return ret;
 }
 
+void RKSettingsModulePlugins::markPluginMapAsWorking (const QString& map) {
+	RK_TRACE (SETTINGS);
+
+	int index = findKnownPluginMap (map, known_plugin_maps);
+	if (index < 0) {
+		RK_ASSERT (index >= 0);
+		return;
+	}
+	known_plugin_maps[index].quirky_in_this_version = false;
+	known_plugin_maps[index].broken_in_this_version = false;
+}
+
 QStringList RKSettingsModulePlugins::pluginMaps () {
 	RK_TRACE (SETTINGS);
 

Modified: trunk/rkward/rkward/settings/rksettingsmoduleplugins.h
===================================================================
--- trunk/rkward/rkward/settings/rksettingsmoduleplugins.h	2013-01-29 08:45:39 UTC (rev 4517)
+++ trunk/rkward/rkward/settings/rksettingsmoduleplugins.h	2013-01-29 18:39:47 UTC (rev 4518)
@@ -64,6 +64,8 @@
 	static bool markPluginMapAsBroken (const QString &map);
 	/** marks given map as quirky (in this version). @Returns false is the map was already known to be quirky, true otherwise. */
 	static bool markPluginMapAsQuirky (const QString &map);
+	/** Clears the broken or quirky flags. E.g. after the map was loaded, successfully */
+	static void markPluginMapAsWorking (const QString &map);
 	/** Helper struct used by RKSettingsModulePlugins to keep track of plugin map files. */
 	struct PluginMapStoredInfo {
 		PluginMapStoredInfo (const QString &_filename) : filename (_filename), active (false), broken_in_this_version (false), quirky_in_this_version (false) {};