| -rw-r--r-- | noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp | 18 | ||||
| -rw-r--r-- | noncore/games/qasteroids/view.cpp | 7 | ||||
| -rw-r--r-- | noncore/games/solitaire/cardpile.h | 2 |
3 files changed, 18 insertions, 9 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,16 +160,18 @@ 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 }, { "Return", 0x1004 }, 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 @@ -52,19 +52,20 @@ #define PI_X_2 6.283185307 #ifndef M_PI #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 }, { ID_ROCK_SMALL, "rock3/rock3\%1.png", 32 }, { ID_SHIP, "ship/ship\%1.png", 32 }, { ID_MISSILE, "missile/missile.png", 0 }, 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 @@ -17,12 +17,14 @@ ** not clear to you. ** **********************************************************************/ #ifndef CARD_PILE_H #define CARD_PILE_H +#include "card.h" + #include <qpoint.h> #include <qlist.h> enum ePileStackingType { |