G++ 4.0 compiler fixes

-Remove anonymous structures and name them
-Include 'card.h' to cardpile to make 'Card' known to QList
 so deleteItem will work
-cast 'enum'  to char in event.cpp and opimevent.cpp

1 files changed, 16 insertions, 10 deletions

diff --git a/noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp b/noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp
index b2180ba..a47bf6c 100644
--- a/noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp
+++ b/noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp
@@ -2,16 +2,18 @@
 
 #include "zkbnames.h"
 
 QString Null_String((const char*) 0);
 
 // Implementation of KeyNames
-static struct {
+struct Key_Names_t {
 	int key;
 	char *name;
-} Key_Names[] = {
+};
+
+static const Key_Names_t Key_Names[] = {
 	{ 32, "Space" },
 	{ 39, "Apostrophe" },
 	{ 44, "Comma" },
 	{ 46, "Period" },
 	{ 47, "Slash" },
 	{ 65, "A" },
@@ -102,16 +104,18 @@ const QString& KeyNames::find(int k) {
 	} else {
 		return it.data();
 	}
 }
 
 // Implementation of ModifierNames
-struct {
+struct Modifier_Names_t {
 	int value;
 	char* name;
-} Modifier_Names[] = {
+};
+
+static const Modifier_Names_t Modifier_Names[] = {
 	{ 8, "Shift" },
 	{ 16, "Control" },
 	{ 32, "Alt" },
 	{ 0x4000, "Keypad" },
 	{ 0, 0 }
 };
@@ -156,20 +160,22 @@ const QString& ModifierNames::find(int k) {
 		return it.data();
 	}
 }
 
 // Implementation of KeycodeNames
 
-struct {
+struct Keycode_Names_t {
 	char* name;
 	int keycode;
-} Keycode_Names[] = {
+};
+
+static const Keycode_Names_t Keycode_Names[] = {
 	{ "Escape", 0x1000 },
 	{ "Tab", 0x1001 },
 	{ "Backtab", 0x1002 },
-	{ "Backspace", 0x1003 }, 
+	{ "Backspace", 0x1003 },
 	{ "BackSpace", 0x1003 },
 	{ "Return", 0x1004 },
 	{ "Enter", 0x1005 },
 	{ "Insert", 0x1006 },
 	{ "Delete", 0x1007 },
 	{ "Pause", 0x1008 },
@@ -178,15 +184,15 @@ struct {
 	{ "Home", 0x1010 },
 	{ "End", 0x1011 },
 	{ "Left", 0x1012 },
 	{ "Up", 0x1013 },
 	{ "Right", 0x1014 },
 	{ "Down", 0x1015 },
-	{ "Prior", 0x1016 }, 
-	{ "PageUp", 0x1016 }, 
-	{ "Next", 0x1017 }, 
+	{ "Prior", 0x1016 },
+	{ "PageUp", 0x1016 },
+	{ "Next", 0x1017 },
 	{ "PageDown", 0x1017 },
 	{ "Shift", 0x1020 },
 	{ "Control", 0x1021 },
 	{ "Meta", 0x1022 },
 	{ "Alt", 0x1023 },
 	{ "CapsLock", 0x1024 },