diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-16 20:33:13 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-16 20:33:13 +0000 |
| commit | 769b537b5e1a99fc53aa7296fd2b21dc77a4071c (patch) | |
| tree | 7df94b386078575e6186523e1a165e4b0ba7ad9f /plugins/IEView | |
| parent | 2e15a3c2aae091fcbdd3234931a2777d050e43e1 (diff) | |
name conflicts solved
git-svn-id: http://svn.miranda-ng.org/main/trunk@14971 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/IEView')
| -rw-r--r-- | plugins/IEView/src/IEView.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/IEView/src/IEView.cpp b/plugins/IEView/src/IEView.cpp index d92c3ce688..09c7afd088 100644 --- a/plugins/IEView/src/IEView.cpp +++ b/plugins/IEView/src/IEView.cpp @@ -882,12 +882,12 @@ void IEView::clear(IEVIEWEVENT *event) if (document == NULL) {
pWebBrowser->Navigate(L"about:blank", NULL, NULL, NULL, NULL);
HRESULT hr = S_OK;
- CComPtr<IHTMLDocument2> document;
- while ((document == NULL) && (hr == S_OK)) {
+ CComPtr<IHTMLDocument2> doc2;
+ while ((doc2 == NULL) && (hr == S_OK)) {
Sleep(0);
CComPtr<IDispatch> dispatch;
if (SUCCEEDED(pWebBrowser->get_Document(&dispatch)) && dispatch != NULL)
- dispatch.QueryInterface(&document);
+ dispatch.QueryInterface(&doc2);
}
}
else {
@@ -935,9 +935,9 @@ HWND IEView::getHWND() return hwnd;
}
-void IEView::setContact(MCONTACT hContact)
+void IEView::setContact(MCONTACT _hContact)
{
- this->hContact = hContact;
+ hContact = _hContact;
isContactSet = true;
}
@@ -1004,9 +1004,9 @@ WCHAR* IEView::getHrefFromAnchor(CComPtr<IHTMLElement> element) return url;
}
- CComPtr<IHTMLElement> parent;
- if (SUCCEEDED(element->get_parentElement(&parent)) && parent != NULL)
- return getHrefFromAnchor(parent);
+ CComPtr<IHTMLElement> pParent;
+ if (SUCCEEDED(element->get_parentElement(&pParent)) && pParent != NULL)
+ return getHrefFromAnchor(pParent);
return NULL;
}
|