-rw-r--r-- | noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp | 26 | ||||
-rw-r--r-- | noncore/games/qasteroids/view.cpp | 7 | ||||
-rw-r--r-- | noncore/games/solitaire/cardpile.h | 2 |
3 files changed, 22 insertions, 13 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,23 +1,25 @@ #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" }, @@ -96,28 +98,30 @@ const QString& KeyNames::find(int k) { 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; @@ -150,49 +154,51 @@ const QString& ModifierNames::find(int k) { } 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 }, 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 @@ -46,31 +46,32 @@ #define MAX_SHIP_SPEED 8 #define MAX_BRAKES 5 #define MAX_SHIELDS 5 #define MAX_FIREPOWER 5 #define TEXT_SPEED 4 #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 }, { ID_BIT, "bits/bits\%1.png", 16 }, { ID_EXHAUST, "exhaust/exhaust.png", 0 }, { ID_ENERGY_POWERUP, "powerups/energy.png", 0 }, // { ID_TELEPORT_POWERUP, "powerups/teleport%1.png", 12 }, { ID_BRAKE_POWERUP, "powerups/brake.png", 0 }, { ID_SHIELD_POWERUP, "powerups/shield.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 @@ -11,24 +11,26 @@ ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #ifndef CARD_PILE_H #define CARD_PILE_H +#include "card.h" + #include <qpoint.h> #include <qlist.h> enum ePileStackingType { pileCascades = 0, pileStacks, pileCascadesOrStacks }; enum ePileFaceingType { pileFaceUp = 0, pileFaceDown, pileFaceUpOrDown |