summaryrefslogtreecommitdiff
path: root/plugins/NotifyAnything/src
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2016-07-27 11:50:07 +0000
committerGeorge Hazan <george.hazan@gmail.com>2016-07-27 11:50:07 +0000
commitddd1af0fdf37364c9472faedad941b4cc5f1b465 (patch)
treed4eb46f481a47b6e16e40b39860e830e40f9dbcf /plugins/NotifyAnything/src
parentcc3be4384048697fe9b7716c11b7bd726b9ca650 (diff)
<tchar.h> removed from <m_system.h>
git-svn-id: http://svn.miranda-ng.org/main/trunk@17136 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/NotifyAnything/src')
-rw-r--r--plugins/NotifyAnything/src/main.cpp8
-rw-r--r--plugins/NotifyAnything/src/options.cpp2
-rw-r--r--plugins/NotifyAnything/src/stdafx.h1
3 files changed, 5 insertions, 6 deletions
diff --git a/plugins/NotifyAnything/src/main.cpp b/plugins/NotifyAnything/src/main.cpp
index 78bdfb9411..616d95f8e9 100644
--- a/plugins/NotifyAnything/src/main.cpp
+++ b/plugins/NotifyAnything/src/main.cpp
@@ -323,7 +323,7 @@ void processSingleAction(const std::wstring &what, bool &closeflag)
std::wstring argstr(what, 7);
- if (_tsystem(argstr.c_str()) == -1)
+ if (_wsystem(argstr.c_str()) == -1)
dbg_msg(L"Failed to execute: " + argstr, SM_WARNING);
}
else if (!what.compare(0, 4, L"cmd:")) {
@@ -345,7 +345,7 @@ void processSingleAction(const std::wstring &what, bool &closeflag)
cargs.push_back(i->c_str());
cargs.push_back(0);
- if (_tspawnvp(_P_DETACH, cargs[0], &cargs[0]) == -1)
+ if (_wspawnvp(_P_DETACH, cargs[0], &cargs[0]) == -1)
dbg_msg(L"Failed to execute: " + what.substr(4), SM_WARNING);
}
@@ -560,7 +560,7 @@ inline int dehex(int c) {
COLORREF parseColor(const std::wstring &buf, bool &ok)
{
ok = false;
- for (int i = 0; i != buf.size(); ++i)
+ for (size_t i = 0; i != buf.size(); ++i)
if (!isxdigit(buf[i]))
return RGB(0, 0, 0);
if (buf.size() == 6) {
@@ -983,7 +983,7 @@ extern "C" int __declspec(dllexport) Load()
wchar_t buf[MAX_PATH + 1];
mir_tstrcpy(buf, L".");
- g_mirandaDir = _tgetcwd(buf, MAX_PATH);
+ g_mirandaDir = _wgetcwd(buf, MAX_PATH);
registerSound(L"Notice");
registerSound(L"Message");
diff --git a/plugins/NotifyAnything/src/options.cpp b/plugins/NotifyAnything/src/options.cpp
index 42ca149146..0abd9cf948 100644
--- a/plugins/NotifyAnything/src/options.cpp
+++ b/plugins/NotifyAnything/src/options.cpp
@@ -166,7 +166,7 @@ void load_settings()
db_free(&dbv);
}
else
- g_settings.log_filename = g_mirandaDir + L"\\" + _T(LOG_ID) + L".log";
+ g_settings.log_filename = g_mirandaDir + L"\\NotifyAnything.log";
}
int OptionsInitialize(WPARAM wParam, LPARAM)
diff --git a/plugins/NotifyAnything/src/stdafx.h b/plugins/NotifyAnything/src/stdafx.h
index 497a5666f0..02d6b1dfec 100644
--- a/plugins/NotifyAnything/src/stdafx.h
+++ b/plugins/NotifyAnything/src/stdafx.h
@@ -47,4 +47,3 @@ void load_settings();
int OptionsInitialize(WPARAM wParam, LPARAM lParam);
extern std::wstring g_mirandaDir;
-#define LOG_ID LPGEN("NotifyAnything")