summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-01-21 20:04:48 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-01-21 20:04:48 +0000
commitd154673f93ad95197bce8cadb995daa5bc39f5d8 (patch)
tree191522aa88f9f845a9c27b1ddb86116b87033c4b /include
parentbe50a70bfd8b3f3daf0c3351fdce6e2fea515bd7 (diff)
minor code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@7820 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include')
-rw-r--r--include/m_netlib.h14
-rw-r--r--include/m_popup.h2
-rw-r--r--include/m_string.h2
-rw-r--r--include/m_system_cpp.h2
-rw-r--r--include/win2k.h2
5 files changed, 11 insertions, 11 deletions
diff --git a/include/m_netlib.h b/include/m_netlib.h
index d660336581..44d9a55b37 100644
--- a/include/m_netlib.h
+++ b/include/m_netlib.h
@@ -175,7 +175,7 @@ should use the MSG_DUMPPROXY flag so that the logging is neat.
//Gets the user-configured settings for a netlib user
//wParam = (WPARAM)(HANDLE)hUser
//lParam = (LPARAM)(NETLIBUSERSETTINGS*)&nlus
-//Returns nonzero on success, 0 on failure ( !! this is different to most of the rest of Miranda, but consistent with netlib)
+//Returns nonzero on success, 0 on failure (!! this is different to most of the rest of Miranda, but consistent with netlib)
//The pointers referred to in the returned struct will remain valid until
//the hUser handle is closed, or until the user changes the settings in the
//options page, so it's best not to rely on them for too long.
@@ -208,7 +208,7 @@ typedef struct {
//Changes the user-configurable settings for a netlib user
//wParam = (WPARAM)(HANDLE)hUser
//lParam = (LPARAM)(NETLIBUSERSETTINGS*)&nlus
-//Returns nonzero on success, 0 on failure ( !! this is different to most of the rest of Miranda, but consistent with netlib)
+//Returns nonzero on success, 0 on failure (!! this is different to most of the rest of Miranda, but consistent with netlib)
//This function is only really useful for people that specify NUF_NOOPTIONS
//and want to create their own options.
//Even if a setting is not active (eg szProxyAuthPassword when useProxyAuth is
@@ -219,7 +219,7 @@ typedef struct {
//Closes a netlib handle
//wParam = (WPARAM)(HANDLE)hNetlibHandle
//lParam = 0
-//Returns nonzero on success, 0 on failure ( !! this is different to most of the rest of Miranda, but consistent with netlib)
+//Returns nonzero on success, 0 on failure (!! this is different to most of the rest of Miranda, but consistent with netlib)
//This function should be called on all handles returned by netlib functions
//once you are done with them. If it's called on a socket-type handle, the
//socket will be closed.
@@ -341,7 +341,7 @@ struct NETLIBOPENCONNECTION_tag {
//Sets the required information for an HTTP proxy connection
//wParam = (WPARAM)(HANDLE)hConnection
//lParam = (LPARAM)(NETLIBHTTPPROXYINFO*)&nlhpi
-//Returns nonzero on success, 0 on failure ( !! this is different to most of the rest of Miranda, but consistent with netlib)
+//Returns nonzero on success, 0 on failure (!! this is different to most of the rest of Miranda, but consistent with netlib)
//This function is designed to be called from within pfnHttpGatewayInit
//See notes below MS_NETLIB_REGISTERUSER.
//Errors: ERROR_INVALID_PARAMETER
@@ -495,7 +495,7 @@ struct NETLIBHTTPREQUEST_tag {
//Free the memory used by a NETLIBHTTPREQUEST structure
//wParam = 0
//lParam = (LPARAM)(NETLIBHTTPREQUEST*)pnlhr
-//Returns nonzero on success, 0 on failure ( !! this is different to most of the rest of Miranda, but consistent with netlib)
+//Returns nonzero on success, 0 on failure (!! this is different to most of the rest of Miranda, but consistent with netlib)
//This should only be called on structures returned by
//MS_NETLIB_RECVHTTPHEADERS or MS_NETLIB_HTTPTRANSACTION. Calling it on an
//arbitrary structure will have disastrous results.
@@ -670,7 +670,7 @@ typedef struct {
//Add a message to the log (if it's running)
//wParam = (WPARAM)(HANDLE)hUser
//lParam = (LPARAM)(const char *)szMessage
-//Returns nonzero on success, 0 on failure ( !! this is different to most of the rest of Miranda, but consistent with netlib)
+//Returns nonzero on success, 0 on failure (!! this is different to most of the rest of Miranda, but consistent with netlib)
//Do not include a final line ending in szMessage.
//Errors: ERROR_INVALID_PARAMETER
#define MS_NETLIB_LOG "Netlib/Log"
@@ -700,7 +700,7 @@ typedef struct
//here's a handy piece of code to let you log using printf-style specifiers:
//#include <stdarg.h> and <stdio.h> before including this header in order to
//use it.
-#if defined va_start && (defined _STDIO_DEFINED || defined _STDIO_H_) && ( !defined NETLIB_NOLOGGING)
+#if defined va_start && (defined _STDIO_DEFINED || defined _STDIO_H_) && (!defined NETLIB_NOLOGGING)
static INT_PTR Netlib_Logf(HANDLE hUser, const char *fmt, ...)
{
va_list va;
diff --git a/include/m_popup.h b/include/m_popup.h
index 3edf9addb9..9109dd33bb 100644
--- a/include/m_popup.h
+++ b/include/m_popup.h
@@ -347,7 +347,7 @@ typedef struct {
HANDLE __forceinline Popup_RegisterClass(POPUPCLASS *pc)
{
- if ( !ServiceExists(MS_POPUP_REGISTERCLASS))
+ if (!ServiceExists(MS_POPUP_REGISTERCLASS))
return NULL;
return (HANDLE)CallService(MS_POPUP_REGISTERCLASS, 0, LPARAM(pc));
}
diff --git a/include/m_string.h b/include/m_string.h
index 4660d3e387..54c464461a 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -582,7 +582,7 @@ private:
{
CMStringData* pNewData = NULL;
- if ( !pData->IsLocked()) {
+ if (!pData->IsLocked()) {
pNewData = pData;
pNewData->AddRef();
}
diff --git a/include/m_system_cpp.h b/include/m_system_cpp.h
index b50449b526..4bddd0ae27 100644
--- a/include/m_system_cpp.h
+++ b/include/m_system_cpp.h
@@ -148,7 +148,7 @@ template<class T> struct LIST
__inline int getIndex(T *p) const
{ int idx;
- return ( !List_GetIndex((SortedList*)this, p, &idx)) ? -1 : idx;
+ return (!List_GetIndex((SortedList*)this, p, &idx)) ? -1 : idx;
}
__inline void destroy(void) { List_Destroy((SortedList*)this); }
diff --git a/include/win2k.h b/include/win2k.h
index 791e11ada9..f35d1bb3c0 100644
--- a/include/win2k.h
+++ b/include/win2k.h
@@ -291,7 +291,7 @@ File created by Christian Kostner, and tweaked a bit by Richard Hughes*/
#define NIN_BALLOONTIMEOUT (WM_USER + 4)
#define NIN_BALLOONUSERCLICK (WM_USER + 5)
// SDK isn't present or some older VC compiler was used, include missing things.
-#elif !defined(NOWIN2K) && ( !defined WS_EX_LAYERED || !defined IDC_HAND)
+#elif !defined(NOWIN2K) && (!defined WS_EX_LAYERED || !defined IDC_HAND)
#pragma message("win2k.h")