diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-06-02 20:55:18 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-06-02 20:55:18 +0000 |
| commit | 78c0815c4118fe24ab78cce2dc48a6232dcd824a (patch) | |
| tree | 8512c50df70b8dd80c919e88ade3419207c95956 /plugins/UserInfoEx/ex_import | |
| parent | ce816d83a8c75808e0eb06832592bffefe4a8dc4 (diff) | |
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@270 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/UserInfoEx/ex_import')
| -rw-r--r-- | plugins/UserInfoEx/ex_import/classExImContactBase.cpp | 10 | ||||
| -rw-r--r-- | plugins/UserInfoEx/ex_import/classExImContactXML.cpp | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/plugins/UserInfoEx/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/ex_import/classExImContactBase.cpp index c0e0bc05ee..0f75c0df43 100644 --- a/plugins/UserInfoEx/ex_import/classExImContactBase.cpp +++ b/plugins/UserInfoEx/ex_import/classExImContactBase.cpp @@ -266,7 +266,7 @@ HANDLE CExImContactBase::toDB() _hContact = INVALID_HANDLE_VALUE;
return INVALID_HANDLE_VALUE;
}
- if(!IsAccountEnabled(pszAccount)) {
+ if (!IsAccountEnabled(pszAccount)) {
;
}
// create new contact
@@ -347,7 +347,7 @@ VOID CExImContactBase::toIni(FILE* file, int modCount) ci.szProto = _pszProto;
ci.dwFlag = CNF_DISPLAY;
- if (!GetContactInfo(NULL, (LPARAM) &ci)){
+ if (!GetContactInfo(NULL, (LPARAM) &ci)) {
// CNF_DISPLAY always returns a string type
pszCI = (LPSTR)ci.pszVal;
}
@@ -398,9 +398,9 @@ BOOLEAN CExImContactBase::compareUID(DBVARIANT *dbv) case DBVT_ASCIIZ:
hash = hashSetting_M2(dbv->pszVal);
case DBVT_WCHAR:
- if(!hash) hash = hashSettingW_M2((const char *)dbv->pwszVal);
+ if (!hash) hash = hashSettingW_M2((const char *)dbv->pwszVal);
case DBVT_UTF8:
- if(!hash) {
+ if (!hash) {
LPWSTR tmp = mir_utf8decodeW(dbv->pszVal);
hash = hashSettingW_M2((const char *)tmp);
mir_free(tmp);
@@ -473,7 +473,7 @@ LPSTR CExImContactBase::uid2String(BOOLEAN bPrependType) INT_PTR baselen = Base64EncodeGetRequiredLength(_dbvUID.cpbVal, BASE64_FLAG_NOCRLF);
LPSTR t = (LPSTR)mir_alloc(baselen + 5 + bPrependType);
assert(t != NULL);
- if (Base64Encode(_dbvUID.pbVal, _dbvUID.cpbVal, t + bPrependType, &baselen, BASE64_FLAG_NOCRLF)){
+ if (Base64Encode(_dbvUID.pbVal, _dbvUID.cpbVal, t + bPrependType, &baselen, BASE64_FLAG_NOCRLF)) {
if (baselen){
t[baselen + bPrependType] = 0;
if (bPrependType) t[0] = 'n';
diff --git a/plugins/UserInfoEx/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/ex_import/classExImContactXML.cpp index ecd7bd73c9..11f2aed631 100644 --- a/plugins/UserInfoEx/ex_import/classExImContactXML.cpp +++ b/plugins/UserInfoEx/ex_import/classExImContactXML.cpp @@ -438,7 +438,7 @@ INT CExImContactXML::ExportSetting(TiXmlElement *xmlModule, LPCSTR pszModule, LP str = (LPSTR)mir_alloc(baselen + 6);
assert(str != NULL);
// encode data
- if (Base64Encode(dbv.pbVal, dbv.cpbVal, str+1, &baselen, BASE64_FLAG_NOCRLF)){
+ if (Base64Encode(dbv.pbVal, dbv.cpbVal, str+1, &baselen, BASE64_FLAG_NOCRLF)) {
if (baselen){
str[baselen+1] = 0;
str[0] = 'n';
@@ -683,7 +683,7 @@ INT CExImContactXML::LoadXmlElemnt(TiXmlElement *xContact) baselen = Base64DecodeGetRequiredLength(len);
pbVal = (PBYTE)mir_alloc(baselen /*+1*/);
if (pbVal != NULL){
- if (Base64Decode(pUID, len, pbVal, &baselen)){
+ if (Base64Decode(pUID, len, pbVal, &baselen)) {
uidn(pbVal, baselen);
}
else {
@@ -934,14 +934,14 @@ INT CExImContactXML::ImportModule(TiXmlNode* xmlModule) isMetaModule = DB::Module::IsMeta(pszModule);
// just ignore MetaModule on normal contact to avoid errors (only keys)
- if(!isProtoModule && isMetaModule) {
+ if (!isProtoModule && isMetaModule) {
continue;
}
// just ignore MetaModule on Meta to avoid errors (only import spetial keys)
else if(isProtoModule && isMetaModule) {
if (!mir_stricmp(xKey->Attribute("key"),"Nick") ||
!mir_stricmp(xKey->Attribute("key"),"TzName") ||
- !mir_stricmp(xKey->Attribute("key"),"Timezone") ){
+ !mir_stricmp(xKey->Attribute("key"),"Timezone") ) {
if (ImportSetting(pszModule, xKey->ToElement()) == ERROR_OK) {
_pXmlFile->_numSettingsDone++;
}
@@ -1040,7 +1040,7 @@ INT CExImContactXML::ImportSetting(LPCSTR pszModule, TiXmlElement *xmlEntry) cws.value.type = DBVT_BLOB;
cws.value.pbVal = (PBYTE)mir_alloc(baselen +1);
if (cws.value.pbVal != NULL){
- if (Base64Decode((value + 1), len, cws.value.pbVal, &baselen)){
+ if (Base64Decode((value + 1), len, cws.value.pbVal, &baselen)) {
cws.value.cpbVal = baselen;
}
else {
|