diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:29:41 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:29:41 +0200 |
commit | f6ec07a3963a401dc736baa9bdd2ed3c7325bb66 (patch) | |
tree | 9cad620eb2cd5846464cf151b10949a8e36e5200 /vcl/unx | |
parent | 9f356d3e66127bf14fe957962e8451dbd27c8ac8 (diff) |
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: I07bf1403e6b992807541a499b786d47f835b2f81
Diffstat (limited to 'vcl/unx')
25 files changed, 137 insertions, 137 deletions
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index 4f3b910ee6af..8de3dc88bc52 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -62,7 +62,7 @@ PreeditDoneCallback ( XIC, XPointer client_data, XPointer ) if (pPreeditData->eState == ePreeditStatusActive ) { if( pPreeditData->pFrame ) - pPreeditData->pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, (void*)NULL ); + pPreeditData->pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, nullptr ); } pPreeditData->eState = ePreeditStatusStartPending; } @@ -94,11 +94,11 @@ Preedit_DeleteText(preedit_text_t *ptext, int from, int howmuch) if (to < (int)ptext->nLength) { // cut out of the middle of the text - memmove( (void*)(ptext->pUnicodeBuffer + from), - (void*)(ptext->pUnicodeBuffer + to), + memmove( static_cast<void*>(ptext->pUnicodeBuffer + from), + static_cast<void*>(ptext->pUnicodeBuffer + to), (ptext->nLength - to) * sizeof(sal_Unicode)); - memmove( (void*)(ptext->pCharStyle + from), - (void*)(ptext->pCharStyle + to), + memmove( static_cast<void*>(ptext->pCharStyle + from), + static_cast<void*>(ptext->pCharStyle + to), (ptext->nLength - to) * sizeof(XIMFeedback)); ptext->nLength -= howmuch; } @@ -127,9 +127,9 @@ enlarge_buffer ( preedit_text_t *ptext, int nnewlimit ) nnewsize *= 2; ptext->nSize = nnewsize; - ptext->pUnicodeBuffer = static_cast<sal_Unicode*>(realloc((void*)ptext->pUnicodeBuffer, + ptext->pUnicodeBuffer = static_cast<sal_Unicode*>(realloc(static_cast<void*>(ptext->pUnicodeBuffer), nnewsize * sizeof(sal_Unicode))); - ptext->pCharStyle = static_cast<XIMFeedback*>(realloc((void*)ptext->pCharStyle, + ptext->pCharStyle = static_cast<XIMFeedback*>(realloc(static_cast<void*>(ptext->pCharStyle), nnewsize * sizeof(XIMFeedback))); } @@ -203,19 +203,19 @@ Preedit_InsertText(preedit_text_t *pText, XIMText *pInsertText, int where) int to = where + nInsertTextLength; int howmany = pText->nLength - where; - memmove((void*)(pText->pUnicodeBuffer + to), - (void*)(pText->pUnicodeBuffer + from), + memmove(static_cast<void*>(pText->pUnicodeBuffer + to), + static_cast<void*>(pText->pUnicodeBuffer + from), howmany * sizeof(sal_Unicode)); - memmove((void*)(pText->pCharStyle + to), - (void*)(pText->pCharStyle + from), + memmove(static_cast<void*>(pText->pCharStyle + to), + static_cast<void*>(pText->pCharStyle + from), howmany * sizeof(XIMFeedback)); to = from; howmany = nInsertTextLength; - memcpy((void*)(pText->pUnicodeBuffer + to), (void*)pInsertTextString, + memcpy(static_cast<void*>(pText->pUnicodeBuffer + to), static_cast<void*>(pInsertTextString), howmany * sizeof(sal_Unicode)); - memcpy((void*)(pText->pCharStyle + to), (void*)pInsertTextCharStyle, + memcpy(static_cast<void*>(pText->pCharStyle + to), static_cast<void*>(pInsertTextCharStyle), howmany * sizeof(XIMFeedback)); pText->nLength += howmany; @@ -262,7 +262,7 @@ Preedit_FeedbackToSAL ( XIMFeedback* pfeedback, int nlength, std::vector<sal_uIn psalattr = &rSalAttr[0]; } else - return (sal_uInt16*)NULL; + return nullptr; for (int npos = 0; npos < nlength; npos++) { @@ -370,9 +370,9 @@ PreeditDrawCallback(XIC ic, XPointer client_data, pPreeditData->aInputEv.mbOnlyCursor = False; if ( pPreeditData->eState == ePreeditStatusActive && pPreeditData->pFrame ) - pPreeditData->pFrame->CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&pPreeditData->aInputEv); + pPreeditData->pFrame->CallCallback(SALEVENT_EXTTEXTINPUT, static_cast<void*>(&pPreeditData->aInputEv)); if (pPreeditData->aText.nLength == 0 && pPreeditData->pFrame ) - pPreeditData->pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, (void*)NULL ); + pPreeditData->pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, nullptr ); if (pPreeditData->aText.nLength == 0) pPreeditData->eState = ePreeditStatusStartPending; @@ -390,7 +390,7 @@ GetPreeditSpotLocation(XIC ic, XPointer client_data) preedit_data_t* pPreeditData = reinterpret_cast<preedit_data_t*>(client_data); if( pPreeditData->pFrame ) - pPreeditData->pFrame->CallCallback(SALEVENT_EXTTEXTINPUTPOS, (void*)&mPosEvent); + pPreeditData->pFrame->CallCallback(SALEVENT_EXTTEXTINPUTPOS, static_cast<void*>(&mPosEvent)); XPoint point; point.x = mPosEvent.mnX + mPosEvent.mnWidth; diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index 2bd02caa5b84..c96b5adfdf5f 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -50,7 +50,7 @@ static void sendEmptyCommit( SalFrame* pFrame ) aEmptyEv.mnCursorPos = 0; aEmptyEv.mnCursorFlags = 0; aEmptyEv.mbOnlyCursor = False; - pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aEmptyEv ); + pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, static_cast<void*>(&aEmptyEv) ); if( ! aDel.isDeleted() ) pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL ); } @@ -128,7 +128,7 @@ get_font_set( Display *p_display ) SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : mbUseable( True ), - maContext( (XIC)NULL ), + maContext( nullptr ), mnSupportedStatusStyle( XIMStatusCallbacks | XIMStatusNothing | @@ -262,7 +262,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : { // spot location SalExtTextInputPosEvent aPosEvent; - pFrame->CallCallback(SALEVENT_EXTTEXTINPUTPOS, (void*)&aPosEvent); + pFrame->CallCallback(SALEVENT_EXTTEXTINPUTPOS, static_cast<void*>(&aPosEvent)); static XPoint aSpot; aSpot.x = aPosEvent.mnX + aPosEvent.mnWidth; @@ -356,7 +356,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : if ( maContext != NULL) { - maDestroyCallback.callback = (XIMProc)IC_IMDestroyCallback; + maDestroyCallback.callback = static_cast<XIMProc>(IC_IMDestroyCallback); maDestroyCallback.client_data = reinterpret_cast<XPointer>(this); XSetICValues( maContext, XNDestroyCallback, &maDestroyCallback, @@ -541,8 +541,8 @@ SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength) aTextEvent.mnCursorFlags = 0; aTextEvent.mbOnlyCursor = False; - maClientData.pFrame->CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aTextEvent); - maClientData.pFrame->CallCallback(SALEVENT_ENDEXTTEXTINPUT, (void*)NULL); + maClientData.pFrame->CallCallback(SALEVENT_EXTTEXTINPUT, static_cast<void*>(&aTextEvent)); + maClientData.pFrame->CallCallback(SALEVENT_ENDEXTTEXTINPUT, nullptr); } #if OSL_DEBUG_LEVEL > 1 else @@ -559,7 +559,7 @@ SalI18N_InputContext::UpdateSpotLocation() return -1; SalExtTextInputPosEvent aPosEvent; - maClientData.pFrame->CallCallback(SALEVENT_EXTTEXTINPUTPOS, (void*)&aPosEvent); + maClientData.pFrame->CallCallback(SALEVENT_EXTTEXTINPUTPOS, static_cast<void*>(&aPosEvent)); XPoint aSpot; aSpot.x = aPosEvent.mnX + aPosEvent.mnWidth; diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index ce8dee888aae..d9dfc831e6bb 100644 --- a/vcl/unx/generic/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -245,11 +245,11 @@ SalI18N_InputMethod::PosixLocale() SalI18N_InputMethod::SalI18N_InputMethod( ) : mbUseable( bUseInputMethodDefault ) - , maMethod( (XIM)NULL ) - , mpStyles( (XIMStyles*)NULL ) + , maMethod( nullptr ) + , mpStyles( nullptr ) { - maDestroyCallback.callback = (XIMProc)NULL; - maDestroyCallback.client_data = (XPointer)NULL; + maDestroyCallback.callback = nullptr; + maDestroyCallback.client_data = nullptr; const char *pUseInputMethod = getenv( "SAL_USEINPUTMETHOD" ); if ( pUseInputMethod != NULL ) mbUseable = pUseInputMethod[0] != '\0' ; @@ -338,7 +338,7 @@ SalI18N_InputMethod::CreateMethod ( Display *pDisplay ) { maMethod = XOpenIM(pDisplay, NULL, NULL, NULL); - if ((maMethod == (XIM)NULL) && (getenv("XMODIFIERS") != NULL)) + if ((maMethod == nullptr) && (getenv("XMODIFIERS") != NULL)) { OUString envVar("XMODIFIERS"); osl_clearEnvironment(envVar.pData); @@ -346,7 +346,7 @@ SalI18N_InputMethod::CreateMethod ( Display *pDisplay ) maMethod = XOpenIM(pDisplay, NULL, NULL, NULL); } - if ( maMethod != (XIM)NULL ) + if ( maMethod != nullptr ) { if ( XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, NULL) != NULL) @@ -367,7 +367,7 @@ SalI18N_InputMethod::CreateMethod ( Display *pDisplay ) fprintf(stderr, "input method creation failed\n"); #endif - maDestroyCallback.callback = (XIMProc)IM_IMDestroyCallback; + maDestroyCallback.callback = static_cast<XIMProc>(IM_IMDestroyCallback); maDestroyCallback.client_data = reinterpret_cast<XPointer>(this); if (mbUseable && maMethod != NULL) XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, NULL); diff --git a/vcl/unx/generic/app/i18n_keysym.cxx b/vcl/unx/generic/app/i18n_keysym.cxx index 2ce0e08ef439..f464c498e689 100644 --- a/vcl/unx/generic/app/i18n_keysym.cxx +++ b/vcl/unx/generic/app/i18n_keysym.cxx @@ -307,11 +307,11 @@ const keymap_t* p_keymap[INITIAL_KEYMAPS] = { &keymap00, &keymap01, &keymap02, &keymap03, /* 00 -- 03 */ &keymap04, &keymap05, &keymap06, &keymap07, /* 04 -- 07 */ &keymap08, &keymap09, &keymap10, &keymap11, /* 08 -- 11 */ - &keymap12, &keymap13, &keymap14, (keymap_t*)NULL, /* 12 -- 15 */ - (keymap_t*)NULL, (keymap_t*)NULL, (keymap_t*)NULL, &keymap19, /* 16 -- 19 */ - (keymap_t*)NULL, (keymap_t*)NULL, (keymap_t*)NULL, (keymap_t*)NULL, /* 20 -- 23 */ - (keymap_t*)NULL, (keymap_t*)NULL, (keymap_t*)NULL, (keymap_t*)NULL, /* 24 -- 27 */ - (keymap_t*)NULL, (keymap_t*)NULL, (keymap_t*)NULL, (keymap_t*)NULL, /* 28 -- 31 */ + &keymap12, &keymap13, &keymap14, nullptr, /* 12 -- 15 */ + nullptr, nullptr, nullptr, &keymap19, /* 16 -- 19 */ + nullptr, nullptr, nullptr, nullptr, /* 20 -- 23 */ + nullptr, nullptr, nullptr, nullptr, /* 24 -- 27 */ + nullptr, nullptr, nullptr, nullptr, /* 28 -- 31 */ &keymap32 /* 32 */ }; diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index 36f0ebcf6254..bb77762ad2d1 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -198,7 +198,7 @@ Point XIMStatusWindow::updatePosition() const SystemEnvData* pParentEnvData = m_pLastParent->GetSystemData(); SalExtTextInputPosEvent aPosEvent; - m_pLastParent->CallCallback( SALEVENT_EXTTEXTINPUTPOS, (void*)&aPosEvent ); + m_pLastParent->CallCallback( SALEVENT_EXTTEXTINPUTPOS, static_cast<void*>(&aPosEvent) ); int x, y; ::Window aChild; XTranslateCoordinates( static_cast<Display*>(pParentEnvData->pDisplay), diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index d95e30bca6d7..b8e266cb9ef3 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -559,7 +559,7 @@ void SalDisplay::Init() for( Cursor & aCsr : aPointerCache_ ) aCsr = None; - mpFactory = (AttributeProvider*)NULL; + mpFactory = nullptr; m_bXinerama = false; int nDisplayScreens = ScreenCount( pDisp_ ); @@ -2354,7 +2354,7 @@ SalVisual::SalVisual() SalVisual::SalVisual( const XVisualInfo* pXVI ) { - *(XVisualInfo*)this = *pXVI; + *static_cast<XVisualInfo*>(this) = *pXVI; if( GetClass() == TrueColor ) { nRedShift_ = sal_Shift( red_mask ); diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx index 9c00f6d5a468..47b64290e40e 100644 --- a/vcl/unx/generic/app/salinst.cxx +++ b/vcl/unx/generic/app/salinst.cxx @@ -162,7 +162,7 @@ void* X11SalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturn static const char* pDisplay = getenv( "DISPLAY" ); rReturnedType = AsciiCString; rReturnedBytes = pDisplay ? strlen( pDisplay )+1 : 1; - return pDisplay ? (void*)pDisplay : (void*)""; + return pDisplay ? const_cast<char *>(pDisplay) : const_cast<char *>(""); } SalFrame *X11SalInstance::CreateFrame( SalFrame *pParent, sal_uLong nSalFrameStyle ) diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx index 360b29d087ad..3b8f45bb6991 100644 --- a/vcl/unx/generic/dtrans/X11_service.cxx +++ b/vcl/unx/generic/dtrans/X11_service.cxx @@ -85,12 +85,12 @@ css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequenc css::uno::Reference< XInterface > X11SalInstance::CreateDragSource() { - return css::uno::Reference < XInterface >( ( OWeakObject * ) new SelectionManagerHolder() ); + return css::uno::Reference < XInterface >( static_cast<OWeakObject *>(new SelectionManagerHolder()) ); } css::uno::Reference< XInterface > X11SalInstance::CreateDropTarget() { - return css::uno::Reference < XInterface >( ( OWeakObject * ) new DropTarget() ); + return css::uno::Reference < XInterface >( static_cast<OWeakObject *>(new DropTarget()) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 1591ffe520ef..d2511917ee85 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -3041,7 +3041,7 @@ void X11SalFrame::beginUnicodeSequence() aEv.mnCursorFlags = 0; aEv.mbOnlyCursor = false; - CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv); + CallCallback(SALEVENT_EXTTEXTINPUT, static_cast<void*>(&aEv)); } } @@ -3070,7 +3070,7 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c ) aEv.mnCursorFlags = 0; aEv.mbOnlyCursor = false; - CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv); + CallCallback(SALEVENT_EXTTEXTINPUT, static_cast<void*>(&aEv)); bRet = true; } else @@ -3101,7 +3101,7 @@ bool X11SalFrame::endUnicodeSequence() aEv.mnCursorPos = 0; aEv.mnCursorFlags = 0; aEv.mbOnlyCursor = false; - CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv); + CallCallback(SALEVENT_EXTTEXTINPUT, static_cast<void*>(&aEv)); } } bool bWasInput = !rSeq.isEmpty(); diff --git a/vcl/unx/gtk/a11y/atkcomponent.cxx b/vcl/unx/gtk/a11y/atkcomponent.cxx index f40cfe004733..08fd93afa6a7 100644 --- a/vcl/unx/gtk/a11y/atkcomponent.cxx +++ b/vcl/unx/gtk/a11y/atkcomponent.cxx @@ -321,14 +321,14 @@ component_wrapper_add_focus_handler (AtkComponent *component, signal_id = g_signal_lookup( "focus-event", ATK_TYPE_OBJECT ); ret = g_signal_handler_find( component, match_type, signal_id, 0, NULL, - (gpointer) &handler, NULL); + static_cast<gpointer>(&handler), NULL); if (!ret) { return g_signal_connect_closure_by_id (component, signal_id, 0, g_cclosure_new ( G_CALLBACK (handler), NULL, - (GClosureNotify) NULL), + nullptr), FALSE); } else diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx index fb0cc7741799..581f4d0091ac 100644 --- a/vcl/unx/gtk/a11y/atkfactory.cxx +++ b/vcl/unx/gtk/a11y/atkfactory.cxx @@ -58,14 +58,14 @@ atk_noop_object_wrapper_get_type() static const GTypeInfo typeInfo = { sizeof (AtkNoOpObjectClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, + nullptr, + nullptr, reinterpret_cast<GClassInitFunc>(atk_noop_object_wrapper_class_init), - (GClassFinalizeFunc) NULL, + nullptr, NULL, sizeof (AtkObjectWrapper), 0, - (GInstanceInitFunc) NULL, + nullptr, NULL } ; diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx index e11f4987b6e5..47872486a55a 100644 --- a/vcl/unx/gtk/a11y/atkhypertext.cxx +++ b/vcl/unx/gtk/a11y/atkhypertext.cxx @@ -173,7 +173,7 @@ hyper_link_get_type() static const GInterfaceInfo atk_action_info = { reinterpret_cast<GInterfaceInitFunc>(actionIfaceInit), - (GInterfaceFinalizeFunc) NULL, + nullptr, NULL }; diff --git a/vcl/unx/gtk/a11y/atkregistry.cxx b/vcl/unx/gtk/a11y/atkregistry.cxx index 10b76c3bffba..ee34ee1209c5 100644 --- a/vcl/unx/gtk/a11y/atkregistry.cxx +++ b/vcl/unx/gtk/a11y/atkregistry.cxx @@ -32,7 +32,7 @@ ooo_wrapper_registry_get(const Reference< XAccessible >& rxAccessible) if( uno_to_gobject ) { gpointer cached = - g_hash_table_lookup(uno_to_gobject, (gpointer) rxAccessible.get()); + g_hash_table_lookup(uno_to_gobject, static_cast<gpointer>(rxAccessible.get())); if( cached ) return ATK_OBJECT( cached ); @@ -49,7 +49,7 @@ ooo_wrapper_registry_add(const Reference< XAccessible >& rxAccessible, AtkObject if( !uno_to_gobject ) uno_to_gobject = g_hash_table_new (NULL, NULL); - g_hash_table_insert( uno_to_gobject, (gpointer) rxAccessible.get(), obj ); + g_hash_table_insert( uno_to_gobject, static_cast<gpointer>(rxAccessible.get()), obj ); } /*****************************************************************************/ @@ -58,7 +58,7 @@ void ooo_wrapper_registry_remove(XAccessible *pAccessible) { if( uno_to_gobject ) - g_hash_table_remove( uno_to_gobject, (gpointer) pAccessible ); + g_hash_table_remove( uno_to_gobject, static_cast<gpointer>(pAccessible) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index 283ff59db9e8..484336773906 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -988,7 +988,7 @@ TabStopList2String( const uno::Any& rAny, bool default_tabs ) if( ret ) { gchar * old_tab_str = ret; - ret = g_strconcat(old_tab_str, " ", tab_str, (const char*)NULL); + ret = g_strconcat(old_tab_str, " ", tab_str, nullptr); g_free( old_tab_str ); } else diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index 03f08e4f30c6..cc2fe84c39bd 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -742,14 +742,14 @@ ooo_atk_util_get_type() static const GTypeInfo typeInfo = { static_cast<guint16>(type_query.class_size), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, + nullptr, + nullptr, reinterpret_cast<GClassInitFunc>(ooo_atk_util_class_init), - (GClassFinalizeFunc) NULL, + nullptr, NULL, static_cast<guint16>(type_query.instance_size), 0, - (GInstanceInitFunc) NULL, + nullptr, NULL } ; diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx index b845389c6437..635645f234e3 100644 --- a/vcl/unx/gtk/a11y/atkwindow.cxx +++ b/vcl/unx/gtk/a11y/atkwindow.cxx @@ -293,14 +293,14 @@ ooo_window_wrapper_get_type() static const GTypeInfo typeInfo = { static_cast<guint16>(type_query.class_size), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, + nullptr, + nullptr, reinterpret_cast<GClassInitFunc>(ooo_window_wrapper_class_init), - (GClassFinalizeFunc) NULL, + nullptr, NULL, static_cast<guint16>(type_query.instance_size), 0, - (GInstanceInitFunc) NULL, + nullptr, NULL } ; diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index 30cfa9c05074..ad27b6a3c6ff 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -665,10 +665,10 @@ atk_object_wrapper_get_type() static const GTypeInfo typeInfo = { sizeof (AtkObjectWrapperClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, + nullptr, + nullptr, reinterpret_cast<GClassInitFunc>(atk_object_wrapper_class_init), - (GClassFinalizeFunc) NULL, + nullptr, NULL, sizeof (AtkObjectWrapper), 0, diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index df1546ac9e43..df4470ba09ba 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -964,7 +964,7 @@ void GtkData::PostUserEvent() g_source_set_priority (m_pUserEvent, G_PRIORITY_HIGH); g_source_set_can_recurse (m_pUserEvent, TRUE); g_source_set_callback (m_pUserEvent, call_userEventFn, - (gpointer) this, NULL); + static_cast<gpointer>(this), NULL); g_source_attach (m_pUserEvent, g_main_context_default ()); } } diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 6c98ca6f72bf..d6e082fd4eb4 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -122,7 +122,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, - (char *)NULL ); + nullptr ); gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT ); @@ -240,7 +240,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext cell = gtk_cell_renderer_text_new (); gtk_tree_view_column_set_expand (column, true); gtk_tree_view_column_pack_start (column, cell, false); - gtk_tree_view_column_set_attributes (column, cell, "text", i, (char *)NULL); + gtk_tree_view_column_set_attributes (column, cell, "text", i, nullptr); gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column); } @@ -272,7 +272,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext pango_layout_get_pixel_extents (layout, NULL, &row_height); g_object_unref (layout); - g_object_get (cell, "ypad", &ypad, (char *)NULL); + g_object_get (cell, "ypad", &ypad, nullptr); guint height = (row_height.height + 2*ypad) * 5; gtk_widget_set_size_request (m_pFilterView, -1, height); gtk_widget_set_size_request (m_pPreview, 1, height); @@ -896,11 +896,11 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std mnHID_FolderChange = g_signal_connect( GTK_FILE_CHOOSER( m_pDialog ), "current-folder-changed", - G_CALLBACK( folder_changed_cb ), ( gpointer )this ); + G_CALLBACK( folder_changed_cb ), static_cast<gpointer>(this) ); mnHID_SelectionChange = g_signal_connect( GTK_FILE_CHOOSER( m_pDialog ), "selection-changed", - G_CALLBACK( selection_changed_cb ), ( gpointer )this ); + G_CALLBACK( selection_changed_cb ), static_cast<gpointer>(this) ); int btn = GTK_RESPONSE_NO; @@ -1352,7 +1352,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& } else if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL ) g_object_set( pWidget, "label", aTxt.getStr(), - "use_underline", true, (char *)NULL ); + "use_underline", true, nullptr ); else OSL_TRACE("Can't set label on list"); } @@ -1535,7 +1535,7 @@ sal_Bool SAL_CALL SalGtkFilePicker::setShowState( sal_Bool bShowState ) throw( u { mHID_Preview = g_signal_connect( GTK_FILE_CHOOSER( m_pDialog ), "update-preview", - G_CALLBACK( update_preview_cb ), ( gpointer )this ); + G_CALLBACK( update_preview_cb ), static_cast<gpointer>(this) ); } gtk_widget_show( m_pPreview ); } @@ -1823,7 +1823,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_URI, case_insensitive_filter, g_strdup( OUStringToOString(aToken, RTL_TEXTENCODING_UTF8).getStr() ), - (GDestroyNotify) g_free ); + g_free ); OSL_TRACE( "fustering with %s", OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ).getStr()); } diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index 0754101b3631..3a2fc6caf93f 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -54,7 +54,7 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentCon m_pDialog = gtk_file_chooser_dialog_new( OUStringToOString( getResString( FOLDERPICKER_TITLE ), RTL_TEXTENCODING_UTF8 ).getStr(), NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (char *)NULL ); + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, nullptr ); gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT ); #if ENABLE_GNOME_VFS || ENABLE_GIO diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index a34c143b99f9..463d9fe00ced 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -529,10 +529,10 @@ void GtkData::initNWF() gint vertical_padding = 1; gtk_widget_style_get( gWidgetData[0].gMenuWidget, "horizontal-padding", &horizontal_padding, - (char *)NULL); + nullptr); gtk_widget_style_get( gWidgetData[0].gMenuWidget, "vertical-padding", &vertical_padding, - (char *)NULL); + nullptr); gint xthickness = gWidgetData[0].gMenuWidget->style->xthickness; gint ythickness = gWidgetData[0].gMenuWidget->style->ythickness; pSVData->maNWFData.mnMenuFormatBorderX = xthickness + horizontal_padding; @@ -774,7 +774,7 @@ bool GtkSalGraphics::hitTestNativeControl( ControlType nType, "has-secondary-forward-stepper", &has_forward2, "has-backward-stepper", &has_backward, "has-secondary-backward-stepper", &has_backward2, - (char *)NULL ); + nullptr ); Rectangle aForward; Rectangle aBackward; @@ -1199,7 +1199,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType, gWidgetData[m_nXScreen].gMenuItemCheckMenuWidget : gWidgetData[m_nXScreen].gMenuItemRadioMenuWidget; gtk_widget_style_get( pWidget, "indicator_size", &indicator_size, - (char *)NULL ); + nullptr ); rNativeBoundingRegion = rControlRegion; Rectangle aIndicatorRect( Point( 0, (rControlRegion.GetHeight()-indicator_size)/2), @@ -1263,7 +1263,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType, "indicator_spacing", &indicator_spacing, "focus-line-width", &focusWidth, "focus-padding", &focusPad, - (char *)NULL); + nullptr); indicator_size += 2*indicator_spacing + 2*(focusWidth + focusWidth); rNativeBoundingRegion = rControlRegion; Rectangle aIndicatorRect( Point( 0, @@ -1295,7 +1295,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType, gtk_widget_style_get( widget, "slider-width", &slider_width, "slider-length", &slider_length, - (char *)NULL); + nullptr); Rectangle aRect( rControlRegion ); if( nPart == PART_THUMB_HORZ ) { @@ -1642,10 +1642,10 @@ bool GtkSalGraphics::NWPaintGTKButtonReal( gtk_widget_style_get( gWidgetData[m_nXScreen].gBtnWidget, "focus-line-width", &focusWidth, "focus-padding", &focusPad, "interior_focus", &interiorFocus, - (char *)NULL ); + nullptr ); gtk_widget_style_get( gWidgetData[m_nXScreen].gBtnWidget, "default_border", &pBorder, - (char *)NULL ); + nullptr ); // Make sure the border values exist, otherwise use some defaults if ( pBorder ) @@ -1748,7 +1748,7 @@ static Rectangle NWGetButtonArea( SalX11Screen nScreen, "focus-padding", &focusPad, "interior_focus", &interiorFocus, "default_border", &pBorder, - (char *)NULL ); + nullptr ); // Make sure the border values exist, otherwise use some defaults if ( pBorder ) @@ -1821,7 +1821,7 @@ bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable, NWConvertVCLStateToGTKState( nState, &stateType, &shadowType ); gint indicator_size; - gtk_widget_style_get( gWidgetData[m_nXScreen].gRadioWidget, "indicator_size", &indicator_size, (char *)NULL); + gtk_widget_style_get( gWidgetData[m_nXScreen].gRadioWidget, "indicator_size", &indicator_size, nullptr); x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2; y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2; @@ -1878,7 +1878,7 @@ bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable, NWConvertVCLStateToGTKState( nState, &stateType, &shadowType ); gint indicator_size; - gtk_widget_style_get( gWidgetData[m_nXScreen].gCheckWidget, "indicator_size", &indicator_size, (char *)NULL); + gtk_widget_style_get( gWidgetData[m_nXScreen].gCheckWidget, "indicator_size", &indicator_size, nullptr); x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2; y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2; @@ -1976,7 +1976,7 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, "stepper_size", &stepper_size, "trough_border", &trough_border, "stepper_spacing", &stepper_spacing, - "min_slider_length", &min_slider_length, (char *)NULL ); + "min_slider_length", &min_slider_length, nullptr ); gboolean has_forward; gboolean has_forward2; gboolean has_backward; @@ -1985,7 +1985,7 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, gtk_widget_style_get( gWidgetData[m_nXScreen].gScrollHorizWidget, "has-forward-stepper", &has_forward, "has-secondary-forward-stepper", &has_forward2, "has-backward-stepper", &has_backward, - "has-secondary-backward-stepper", &has_backward2, (char *)NULL ); + "has-secondary-backward-stepper", &has_backward2, nullptr ); gint magic = trough_border ? 1 : 0; gint nFirst = 0; @@ -2253,7 +2253,7 @@ static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPa "slider-width", &slider_width, "stepper-size", &stepper_size, "trough-border", &trough_border, - "stepper-spacing", &stepper_spacing, (char *)NULL ); + "stepper-spacing", &stepper_spacing, nullptr ); gboolean has_forward; gboolean has_forward2; @@ -2264,7 +2264,7 @@ static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPa "has-forward-stepper", &has_forward, "has-secondary-forward-stepper", &has_forward2, "has-backward-stepper", &has_backward, - "has-secondary-backward-stepper", &has_backward2, (char *)NULL ); + "has-secondary-backward-stepper", &has_backward2, nullptr ); gint buttonWidth; gint buttonHeight; Rectangle buttonRect; @@ -2369,7 +2369,7 @@ static Rectangle NWGetEditBoxPixmapRect(SalX11Screen nScreen, // Grab some entry style attributes gtk_widget_style_get( gWidgetData[nScreen].gEditBoxWidget, "focus-line-width", &focusWidth, - "interior-focus", &interiorFocus, (char *)NULL ); + "interior-focus", &interiorFocus, nullptr ); if ( !interiorFocus ) { @@ -2435,7 +2435,7 @@ static void NWPaintOneEditBox( SalX11Screen nScreen, gtk_widget_style_get( widget, "interior-focus", &bInteriorFocus, "focus-line-width", &nFocusLineWidth, - (char *)NULL); + nullptr); if ( !bInteriorFocus ) { xborder += nFocusLineWidth; @@ -2527,7 +2527,7 @@ bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, } NWSetWidgetState( gWidgetData[m_nXScreen].gSpinButtonWidget, nState, stateType ); - gtk_widget_style_get( gWidgetData[m_nXScreen].gSpinButtonWidget, "shadow_type", &shadowType, (char *)NULL ); + gtk_widget_style_get( gWidgetData[m_nXScreen].gSpinButtonWidget, "shadow_type", &shadowType, nullptr ); if ( shadowType != GTK_SHADOW_NONE ) { @@ -2734,7 +2734,7 @@ static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, // Grab some button style attributes gtk_widget_style_get( gWidgetData[nScreen].gDropdownWidget, "focus-line-width", &nFocusWidth, - "focus-padding", &nFocusPad, (char *)NULL ); + "focus-padding", &nFocusPad, nullptr ); nArrowWidth = MIN_ARROW_SIZE + (GTK_MISC(gWidgetData[nScreen].gArrowWidget)->xpad * 2); nButtonWidth = nArrowWidth + @@ -2961,7 +2961,7 @@ bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable, "interior_focus", &bInteriorFocus, "focus_line_width", &nFocusLineWidth, "focus_padding", &nFocusPadding, - (char *)NULL); + nullptr); } for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it ) @@ -3200,7 +3200,7 @@ bool GtkSalGraphics::NWPaintGTKMenubar( { gtk_widget_style_get( gWidgetData[m_nXScreen].gMenuItemMenubarWidget, "selected_shadow_type", &selected_shadow_type, - (char *)NULL); + nullptr); } } @@ -3291,7 +3291,7 @@ bool GtkSalGraphics::NWPaintGTKPopupMenu( { gtk_widget_style_get( gWidgetData[m_nXScreen].gMenuItemMenuWidget, "selected_shadow_type", &selected_shadow_type, - (char *)NULL); + nullptr); } NWSetWidgetState( gWidgetData[m_nXScreen].gMenuWidget, nState, stateType ); @@ -3685,7 +3685,7 @@ static Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen, gtk_widget_style_get( gWidgetData[nScreen].gOptionMenuWidget, "indicator_size", &pIndicatorSize, - "indicator_spacing",&pIndicatorSpacing, (char *)NULL); + "indicator_spacing",&pIndicatorSpacing, nullptr); if ( pIndicatorSize ) width = pIndicatorSize->width; @@ -3748,7 +3748,7 @@ static Rectangle NWGetListBoxIndicatorRect( SalX11Screen nScreen, gtk_widget_style_get( gWidgetData[nScreen].gOptionMenuWidget, "indicator_size", &pIndicatorSize, - "indicator_spacing",&pIndicatorSpacing, (char *)NULL); + "indicator_spacing",&pIndicatorSpacing, nullptr); if ( pIndicatorSize ) { @@ -3868,7 +3868,7 @@ void GtkSalGraphics::refreshFontconfig( GtkSettings *pSettings ) { guint latest_fontconfig_timestamp = 0; static guint our_fontconfig_timestamp = 0; - g_object_get( pSettings, "gtk-fontconfig-timestamp", &latest_fontconfig_timestamp, (char *)NULL ); + g_object_get( pSettings, "gtk-fontconfig-timestamp", &latest_fontconfig_timestamp, nullptr ); if (latest_fontconfig_timestamp != our_fontconfig_timestamp) { bool bFirstTime = our_fontconfig_timestamp == 0; @@ -4147,11 +4147,11 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) // get cursor blink time gboolean blink = false; - g_object_get( pSettings, "gtk-cursor-blink", &blink, (char *)NULL ); + g_object_get( pSettings, "gtk-cursor-blink", &blink, nullptr ); if( blink ) { gint blink_time = static_cast<gint>(STYLE_CURSOR_NOBLINKTIME); - g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, (char *)NULL ); + g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, nullptr ); // set the blink_time if there is a setting and it is reasonable // else leave the default value if( blink_time > 100 && blink_time != gint(STYLE_CURSOR_NOBLINKTIME) ) @@ -4167,7 +4167,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) "gtk-double-click-distance", &iDoubleClickDistance, "gtk-dnd-drag-threshold", &iDragThreshold, "gtk-menu-popup-delay", &iMenuPopupDelay, - (char *)NULL ); + nullptr ); aMouseSettings.SetDoubleClickTime( iDoubleClickTime ); aMouseSettings.SetDoubleClickWidth( iDoubleClickDistance ); aMouseSettings.SetDoubleClickHeight( iDoubleClickDistance ); @@ -4179,13 +4179,13 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) gboolean showmenuicons = true, primarybuttonwarps = false; g_object_get( pSettings, "gtk-menu-images", &showmenuicons, - (char *)NULL ); + nullptr ); if( g_object_class_find_property( G_OBJECT_GET_CLASS(pSettings), "gtk-primary-button-warps-slider") ) { g_object_get( pSettings, "gtk-primary-button-warps-slider", &primarybuttonwarps, - (char *)NULL ); + nullptr ); } aStyleSet.SetPreferredUseImagesInMenus(showmenuicons); aStyleSet.SetPrimaryButtonWarpsSlider(primarybuttonwarps); @@ -4200,14 +4200,14 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) "slider-width", &slider_width, "trough-border", &trough_border, "min-slider-length", &min_slider_length, - (char *)NULL ); + nullptr ); gint magic = trough_border ? 1 : 0; aStyleSet.SetScrollBarSize( slider_width + 2*trough_border ); aStyleSet.SetMinThumbSize( min_slider_length - magic ); // preferred icon style gchar* pIconThemeName = NULL; - g_object_get( pSettings, "gtk-icon-theme-name", &pIconThemeName, (char *)NULL ); + g_object_get( pSettings, "gtk-icon-theme-name", &pIconThemeName, nullptr ); aStyleSet.SetPreferredIconTheme( OUString::createFromAscii( pIconThemeName ) ); g_free( pIconThemeName ); @@ -4322,7 +4322,7 @@ static void NWAddWidgetToCacheWindow( GtkWidget* widget, SalX11Screen nScreen ) { rData.gCacheWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); g_object_set_data( G_OBJECT( rData.gCacheWindow ), "libo-version", - (gpointer)LIBO_VERSION_DOTTED ); + const_cast<char *>(LIBO_VERSION_DOTTED) ); GdkScreen* pScreen = gdk_display_get_screen( gdk_display_get_default(), nScreen.getXScreen() ); @@ -4487,7 +4487,7 @@ static void NWEnsureGTKToolbar( SalX11Screen nScreen ) gtk_widget_ensure_style( gWidgetData[nScreen].gToolbarWidget ); gtk_widget_style_get( gWidgetData[nScreen].gToolbarWidget, "button_relief", &aRelief, - (char *)NULL); + nullptr); gtk_button_set_relief( GTK_BUTTON(gWidgetData[nScreen].gToolbarButtonWidget), aRelief ); GTK_WIDGET_UNSET_FLAGS( gWidgetData[nScreen].gToolbarButtonWidget, GTK_CAN_FOCUS ); diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 874f250b0b16..e590a8ab1bcd 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -956,14 +956,14 @@ ooo_fixed_get_type() static const GTypeInfo tinfo = { sizeof (GtkFixedClass), - (GBaseInitFunc) NULL, /* base init */ - (GBaseFinalizeFunc) NULL, /* base finalize */ - (GClassInitFunc) NULL, /* class init */ - (GClassFinalizeFunc) NULL, /* class finalize */ + nullptr, /* base init */ + nullptr, /* base finalize */ + nullptr, /* class init */ + nullptr, /* class finalize */ NULL, /* class data */ sizeof (GtkFixed), /* instance size */ 0, /* nb preallocs */ - (GInstanceInitFunc) NULL, /* instance init */ + nullptr, /* instance init */ NULL /* value table */ }; @@ -1296,7 +1296,7 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle ) m_pWindow = gtk_widget_new( GTK_TYPE_WINDOW, "type", eWinType, "visible", FALSE, NULL ); g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", this ); - g_object_set_data( G_OBJECT( m_pWindow ), "libo-version", (gpointer)LIBO_VERSION_DOTTED); + g_object_set_data( G_OBJECT( m_pWindow ), "libo-version", const_cast<char *>(LIBO_VERSION_DOTTED)); // force wm class hint m_nExtStyle = ~0; @@ -4048,7 +4048,7 @@ void GtkSalFrame::IMHandler::doCallEndExtTextInput() void GtkSalFrame::IMHandler::updateIMSpotLocation() { SalExtTextInputPosEvent aPosEvent; - m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUTPOS, (void*)&aPosEvent ); + m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUTPOS, static_cast<void*>(&aPosEvent) ); GdkRectangle aArea; aArea.x = aPosEvent.mnX; aArea.y = aPosEvent.mnY; @@ -4070,7 +4070,7 @@ void GtkSalFrame::IMHandler::sendEmptyCommit() aEmptyEv.mnCursorPos = 0; aEmptyEv.mnCursorFlags = 0; aEmptyEv.mbOnlyCursor = False; - m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aEmptyEv ); + m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, static_cast<void*>(&aEmptyEv) ); if( ! aDel.isDeleted() ) m_pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL ); } @@ -4289,7 +4289,7 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* pContext, gchar* pTex } if( ! bSingleCommit ) { - pThis->m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&pThis->m_aInputEvent); + pThis->m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, static_cast<void*>(&pThis->m_aInputEvent)); if( ! aDel.isDeleted() ) pThis->doCallEndExtTextInput(); } @@ -4413,7 +4413,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_ SolarMutexGuard aGuard; vcl::DeletionListener aDel( pThis->m_pFrame ); - pThis->m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&pThis->m_aInputEvent); + pThis->m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, static_cast<void*>(&pThis->m_aInputEvent)); if( bEndPreedit && ! aDel.isDeleted() ) pThis->doCallEndExtTextInput(); if( ! aDel.isDeleted() ) diff --git a/vcl/unx/gtk/window/hudawareness.cxx b/vcl/unx/gtk/window/hudawareness.cxx index 947f404f9d52..760103314d7c 100644 --- a/vcl/unx/gtk/window/hudawareness.cxx +++ b/vcl/unx/gtk/window/hudawareness.cxx @@ -61,7 +61,7 @@ hud_awareness_register (GDBusConnection *connection, HudAwarenessHandle *handle; guint object_id; - memset ((void *)&vtable, 0, sizeof (vtable)); + memset (static_cast<void *>(&vtable), 0, sizeof (vtable)); vtable.method_call = hud_awareness_method_call; if G_UNLIKELY (iface == NULL) diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index 3b0662692d73..09bfac55a89e 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -167,7 +167,7 @@ Rectangle GtkSalGraphics::NWGetScrollButtonRect( ControlPart nPart, Rectangle aA "slider-width", &slider_width, "stepper-size", &stepper_size, "trough-border", &trough_border, - "stepper-spacing", &stepper_spacing, (char *)NULL ); + "stepper-spacing", &stepper_spacing, nullptr ); gboolean has_forward; gboolean has_forward2; @@ -178,7 +178,7 @@ Rectangle GtkSalGraphics::NWGetScrollButtonRect( ControlPart nPart, Rectangle aA "has-forward-stepper", &has_forward, "has-secondary-forward-stepper", &has_forward2, "has-backward-stepper", &has_backward, - "has-secondary-backward-stepper", &has_backward2, (char *)NULL ); + "has-secondary-backward-stepper", &has_backward2, nullptr ); gint buttonWidth; gint buttonHeight; Rectangle buttonRect; @@ -285,7 +285,7 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context, "stepper_size", &stepper_size, "trough_border", &trough_border, "stepper_spacing", &stepper_spacing, - "min_slider_length", &min_slider_length, (char *)NULL ); + "min_slider_length", &min_slider_length, nullptr ); gboolean has_forward; gboolean has_forward2; gboolean has_backward; @@ -295,7 +295,7 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context, "has-forward-stepper", &has_forward, "has-secondary-forward-stepper", &has_forward2, "has-backward-stepper", &has_backward, - "has-secondary-backward-stepper", &has_backward2, (char *)NULL ); + "has-secondary-backward-stepper", &has_backward2, nullptr ); gint magic = trough_border ? 1 : 0; gint nFirst = 0; gint slider_side = slider_width + (trough_border * 2); @@ -1229,7 +1229,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar gtk_style_context_get_style( mpCheckButtonStyle, "indicator-size", &indicator_size, "indicator-spacing", &indicator_spacing, - (char *)NULL ); + nullptr ); GtkBorder border; gtk_style_context_get_border(mpCheckButtonStyle, GTK_STATE_FLAG_NORMAL, &border); @@ -1255,7 +1255,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar gtk_style_context_get_style( mpMenuItemStyle, "indicator-size", &indicator_size, - (char *)NULL ); + nullptr ); point = MAX(0, rControlRegion.GetHeight() - indicator_size); aEditRect = Rectangle( Point( 0, point / 2), @@ -1697,11 +1697,11 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) // get cursor blink time gboolean blink = false; - g_object_get( pSettings, "gtk-cursor-blink", &blink, (char *)NULL ); + g_object_get( pSettings, "gtk-cursor-blink", &blink, nullptr ); if( blink ) { gint blink_time = static_cast<gint>(STYLE_CURSOR_NOBLINKTIME); - g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, (char *)NULL ); + g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, nullptr ); // set the blink_time if there is a setting and it is reasonable // else leave the default value if( blink_time > 100 && blink_time != gint(STYLE_CURSOR_NOBLINKTIME) ) @@ -1717,7 +1717,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) "gtk-double-click-distance", &iDoubleClickDistance, "gtk-dnd-drag-threshold", &iDragThreshold, "gtk-menu-popup-delay", &iMenuPopupDelay, - (char *)NULL ); + nullptr ); aMouseSettings.SetDoubleClickTime( iDoubleClickTime ); aMouseSettings.SetDoubleClickWidth( iDoubleClickDistance ); aMouseSettings.SetDoubleClickHeight( iDoubleClickDistance ); @@ -1730,7 +1730,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) g_object_get( pSettings, "gtk-menu-images", &showmenuicons, "gtk-primary-button-warps-slider", &primarybuttonwarps, - (char *)NULL ); + nullptr ); aStyleSet.SetPreferredUseImagesInMenus(showmenuicons); aStyleSet.SetPrimaryButtonWarpsSlider(primarybuttonwarps); @@ -1744,14 +1744,14 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) "slider-width", &slider_width, "trough-border", &trough_border, "min-slider-length", &min_slider_length, - (char *)NULL ); + nullptr ); gint magic = trough_border ? 1 : 0; aStyleSet.SetScrollBarSize( slider_width + 2*trough_border ); aStyleSet.SetMinThumbSize( min_slider_length - magic ); // preferred icon style gchar* pIconThemeName = NULL; - g_object_get( pSettings, "gtk-icon-theme-name", &pIconThemeName, (char *)NULL ); + g_object_get( pSettings, "gtk-icon-theme-name", &pIconThemeName, nullptr ); aStyleSet.SetPreferredIconTheme( OUString::createFromAscii( pIconThemeName ) ); g_free( pIconThemeName ); @@ -1762,7 +1762,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) // finally update the collected settings rSettings.SetStyleSettings( aStyleSet ); gchar* pThemeName = NULL; - g_object_get( pSettings, "gtk-theme-name", &pThemeName, (char *)NULL ); + g_object_get( pSettings, "gtk-theme-name", &pThemeName, nullptr ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "Theme name is \"%s\"\n", pThemeName ); #endif diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index 540773dde5f0..6c464ac810a5 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -72,7 +72,7 @@ static Color toColor( const QColor &rColor ) */ static OUString readEntryUntranslated( KConfigGroup *pGroup, const char *pKey ) { - return OUString::createFromAscii( (const char *) pGroup->readEntryUntranslated( pKey ).toAscii() ); + return OUString::createFromAscii( static_cast<const char *>(pGroup->readEntryUntranslated( pKey ).toAscii()) ); } /** Helper function to add information to Font from QFont. @@ -85,7 +85,7 @@ static vcl::Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Loca QFontInfo qFontInfo( rQFont ); // set family name - aInfo.m_aFamilyName = OUString( (const char *) rQFont.family().toUtf8(), strlen( (const char *) rQFont.family().toUtf8() ), RTL_TEXTENCODING_UTF8 ); + aInfo.m_aFamilyName = OUString( static_cast<const char *>(rQFont.family().toUtf8()), strlen( static_cast<const char *>(rQFont.family().toUtf8()) ), RTL_TEXTENCODING_UTF8 ); // set italic aInfo.m_eItalic = ( qFontInfo.italic()? ITALIC_NORMAL: ITALIC_NONE ); |