6 files changed, 29 insertions, 19 deletions

diff --git a/core/launcher/firstuse.cpp b/core/launcher/firstuse.cpp
index acddeea..8344787 100644
--- a/core/launcher/firstuse.cpp
+++ b/core/launcher/firstuse.cpp
@@ -63,4 +63,4 @@ using namespace Opie::Core;
 
-struct {
-    bool enabled;
+struct settingsTable_t {
+    bool enabled : 1;
     const char *app;
@@ -69,4 +69,5 @@ struct {
     const char *desc;
-}
-settingsTable [] =
+};
+
+static settingsTable_t settingsTable [] =
 {
diff --git a/libopie2/opiepim/core/opimevent.cpp b/libopie2/opiepim/core/opimevent.cpp
index c656c3d..7bc6c32 100644
--- a/libopie2/opiepim/core/opimevent.cpp
+++ b/libopie2/opiepim/core/opimevent.cpp
@@ -72,3 +72,3 @@ int OCalendarHelper::dayOfWeek( char day )
     char i = OPimRecurrence::MON;
-    while ( !( i & day ) && i <= OPimRecurrence::SUN )
+    while ( !( i & day ) && i <= static_cast<char>(OPimRecurrence::SUN) )
     {
diff --git a/library/backend/event.cpp b/library/backend/event.cpp
index 90860e8..abc420b 100644
--- a/library/backend/event.cpp
+++ b/library/backend/event.cpp
@@ -401,3 +401,3 @@ int Event::dayOfWeek( char day )
     char i = Event::MON;
-    while ( !( i & day ) && i <= Event::SUN ) {
+    while ( !( i & day ) && i <= static_cast<char>(Event::SUN) ) {
 	i <<= 1;
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
@@ -7,6 +7,8 @@ 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" },
@@ -107,6 +109,8 @@ const QString& KeyNames::find(int k) {
 // Implementation of ModifierNames
-struct {
+struct Modifier_Names_t {
 	int value;
 	char* name;
-} Modifier_Names[] = {
+};
+
+static const Modifier_Names_t Modifier_Names[] = {
 	{ 8, "Shift" },
@@ -161,6 +165,8 @@ const QString& ModifierNames::find(int k) {
 
-struct {
+struct Keycode_Names_t {
 	char* name;
 	int keycode;
-} Keycode_Names[] = {
+};
+
+static const Keycode_Names_t Keycode_Names[] = {
 	{ "Escape", 0x1000 },
@@ -168,3 +174,3 @@ struct {
 	{ "Backtab", 0x1002 },
-	{ "Backspace", 0x1003 }, 
+	{ "Backspace", 0x1003 },
 	{ "BackSpace", 0x1003 },
@@ -183,5 +189,5 @@ struct {
 	{ "Down", 0x1015 },
-	{ "Prior", 0x1016 }, 
-	{ "PageUp", 0x1016 }, 
-	{ "Next", 0x1017 }, 
+	{ "Prior", 0x1016 },
+	{ "PageUp", 0x1016 },
+	{ "Next", 0x1017 },
 	{ "PageDown", 0x1017 },
diff --git a/noncore/games/qasteroids/view.cpp b/noncore/games/qasteroids/view.cpp
index 352c63b..3a4d410 100644
--- a/noncore/games/qasteroids/view.cpp
+++ b/noncore/games/qasteroids/view.cpp
@@ -57,3 +57,3 @@
 
-struct
+struct kas_animations_t
 {
@@ -62,4 +62,5 @@ struct
     int frames;
-}
-kas_animations [] =
+};
+
+static const kas_animations_t kas_animations [] =
 {
diff --git a/noncore/games/solitaire/cardpile.h b/noncore/games/solitaire/cardpile.h
index 1eb2499..757e6b3 100644
--- a/noncore/games/solitaire/cardpile.h
+++ b/noncore/games/solitaire/cardpile.h
@@ -22,2 +22,4 @@
 
+#include "card.h"
+