[gimp] plug-ins: add a typedef for IfsCompose's token enum
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] plug-ins: add a typedef for IfsCompose's token enum
- Date: Thu, 17 Mar 2011 14:30:46 +0000 (UTC)
commit d23c0d3fdff42e26a8010eb4532e77d99e155404
Author: Michael Natterer <mitch gimp org>
Date: Thu Mar 17 15:29:43 2011 +0100
plug-ins: add a typedef for IfsCompose's token enum
and don't treat its values as GTokenType.
plug-ins/ifs-compose/ifs-compose-storage.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/plug-ins/ifs-compose/ifs-compose-storage.c b/plug-ins/ifs-compose/ifs-compose-storage.c
index 535188a..f2df556 100644
--- a/plug-ins/ifs-compose/ifs-compose-storage.c
+++ b/plug-ins/ifs-compose/ifs-compose-storage.c
@@ -29,7 +29,7 @@
#include "ifs-compose.h"
-enum {
+typedef enum {
TOKEN_INVALID = G_TOKEN_LAST,
TOKEN_ITERATIONS,
TOKEN_MAX_MEMORY,
@@ -55,12 +55,12 @@ enum {
TOKEN_VALUE_SCALE,
TOKEN_SIMPLE_COLOR,
TOKEN_PROB
-};
+} IfsComposeToken;
static struct
{
- const gchar *name;
- gint token;
+ const gchar *name;
+ IfsComposeToken token;
} symbols[] = {
{ "iterations", TOKEN_ITERATIONS },
{ "max_memory", TOKEN_MAX_MEMORY },
@@ -171,7 +171,7 @@ ifsvals_parse_element (GScanner *scanner,
token = g_scanner_get_next_token (scanner);
while (token != G_TOKEN_RIGHT_CURLY)
{
- switch (token)
+ switch ((IfsComposeToken) token)
{
case TOKEN_X:
expected_token = parse_genuine_float (scanner, &result->x);
@@ -281,6 +281,7 @@ ifsvals_parse_element (GScanner *scanner,
token = g_scanner_get_next_token (scanner);
}
+
return G_TOKEN_NONE;
}
@@ -323,7 +324,7 @@ ifsvals_parse (GScanner *scanner,
if (g_scanner_eof (scanner))
break;
- switch (token)
+ switch ((IfsComposeToken) token)
{
case TOKEN_ITERATIONS:
token = g_scanner_get_next_token (scanner);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]