Accounts() : iterator for accounts

1 files changed, 3 insertions, 6 deletions

diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp
index 2f3577df98..e98e60b23a 100644
--- a/plugins/AVS/src/main.cpp
+++ b/plugins/AVS/src/main.cpp
@@ -324,10 +324,6 @@ static int ModulesLoaded(WPARAM, LPARAM)
 

 	g_AvatarHistoryAvail = ServiceExists(MS_AVATARHISTORY_ENABLED);

 

-	int accCount;

-	PROTOACCOUNT **accs = nullptr;

-	Proto_EnumAccounts(&accCount, &accs);

-

 	LoadDefaultInfo();

 

 	int protoCount;

@@ -335,8 +331,9 @@ static int ModulesLoaded(WPARAM, LPARAM)
 	Proto_EnumProtocols(&protoCount, &proto);

 	for (int i = 0; i < protoCount; i++)

 		LoadProtoInfo(proto[i]);

-	for (int i = 0; i < accCount; i++)

-		LoadAccountInfo(accs[i]);

+	

+	for (auto &it : Accounts())

+		LoadAccountInfo(it);

 

 	// Load global avatar

 	protoPicCacheEntry *pce = new protoPicCacheEntry(PCE_TYPE_GLOBAL);