diff options
| author | George Hazan <ghazan@miranda.im> | 2018-03-16 21:05:31 +0300 | 
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-03-16 21:05:31 +0300 | 
| commit | 12225716d38830a23477b97a6979b6414faeec7b (patch) | |
| tree | baa3169833239de523eef0c7cf1c1c1fe0731c35 /plugins/Weather/src | |
| parent | 39390b02dbd5aa7eb21a83773fa561b39f8828bc (diff) | |
entities' names to be started with capital letters
Diffstat (limited to 'plugins/Weather/src')
| -rw-r--r-- | plugins/Weather/src/weather_addstn.cpp | 2 | ||||
| -rw-r--r-- | plugins/Weather/src/weather_contacts.cpp | 2 | ||||
| -rw-r--r-- | plugins/Weather/src/weather_data.cpp | 2 | ||||
| -rw-r--r-- | plugins/Weather/src/weather_mwin.cpp | 4 | ||||
| -rw-r--r-- | plugins/Weather/src/weather_update.cpp | 2 | 
5 files changed, 6 insertions, 6 deletions
diff --git a/plugins/Weather/src/weather_addstn.cpp b/plugins/Weather/src/weather_addstn.cpp index 87825b72a5..59f5720d22 100644 --- a/plugins/Weather/src/weather_addstn.cpp +++ b/plugins/Weather/src/weather_addstn.cpp @@ -39,7 +39,7 @@ INT_PTR WeatherAddToList(WPARAM, LPARAM lParam)  		return 0;
  	// search for existing contact
 -	for (auto &hContact : contact_iter()) {
 +	for (auto &hContact : Contacts()) {
  		// check if it is a weather contact
  		if (IsMyContact(hContact)) {
  			DBVARIANT dbv;
 diff --git a/plugins/Weather/src/weather_contacts.cpp b/plugins/Weather/src/weather_contacts.cpp index 647e855e99..efde7bc6d2 100644 --- a/plugins/Weather/src/weather_contacts.cpp +++ b/plugins/Weather/src/weather_contacts.cpp @@ -444,7 +444,7 @@ int ContactDeleted(WPARAM wParam, LPARAM)  	// now the default station is deleted, try to get a new one
  	// start looking for other weather stations
 -	for (auto &hContact : contact_iter(WEATHERPROTONAME)) {
 +	for (auto &hContact : Contacts(WEATHERPROTONAME)) {
  		tszID = db_get_wsa(hContact, WEATHERPROTONAME, "ID");
  		if (tszID == NULL)
  			continue;
 diff --git a/plugins/Weather/src/weather_data.cpp b/plugins/Weather/src/weather_data.cpp index 90a8a05c0a..cc3fcbbf27 100644 --- a/plugins/Weather/src/weather_data.cpp +++ b/plugins/Weather/src/weather_data.cpp @@ -112,7 +112,7 @@ void EraseAllInfo()  	MCONTACT LastContact = NULL;
  	DBVARIANT dbv;
  	// loop through all contacts
 -	for (auto &hContact : contact_iter(WEATHERPROTONAME)) {
 +	for (auto &hContact : Contacts(WEATHERPROTONAME)) {
  		db_set_w(hContact, WEATHERPROTONAME, "Status", ID_STATUS_OFFLINE);
  		db_set_w(hContact, WEATHERPROTONAME, "StatusIcon", ID_STATUS_OFFLINE);
  		db_unset(hContact, "CList", "MyHandle");
 diff --git a/plugins/Weather/src/weather_mwin.cpp b/plugins/Weather/src/weather_mwin.cpp index c219c2a9ca..12d24e8dfb 100644 --- a/plugins/Weather/src/weather_mwin.cpp +++ b/plugins/Weather/src/weather_mwin.cpp @@ -348,7 +348,7 @@ void InitMwin(void)  	mir_strcpy(fontid.prefix, "fnt1");
  	Font_RegisterW(&fontid);
 -	for (auto &hContact : contact_iter(WEATHERPROTONAME))
 +	for (auto &hContact : Contacts(WEATHERPROTONAME))
  		if (db_get_dw(hContact, WEATHERPROTONAME, "mwin", 0))
  			addWindow(hContact);
 @@ -357,7 +357,7 @@ void InitMwin(void)  void DestroyMwin(void)
  {
 -	for (auto &hContact : contact_iter(WEATHERPROTONAME)) {
 +	for (auto &hContact : Contacts(WEATHERPROTONAME)) {
  		DWORD frameId = db_get_dw(hContact, WEATHERPROTONAME, "mwin", 0);
  		if (frameId)
  			CallService(MS_CLIST_FRAMES_REMOVEFRAME, frameId, 0);
 diff --git a/plugins/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp index 66feef7258..91a1755ede 100644 --- a/plugins/Weather/src/weather_update.cpp +++ b/plugins/Weather/src/weather_update.cpp @@ -307,7 +307,7 @@ static void UpdateThreadProc(void *)  void UpdateAll(BOOL AutoUpdate, BOOL RemoveData)
  {
  	// add all weather contact to the update queue list
 -	for (auto &hContact : contact_iter(WEATHERPROTONAME))
 +	for (auto &hContact : Contacts(WEATHERPROTONAME))
  		if (!db_get_b(hContact, WEATHERPROTONAME, "AutoUpdate", FALSE) || !AutoUpdate) {
  			if (RemoveData)
  				DBDataManage(hContact, WDBM_REMOVE, 0, 0);
  | 
