Reset submodule main/applications/compizconfig-backend-tdeconfig/cmake to latest HEAD

(cherry picked from commit 3433a78d45)

admin

@@ -1 +1 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit f9148018b2f8a11fd830712c1b508046cc34ff22

cmake

@@ -1 +1 @@
-Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463
+Subproject commit cfc1242197c9eb60b55c91eddd0f5572700db8ed

settings-backend/tdeconfig_backend.cpp

@@ -95,8 +95,8 @@ const specialOptions[] =
     {"lower_window_key", CORE_NAME, "Window Lower", true, OptionKey},
     {"toggle_window_maximized_key", CORE_NAME, "Window Maximize", true, OptionKey},
     {"minimize_window_key", CORE_NAME, "Window Minimize", true, OptionKey},
-    {"toggle_window_maximized_horizontally_key", CORE_NAME, "Window MaximizeQt::Horizontal", true, OptionKey},
-    {"toggle_window_maximized_vertically_key", CORE_NAME, "Window MaximizeQt::Vertical", true, OptionKey},
+    {"toggle_window_maximized_horizontally_key", CORE_NAME, "Window Maximize Horizontal", true, OptionKey},
+    {"toggle_window_maximized_vertically_key", CORE_NAME, "Window Maximize Vertical", true, OptionKey},
     {"show_desktop_key", CORE_NAME, "Toggle Showing Desktop", true, OptionKey},
     {"window_menu_key", CORE_NAME, "Window Operations Menu", true, OptionKey},
     {"toggle_window_shaded_key", CORE_NAME, "Window Shade", true, OptionKey},
@@ -163,7 +163,7 @@ const specialOptions[] =
     {"snapoff_maximized", "move", "MoveResizeMaximizedWindows", false, OptionBool},
     {"always_show", "resizeinfo", "GeometryTip", false, OptionBool},
     {"allow_wraparound", "wall", "RollOverDesktops",  false, OptionBool},
-    
+
     {"autoraise_delay", CORE_NAME, "AutoRaiseInterval", false, OptionInt},
     {"flip_time", "rotate", "ElectricBorderDelay", false, OptionInt},
 
@@ -214,7 +214,7 @@ reload (unsigned int,
 	void     *closure)
 {
     CCSContext *context = (CCSContext *) closure;
-    
+
     ccsDisableFileWatch (cFiles->watch);
     ccsDisableFileWatch (cFiles->twinWatch);
     ccsDisableFileWatch (cFiles->globalWatch);
@@ -406,7 +406,7 @@ readIntegratedOption (CCSSetting *setting)
 
 	    if (result == 0)
 		result =  cFiles->main->readNumEntry ("snap_distance (Integrated)");
-	    
+
 	    if (result > 0)
 	    	ccsSetInt (setting, result);
 	}
@@ -1235,7 +1235,7 @@ writeIntegratedOption (CCSSetting *setting)
 		cFiles->twin->writeEntry ("BorderSnapZone", iVal);
 	    else
 		cFiles->twin->writeEntry ("BorderSnapZone", 0);
-	    
+
 	    if (window)
 		cFiles->twin->writeEntry ("WindowSnapZone", iVal);
 	    else
@@ -1260,7 +1260,7 @@ writeIntegratedOption (CCSSetting *setting)
 	    cFiles->twin->setGroup ("TabBox");
 	    cFiles->twin->writeEntry ("TraverseAll", false);
 	    cFiles->twin->setGroup ("Windows");
-	    
+
 	    cFiles->twin->writeEntry ("AltTabStyle", "KDE");
 
 	    cFiles->modified = true;
@@ -1281,7 +1281,7 @@ writeIntegratedOption (CCSSetting *setting)
 	    cFiles->twin->setGroup ("TabBox");
 	    cFiles->twin->writeEntry ("TraverseAll", true);
 	    cFiles->twin->setGroup ("Windows");
-	    
+
 	    cFiles->twin->writeEntry ("AltTabStyle", "KDE");
 
 	    cFiles->modified = true;
@@ -1344,7 +1344,7 @@ writeIntegratedOption (CCSSetting *setting)
 	    }
 	    else
 		oVal = 0;
-		
+
 
 	    if (val)
 		cFiles->twin->writeEntry ("ElectricBorders", 2);
@@ -1503,7 +1503,7 @@ writeSetting (CCSContext *c,
 		    cfg->writeEntry (key, list);
 		}
 		break;
-		
+
 	    case TypeInt:
 		{
 		    TQValueList<int> list;
@@ -1617,7 +1617,7 @@ writeSetting (CCSContext *c,
 
 			str = val;
 			free (val);
-			
+
 			list.append (str);
 			l = l->next;
 		    }
@@ -1642,7 +1642,7 @@ writeSetting (CCSContext *c,
 
 			str = val;
 			free (val);
-			
+
 			list.append (str);
 			l = l->next;
 		    }
@@ -1666,7 +1666,7 @@ writeSetting (CCSContext *c,
 
 			str = val;
 			free (val);
-			
+
 			list.append (str);
 			l = l->next;
 		    }
@@ -1696,7 +1696,7 @@ writeSetting (CCSContext *c,
 	    }
 	}
 	break;
-	
+
     case TypeKey:
 	{
 	    CCSSettingKeyValue keyVal;
@@ -1778,7 +1778,7 @@ readInit (CCSContext *c)
 	TQString wFile = TDEGlobal::dirs()->saveLocation ("config",
 			TQString(), false) + configName;
 	createFile (wFile);
-	
+
 	cFiles->main = new KSimpleConfig (configName);
 	ccsRemoveFileWatch (cFiles->watch);
 	cFiles->watch = ccsAddFileWatch (wFile.ascii(), TRUE,
@@ -1813,9 +1813,9 @@ writeInit (CCSContext *c)
 
 	TQString wFile = TDEGlobal::dirs()->saveLocation ("config",
 			TQString(), false) + configName;
-	
+
 	createFile (wFile);
-	
+
 	cFiles->main = new KSimpleConfig (configName);
 	ccsRemoveFileWatch (cFiles->watch);
 	cFiles->watch = ccsAddFileWatch (wFile.ascii(), TRUE,