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/QuickSearch/quicksearch.dpr |  2 +-
 plugins/QuickSearch/sr_frame.pas    |  2 +-
 plugins/QuickSearch/sr_global.pas   |  4 ++--
 plugins/QuickSearch/sr_window.pas   | 12 ++++++------
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'plugins/QuickSearch')

diff --git a/plugins/QuickSearch/quicksearch.dpr b/plugins/QuickSearch/quicksearch.dpr
index 2a6ce5742b..c9f90d01fb 100644
--- a/plugins/QuickSearch/quicksearch.dpr
+++ b/plugins/QuickSearch/quicksearch.dpr
@@ -52,7 +52,7 @@ begin
   result:=0;
 
 // toptoolbar
-  if ServiceExists(MS_TTB_GETBUTTONOPTIONS)<>0 then
+  if ServiceExists(MS_TTB_GETBUTTONOPTIONS) then
   begin
     CallService(MS_TTB_GETBUTTONOPTIONS,(hTTBButton shl 16)+TTBO_ALLDATA,TLPARAM(@ttb));
     ttb.hIconUp:=IcoLib_GetIcon(QS_QS,0);
diff --git a/plugins/QuickSearch/sr_frame.pas b/plugins/QuickSearch/sr_frame.pas
index e66fe68568..ed83536d43 100644
--- a/plugins/QuickSearch/sr_frame.pas
+++ b/plugins/QuickSearch/sr_frame.pas
@@ -144,7 +144,7 @@ var
   tr:TRECT;
   cid:TColourID;
 begin
-  if ServiceExists(MS_CLIST_FRAMES_ADDFRAME)=0 then
+  if not ServiceExists(MS_CLIST_FRAMES_ADDFRAME) then
     exit;
 
   hbr:=0;
diff --git a/plugins/QuickSearch/sr_global.pas b/plugins/QuickSearch/sr_global.pas
index 1412e8142a..8299edc8fc 100644
--- a/plugins/QuickSearch/sr_global.pas
+++ b/plugins/QuickSearch/sr_global.pas
@@ -201,7 +201,7 @@ procedure removetoolbar;
 begin
   if hTTBButton<>0 then
   begin
-    if ServiceExists(MS_TTB_REMOVEBUTTON)>0 then
+    if ServiceExists(MS_TTB_REMOVEBUTTON) then
     begin
       CallService(MS_TTB_REMOVEBUTTON,WPARAM(hTTBButton),0);
       hTTBButton:=0;
@@ -215,7 +215,7 @@ var
 begin
   removetoolbar;
 
-  if ServiceExists(MS_TTB_ADDBUTTON)>0 then
+  if ServiceExists(MS_TTB_ADDBUTTON) then
   begin
     ZeroMemory(@ttbopt,sizeof(ttbopt));
     ttbopt.pszService:=QS_SHOWSERVICE;
diff --git a/plugins/QuickSearch/sr_window.pas b/plugins/QuickSearch/sr_window.pas
index bdefa5f51b..e1d44f8e11 100644
--- a/plugins/QuickSearch/sr_window.pas
+++ b/plugins/QuickSearch/sr_window.pas
@@ -359,7 +359,7 @@ end;
 
 procedure DeleteOneContact(hContact:TMCONTACT);
 begin
-  if ServiceExists(strCListDel)>0 then
+  if ServiceExists(strCListDel) then
     CallService(strCListDel,hContact,0)
   else
     db_delete_contact(hContact);
@@ -899,7 +899,7 @@ begin
   AppendMenuW(mmenu,MF_SEPARATOR,0,nil);
   AppendMenuW(mmenu,MF_STRING,101,TranslateW('&Delete'));
   AppendMenuW(mmenu,MF_STRING,102,TranslateW('&Copy'));
-  if ServiceExists(MS_MC_CONVERTTOMETA)<>0 then
+  if ServiceExists(MS_MC_CONVERTTOMETA) then
     AppendMenuW(mmenu,MF_STRING,103,TranslateW('C&onvert to Meta'));
 
   cntmenu:=MakeContainerMenu(300);
@@ -1485,7 +1485,7 @@ begin
         if j>0 then
         begin
           StrCopy(StrCopyE(buf,GetProtoName(FlagBuf[i].proto)),PS_GETCUSTOMSTATUSICON);
-          if ServiceExists(buf)<>0 then
+          if ServiceExists(buf) then
           begin
             h:=CallService(buf,j,LR_SHARED);
 
@@ -1508,7 +1508,7 @@ begin
         MirVerW:=MainBuf[lplvcd^.nmcd.lItemlParam,sub].text;
 
 //!!
-        if (MirVerW<>nil) and (MirVerW[0]<>#0) and (ServiceExists(MS_FP_GETCLIENTICONW)<>0) then
+        if (MirVerW<>nil) and (MirVerW[0]<>#0) and ServiceExists(MS_FP_GETCLIENTICONW) then
         begin
           h:=CallService(MS_FP_GETCLIENTICONW,tlparam(MirVerW),0);
           ListView_GetSubItemRect(grid,lplvcd^.nmcd.dwItemSpec,lplvcd^.iSubItem,LVIR_ICON,@rc);
@@ -1622,7 +1622,7 @@ begin
 
       else if (datatype=QSTS_STRING) and
          (StrCmp(setting,'MirVer')=0) and
-         (ServiceExists(MS_FP_GETCLIENTICONW)<>0) then
+         ServiceExists(MS_FP_GETCLIENTICONW) then
         flags:=flags or COL_CLIENT;
 
     end
@@ -2258,7 +2258,7 @@ begin
   if j=0 then
     exit;
 
-  TTInstalled := ServiceExists(MS_TIPPER_SHOWTIP)<>0;
+  TTInstalled := ServiceExists(MS_TIPPER_SHOWTIP);
   // too lazy to move pattern and flags to thread
   if apattern<>nil then
   begin
-- 
cgit v1.2.3