[Libreoffice-commits] core.git: compilerplugins/clang desktop/inc desktop/source desktop/unx
Noel Grandin
noel.grandin at collabora.co.uk
Wed Jul 19 07:28:46 UTC 2017
compilerplugins/clang/constparams.cxx | 1
desktop/inc/dp_misc.h | 2 -
desktop/source/app/check_ext_deps.cxx | 2 -
desktop/source/app/lockfile2.cxx | 2 -
desktop/source/app/officeipcthread.cxx | 2 -
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 20 ++++++------
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 16 ++++-----
desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 8 ++--
desktop/source/deployment/inc/lockfile.hxx | 6 +--
desktop/source/deployment/misc/dp_misc.cxx | 2 -
desktop/source/migration/migration.cxx | 4 +-
desktop/source/migration/services/basicmigration.cxx | 2 -
desktop/source/migration/services/basicmigration.hxx | 2 -
desktop/source/migration/services/oo3extensionmigration.cxx | 2 -
desktop/source/migration/services/oo3extensionmigration.hxx | 2 -
desktop/source/migration/services/wordbookmigration.cxx | 2 -
desktop/source/migration/services/wordbookmigration.hxx | 2 -
desktop/unx/source/args.c | 2 -
18 files changed, 40 insertions(+), 39 deletions(-)
New commits:
commit 0f7e64f3edbc1a49e9681d12ce24326150a8a675
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Jul 18 14:39:52 2017 +0200
loplugin:constparams in desktop
Change-Id: Idba3acbd1e6ad5e1ce1cae9f80f764906ab8b143
Reviewed-on: https://gerrit.libreoffice.org/40157
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/constparams.cxx b/compilerplugins/clang/constparams.cxx
index 3fc5928c9589..4873b7828547 100644
--- a/compilerplugins/clang/constparams.cxx
+++ b/compilerplugins/clang/constparams.cxx
@@ -106,6 +106,7 @@ bool ConstParams::VisitFunctionDecl(FunctionDecl * functionDecl)
|| name == "signalDragDropReceived"
|| name == "memory_write"
|| name == "file_write"
+ || name == "SalMainPipeExchangeSignal_impl"
// UNO component entry points
|| name.endswith("component_getFactory")
// in Scheduler::, wants to loop until a reference to a bool becomes true
diff --git a/desktop/inc/dp_misc.h b/desktop/inc/dp_misc.h
index 154a4de59543..36ea24164d00 100644
--- a/desktop/inc/dp_misc.h
+++ b/desktop/inc/dp_misc.h
@@ -95,7 +95,7 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
css::uno::Reference< css::uno::XInterface> resolveUnoURL(
OUString const & connectString,
css::uno::Reference< css::uno::XComponentContext> const & xLocalContext,
- AbortChannel * abortChannel = nullptr );
+ AbortChannel const * abortChannel = nullptr );
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool office_is_running();
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index a9edc0c11b14..788686c5528a 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -214,7 +214,7 @@ void SilentCommandEnv::pop()
static const char aAccessSrvc[] = "com.sun.star.configuration.ConfigurationUpdateAccess";
-static sal_Int16 impl_showExtensionDialog( uno::Reference< uno::XComponentContext > &xContext )
+static sal_Int16 impl_showExtensionDialog( uno::Reference< uno::XComponentContext > const &xContext )
{
OUString sServiceName = "com.sun.star.deployment.ui.UpdateRequiredDialog";
uno::Reference< uno::XInterface > xService;
diff --git a/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx
index a84584d8c21f..fbcd5633f524 100644
--- a/desktop/source/app/lockfile2.cxx
+++ b/desktop/source/app/lockfile2.cxx
@@ -27,7 +27,7 @@
namespace desktop {
-bool Lockfile_execWarning( Lockfile * that )
+bool Lockfile_execWarning( Lockfile const * that )
{
// read information from lock
OUString aLockname = that->m_aLockname;
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index e32c32d82498..2907e86ac76d 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -70,7 +70,7 @@ static char const PROCESSING_DONE[] = "InternalIPC::ProcessingDone";
// will not be included in the returned string) or it cannot read anything (due
// to error or closed pipe, in which case an empty string will be returned to
// signal failure):
-OString readStringFromPipe(osl::StreamPipe & pipe) {
+OString readStringFromPipe(osl::StreamPipe const & pipe) {
for (OStringBuffer str;;) {
char buf[1024];
sal_Int32 n = pipe.recv(buf, SAL_N_ELEMENTS(buf));
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 9ff2e7556788..65b8053306ef 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -230,18 +230,18 @@ private:
void _insert(const TExtensionCmd& rExtCmd);
- void _addExtension( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv,
+ void _addExtension( ::rtl::Reference< ProgressCmdEnv > const &rCmdEnv,
const OUString &rPackageURL,
const OUString &rRepository,
const bool bWarnUser );
- void _removeExtension( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv,
+ void _removeExtension( ::rtl::Reference< ProgressCmdEnv > const &rCmdEnv,
const uno::Reference< deployment::XPackage > &xPackage );
- void _enableExtension( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv,
+ void _enableExtension( ::rtl::Reference< ProgressCmdEnv > const &rCmdEnv,
const uno::Reference< deployment::XPackage > &xPackage );
- void _disableExtension( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv,
+ void _disableExtension( ::rtl::Reference< ProgressCmdEnv > const &rCmdEnv,
const uno::Reference< deployment::XPackage > &xPackage );
void _checkForUpdates( const std::vector<uno::Reference<deployment::XPackage > > &vExtensionList );
- void _acceptLicense( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv,
+ void _acceptLicense( ::rtl::Reference< ProgressCmdEnv > const &rCmdEnv,
const uno::Reference< deployment::XPackage > &xPackage );
enum Input { NONE, START, STOP };
@@ -813,7 +813,7 @@ void ExtensionCmdQueue::Thread::execute()
}
-void ExtensionCmdQueue::Thread::_addExtension( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv,
+void ExtensionCmdQueue::Thread::_addExtension( ::rtl::Reference< ProgressCmdEnv > const &rCmdEnv,
const OUString &rPackageURL,
const OUString &rRepository,
const bool bWarnUser )
@@ -863,7 +863,7 @@ void ExtensionCmdQueue::Thread::_addExtension( ::rtl::Reference< ProgressCmdEnv
}
-void ExtensionCmdQueue::Thread::_removeExtension( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv,
+void ExtensionCmdQueue::Thread::_removeExtension( ::rtl::Reference< ProgressCmdEnv > const &rCmdEnv,
const uno::Reference< deployment::XPackage > &xPackage )
{
uno::Reference< deployment::XExtensionManager > xExtMgr = m_pManager->getExtensionManager();
@@ -943,7 +943,7 @@ void ExtensionCmdQueue::Thread::_checkForUpdates(
}
-void ExtensionCmdQueue::Thread::_enableExtension( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv,
+void ExtensionCmdQueue::Thread::_enableExtension( ::rtl::Reference< ProgressCmdEnv > const &rCmdEnv,
const uno::Reference< deployment::XPackage > &xPackage )
{
if ( !xPackage.is() )
@@ -967,7 +967,7 @@ void ExtensionCmdQueue::Thread::_enableExtension( ::rtl::Reference< ProgressCmdE
}
-void ExtensionCmdQueue::Thread::_disableExtension( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv,
+void ExtensionCmdQueue::Thread::_disableExtension( ::rtl::Reference< ProgressCmdEnv > const &rCmdEnv,
const uno::Reference< deployment::XPackage > &xPackage )
{
if ( !xPackage.is() )
@@ -991,7 +991,7 @@ void ExtensionCmdQueue::Thread::_disableExtension( ::rtl::Reference< ProgressCmd
}
-void ExtensionCmdQueue::Thread::_acceptLicense( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv,
+void ExtensionCmdQueue::Thread::_acceptLicense( ::rtl::Reference< ProgressCmdEnv > const &rCmdEnv,
const uno::Reference< deployment::XPackage > &xPackage )
{
if ( !xPackage.is() )
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index e18efb567dae..31ac8641f60b 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -215,8 +215,8 @@ private:
dp_gui::UpdateData & out_data) const;
bool update(
- UpdateDialog::DisabledUpdate & du,
- dp_gui::UpdateData & data) const;
+ UpdateDialog::DisabledUpdate const & du,
+ dp_gui::UpdateData const & data) const;
uno::Reference< uno::XComponentContext > m_context;
UpdateDialog & m_dialog;
@@ -449,8 +449,8 @@ void UpdateDialog::Thread::prepareUpdateData(
}
bool UpdateDialog::Thread::update(
- UpdateDialog::DisabledUpdate & du,
- dp_gui::UpdateData & data) const
+ UpdateDialog::DisabledUpdate const & du,
+ dp_gui::UpdateData const & data) const
{
bool ret = false;
if (du.unsatisfiedDependencies.getLength() == 0)
@@ -719,7 +719,7 @@ void UpdateDialog::addAdditional( UpdateDialog::Index * index, SvLBoxButtonKind
void UpdateDialog::addEnabledUpdate( OUString const & name,
- dp_gui::UpdateData & data )
+ dp_gui::UpdateData const & data )
{
sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_enabledUpdates.size() );
UpdateDialog::Index *pEntry = new UpdateDialog::Index( ENABLED_UPDATE, nIndex, name );
@@ -742,7 +742,7 @@ void UpdateDialog::addEnabledUpdate( OUString const & name,
}
-void UpdateDialog::addDisabledUpdate( UpdateDialog::DisabledUpdate & data )
+void UpdateDialog::addDisabledUpdate( UpdateDialog::DisabledUpdate const & data )
{
sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_disabledUpdates.size() );
UpdateDialog::Index *pEntry = new UpdateDialog::Index( DISABLED_UPDATE, nIndex, data.name );
@@ -755,7 +755,7 @@ void UpdateDialog::addDisabledUpdate( UpdateDialog::DisabledUpdate & data )
}
-void UpdateDialog::addSpecificError( UpdateDialog::SpecificError & data )
+void UpdateDialog::addSpecificError( UpdateDialog::SpecificError const & data )
{
sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_specificErrors.size() );
UpdateDialog::Index *pEntry = new UpdateDialog::Index( SPECIFIC_ERROR, nIndex, data.name );
@@ -793,7 +793,7 @@ void UpdateDialog::enableOk() {
// *********************************************************************************
void UpdateDialog::createNotifyJob( bool bPrepareOnly,
- uno::Sequence< uno::Sequence< OUString > > &rItemList )
+ uno::Sequence< uno::Sequence< OUString > > const &rItemList )
{
if ( !dp_misc::office_is_running() )
return;
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index 0bae4cf9d303..1c5c1e72b826 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -93,7 +93,7 @@ public:
void notifyMenubar( bool bPrepareOnly, bool bRecheckOnly );
static void createNotifyJob( bool bPrepareOnly,
- css::uno::Sequence< css::uno::Sequence< OUString > > &rItemList );
+ css::uno::Sequence< css::uno::Sequence< OUString > > const &rItemList );
private:
UpdateDialog(UpdateDialog &) = delete;
@@ -138,9 +138,9 @@ private:
bool isIgnoredUpdate( UpdateDialog::Index *pIndex );
void setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, bool bIgnoreAll );
- void addEnabledUpdate( OUString const & name, dp_gui::UpdateData & data );
- void addDisabledUpdate( UpdateDialog::DisabledUpdate & data );
- void addSpecificError( UpdateDialog::SpecificError & data );
+ void addEnabledUpdate( OUString const & name, dp_gui::UpdateData const & data );
+ void addDisabledUpdate( UpdateDialog::DisabledUpdate const & data );
+ void addSpecificError( UpdateDialog::SpecificError const & data );
void checkingDone();
diff --git a/desktop/source/deployment/inc/lockfile.hxx b/desktop/source/deployment/inc/lockfile.hxx
index 68dbb8ee0df2..8e2fea7b60dc 100644
--- a/desktop/source/deployment/inc/lockfile.hxx
+++ b/desktop/source/deployment/inc/lockfile.hxx
@@ -51,7 +51,7 @@
namespace desktop {
class Lockfile;
- bool Lockfile_execWarning( Lockfile * that );
+ bool Lockfile_execWarning( Lockfile const * that );
class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Lockfile
{
@@ -61,7 +61,7 @@ namespace desktop {
Lockfile( bool bIPCserver = true );
// separating GUI code:
- typedef bool (* fpExecWarning)( Lockfile * that );
+ typedef bool (* fpExecWarning)( Lockfile const * that );
// checks the lockfile, asks user when lockfile is
// found (iff gui) and returns false when we may not continue
@@ -83,7 +83,7 @@ namespace desktop {
// access to data in file
void syncToFile() const;
bool isStale() const;
- friend bool Lockfile_execWarning( Lockfile * that );
+ friend bool Lockfile_execWarning( Lockfile const * that );
};
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index ee3e93cb0d95..e593e1b2f71b 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -441,7 +441,7 @@ OUString generateRandomPipeId()
Reference<XInterface> resolveUnoURL(
OUString const & connectString,
Reference<XComponentContext> const & xLocalContext,
- AbortChannel * abortChannel )
+ AbortChannel const * abortChannel )
{
Reference<bridge::XUnoUrlResolver> xUnoUrlResolver(
bridge::UnoUrlResolver::create( xLocalContext ) );
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 0f5b4693a651..338302bc22cf 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -336,7 +336,7 @@ bool MigrationImpl::checkMigrationCompleted()
return bMigrationCompleted;
}
-static void insertSorted(migrations_available& rAvailableMigrations, supported_migration& aSupportedMigration)
+static void insertSorted(migrations_available& rAvailableMigrations, supported_migration const & aSupportedMigration)
{
bool bInserted( false );
migrations_available::iterator pIter = rAvailableMigrations.begin();
@@ -448,7 +448,7 @@ migrations_vr MigrationImpl::readMigrationSteps(const OUString& rMigrationName)
return vrMigrations;
}
-static FileBase::RC _checkAndCreateDirectory(INetURLObject& dirURL)
+static FileBase::RC _checkAndCreateDirectory(INetURLObject const & dirURL)
{
FileBase::RC result = Directory::create(dirURL.GetMainURL(INetURLObject::DecodeMechanism::ToIUri));
if (result == FileBase::E_NOENT) {
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index 5bd36c836b2e..dc0c47d0be05 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -100,7 +100,7 @@ namespace migration
}
- void BasicMigration::checkAndCreateDirectory( INetURLObject& rDirURL )
+ void BasicMigration::checkAndCreateDirectory( INetURLObject const & rDirURL )
{
::osl::FileBase::RC aResult = ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ) );
if ( aResult == ::osl::FileBase::E_NOENT )
diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx
index f8d3d0a4a1df..d2d18463b297 100644
--- a/desktop/source/migration/services/basicmigration.hxx
+++ b/desktop/source/migration/services/basicmigration.hxx
@@ -58,7 +58,7 @@ namespace migration
OUString m_sSourceDir;
TStringVectorPtr getFiles( const OUString& rBaseURL ) const;
- void checkAndCreateDirectory( INetURLObject& rDirURL );
+ void checkAndCreateDirectory( INetURLObject const & rDirURL );
void copyFiles();
public:
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 7645e13926a4..fb1458767139 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -80,7 +80,7 @@ OO3ExtensionMigration::~OO3ExtensionMigration()
{
}
-void OO3ExtensionMigration::checkAndCreateDirectory( INetURLObject& rDirURL )
+void OO3ExtensionMigration::checkAndCreateDirectory( INetURLObject const & rDirURL )
{
::osl::FileBase::RC aResult = ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ) );
if ( aResult == ::osl::FileBase::E_NOENT )
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index f9722aa2edac..690bb94093e3 100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -78,7 +78,7 @@ namespace migration
SCANRESULT_DONTMIGRATE_EXTENSION
};
- void checkAndCreateDirectory( INetURLObject& rDirURL );
+ void checkAndCreateDirectory( INetURLObject const & rDirURL );
ScanResult scanExtensionFolder( const OUString& sExtFolder );
void scanUserExtensions( const OUString& sSourceDir, TStringVector& aMigrateExtensions );
bool scanDescriptionXml( const OUString& sDescriptionXmlFilePath );
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 00136d7f7db0..1830c65a362c 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -93,7 +93,7 @@ namespace migration
}
- void WordbookMigration::checkAndCreateDirectory( INetURLObject& rDirURL )
+ void WordbookMigration::checkAndCreateDirectory( INetURLObject const & rDirURL )
{
::osl::FileBase::RC aResult = ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ) );
if ( aResult == ::osl::FileBase::E_NOENT )
diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx
index ab89858ee109..4fd535b1738b 100644
--- a/desktop/source/migration/services/wordbookmigration.hxx
+++ b/desktop/source/migration/services/wordbookmigration.hxx
@@ -58,7 +58,7 @@ namespace migration
OUString m_sSourceDir;
TStringVectorPtr getFiles( const OUString& rBaseURL ) const;
- void checkAndCreateDirectory( INetURLObject& rDirURL );
+ void checkAndCreateDirectory( INetURLObject const & rDirURL );
void copyFiles();
public:
diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c
index bc4c960a2583..9a9b8f913d5d 100644
--- a/desktop/unx/source/args.c
+++ b/desktop/unx/source/args.c
@@ -14,7 +14,7 @@
/* do we start -env: */
static int
-is_env_arg (rtl_uString *str)
+is_env_arg (rtl_uString const *str)
{
return !rtl_ustr_ascii_compare_WithLength (str->buffer, 5, "-env:");
}
More information about the Libreoffice-commits
mailing list