linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2498
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2011-04-17 23:09:31 +0200
message:
  fixes for GCC
modified:
  win32/MainWindow.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'win32/MainWindow.cpp'
--- win32/MainWindow.cpp	2011-04-17 20:56:38 +0000
+++ win32/MainWindow.cpp	2011-04-17 21:09:31 +0000
@@ -693,8 +693,8 @@
 	int arr[] = { 0 /* disabled */, x /* current value */,
 		x + 1, x + 2, x + 5, x + 10, x + 20, x + 50, x + 100,
 		x - 1, x - 2, x - 5, x - 10, x - 20, x - 50, x - 100,
-		x * 1.5, x * 2, x * 3, x * 4, x * 5, x * 10, x * 100,
-		x / 1.5, x / 2, x / 3, x / 4, x / 5, x / 10, x / 100 };
+		x * 3 / 2, x * 2, x * 3, x * 4, x * 5, x * 10, x * 100,
+		x * 2 / 3, x / 2, x / 3, x / 4, x / 5, x / 10, x / 100 };
 
 	// set ensures unique members; remove_if performs range and relevancy checking.
 	set<int> values(arr, std::remove_if(arr, arr + sizeof(arr) / sizeof(int), [x](int i) {
@@ -709,7 +709,7 @@
 		auto pos = menu->appendItem(value ? escapeMenu(str(TF_("%1%/s") % formatted)) : T_("Disabled"), [setting, value] {
 			SettingsManager::getInstance()->set(setting, value);
 			ClientManager::getInstance()->infoUpdated();
-		}, nullptr, !same);
+		}, 0, !same);
 		if(same)
 			menu->checkItem(pos);
 		if(!value)