Index: sources/view/settings/VSettings.cpp
===================================================================
diff -u -ra84120f4c6d438b4b506a0303806d37c7dcb5615 -re08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3
--- sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision a84120f4c6d438b4b506a0303806d37c7dcb5615)
+++ sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision e08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3)
@@ -39,7 +39,6 @@
 
     PROPERTY_POST_CONNECTION(VSettings, servicePass         );
     PROPERTY_POST_CONNECTION(VSettings, alarmVolume         );
-    PROPERTY_POST_CONNECTION(VSettings, roWaterMode         );
     PROPERTY_POST_CONNECTION(VSettings, integratedBPCuff    );
     PROPERTY_POST_CONNECTION(VSettings, heparinSyringePump  );
     PROPERTY_POST_CONNECTION(VSettings, chemicalDisinfection);
@@ -56,14 +55,6 @@
     }
 }
 
-void VSettings::roWaterMode_post(const bool &vroWaterMode_post) {
-    //TODO  The Settings shall be the Singleton SettingsController and modify the MSettings like the others.
-    if ( Storage::Settings::save(roWaterModeGroup(), roWaterModeKey(), QString::number(vroWaterMode_post)) != 0 ) {
-        roWaterMode(false);
-        // FIXME: Notify UI with a message
-    }
-}
-
 void VSettings::advancedMode_post(const bool &vadvancedMode_post) {
     //TODO  The Settings shall be the Singleton SettingsController and modify the MSettings like the others.
     if ( Storage::Settings::save(advancedModeGroup(), advancedModeKey(), QString::number(vadvancedMode_post)) != 0 ) {
@@ -150,12 +141,6 @@
                         keyValue[key]   = mServicePass ;
                         servicePass     ( mServicePass);
                     }
-                    else if ( isroWaterMode (category, group, key) ) {
-                        bool mRoWaterMode;
-                        mRoWaterMode    = _Settings.value(category, group, key).toBool    ();
-                        keyValue[key]   = mRoWaterMode ;
-                        roWaterMode     ( mRoWaterMode);
-                    }
                     else if ( isadvancedMode(category, group, key) ) {
                         bool mAdvancedMode;
                         mAdvancedMode   = _Settings.value(category, group, key).toBool    ();
@@ -207,10 +192,8 @@
     // otherwise will use the default value and will notify the update.
     servicePass ( _servicePass );
     alarmVolume ( _alarmVolume );
-    roWaterMode ( _roWaterMode );
     advancedMode( _advancedMode );
 
-    //DEBUG qDebug() << servicePass() << roWaterMode() << alarmVolume();
     adjustment(true);
 
     initConnectionsSettings();