From 82ce227d67e9cc827471b8f01abca37c2c99fec7 Mon Sep 17 00:00:00 2001 From: Arkadiy Illarionov Date: Sat, 9 Mar 2024 14:02:22 +0300 Subject: [PATCH] Deduplicate FILE_COLUMN_POINTER --- src/layout-image.cc | 8 ++------ src/layout-util.cc | 3 +-- src/view-file.h | 2 ++ src/view-file/view-file-icon.cc | 2 +- src/view-file/view-file-list.cc | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/layout-image.cc b/src/layout-image.cc index 9699e029..4745404a 100644 --- a/src/layout-image.cc +++ b/src/layout-image.cc @@ -60,10 +60,6 @@ #include "utilops.h" #include "view-file.h" -enum { - FILE_COLUMN_POINTER = 0 -}; - static GtkWidget *layout_image_pop_menu(LayoutWindow *lw); static void layout_image_set_buttons(LayoutWindow *lw); static gboolean layout_image_animate_new_file(LayoutWindow *lw); @@ -1263,7 +1259,7 @@ void layout_image_alter_orientation(LayoutWindow *lw, AlterType type) { tpath = static_cast(work->data); gtk_tree_model_get_iter(store, &iter, tpath); - gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd_n, -1); + gtk_tree_model_get(store, &iter, VIEW_FILE_COLUMN_POINTER, &fd_n, -1); work = work->next; } @@ -1312,7 +1308,7 @@ void layout_image_rating(LayoutWindow *lw, const gchar *rating) { tpath = static_cast(work->data); gtk_tree_model_get_iter(store, &iter, tpath); - gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd_n, -1); + gtk_tree_model_get(store, &iter, VIEW_FILE_COLUMN_POINTER, &fd_n, -1); work = work->next; } diff --git a/src/layout-util.cc b/src/layout-util.cc index d3b2f684..d1d619a7 100644 --- a/src/layout-util.cc +++ b/src/layout-util.cc @@ -83,7 +83,6 @@ enum { MENU_EDIT_ACTION_OFFSET = 16, - FILE_COLUMN_POINTER = 0 }; static gboolean layout_bar_enabled(LayoutWindow *lw); @@ -605,7 +604,7 @@ static void layout_menu_write_rotate(GtkToggleAction *, gpointer data, gboolean { tpath = static_cast(work->data); gtk_tree_model_get_iter(store, &iter, tpath); - gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd_n, -1); + gtk_tree_model_get(store, &iter, VIEW_FILE_COLUMN_POINTER, &fd_n, -1); work = work->next; } diff --git a/src/view-file.h b/src/view-file.h index 40394340..002e59c6 100644 --- a/src/view-file.h +++ b/src/view-file.h @@ -128,6 +128,8 @@ struct ViewFileInfoIcon #define VFLIST(_vf_) ((ViewFileInfoList *)(_vf_->info)) #define VFICON(_vf_) ((ViewFileInfoIcon *)(_vf_->info)) +const gint VIEW_FILE_COLUMN_POINTER = 0; // @todo Use inline constexpr in C++17 + void vf_send_update(ViewFile *vf); ViewFile *vf_new(FileViewType type, FileData *dir_fd); diff --git a/src/view-file/view-file-icon.cc b/src/view-file/view-file-icon.cc index 356e3dbd..1a61eaca 100644 --- a/src/view-file/view-file-icon.cc +++ b/src/view-file/view-file-icon.cc @@ -61,7 +61,7 @@ constexpr gint THUMB_BORDER_PADDING = 2; constexpr gint VFICON_TIP_DELAY = 500; enum { - FILE_COLUMN_POINTER = 0, + FILE_COLUMN_POINTER = VIEW_FILE_COLUMN_POINTER, FILE_COLUMN_COUNT }; diff --git a/src/view-file/view-file-list.cc b/src/view-file/view-file-list.cc index f42ac326..a941e7f7 100644 --- a/src/view-file/view-file-list.cc +++ b/src/view-file/view-file-list.cc @@ -48,7 +48,7 @@ /* Index to tree store */ enum { - FILE_COLUMN_POINTER = 0, + FILE_COLUMN_POINTER = VIEW_FILE_COLUMN_POINTER, FILE_COLUMN_VERSION, FILE_COLUMN_THUMB, FILE_COLUMN_FORMATTED, -- 2.20.1