summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-03-28 19:08:09 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-03-28 19:09:27 +0100
commitc0de7e43b8b51c48c4c0a1f641a1654678bba07a (patch)
treeb45a470190dc183106bd0bf104737ec06c6807e9 /ucb
parent9826b9cf5b8c78fe25eaab1009e0c95142678ecb (diff)
Clean up C-style casts from pointers to void
Change-Id: Ibd269ae3147ce95f3f093e10ab736e8287e7098c
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/sorter/sortresult.cxx4
-rw-r--r--ucb/source/ucp/ftp/ftpurl.cxx6
-rw-r--r--ucb/source/ucp/gio/gio_content.cxx2
-rw-r--r--ucb/source/ucp/gio/gio_mount.cxx2
4 files changed, 7 insertions, 7 deletions
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index c4cec6ea031f..bd42b276564e 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -1707,7 +1707,7 @@ void SortedResultSet::ResortModified( EventList* pList )
try {
for ( i=0; i<maModList.Count(); i++ )
{
- pData = (SortListData*) maModList.GetObject( i );
+ pData = static_cast<SortListData*>(maModList.GetObject( i ));
nCompare = CompareImpl( mxOther, mxOriginal,
pData->mnOldPos, pData->mnCurPos );
pData->mbModified = false;
@@ -1774,7 +1774,7 @@ void SortedResultSet::ResortNew( EventList* pList )
try {
for ( i = mnLastSort; i<(sal_IntPtr)maS2O.Count(); i++ )
{
- SortListData *pData = (SortListData*) maModList.GetObject( i );
+ SortListData *pData = static_cast<SortListData*>(maModList.GetObject( i ));
nNewPos = FindPos( pData, 1, mnLastSort );
if ( nNewPos != i )
{
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 7a2224da2be9..75d7abe80043 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -451,7 +451,7 @@ std::vector<FTPDirentry> FTPURL::list(
// now evaluate the error messages
sal_uInt32 len = data.m_nWritePos;
- char* fwd = (char*) data.m_pBuffer;
+ char* fwd = static_cast<char*>(data.m_pBuffer);
char *p1, *p2;
p1 = p2 = fwd;
@@ -542,7 +542,7 @@ OUString FTPURL::net_title() const
err = curl_easy_perform(curl);
if(err == CURLE_OK) { // get the title from the server
- char* fwd = (char*) control.m_pBuffer;
+ char* fwd = static_cast<char*>(control.m_pBuffer);
sal_uInt32 len = (sal_uInt32) control.m_nWritePos;
aNetTitle = OUString(fwd,len,RTL_TEXTENCODING_UTF8);
@@ -632,7 +632,7 @@ extern "C" {
sal_Int32 nRequested = sal_Int32(size*nmemb);
CurlInput *curlInput = static_cast<CurlInput*>(stream);
if(curlInput)
- return size_t(curlInput->read(((sal_Int8*)ptr),nRequested));
+ return size_t(curlInput->read(static_cast<sal_Int8*>(ptr),nRequested));
else
return 0;
}
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index d821e6b90fa7..59217807b5bb 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -344,7 +344,7 @@ MountOperation::MountOperation(const uno::Reference< ucb::XCommandEnvironment >&
void MountOperation::Completed(GObject *source, GAsyncResult *res, gpointer user_data)
{
- MountOperation *pThis = (MountOperation*)user_data;
+ MountOperation *pThis = static_cast<MountOperation*>(user_data);
g_file_mount_enclosing_volume_finish(G_FILE(source), res, &(pThis->mpError));
g_main_loop_quit(pThis->mpLoop);
}
diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx
index 957a62b92f5a..9b834b83965a 100644
--- a/ucb/source/ucp/gio/gio_mount.cxx
+++ b/ucb/source/ucp/gio/gio_mount.cxx
@@ -176,7 +176,7 @@ static void ooo_mount_operation_ask_password (GMountOperation *op,
GMountOperation *ooo_mount_operation_new(const uno::Reference< ucb::XCommandEnvironment >& rEnv)
{
- OOoMountOperation *pRet = (OOoMountOperation*)g_object_new (OOO_TYPE_MOUNT_OPERATION, NULL);
+ OOoMountOperation *pRet = static_cast<OOoMountOperation*>(g_object_new (OOO_TYPE_MOUNT_OPERATION, NULL));
pRet->pEnv = &rEnv;
return &pRet->parent_instance;
}