summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-03-22 11:32:16 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-03-22 11:32:16 +0000
commit739fd4137010dc56881cf8328770b3175a2f2696 (patch)
tree7c77a540a1795bf1353991355645a77c1f90016f
parent14134369ad6b27a974b8147aea6535ac8d2f9e87 (diff)
feeding awk's aesthetic worldview
git-svn-id: http://svn.miranda-ng.org/main/trunk@8684 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--bin10/lib/mir_core.libbin58468 -> 58468 bytes
-rw-r--r--bin10/lib/mir_core64.libbin53480 -> 53480 bytes
-rw-r--r--bin12/lib/mir_core.libbin58468 -> 58468 bytes
-rw-r--r--bin12/lib/mir_core64.libbin53480 -> 53480 bytes
-rw-r--r--include/m_metacontacts.h4
-rw-r--r--src/mir_core/mc.cpp12
6 files changed, 8 insertions, 8 deletions
diff --git a/bin10/lib/mir_core.lib b/bin10/lib/mir_core.lib
index 077401f6f7..e2afe910ae 100644
--- a/bin10/lib/mir_core.lib
+++ b/bin10/lib/mir_core.lib
Binary files differ
diff --git a/bin10/lib/mir_core64.lib b/bin10/lib/mir_core64.lib
index 217c644302..bd60a2b294 100644
--- a/bin10/lib/mir_core64.lib
+++ b/bin10/lib/mir_core64.lib
Binary files differ
diff --git a/bin12/lib/mir_core.lib b/bin12/lib/mir_core.lib
index c7983453ff..d51a099b21 100644
--- a/bin12/lib/mir_core.lib
+++ b/bin12/lib/mir_core.lib
Binary files differ
diff --git a/bin12/lib/mir_core64.lib b/bin12/lib/mir_core64.lib
index 217c644302..7872628509 100644
--- a/bin12/lib/mir_core64.lib
+++ b/bin12/lib/mir_core64.lib
Binary files differ
diff --git a/include/m_metacontacts.h b/include/m_metacontacts.h
index fc09425ea9..889d3ac188 100644
--- a/include/m_metacontacts.h
+++ b/include/m_metacontacts.h
@@ -75,10 +75,10 @@ MIR_CORE_DLL(BOOL) db_mc_isEnabled(void);
MIR_CORE_DLL(void) db_mc_enable(BOOL);
// checks whether a contact is a metacontact
-MIR_CORE_DLL(int) db_mc_isMeta(MCONTACT hMetaContact);
+MIR_CORE_DLL(BOOL) db_mc_isMeta(MCONTACT hMetaContact);
// checks whether a contact is a subcontact of existing MC
-MIR_CORE_DLL(int) db_mc_isSub(MCONTACT hSubContact);
+MIR_CORE_DLL(BOOL) db_mc_isSub(MCONTACT hSubContact);
//returns a handle to the default contact, or null on failure
MIR_CORE_DLL(MCONTACT) db_mc_getDefault(MCONTACT hMetaContact);
diff --git a/src/mir_core/mc.cpp b/src/mir_core/mc.cpp
index e440160dc0..289e29e188 100644
--- a/src/mir_core/mc.cpp
+++ b/src/mir_core/mc.cpp
@@ -72,20 +72,20 @@ MIR_CORE_DLL(void) db_mc_enable(BOOL bEnabled)
g_bEnabled = bEnabled != 0;
}
-MIR_CORE_DLL(int) db_mc_isMeta(MCONTACT hContact)
+MIR_CORE_DLL(BOOL) db_mc_isMeta(MCONTACT hContact)
{
- if (currDb == NULL) return false;
+ if (currDb == NULL) return FALSE;
DBCachedContact *cc = currDb->m_cache->GetCachedContact(hContact);
- return (cc == NULL) ? false : cc->nSubs != -1;
+ return (cc == NULL) ? FALSE : cc->nSubs != -1;
}
-MIR_CORE_DLL(int) db_mc_isSub(MCONTACT hContact)
+MIR_CORE_DLL(BOOL) db_mc_isSub(MCONTACT hContact)
{
- if (currDb == NULL) return false;
+ if (currDb == NULL) return FALSE;
DBCachedContact *cc = currDb->m_cache->GetCachedContact(hContact);
- return (cc == NULL) ? false : cc->parentID != 0;
+ return (cc == NULL) ? FALSE : cc->parentID != 0;
}
//returns a handle to the default contact, or null on failure