From 0ebb1294ecaf4d62ad6b3e911be6275248c05354 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 27 Nov 2016 21:02:54 +0300
Subject: correct type for ServiceExists() - bool

---
 plugins/Utils.pas/cbex.pas        |  2 +-
 plugins/Utils.pas/editwrapper.pas | 12 ++----------
 plugins/Utils.pas/mircontacts.pas |  2 +-
 plugins/Utils.pas/mirutils.pas    |  4 ++--
 plugins/Utils.pas/protocols.pas   |  4 ++--
 plugins/Utils.pas/srvblock.pas    |  2 +-
 6 files changed, 9 insertions(+), 17 deletions(-)

(limited to 'plugins/Utils.pas')

diff --git a/plugins/Utils.pas/cbex.pas b/plugins/Utils.pas/cbex.pas
index 59778fcee7..7c05478ae9 100644
--- a/plugins/Utils.pas/cbex.pas
+++ b/plugins/Utils.pas/cbex.pas
@@ -26,7 +26,7 @@ begin
   SendMessage(wnd,CB_RESETCONTENT,0,0);
   StrCopy(StrCopyE(buf,proto),PS_GETCUSTOMSTATUSICON);
 
-  if ServiceExists(@buf)=0 then
+  if not ServiceExists(@buf) then
     exit;
 
   il:=ImageList_Create(16,16,ILC_COLOR32 or ILC_MASK,0,1);
diff --git a/plugins/Utils.pas/editwrapper.pas b/plugins/Utils.pas/editwrapper.pas
index 034a45e15b..61d1c60277 100644
--- a/plugins/Utils.pas/editwrapper.pas
+++ b/plugins/Utils.pas/editwrapper.pas
@@ -127,16 +127,12 @@ begin
       ShowWindow(GetDlgItem(Dialog,idhide),SW_HIDE);
 
       wnd:=GetDlgItem(Dialog,IDC_SCRIPT_HELP);
-      if ServiceExists(MS_VARS_FORMATSTRING)<>0 then
+      if ServiceExists(MS_VARS_FORMATSTRING) then
       begin
         SendMessage(wnd,BM_SETIMAGE,IMAGE_ICON,
             CallService(MS_VARS_GETSKINITEM,0,VSI_HELPICON));
         SendMessage(wnd,BUTTONADDTOOLTIP,
             CallService(MS_VARS_GETSKINITEM,0,VSI_HELPTIPTEXT),0);
-{
-        SendMessage(wnd,BM_SETIMAGE,IMAGE_ICON,
-            CallService(MS_SKIN_LOADICON,SKINICON_OTHER_HELP,0));
-}
       end
       else
       begin
@@ -414,16 +410,12 @@ begin
       ShowWindow(GetDlgItem(Dialog,idhide),SW_HIDE);
 
       wnd:=GetDlgItem(Dialog,IDC_SCRIPT_HELP);
-      if ServiceExists(MS_VARS_FORMATSTRING)<>0 then
+      if ServiceExists(MS_VARS_FORMATSTRING) then
       begin
         SendMessage(wnd,BM_SETIMAGE,IMAGE_ICON,
             CallService(MS_VARS_GETSKINITEM,0,VSI_HELPICON));
         SendMessage(wnd,BUTTONADDTOOLTIP,
             CallService(MS_VARS_GETSKINITEM,0,VSI_HELPTIPTEXT),0);
-{
-        SendMessage(wnd,BM_SETIMAGE,IMAGE_ICON,
-            CallService(MS_SKIN_LOADICON,SKINICON_OTHER_HELP,0));
-}
       end
       else
       begin
diff --git a/plugins/Utils.pas/mircontacts.pas b/plugins/Utils.pas/mircontacts.pas
index 7e5337c8c8..8cc128ab2f 100644
--- a/plugins/Utils.pas/mircontacts.pas
+++ b/plugins/Utils.pas/mircontacts.pas
@@ -477,7 +477,7 @@ CallService(MS_CLIST_CONTACTDOUBLECLICKED,hContact,0);
       end
       else
       begin
-        if ServiceExists(MS_MSG_CONVERS)<>0 then // Convers compat.
+        if ServiceExists(MS_MSG_CONVERS) then // Convers compat.
           CallService(MS_MSG_CONVERS,hContact,0)
         else
           CallService(MS_MSG_SENDMESSAGE,hContact,0)
diff --git a/plugins/Utils.pas/mirutils.pas b/plugins/Utils.pas/mirutils.pas
index bbedeb252b..10f2ea2578 100644
--- a/plugins/Utils.pas/mirutils.pas
+++ b/plugins/Utils.pas/mirutils.pas
@@ -139,7 +139,7 @@ end;
 function isVarsInstalled:bool;
 {$IFDEF AllowInline}inline;{$ENDIF}
 begin
-  result:=ServiceExists(MS_VARS_FORMATSTRING)<>0;
+  result:=ServiceExists(MS_VARS_FORMATSTRING);
 end;
 
 function ParseVarString(astr:PAnsiChar;aContact:TMCONTACT=0;extra:PAnsiChar=nil):PAnsiChar;
@@ -228,7 +228,7 @@ procedure ShowPopupW(text:PWideChar;title:PWideChar=nil);
 var
   ppdu:TPOPUPDATAW;
 begin
-  if ServiceExists(MS_POPUP_ADDPOPUPW)=0 then
+  if not ServiceExists(MS_POPUP_ADDPOPUPW) then
     exit;
 
   FillChar(ppdu,SizeOf(TPOPUPDATAW),0);
diff --git a/plugins/Utils.pas/protocols.pas b/plugins/Utils.pas/protocols.pas
index f4526a6c09..97a972dbe0 100644
--- a/plugins/Utils.pas/protocols.pas
+++ b/plugins/Utils.pas/protocols.pas
@@ -448,11 +448,11 @@ begin
 
       p:=StrCopyE(buf,name);
       StrCopy(p,PS_GETCUSTOMSTATUSEX);
-      if ServiceExists(buf)<>0 then
+      if ServiceExists(buf) then
         status:=status or psf_icq;
 
       StrCopy(p,PS_SET_LISTENINGTO);
-      if ServiceExists(buf)<>0 then
+      if ServiceExists(buf) then
         status:=status or psf_tunes;
 
     end;
diff --git a/plugins/Utils.pas/srvblock.pas b/plugins/Utils.pas/srvblock.pas
index 6a0e0adfe0..4a088b86f0 100644
--- a/plugins/Utils.pas/srvblock.pas
+++ b/plugins/Utils.pas/srvblock.pas
@@ -566,7 +566,7 @@ begin
     else
       Exit;
 
-  if ServiceExists(buf)<>0 then
+  if ServiceExists(buf) then
   begin
     result:=true;
 
-- 
cgit v1.2.3