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
@@ -61,14 +61,15 @@ using namespace Opie::Core;
 #endif
 
 
-struct {
-    bool enabled;
+struct settingsTable_t {
+    bool enabled : 1;
     const char *app;
     const char *start;
     const char *stop;
     const char *desc;
-}
-settingsTable [] =
+};
+
+static settingsTable_t settingsTable [] =
 {
     { FALSE, "language", "raise()", "accept()", // No tr
         QT_TR_NOOP("Language") },
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
@@ -70,7 +70,7 @@ int OCalendarHelper::dayOfWeek( char day )
 {
     int dayOfWeek = 1;
     char i = OPimRecurrence::MON;
-    while ( !( i & day ) && i <= OPimRecurrence::SUN )
+    while ( !( i & day ) && i <= static_cast<char>(OPimRecurrence::SUN) )
     {
         i <<= 1;
         ++dayOfWeek;
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
@@ -399,7 +399,7 @@ int Event::dayOfWeek( char day )
 {
     int dayOfWeek = 1;
     char i = Event::MON;
-    while ( !( i & day ) && i <= Event::SUN ) {
+    while ( !( i & day ) && i <= static_cast<char>(Event::SUN) ) {
         i <<= 1;
         ++dayOfWeek;
     }
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
@@ -5,10 +5,12 @@
 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" },
@@ -105,10 +107,12 @@ 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" },
         { 16, "Control" },
         { 32, "Alt" },
@@ -159,14 +163,16 @@ const QString& ModifierNames::find(int k) {
 
 // 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 },
@@ -181,9 +187,9 @@ struct {
         { "Up", 0x1013 },
         { "Right", 0x1014 },
         { "Down", 0x1015 },
-        { "Prior", 0x1016 }, 
-        { "PageUp", 0x1016 }, 
-        { "Next", 0x1017 }, 
+        { "Prior", 0x1016 },
+        { "PageUp", 0x1016 },
+        { "Next", 0x1017 },
         { "PageDown", 0x1017 },
         { "Shift", 0x1020 },
         { "Control", 0x1021 },
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
@@ -55,13 +55,14 @@
 #define M_PI 3.141592654
 #endif
 
-struct
+struct kas_animations_t
 {
     int id;
     const char *path;
     int frames;
-}
-kas_animations [] =
+};
+
+static const kas_animations_t kas_animations [] =
 {
 //    { ID_ROCK_LARGE,       "rock1/rock1\%1.png",       32 },
     { ID_ROCK_MEDIUM,      "rock2/rock2\%1.png",       32 },
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
@@ -20,6 +20,8 @@
 #ifndef CARD_PILE_H
 #define CARD_PILE_H
 
+#include "card.h"
+
 
 #include <qpoint.h>
 #include <qlist.h>