From af7e9ecd1fdd9a3499da7fc2721c4e4a74d8542f Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Tue, 19 Jun 2018 17:11:19 +0200 Subject: Replace typedef struct with struct in POD type declarations. --- src/ui/dialog-events.h | 4 ++-- src/ui/dialog/filedialogimpl-win32.cpp | 5 +++-- src/ui/widget/selected-style.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src/ui') diff --git a/src/ui/dialog-events.h b/src/ui/dialog-events.h index 547cfb95d..e00c0560b 100644 --- a/src/ui/dialog-events.h +++ b/src/ui/dialog-events.h @@ -30,10 +30,10 @@ class Entry; class SPDesktop; -typedef struct { +struct win_data { GtkWidget *win; guint stop; -} win_data; +}; gboolean sp_dialog_event_handler ( GtkWindow *win, diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp index 0effddfed..c57594551 100644 --- a/src/ui/dialog/filedialogimpl-win32.cpp +++ b/src/ui/dialog/filedialogimpl-win32.cpp @@ -1097,7 +1097,7 @@ bool FileOpenDialogImplWin32::set_image_preview() // for the bbox rectangle. #pragma pack( push ) #pragma pack( 2 ) -typedef struct +struct APMHEADER { DWORD dwKey; WORD hmf; @@ -1105,7 +1105,8 @@ typedef struct WORD wInch; DWORD dwReserved; WORD wCheckSum; -} APMHEADER, *PAPMHEADER; +}; +using PAPMHEADER = APMHEADER *; #pragma pack( pop ) diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index bc4a3558f..9a5d35f3b 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -92,15 +92,15 @@ namespace UI { namespace Widget { -typedef struct { +struct DropTracker { SelectedStyle* parent; int item; -} DropTracker; +}; /* Drag and Drop */ -typedef enum { +enum ui_drop_target_info { APP_X_COLOR -} ui_drop_target_info; +}; //TODO: warning: deprecated conversion from string constant to ‘gchar*’ // -- cgit v1.2.3