explicit constructors for ptrT

git-svn-id: http://svn.miranda-ng.org/main/trunk@6174 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

13 files changed, 45 insertions, 45 deletions

diff --git a/plugins/PluginUpdater/src/Options.cpp b/plugins/PluginUpdater/src/Options.cpp
index bc5be97382..30e06842cf 100644
--- a/plugins/PluginUpdater/src/Options.cpp
+++ b/plugins/PluginUpdater/src/Options.cpp
@@ -155,7 +155,7 @@ INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA
 				else if ( IsDlgButtonChecked(hwndDlg, IDC_TRUNK))

 					db_set_s(NULL, MODNAME, "UpdateURL", DEFAULT_UPDATE_URL_TRUNK);

 				else if ( IsDlgButtonChecked(hwndDlg, IDC_TRUNK_SYMBOLS)) {

-					ptrA oldUrl = db_get_sa(NULL, MODNAME, "UpdateURL");

+					ptrA oldUrl( db_get_sa(NULL, MODNAME, "UpdateURL"));

 					if (strcmp(oldUrl, DEFAULT_UPDATE_URL_TRUNK_SYMBOLS)) {

 						opts.bForceRedownload = true;

 						db_set_b(NULL, MODNAME, "ForceRedownload", 1);

diff --git a/plugins/Quotes/src/ImportExport.cpp b/plugins/Quotes/src/ImportExport.cpp
index 15d72b84fb..be7b4fc974 100644
--- a/plugins/Quotes/src/ImportExport.cpp
+++ b/plugins/Quotes/src/ImportExport.cpp
@@ -94,7 +94,7 @@ namespace
 				sType = g_pszXmlTypeBlob;

 				if(dbv.pbVal)

 				{

-					ptrA buf = mir_base64_encode(dbv.pbVal, dbv.cpbVal);

+					ptrA buf( mir_base64_encode(dbv.pbVal, dbv.cpbVal));

 					if (buf) {

 						sValue << buf;

 					}

diff --git a/plugins/SimpleStatusMsg/src/options.cpp b/plugins/SimpleStatusMsg/src/options.cpp
index 608da025a6..948bb912e4 100644
--- a/plugins/SimpleStatusMsg/src/options.cpp
+++ b/plugins/SimpleStatusMsg/src/options.cpp
@@ -137,7 +137,7 @@ static INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
 

 						val = db_get_b(NULL, "SimpleStatusMsg", (char *)StatusModeToDbSetting(i, "Flags"), STATUS_DEFAULT);

 						data->status_msg[0].flags[i - ID_STATUS_ONLINE] = val;

-						ptrT text = db_get_tsa(NULL, "SRAway", StatusModeToDbSetting(i, "Default"));

+						ptrT text( db_get_tsa(NULL, "SRAway", StatusModeToDbSetting(i, "Default")));

 						lstrcpyn(data->status_msg[0].msg[i - ID_STATUS_ONLINE], (text == NULL) ? GetDefaultMessage(i) : text, 1024);

 

 						for (j = 0; j < accounts->count; j++)

diff --git a/plugins/Variables/src/parse_regexp.cpp b/plugins/Variables/src/parse_regexp.cpp
index 3b8679de6b..2792cf05e5 100644
--- a/plugins/Variables/src/parse_regexp.cpp
+++ b/plugins/Variables/src/parse_regexp.cpp
@@ -64,9 +64,9 @@ static TCHAR *parseRegExpSubstr(ARGUMENTSINFO *ai)
 	if (ai->argc != 4)

 		return NULL;

 

-	ptrA arg1 = mir_t2a(ai->targv[1]);

-	ptrA arg2 = mir_t2a(ai->targv[2]);

-	ptrA arg3 = mir_t2a(ai->targv[3]);

+	ptrA arg1( mir_t2a(ai->targv[1]));

+	ptrA arg2( mir_t2a(ai->targv[2]));

+	ptrA arg3( mir_t2a(ai->targv[3]));

 

 	number = atoi(arg3);

 	if (number < 0)

diff --git a/protocols/FacebookRM/src/contacts.cpp b/protocols/FacebookRM/src/contacts.cpp
index cdb71054ac..dddc83e4ff 100644
--- a/protocols/FacebookRM/src/contacts.cpp
+++ b/protocols/FacebookRM/src/contacts.cpp
@@ -86,7 +86,7 @@ HANDLE FacebookProto::AddToContactList(facebook_user* fbu, ContactType type, boo
 

 			db_unset(hContact, "CList", "MyHandle");

 

-			ptrT group = getTStringA(NULL, FACEBOOK_KEY_DEF_GROUP);

+			ptrT group( getTStringA(NULL, FACEBOOK_KEY_DEF_GROUP));

 			if (group)

 				db_set_ts(hContact, "CList", "Group", group);

 

@@ -122,7 +122,7 @@ void FacebookProto::SetAllContactStatuses(int status, bool reset_client)
 			continue;

 

 		if (reset_client) {

-			ptrT mirver = getTStringA(hContact, "MirVer");

+			ptrT mirver( getTStringA(hContact, "MirVer"));

 			if (!mirver || _tcscmp(mirver, _T(FACEBOOK_NAME)))

 				setTString(hContact, "MirVer", _T(FACEBOOK_NAME));

 

@@ -317,7 +317,7 @@ void FacebookProto::SendPokeWorker(void *p)
 				utils::text::slashu_to_utf8(

 					utils::text::source_get_value(&resp.data, 3, "\"body\":", "__html\":\"", "\"}"))));

 

-		ptrT tmessage = mir_utf8decodeT(message.c_str());

+		ptrT tmessage( mir_utf8decodeT(message.c_str()));

 		NotifyEvent(m_tszUserName, tmessage, NULL, FACEBOOK_EVENT_OTHER);

 	}

 

diff --git a/protocols/FacebookRM/src/dialogs.cpp b/protocols/FacebookRM/src/dialogs.cpp
index b2181d8aa9..9f545181af 100644
--- a/protocols/FacebookRM/src/dialogs.cpp
+++ b/protocols/FacebookRM/src/dialogs.cpp
@@ -198,7 +198,7 @@ INT_PTR CALLBACK FBMindProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara
 		SendDlgItemMessage(hwnd, IDC_MINDMSG, EM_LIMITTEXT, FACEBOOK_MIND_LIMIT, 0);

 		SendDlgItemMessage(hwnd, IDC_URL, EM_LIMITTEXT, 1024, 0);

 

-		ptrT place = data->proto->getTStringA(FACEBOOK_KEY_PLACE);

+		ptrT place( data->proto->getTStringA(FACEBOOK_KEY_PLACE));

 		SetDlgItemText(hwnd, IDC_PLACE, place != NULL ? place : _T("Miranda NG"));

 

 		bShowContacts = data->proto->getByte("PostStatusExpand", 0) > 0;

@@ -307,7 +307,7 @@ INT_PTR CALLBACK FBMindProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara
 			HWND hwndList = GetDlgItem(hwnd, IDC_CCLIST);

 			GetSelectedContacts(data->proto, NULL, hwndList, &status->users);

 

-			ptrA narrow = mir_utf8encodeT(mindMessageT);		

+			ptrA narrow( mir_utf8encodeT(mindMessageT));

 			status->text = narrow;

 

 			if (status->user_id == data->proto->facy.self_.user_id && data->proto->last_status_msg_ != (char *)narrow)

diff --git a/protocols/FacebookRM/src/process.cpp b/protocols/FacebookRM/src/process.cpp
index 218f95125a..edb554f9f8 100644
--- a/protocols/FacebookRM/src/process.cpp
+++ b/protocols/FacebookRM/src/process.cpp
@@ -806,11 +806,11 @@ void FacebookProto::SearchAckThread(void *targ)
 				if (id.empty() || id == facy.self_.user_id)

 					continue;

 

-				ptrT tid = mir_utf8decodeT(id.c_str());

-				ptrT tname = mir_utf8decodeT(utils::text::special_expressions_decode(name).c_str());

-				ptrT tsurname = mir_utf8decodeT(utils::text::special_expressions_decode(surname).c_str());

-				ptrT tnick = mir_utf8decodeT(utils::text::special_expressions_decode(nick).c_str());

-				ptrT tcommon = mir_utf8decodeT(utils::text::special_expressions_decode(common).c_str());

+				ptrT tid( mir_utf8decodeT(id.c_str()));

+				ptrT tname( mir_utf8decodeT(utils::text::special_expressions_decode(name).c_str()));

+				ptrT tsurname( mir_utf8decodeT(utils::text::special_expressions_decode(surname).c_str()));

+				ptrT tnick( mir_utf8decodeT(utils::text::special_expressions_decode(nick).c_str()));

+				ptrT tcommon( mir_utf8decodeT(utils::text::special_expressions_decode(common).c_str()));

 

 				PROTOSEARCHRESULT isr = {0};

 				isr.cbSize = sizeof(isr);

@@ -874,9 +874,9 @@ void FacebookProto::SearchIdAckThread(void *targ)
 

 			// ignore self contact and empty ids

 			if (!id.empty() && id != facy.self_.user_id){

-				ptrT tid = mir_utf8decodeT(id.c_str());

-				ptrT tname = mir_utf8decodeT(name.c_str());

-				ptrT tsurname = mir_utf8decodeT(surname.c_str());

+				ptrT tid( mir_utf8decodeT(id.c_str()));

+				ptrT tname( mir_utf8decodeT(name.c_str()));

+				ptrT tsurname( mir_utf8decodeT(surname.c_str()));

 

 				PROTOSEARCHRESULT isr = {0};

 				isr.cbSize = sizeof(isr);

diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index 7a508dfe29..bd2dd4e071 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -241,9 +241,9 @@ HANDLE FacebookProto::SearchByName(const PROTOCHAR* nick, const PROTOCHAR* first
 

 HANDLE FacebookProto::AddToList(int flags, PROTOSEARCHRESULT* psr)

 {

-	ptrA id = mir_t2a_cp(psr->id, CP_UTF8);

-	ptrA name = mir_t2a_cp(psr->firstName, CP_UTF8);

-	ptrA surname = mir_t2a_cp(psr->lastName, CP_UTF8);

+	ptrA id( mir_t2a_cp(psr->id, CP_UTF8));

+	ptrA name( mir_t2a_cp(psr->firstName, CP_UTF8));

+	ptrA surname( mir_t2a_cp(psr->lastName, CP_UTF8));

 

 	if (id == NULL)

 		return NULL;

@@ -683,7 +683,7 @@ void FacebookProto::OpenUrl(std::string url)
 		url = (useHttps ? HTTP_PROTO_SECURE : HTTP_PROTO_REGULAR) + facy.get_server_type() + url;

 	}

 

-	ptrT data = mir_utf8decodeT(url.c_str());

+	ptrT data( mir_utf8decodeT(url.c_str()));

 	CallService(MS_UTILS_OPENURL, (WPARAM)OUF_TCHAR, (LPARAM)data);

 }

 

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index bf49fe07be..0ba244248e 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -50,7 +50,7 @@ static int compareListItems(const JABBER_LIST_ITEM *p1, const JABBER_LIST_ITEM *
 	return lstrcmpi(szp1, szp2);

 }

 

-CJabberProto::CJabberProto(const char* aProtoName, const TCHAR *aUserName) :

+CJabberProto::CJabberProto(const char *aProtoName, const TCHAR *aUserName) :

 	PROTO<CJabberProto>(aProtoName, aUserName),

 	m_options(this),

 	m_lstTransports(50, compareTransports),

diff --git a/protocols/Skype/src/skype_avatars.cpp b/protocols/Skype/src/skype_avatars.cpp
index a1e9a72e26..24c44299fc 100644
--- a/protocols/Skype/src/skype_avatars.cpp
+++ b/protocols/Skype/src/skype_avatars.cpp
@@ -58,7 +58,7 @@ INT_PTR __cdecl CSkypeProto::GetAvatarInfo(WPARAM, LPARAM lParam)
 	if (this->getDword(pai->hContact, "AvatarTS", 0))

 		return GAIR_NOAVATAR;

 

-	ptrW sid = ::db_get_wsa(pai->hContact, this->m_szModuleName, SKYPE_SETTINGS_SID);

+	ptrW sid( ::db_get_wsa(pai->hContact, this->m_szModuleName, SKYPE_SETTINGS_SID));

 	if (sid)

 	{

 		ptrW path( this->GetContactAvatarFilePath(pai->hContact));

diff --git a/protocols/Skype/src/skype_chat.cpp b/protocols/Skype/src/skype_chat.cpp
index 84f7b8dc48..c8e5dcda39 100644
--- a/protocols/Skype/src/skype_chat.cpp
+++ b/protocols/Skype/src/skype_chat.cpp
@@ -195,7 +195,7 @@ wchar_t *ChatRoom::GetUri()
 {

 	SEString data;

 	this->conversation->GetJoinBlob(data);

-	ptrW blob = ::mir_utf8decodeW(data);

+	ptrW blob( ::mir_utf8decodeW(data));

 				

 	wchar_t *uri = (wchar_t *)::mir_alloc(sizeof(wchar_t) * MAX_PATH);

 	::mir_sntprintf(uri, SIZEOF(uri), L"skype:?chat&blob=%s", blob);

@@ -279,7 +279,7 @@ void ChatRoom::Start(const ConversationRef &conversation, bool showWindow)
 	if ( !::CallServiceSync(MS_GC_GETINFO, 0, (LPARAM)&gci))

 	{

 		this->hContact = gci.hContact;

-		ptrW cid = ::db_get_wsa(gci.hContact, ppro->m_szModuleName, SKYPE_SETTINGS_SID);

+		ptrW cid( ::db_get_wsa(gci.hContact, ppro->m_szModuleName, SKYPE_SETTINGS_SID));

 		if (cid == NULL)

 		{

 			this->conversation->GetPropIdentity(data);

@@ -295,7 +295,7 @@ void ChatRoom::Start(const ConversationRef &conversation, bool showWindow)
 		auto participant = participants[i];

 

 		participant->GetPropIdentity(data);

-		ptrW sid = ::mir_utf8decodeW(data);

+		ptrW sid( ::mir_utf8decodeW(data));

 

 		ChatMember member(sid);

 		member.SetRank(participant->GetUintProp(Participant::P_RANK));

@@ -310,7 +310,7 @@ void ChatRoom::Start(const ConversationRef &conversation, bool showWindow)
 		contact->GetPropFullname(data);

 		if (data.length() != 0)

 		{

-			ptrW nick = ::mir_utf8decodeW(data);

+			ptrW nick( ::mir_utf8decodeW(data));

 			member.SetNick(nick);

 		}

 

@@ -660,10 +660,10 @@ void ChatRoom::OnEvent(const ConversationRef &conversation, const MessageRef &me
 			SEString data;

 

 			message->GetPropAuthor(data);

-			ptrW sid = ::mir_utf8decodeW(data);

+			ptrW sid( ::mir_utf8decodeW(data));

 

 			message->GetPropBodyXml(data);

-			ptrW text =::mir_utf8decodeW( ptrA(CSkypeProto::RemoveHtml(data)));

+			ptrW text( ::mir_utf8decodeW( ptrA(CSkypeProto::RemoveHtml(data))));

 

 			uint timestamp;

 			message->GetPropTimestamp(timestamp);

@@ -716,7 +716,7 @@ void ChatRoom::OnEvent(const ConversationRef &conversation, const MessageRef &me
 						ptrW nick(::mir_utf8decodeW(data));

 						if (data.length() != 0)

 						{

-							ptrW nick = ::mir_utf8decodeW(data);

+							ptrW nick( ::mir_utf8decodeW(data));

 							member.SetNick(nick);

 						}

 						

@@ -787,7 +787,7 @@ void ChatRoom::OnEvent(const ConversationRef &conversation, const MessageRef &me
 				message->GetPropTimestamp(timestamp);

 

 				message->GetPropAuthor(data);

-				ptrW author = ::mir_utf8decodeW(data);

+				ptrW author( ::mir_utf8decodeW(data));

 

 				message->GetPropIdentities(data);

 				char *identities = ::mir_strdup(data);

@@ -825,7 +825,7 @@ void ChatRoom::OnEvent(const ConversationRef &conversation, const MessageRef &me
 				message->GetPropTimestamp(timestamp);

 

 				message->GetPropAuthor(data);

-				ptrW sid = ::mir_utf8decodeW(data);

+				ptrW sid( ::mir_utf8decodeW(data));

 

 				this->RemoveMember(sid, timestamp);

 			}

@@ -900,7 +900,7 @@ void ChatRoom::OnEvent(const ConversationRef &conversation, const MessageRef &me
 			//	break;

 

 			message->GetPropAuthor(data);	

-			ptrW sid = ::mir_utf8decodeW(data);

+			ptrW sid( ::mir_utf8decodeW(data));

 

 			uint timestamp;

 			message->GetPropTimestamp(timestamp);

@@ -1437,7 +1437,7 @@ int __cdecl CSkypeProto::OnGCEventHook(WPARAM, LPARAM lParam)
 				HANDLE hContact = this->GetContactBySid(gch->ptszUID);

 				if (!hContact)

 				{

-					ptrW sid = ::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID);

+					ptrW sid( ::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID));

 					if (sid != NULL)

 						CSkypeProto::CopyToClipboard(sid);

 				}

@@ -1651,11 +1651,11 @@ void __cdecl CSkypeProto::LoadChatList(void*)
 			if (status == Conversation::APPLICANT || status == Conversation::CONSUMER )

 			{

 				conversation->GetPropIdentity(data);

-				ptrW cid = ::mir_utf8decodeW(data);

+				ptrW cid( ::mir_utf8decodeW(data));

 				CSkypeProto::ReplaceSpecialChars(cid);

 

 				conversation->GetPropDisplayname(data);

-				ptrW name = ::mir_utf8decodeW(data);

+				ptrW name( ::mir_utf8decodeW(data));

 

 				ChatRoom *room = new ChatRoom(cid, name, this);

 				chatRooms.insert(room);

@@ -1674,7 +1674,7 @@ void CSkypeProto::OnChatEvent(const ConversationRef &conversation, const Message
 

 	SEString data;

 	conversation->GetPropIdentity(data);

-	ptrW cid = ::mir_utf8decodeW(data);

+	ptrW cid( ::mir_utf8decodeW(data));

 	CSkypeProto::ReplaceSpecialChars(cid);

 

 	ChatRoom *room = this->FindChatRoom(cid);

@@ -1691,7 +1691,7 @@ void CSkypeProto::OnChatEvent(const ConversationRef &conversation, const Message
 			SEString data;

 

 			conversation->GetPropDisplayname(data);

-			ptrW name = ::mir_utf8decodeW(data);

+			ptrW name( ::mir_utf8decodeW(data));

 

 			ChatRoom *room = new ChatRoom(cid, name, this);

 			chatRooms.insert(room);

@@ -1711,13 +1711,13 @@ void CSkypeProto::OnConversationListChange(
 		SEString data;

 

 		conversation->GetPropIdentity(data);

-		ptrW cid = ::mir_utf8decodeW(data);

+		ptrW cid( ::mir_utf8decodeW(data));

 		CSkypeProto::ReplaceSpecialChars(cid);

 

 		if ( !this->FindChatRoom(cid))

 		{

 			conversation->GetPropDisplayname(data);

-			ptrW name = ::mir_utf8decodeW(data);

+			ptrW name( ::mir_utf8decodeW(data));

 

 			ChatRoom *room = new ChatRoom(cid, name, this);

 			chatRooms.insert(room);

diff --git a/protocols/Skype/src/skype_messages.cpp b/protocols/Skype/src/skype_messages.cpp
index c04b6e2c55..93d8f71f49 100644
--- a/protocols/Skype/src/skype_messages.cpp
+++ b/protocols/Skype/src/skype_messages.cpp
@@ -226,7 +226,7 @@ void CSkypeProto::SyncHistoryCommand(HANDLE hContact, time_t timestamp)
 {

 	if (hContact)

 	{

-		ptrW sid = ::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID);

+		ptrW sid( ::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID));

 

 		ConversationRef conversation;

 		if ( !this->isChatRoom(hContact))

@@ -291,7 +291,7 @@ int CSkypeProto::SyncAllTimeHistoryCommand(WPARAM wParam, LPARAM lParam)
 	HANDLE hContact = (HANDLE)wParam;

 	if (hContact)

 	{

-		ptrW sid = ::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID);

+		ptrW sid( ::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID));

 

 		ConversationRef conversation;

 		if ( !this->isChatRoom(hContact))

diff --git a/protocols/Skype/src/skype_transfers.cpp b/protocols/Skype/src/skype_transfers.cpp
index 920e3c4d99..b97e1290d3 100644
--- a/protocols/Skype/src/skype_transfers.cpp
+++ b/protocols/Skype/src/skype_transfers.cpp
@@ -131,7 +131,7 @@ void CSkypeProto::OnFileEvent(const ConversationRef &conversation, const Message
 	FileTransferParam ftp;

 	ftp.pfts.flags = PFTS_RECEIVING | PFTS_UNICODE;

 	ftp.pfts.hContact = this->AddContact(author, true);

-	ftp.pfts.totalFiles = transfers.size();

+	ftp.pfts.totalFiles = (int)transfers.size();

 	ftp.pfts.ptszFiles = new wchar_t*[transfers.size() + 1];

 

 	int nifc = 0;