diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2010-03-01 03:21:55 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2010-03-01 03:21:55 +0000 |
| commit | d36de20ada4493381ddda28f529b6933b98a51de (patch) | |
| tree | be892351e375ff2b5b75572cf90ae2bda0252c2a /src | |
| parent | Fixed type problem with cast. (diff) | |
| download | inkscape-d36de20ada4493381ddda28f529b6933b98a51de.tar.gz inkscape-d36de20ada4493381ddda28f529b6933b98a51de.zip | |
Cast cleanup.
(bzr r9124)
Diffstat (limited to 'src')
| -rw-r--r-- | src/io/sys.cpp | 3 | ||||
| -rw-r--r-- | src/ui/dialog/filedialogimpl-win32.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/io/sys.cpp b/src/io/sys.cpp index f25575c9c..34160b648 100644 --- a/src/io/sys.cpp +++ b/src/io/sys.cpp @@ -412,10 +412,9 @@ dup_noninherited (int fd, GetCurrentProcess (), &filehandle, 0, FALSE, DUPLICATE_SAME_ACCESS); close (fd); - return _open_osfhandle ((LONG_PTR) filehandle, mode | _O_NOINHERIT); + return _open_osfhandle(reinterpret_cast<LONG_PTR>(filehandle), mode | _O_NOINHERIT); } - /* The helper process writes a status report back to us, through a * pipe, consisting of two ints. */ diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp index 3cdd61184..0f3672f25 100644 --- a/src/ui/dialog/filedialogimpl-win32.cpp +++ b/src/ui/dialog/filedialogimpl-win32.cpp @@ -455,14 +455,14 @@ UINT_PTR CALLBACK FileOpenDialogImplWin32::GetOpenFileName_hookproc( // Subclass the parent pImpl->_base_window_proc = (WNDPROC)GetWindowLongPtr(hParentWnd, GWLP_WNDPROC); - SetWindowLongPtr(hParentWnd, GWLP_WNDPROC, (LONG_PTR)file_dialog_subclass_proc); + SetWindowLongPtr(hParentWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(file_dialog_subclass_proc)); // Add a button to the toolbar pImpl->_toolbar_wnd = FindWindowEx(hParentWnd, NULL, "ToolbarWindow32", NULL); pImpl->_show_preview_button_bitmap = LoadBitmap( hInstance, MAKEINTRESOURCE(IDC_SHOW_PREVIEW)); - TBADDBITMAP tbAddBitmap = {NULL, (UINT_PTR)pImpl->_show_preview_button_bitmap}; + TBADDBITMAP tbAddBitmap = {NULL, reinterpret_cast<UINT_PTR>(pImpl->_show_preview_button_bitmap)}; const int iBitmapIndex = SendMessage(pImpl->_toolbar_wnd, TB_ADDBITMAP, 1, (LPARAM)&tbAddBitmap); |