From 47babe69871cd65b2fb3ae2d9f97b5c31331a28f Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Wed, 12 Aug 2020 01:41:09 +0200 Subject: Remove unused macros --- libcaja-private/caja-file-operations.c | 2 -- libcaja-private/caja-file.c | 6 ------ libcaja-private/caja-icon-container.c | 18 ------------------ libcaja-private/caja-keep-last-vertical-box.c | 2 -- libcaja-private/caja-module.c | 3 --- libcaja-private/caja-open-with-dialog.c | 1 - libcaja-private/caja-search-engine-beagle.c | 1 - 7 files changed, 33 deletions(-) (limited to 'libcaja-private') diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c index fc400a3a..017aa5cb 100644 --- a/libcaja-private/caja-file-operations.c +++ b/libcaja-private/caja-file-operations.c @@ -186,9 +186,7 @@ typedef struct { #define RETRY _("_Retry") #define DELETE _("_Delete") #define DELETE_ALL _("Delete _All") -#define REPLACE _("_Replace") #define REPLACE_ALL _("Replace _All") -#define MERGE _("_Merge") #define MERGE_ALL _("Merge _All") #define COPY_FORCE _("Copy _Anyway") diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c index acf31926..db8bda9a 100644 --- a/libcaja-private/caja-file.c +++ b/libcaja-private/caja-file.c @@ -76,9 +76,6 @@ #include #endif -/* Time in seconds to cache getpwuid results */ -#define GETPWUID_CACHE_TIME (5*60) - #define ICON_NAME_THUMBNAIL_LOADING "image-loading" #undef CAJA_FILE_DEBUG_REF @@ -95,9 +92,6 @@ #define SORT_LAST_CHAR1 '.' #define SORT_LAST_CHAR2 '#' -/* Name of Caja trash directories */ -#define TRASH_DIRECTORY_NAME ".Trash" - #define METADATA_ID_IS_LIST_MASK (1U<<31) #define SORT_BY_EXTENSION_FOLLOWING_MAX_LENGTH 3 diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c index b45d046f..d1084a71 100644 --- a/libcaja-private/caja-icon-container.c +++ b/libcaja-private/caja-icon-container.c @@ -68,8 +68,6 @@ */ #define KEYBOARD_ICON_REVEAL_TIMEOUT 10 -#define CONTEXT_MENU_TIMEOUT_INTERVAL 500 - /* Maximum amount of milliseconds the mouse button is allowed to stay down * and still be considered a click. */ @@ -88,7 +86,6 @@ #define ICON_PAD_LEFT 4 #define ICON_PAD_RIGHT 4 -#define ICON_BASE_WIDTH 96 #define ICON_PAD_TOP 4 #define ICON_PAD_BOTTOM 4 @@ -100,32 +97,17 @@ #define STANDARD_ICON_GRID_WIDTH 155 -#define TEXT_BESIDE_ICON_GRID_WIDTH 205 - /* Desktop layout mode defines */ #define DESKTOP_PAD_HORIZONTAL 10 #define DESKTOP_PAD_VERTICAL 10 #define SNAP_SIZE_X 78 #define SNAP_SIZE_Y 20 -#define DEFAULT_SELECTION_BOX_ALPHA 0x40 -#define DEFAULT_HIGHLIGHT_ALPHA 0xff -#define DEFAULT_NORMAL_ALPHA 0xff -#define DEFAULT_PRELIGHT_ALPHA 0xff -#define DEFAULT_LIGHT_INFO_COLOR "#AAAAFD" -#define DEFAULT_DARK_INFO_COLOR "#33337F" - -#define MINIMUM_EMBEDDED_TEXT_RECT_WIDTH 20 -#define MINIMUM_EMBEDDED_TEXT_RECT_HEIGHT 20 - /* If icon size is bigger than this, request large embedded text. * Its selected so that the non-large text should fit in "normal" icon sizes */ #define ICON_SIZE_FOR_LARGE_EMBEDDED_TEXT 55 -/* From caja-icon-canvas-item.c */ -#define MAX_TEXT_WIDTH_BESIDE 90 - #define SNAP_HORIZONTAL(func,x) ((func ((double)((x) - DESKTOP_PAD_HORIZONTAL) / SNAP_SIZE_X) * SNAP_SIZE_X) + DESKTOP_PAD_HORIZONTAL) #define SNAP_VERTICAL(func, y) ((func ((double)((y) - DESKTOP_PAD_VERTICAL) / SNAP_SIZE_Y) * SNAP_SIZE_Y) + DESKTOP_PAD_VERTICAL) diff --git a/libcaja-private/caja-keep-last-vertical-box.c b/libcaja-private/caja-keep-last-vertical-box.c index 91107c69..441e8a11 100644 --- a/libcaja-private/caja-keep-last-vertical-box.c +++ b/libcaja-private/caja-keep-last-vertical-box.c @@ -31,8 +31,6 @@ static void caja_keep_last_vertical_box_size_allocate (GtkWidget *widg G_DEFINE_TYPE (CajaKeepLastVerticalBox, caja_keep_last_vertical_box, GTK_TYPE_BOX) -#define parent_class caja_keep_last_vertical_box_parent_class - /* Standard class initialization function */ static void caja_keep_last_vertical_box_class_init (CajaKeepLastVerticalBoxClass *klass) diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c index b023afcf..70e93b10 100644 --- a/libcaja-private/caja-module.c +++ b/libcaja-private/caja-module.c @@ -32,9 +32,6 @@ #define CAJA_TYPE_MODULE (caja_module_get_type ()) #define CAJA_MODULE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_MODULE, CajaModule)) -#define CAJA_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CAJA_TYPE_MODULE, CajaModule)) -#define CAJA_IS_MODULE(obj) (G_TYPE_INSTANCE_CHECK_TYPE ((obj), CAJA_TYPE_MODULE)) -#define CAJA_IS_MODULE_CLASS(klass) (G_TYPE_CLASS_CHECK_CLASS_TYPE ((klass), CAJA_TYPE_MODULE)) typedef struct _CajaModule CajaModule; typedef struct _CajaModuleClass CajaModuleClass; diff --git a/libcaja-private/caja-open-with-dialog.c b/libcaja-private/caja-open-with-dialog.c index 91810f84..dcffd4c2 100644 --- a/libcaja-private/caja-open-with-dialog.c +++ b/libcaja-private/caja-open-with-dialog.c @@ -39,7 +39,6 @@ #include "caja-signaller.h" #define sure_string(s) ((const char *)((s)!=NULL?(s):"")) -#define DESKTOP_ENTRY_GROUP "Desktop Entry" struct _CajaOpenWithDialogDetails { diff --git a/libcaja-private/caja-search-engine-beagle.c b/libcaja-private/caja-search-engine-beagle.c index c01b6539..542ad95b 100644 --- a/libcaja-private/caja-search-engine-beagle.c +++ b/libcaja-private/caja-search-engine-beagle.c @@ -51,7 +51,6 @@ struct CajaSearchEngineBeagleDetails /* We dlopen() all the following from libbeagle at runtime */ #define BEAGLE_HIT(x) ((BeagleHit *)(x)) #define BEAGLE_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), beagle_request_get_type(), BeagleRequest)) -#define BEAGLE_QUERY_PART(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), beagle_query_part_get_type(), BeagleQueryPart)) typedef enum { -- cgit v1.2.1