diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/IcqOscarJ/icqoscar8_10.vcxproj | 1 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters | 3 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/icqoscar8_11.vcxproj | 1 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/icqoscar8_11.vcxproj.filters | 3 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_avatar.cpp | 2 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_db.h | 42 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/icqosc_svcs.cpp | 2 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/icqoscar.h | 1 |
8 files changed, 2 insertions, 53 deletions
diff --git a/protocols/IcqOscarJ/icqoscar8_10.vcxproj b/protocols/IcqOscarJ/icqoscar8_10.vcxproj index 15722e9ee4..5f2e6f2c8f 100644 --- a/protocols/IcqOscarJ/icqoscar8_10.vcxproj +++ b/protocols/IcqOscarJ/icqoscar8_10.vcxproj @@ -206,7 +206,6 @@ <ClInclude Include="src\icq_advsearch.h" />
<ClInclude Include="src\icq_avatar.h" />
<ClInclude Include="src\icq_constants.h" />
- <ClInclude Include="src\icq_db.h" />
<ClInclude Include="src\icq_direct.h" />
<ClInclude Include="src\icq_fieldnames.h" />
<ClInclude Include="src\icq_http.h" />
diff --git a/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters b/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters index c91460a53f..af63692b9a 100644 --- a/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters +++ b/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters @@ -110,9 +110,6 @@ <ClInclude Include="src\changeinfo\changeinfo.h">
<Filter>Changeinfo</Filter>
</ClInclude>
- <ClInclude Include="src\icq_db.h">
- <Filter>Header Files</Filter>
- </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\resources.rc">
diff --git a/protocols/IcqOscarJ/icqoscar8_11.vcxproj b/protocols/IcqOscarJ/icqoscar8_11.vcxproj index 128af1858f..dc1f2cd714 100644 --- a/protocols/IcqOscarJ/icqoscar8_11.vcxproj +++ b/protocols/IcqOscarJ/icqoscar8_11.vcxproj @@ -209,7 +209,6 @@ <ClInclude Include="src\icq_advsearch.h" />
<ClInclude Include="src\icq_avatar.h" />
<ClInclude Include="src\icq_constants.h" />
- <ClInclude Include="src\icq_db.h" />
<ClInclude Include="src\icq_direct.h" />
<ClInclude Include="src\icq_fieldnames.h" />
<ClInclude Include="src\icq_http.h" />
diff --git a/protocols/IcqOscarJ/icqoscar8_11.vcxproj.filters b/protocols/IcqOscarJ/icqoscar8_11.vcxproj.filters index c91460a53f..af63692b9a 100644 --- a/protocols/IcqOscarJ/icqoscar8_11.vcxproj.filters +++ b/protocols/IcqOscarJ/icqoscar8_11.vcxproj.filters @@ -110,9 +110,6 @@ <ClInclude Include="src\changeinfo\changeinfo.h">
<Filter>Changeinfo</Filter>
</ClInclude>
- <ClInclude Include="src\icq_db.h">
- <Filter>Header Files</Filter>
- </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\resources.rc">
diff --git a/protocols/IcqOscarJ/src/icq_avatar.cpp b/protocols/IcqOscarJ/src/icq_avatar.cpp index d13cc23067..4058cf4649 100644 --- a/protocols/IcqOscarJ/src/icq_avatar.cpp +++ b/protocols/IcqOscarJ/src/icq_avatar.cpp @@ -1675,7 +1675,7 @@ void avatars_server_connection::handleAvatarFam(BYTE *pBuffer, WORD wBufferLengt {
TCHAR tmp[MAX_PATH * 2];
PathToRelativeT(tszImageFile, tmp);
- ppro->setSettingStringT(NULL, "AvatarFile", tmp);
+ ppro->setTString(NULL, "AvatarFile", tmp);
}
else
{ // contact's avatar set hash
diff --git a/protocols/IcqOscarJ/src/icq_db.h b/protocols/IcqOscarJ/src/icq_db.h deleted file mode 100644 index 1a0266de74..0000000000 --- a/protocols/IcqOscarJ/src/icq_db.h +++ /dev/null @@ -1,42 +0,0 @@ -// ---------------------------------------------------------------------------80
-// ICQ plugin for Miranda Instant Messenger
-// ________________________________________
-//
-// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright © 2001-2002 Jon Keating, Richard Hughes
-// Copyright © 2002-2004 Martin Öberg, Sam Kothari, Robert Rainwater
-// Copyright © 2004-2010 Joe Kucera
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// -----------------------------------------------------------------------------
-// DESCRIPTION:
-//
-// Describe me here please...
-//
-// -----------------------------------------------------------------------------
-#ifndef __ICQ_DB_H
-#define __ICQ_DB_H
-
-
-#ifdef _UNICODE
- #define getTString getSettingStringW
- #define setSettingStringT setTString
-#else
- #define getTString getString
- #define setSettingStringT setString
-#endif
-
-#endif /* __ICQ_DB_H */
diff --git a/protocols/IcqOscarJ/src/icqosc_svcs.cpp b/protocols/IcqOscarJ/src/icqosc_svcs.cpp index 40d6503022..8bd8195462 100644 --- a/protocols/IcqOscarJ/src/icqosc_svcs.cpp +++ b/protocols/IcqOscarJ/src/icqosc_svcs.cpp @@ -598,7 +598,7 @@ INT_PTR CIcqProto::SetMyAvatar(WPARAM wParam, LPARAM lParam) TCHAR tmp[MAX_PATH];
PathToRelativeT(tszMyFile, tmp);
- setSettingStringT(NULL, "AvatarFile", tmp);
+ setTString(NULL, "AvatarFile", tmp);
iRet = 0;
diff --git a/protocols/IcqOscarJ/src/icqoscar.h b/protocols/IcqOscarJ/src/icqoscar.h index 1208d9524f..3699ed2d0d 100644 --- a/protocols/IcqOscarJ/src/icqoscar.h +++ b/protocols/IcqOscarJ/src/icqoscar.h @@ -98,7 +98,6 @@ #include "version.h"
#include "globals.h"
#include "i18n.h"
-#include "icq_db.h"
#include "cookies.h"
#include "icq_packet.h"
#include "utilities.h"
|