summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-11-26 14:37:20 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-11-26 16:45:19 +0100
commit9f90050aa17a76adef94b4ba2568db2da1bd1b9b (patch)
tree059ed03f013271da708107f2a3782e331ce44288 /setup_native
parentfa42338091ecd96b637ea52984c2642b89966f44 (diff)
loplugin:consttobool (clang-cl)
Change-Id: I81fea38cd737a8be74e6ece333ca37cc434a1c33 Reviewed-on: https://gerrit.libreoffice.org/83765 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/source/win32/customactions/regactivex/regactivex.cxx20
-rw-r--r--setup_native/source/win32/customactions/sellang/sellang.cxx8
-rw-r--r--setup_native/source/win32/customactions/tools/checkversion.cxx4
3 files changed, 16 insertions, 16 deletions
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
index 2815d1d85f03..48b11bd4f452 100644
--- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx
+++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
@@ -40,9 +40,9 @@ typedef int ( __stdcall * DllNativeUnregProc ) ( int, BOOL, BOOL );
static bool UnicodeEquals( wchar_t const * pStr1, wchar_t const * pStr2 )
{
if ( pStr1 == nullptr && pStr2 == nullptr )
- return TRUE;
+ return true;
else if ( pStr1 == nullptr || pStr2 == nullptr )
- return FALSE;
+ return false;
while( *pStr1 == *pStr2 && *pStr1 && *pStr2 )
{
@@ -109,10 +109,10 @@ static bool GetMsiPropW( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppV
MsiGetPropertyW( hMSI, pPropName, buff, &sz );
*ppValue = buff;
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
@@ -129,10 +129,10 @@ static bool GetActiveXControlPath( MSIHANDLE hMSI, wchar_t** ppActiveXPath )
free(pProgPath);
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
@@ -231,13 +231,13 @@ static bool GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, i
// assert( FALSE );
}
- return TRUE;
+ return true;
}
static bool MakeInstallForAllUsers( MSIHANDLE hMSI )
{
- bool bResult = FALSE;
+ bool bResult = false;
wchar_t* pVal = nullptr;
if ( GetMsiPropW( hMSI, L"ALLUSERS", &pVal ) && pVal )
{
@@ -251,11 +251,11 @@ static bool MakeInstallForAllUsers( MSIHANDLE hMSI )
static bool MakeInstallFor64Bit( MSIHANDLE hMSI )
{
- bool bResult = FALSE;
+ bool bResult = false;
wchar_t* pVal = nullptr;
if ( GetMsiPropW( hMSI, L"VersionNT64", &pVal ) && pVal )
{
- bResult = TRUE;
+ bResult = true;
free( pVal );
}
diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx
index 2610da36003e..8740b86a4757 100644
--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -51,7 +51,7 @@ static bool GetMsiPropA( MSIHANDLE hMSI, const char* pPropName, char** ppValue )
*ppValue = buff;
return ( strlen(buff) > 0 );
}
- return FALSE;
+ return false;
}
static const char *
@@ -190,11 +190,11 @@ present_in_ui_langs(const char *lang)
{
if (strchr (lang, '_') != nullptr)
if (memcmp (ui_langs[i], lang, std::min(strlen(ui_langs[i]), strlen(lang))) == 0)
- return TRUE;
+ return true;
if (strcmp (ui_langs[i], lang) == 0)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
namespace {
diff --git a/setup_native/source/win32/customactions/tools/checkversion.cxx b/setup_native/source/win32/customactions/tools/checkversion.cxx
index c5355008d13d..3f0b30f3ce34 100644
--- a/setup_native/source/win32/customactions/tools/checkversion.cxx
+++ b/setup_native/source/win32/customactions/tools/checkversion.cxx
@@ -43,10 +43,10 @@ static bool GetMsiPropW( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppV
MsiGetPropertyW( hMSI, pPropName, buff, &sz );
*ppValue = buff;
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}