kwo pushed a commit to branch master.
http://git.enlightenment.org/e16/e16.git/commit/?id=9d235a1ecdf36774a81be6f7986bac2a10fb15c0
commit 9d235a1ecdf36774a81be6f7986bac2a10fb15c0
Author: Kim Woelders <k...@woelders.dk>
Date: Fri Sep 25 10:14:28 2020 +0200
Remove some (duplicated?) configuration identifiers that are not in
definitions
---
src/aclass.c | 7 -------
src/backgrounds.c | 1 -
src/borders.c | 4 ----
src/conf.h | 15 ---------------
src/iclass.c | 3 +--
src/tooltips.c | 3 +--
6 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/src/aclass.c b/src/aclass.c
index 4b025dc1..02cf307f 100644
--- a/src/aclass.c
+++ b/src/aclass.c
@@ -321,7 +321,6 @@ AclassConfigLoad(FILE * fs)
goto done;
case CONFIG_CLASSNAME:
- case ACLASS_NAME:
ac = ActionclassFindAny(s2);
if (ac)
{
@@ -335,7 +334,6 @@ AclassConfigLoad(FILE * fs)
}
break;
case CONFIG_TYPE:
- case ACLASS_TYPE:
if (!ac || i2 == ACLASS_TYPE_ACLASS)
break;
LIST_REMOVE(ActionClass, &aclass_list, ActionclassFind(ac->name));
@@ -344,7 +342,6 @@ AclassConfigLoad(FILE * fs)
break;
case CONFIG_MODIFIER:
- case ACLASS_MODIFIER:
/* These are the defines that I have listed...
* These, therefore, are the ones that I am
* going to accept by default.
@@ -431,19 +428,15 @@ AclassConfigLoad(FILE * fs)
}
break;
case CONFIG_ANYMOD:
- case ACLASS_ANYMOD:
anymod = i2;
break;
case CONFIG_ANYBUT:
- case ACLASS_ANYBUT:
anybut = i2;
break;
case CONFIG_BUTTON:
- case ACLASS_BUT:
but = i2;
break;
case CONFIG_ANYKEY:
- case ACLASS_ANYKEY:
anykey = i2;
break;
case ACLASS_KEY:
diff --git a/src/backgrounds.c b/src/backgrounds.c
index f2406a19..61a24a82 100644
--- a/src/backgrounds.c
+++ b/src/backgrounds.c
@@ -1095,7 +1095,6 @@ BackgroundsConfigLoad(FILE * fs)
break;
case CONFIG_CLASSNAME:
- case BG_NAME:
bg = BackgroundFind(s2);
if (!bg)
{
diff --git a/src/borders.c b/src/borders.c
index f33f0a9c..886d733b 100644
--- a/src/borders.c
+++ b/src/borders.c
@@ -1226,17 +1226,14 @@ _BorderPartLoad(FILE * fs, char type __UNUSED__, Border
* b)
borigin, bxp, bxa, byp, bya, keepshade);
goto done;
case CONFIG_IMAGECLASS:
- case BORDERPART_ICLASS:
STRCPY(iclass, s2);
piclass = iclass;
break;
case CONFIG_ACTIONCLASS:
- case BORDERPART_ACLASS:
STRCPY(aclass, s2);
paclass = aclass;
break;
case CONFIG_TEXT:
- case BORDERPART_TEXTCLASS:
STRCPY(tclass, s2);
ptclass = tclass;
break;
@@ -1331,7 +1328,6 @@ BorderConfigLoad(FILE * fs)
_BorderCheck(b);
goto done;
case CONFIG_CLASSNAME:
- case BORDER_NAME:
if (BorderFind(s2))
{
SkipTillEnd(fs);
diff --git a/src/conf.h b/src/conf.h
index 98495297..282fa546 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -52,7 +52,6 @@
#define TEXT_FG_COL 205
#define TEXT_BG_COL 206
-#define ICLASS_NAME 350
#define ICLASS_NORMAL 351
#define ICLASS_CLICKED 352
#define ICLASS_HILITED 353
@@ -77,22 +76,11 @@
#define ICLASS_ROTATE 373
#define ICLASS_BEVEL 374
-#define ACLASS_NAME 420
-#define ACLASS_TYPE 421
-#define ACLASS_MODIFIER 422
-#define ACLASS_ANYMOD 423
-#define ACLASS_ANYBUT 424
-#define ACLASS_BUT 425
-#define ACLASS_ANYKEY 426
#define ACLASS_KEY 427
#define ACLASS_EVENT_TRIGGER 428
-#define ACLASS_ACTION 429
#define ACLASS_TYPE_ACLASS 5
-#define BORDERPART_ICLASS 450
-#define BORDERPART_ACLASS 451
-#define BORDERPART_TEXTCLASS 452
#define BORDERPART_ONTOP 453
#define BORDERPART_FLAGS 454
#define BORDERPART_ISREGION 455
@@ -126,7 +114,6 @@
#define WINDOWMATCH_DESKTOP 491
#define WINDOWMATCH_MAKESTICKY 492
-#define BORDER_NAME 500
#define BORDER_LEFT 501
#define BORDER_RIGHT 502
#define BORDER_TOP 503
@@ -156,7 +143,6 @@
#define BG_RGB 560
#define BG_BG1 561
#define BG_BG2 562
-#define BG_NAME 563
#define BG_DESKNUM 564
#define BG_BG_FILE 565
#define BG_BG_PARAM 566
@@ -169,7 +155,6 @@
#define SLIDEOUT_DIRECTION 620
-#define TOOLTIP_DRAWICLASS 640
#define TOOLTIP_BUBBLE1 641
#define TOOLTIP_BUBBLE2 642
#define TOOLTIP_BUBBLE3 643
diff --git a/src/iclass.c b/src/iclass.c
index 5f42649a..822c7c89 100644
--- a/src/iclass.c
+++ b/src/iclass.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various
contributors
- * Copyright (C) 2004-2018 Kim Woelders
+ * Copyright (C) 2004-2020 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -405,7 +405,6 @@ ImageclassConfigLoad(FILE * fs)
case ICLASS_COLORMOD:
continue;
case CONFIG_CLASSNAME:
- case ICLASS_NAME:
if (ImageclassFind(s2, 0))
{
SkipTillEnd(fs);
diff --git a/src/tooltips.c b/src/tooltips.c
index 10ba119f..5fa94c9a 100644
--- a/src/tooltips.c
+++ b/src/tooltips.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various
contributors
- * Copyright (C) 2004-2018 Kim Woelders
+ * Copyright (C) 2004-2020 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -176,7 +176,6 @@ TooltipConfigLoad(FILE * fs)
}
STRCPY(name, s2);
break;
- case TOOLTIP_DRAWICLASS:
case CONFIG_IMAGECLASS:
STRCPY(iclass, s2);
break;
--
