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
@@ -1,234 +1,240 @@
 #include <qmap.h>
 
 #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" },
 	{ 66, "B" },
 	{ 67, "C" },
 	{ 68, "D" },
 	{ 69, "E" },
 	{ 70, "F" },
 	{ 71, "G" },
 	{ 72, "H" },
 	{ 73, "I" },
 	{ 74, "J" },
 	{ 75, "K" },
 	{ 76, "L" },
 	{ 77, "M" },
 	{ 78, "N" },
 	{ 79, "O" },
 	{ 80, "P" },
 	{ 81, "Q" },
 	{ 82, "R" },
 	{ 83, "S" },
 	{ 84, "T" },
 	{ 85, "U" },
 	{ 86, "V" },
 	{ 87, "W" },
 	{ 88, "X" },
 	{ 89, "Y" },
 	{ 90, "Z" },
 	{ 4096, "Cancel" },
 	{ 4097, "Tab" },
 	{ 4099, "Backspace" },
 	{ 4100, "Enter" },
 	{ 4114, "Left" },
 	{ 4115, "Up" },
 	{ 4116, "Right" },
 	{ 4117, "Down" },
 	{ 4128, "Left Shift" },
 	{ 4130, "Right Shift" },
 	{ 4152, "Calendar" },
 	{ 4153, "Addressbook" },
 	{ 4154, "Menu" },
 	{ 4155, "Home" },
 	{ 4156, "Mail" },
 	{ 4165, "Fn" },
 	{ 4173, "Middle" },
 	{ 4176, "OK" },
 	{ 4177, "Off" },
 	{ 4178, "Light" },
 	{ 0, 0 }
 };
 
 static QMap<QString, int> kn_map;
 static QMap<int, QString> kn_rmap;
 
 void init_kn_maps() {
 	int i = 0;
 	while (Key_Names[i].name != 0) {
 		int key = Key_Names[i].key;
 		QString name(Key_Names[i].name);
 
 		kn_map.insert(name, key);
 		kn_rmap.insert(key, name);
 		i++;
 	}
 }
 
 int KeyNames::find(const QString& key) {
 	if (kn_map.isEmpty()) {
 		init_kn_maps();
 	}
 
 	QMap<QString, int>::Iterator it = kn_map.find(key);
 	if (it == kn_map.end()) {
 		return -1;
 	} else {
 		return it.data();
 	}
 }
 
 const QString& KeyNames::find(int k) {
 	if (kn_map.isEmpty()) {
 		init_kn_maps();
 	}
 
 	QMap<int, QString>::Iterator it = kn_rmap.find(k);
 	if (it == kn_rmap.end()) {
 		return Null_String;
 	} 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 }
 };
 
 static QMap<QString, int> mn_map;
 static QMap<int, QString> mn_rmap;
 
 void init_mn_maps() {
 	int i = 0;
 	while (Modifier_Names[i].name != 0) {
 		int value = Modifier_Names[i].value;
 		QString name(Modifier_Names[i].name);
 
 		mn_map.insert(name, value);
 		mn_rmap.insert(value, name);
 		i++;
 	}
 }
 
 int ModifierNames::find(const QString& key) {
 	if (mn_map.isEmpty()) {
 		init_mn_maps();
 	}
 
 	QMap<QString, int>::Iterator it = mn_map.find(key);
 	if (it == mn_map.end()) {
 		return -1;
 	} else {
 		return it.data();
 	}
 }
 
 const QString& ModifierNames::find(int k) {
 	if (mn_map.isEmpty()) {
 		init_mn_maps();
 	}
 
 	QMap<int, QString>::Iterator it = mn_rmap.find(k);
 	if (it == mn_rmap.end()) {
 		return Null_String;
 	} else {
 		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 },
 	{ "Print", 0x1009 },
 	{ "SysReq", 0x100a },
 	{ "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 },
 	{ "NumLock", 0x1025 },
 	{ "ScrollLock", 0x1026 },
 	{ "F1", 0x1030 },
 	{ "F2", 0x1031 },
 	{ "F3", 0x1032 },
 	{ "F4", 0x1033 },
 	{ "F5", 0x1034 },
 	{ "F6", 0x1035 },
 	{ "F7", 0x1036 },
 	{ "F8", 0x1037 },
 	{ "F9", 0x1038 },
 	{ "F10", 0x1039 },
 	{ "F11", 0x103a },
 	{ "F12", 0x103b },
 	{ "F13", 0x103c },
 	{ "F14", 0x103d },
 	{ "F15", 0x103e },
 	{ "F16", 0x103f },
 	{ "F17", 0x1040 },
 	{ "F18", 0x1041 },
 	{ "F19", 0x1042 },
 	{ "F20", 0x1043 },
 	{ "F21", 0x1044 },
 	{ "F22", 0x1045 },
 	{ "F23", 0x1046 },
 	{ "F24", 0x1047 },
 	{ "F25", 0x1048 },
 	{ "F26", 0x1049 },
 	{ "F27", 0x104a },
 	{ "F28", 0x104b },
 	{ "F29", 0x104c },
 	{ "F30", 0x104d },
 	{ "F31", 0x104e },
 	{ "F32", 0x104f },
 	{ "F33", 0x1050 },
 	{ "F34", 0x1051 },
 	{ "F35", 0x1052 },
 	{ "Super_L", 0x1053 },
 	{ "Super_R", 0x1054 },
 	{ "Menu", 0x1055 },
 	{ "Hyper_L", 0x1056 },
 	{ "Hyper_R", 0x1057 },