From a7e5e613f86963c8bf82248ab044e0ea36e42fbc Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 16 Mar 2018 12:09:30 +0300
Subject: LIST<>::indexOf(T**) - fast index calculation for direct iterators

---
 plugins/Weather/src/weather_data.cpp | 53 ++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

(limited to 'plugins/Weather/src')

diff --git a/plugins/Weather/src/weather_data.cpp b/plugins/Weather/src/weather_data.cpp
index dfcfc642d2..28fa9a622d 100644
--- a/plugins/Weather/src/weather_data.cpp
+++ b/plugins/Weather/src/weather_data.cpp
@@ -408,33 +408,32 @@ void DBDataManage(MCONTACT hContact, WORD Mode, WPARAM wParam, LPARAM)
 	db_enum_settings(hContact, GetWeatherDataFromDB, WEATHERCONDITION, &arSettings);
 
 	// begin deleting settings
-	for (int i = arSettings.getCount() - 1; i >= 0; i--) {
-		char *szSetting = arSettings[i];
-
-		DBVARIANT dbv;
-		if (!db_get_ws(hContact, WEATHERCONDITION, szSetting, &dbv)) {
-			switch (Mode) {
-			case WDBM_REMOVE:
-				db_unset(hContact, WEATHERCONDITION, szSetting);
-				break;
-
-			case WDBM_DETAILDISPLAY:
-				// skip the "WeatherInfo" variable
-				if (!mir_strcmp(szSetting, "WeatherInfo") || !mir_strcmp(szSetting, "Ignore") || szSetting[0] == '#')
-					continue;
-
-				HWND hList = GetDlgItem((HWND)wParam, IDC_DATALIST);
-				LV_ITEM lvi = { 0 };
-				lvi.mask = LVIF_TEXT | LVIF_PARAM;
-				lvi.lParam = i;
-				lvi.pszText = TranslateW(_A2T(szSetting));
-				lvi.iItem = ListView_InsertItem(hList, &lvi);
-				lvi.pszText = dbv.ptszVal;
-				ListView_SetItemText(hList, lvi.iItem, 1, dbv.ptszVal);
-				break;
-			}
-			db_free(&dbv);
+	auto T = arSettings.rev_iter();
+	for (auto &str : T) {
+		ptrW wszText(db_get_wsa(hContact, WEATHERCONDITION, str));
+		if (wszText == nullptr)
+			continue;
+
+		switch (Mode) {
+		case WDBM_REMOVE:
+			db_unset(hContact, WEATHERCONDITION, str);
+			break;
+
+		case WDBM_DETAILDISPLAY:
+			// skip the "WeatherInfo" variable
+			if (!mir_strcmp(str, "WeatherInfo") || !mir_strcmp(str, "Ignore") || str[0] == '#')
+				continue;
+
+			HWND hList = GetDlgItem((HWND)wParam, IDC_DATALIST);
+			LV_ITEM lvi = { 0 };
+			lvi.mask = LVIF_TEXT | LVIF_PARAM;
+			lvi.lParam = T.indexOf(&str);
+			lvi.pszText = TranslateW(_A2T(str));
+			lvi.iItem = ListView_InsertItem(hList, &lvi);
+			lvi.pszText = wszText;
+			ListView_SetItemText(hList, lvi.iItem, 1, wszText);
+			break;
 		}
-		mir_free(szSetting);
+		mir_free(str);
 	}
 }
-- 
cgit v1.2.3