diff options
| author | George Hazan <ghazan@miranda.im> | 2019-01-28 15:51:04 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-01-28 15:51:04 +0300 |
| commit | ac6607c5f76566c2c840ca3955a22448738df9b3 (patch) | |
| tree | b697dbe07b88ac8fefb5f00a003c95710b3bbbeb /plugins/Scriver | |
| parent | e787987f54733bd58f69ced43a506aa7fc42fb7c (diff) | |
mir_urlDecode & mir_urlEncode to return CMStringA
Diffstat (limited to 'plugins/Scriver')
| -rw-r--r-- | plugins/Scriver/src/stdafx.h | 1 | ||||
| -rw-r--r-- | plugins/Scriver/src/utils.cpp | 18 |
2 files changed, 9 insertions, 10 deletions
diff --git a/plugins/Scriver/src/stdafx.h b/plugins/Scriver/src/stdafx.h index 7a023eaeab..e1ae6b4b96 100644 --- a/plugins/Scriver/src/stdafx.h +++ b/plugins/Scriver/src/stdafx.h @@ -59,7 +59,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_hotkeys.h>
#include <m_popup.h>
#include <m_timezones.h>
-#include <m_string.h>
#include <m_xstatus.h>
#include <m_chat_int.h>
#include <m_srmm_int.h>
diff --git a/plugins/Scriver/src/utils.cpp b/plugins/Scriver/src/utils.cpp index 593eaba0f2..e8f9590391 100644 --- a/plugins/Scriver/src/utils.cpp +++ b/plugins/Scriver/src/utils.cpp @@ -232,32 +232,32 @@ void SearchWord(wchar_t *word, int engine) char szURL[4096];
if (word && word[0]) {
T2Utf wordUTF(word);
- ptrA wordURL(mir_urlEncode(wordUTF));
+ CMStringA wordURL(mir_urlEncode(wordUTF));
switch (engine) {
case SEARCHENGINE_WIKIPEDIA:
- mir_snprintf(szURL, "http://en.wikipedia.org/wiki/%s", wordURL);
+ mir_snprintf(szURL, "http://en.wikipedia.org/wiki/%s", wordURL.c_str());
break;
case SEARCHENGINE_YAHOO:
- mir_snprintf(szURL, "http://search.yahoo.com/search?p=%s&ei=UTF-8", wordURL);
+ mir_snprintf(szURL, "http://search.yahoo.com/search?p=%s&ei=UTF-8", wordURL.c_str());
break;
case SEARCHENGINE_FOODNETWORK:
- mir_snprintf(szURL, "http://search.foodnetwork.com/search/delegate.do?fnSearchString=%s", wordURL);
+ mir_snprintf(szURL, "http://search.foodnetwork.com/search/delegate.do?fnSearchString=%s", wordURL.c_str());
break;
case SEARCHENGINE_BING:
- mir_snprintf(szURL, "http://www.bing.com/search?q=%s&form=OSDSRC", wordURL);
+ mir_snprintf(szURL, "http://www.bing.com/search?q=%s&form=OSDSRC", wordURL.c_str());
break;
case SEARCHENGINE_GOOGLE_MAPS:
- mir_snprintf(szURL, "http://maps.google.com/maps?q=%s&ie=utf-8&oe=utf-8", wordURL);
+ mir_snprintf(szURL, "http://maps.google.com/maps?q=%s&ie=utf-8&oe=utf-8", wordURL.c_str());
break;
case SEARCHENGINE_GOOGLE_TRANSLATE:
- mir_snprintf(szURL, "http://translate.google.com/?q=%s&ie=utf-8&oe=utf-8", wordURL);
+ mir_snprintf(szURL, "http://translate.google.com/?q=%s&ie=utf-8&oe=utf-8", wordURL.c_str());
break;
case SEARCHENGINE_YANDEX:
- mir_snprintf(szURL, "http://yandex.ru/yandsearch?text=%s", wordURL);
+ mir_snprintf(szURL, "http://yandex.ru/yandsearch?text=%s", wordURL.c_str());
break;
case SEARCHENGINE_GOOGLE:
default:
- mir_snprintf(szURL, "http://www.google.com/search?q=%s&ie=utf-8&oe=utf-8", wordURL);
+ mir_snprintf(szURL, "http://www.google.com/search?q=%s&ie=utf-8&oe=utf-8", wordURL.c_str());
break;
}
|