diff options
author | Tarek Soliman | 2012-02-24 21:43:08 -0600 |
---|---|---|
committer | Tarek Soliman | 2012-02-24 21:43:08 -0600 |
commit | 3edd4180f3fe9fb098a33870d25f7a4fc53eb96e (patch) | |
tree | 4172dee86c2f9b8b335b2162e9d5b84305a83470 /backends | |
parent | f1a4f508afb7552629b8278d3cef8ed23c05998e (diff) | |
download | scummvm-rg350-3edd4180f3fe9fb098a33870d25f7a4fc53eb96e.tar.gz scummvm-rg350-3edd4180f3fe9fb098a33870d25f7a4fc53eb96e.tar.bz2 scummvm-rg350-3edd4180f3fe9fb098a33870d25f7a4fc53eb96e.zip |
MAEMO: Move static table out of .h file
Thanks fuzzie & LordHoto for pointing this out
Diffstat (limited to 'backends')
-rw-r--r-- | backends/platform/maemo/maemo-common.h | 9 | ||||
-rw-r--r-- | backends/platform/maemo/maemo.cpp | 11 |
2 files changed, 10 insertions, 10 deletions
diff --git a/backends/platform/maemo/maemo-common.h b/backends/platform/maemo/maemo-common.h index 453c70c45f..0442b9c0ae 100644 --- a/backends/platform/maemo/maemo-common.h +++ b/backends/platform/maemo/maemo-common.h @@ -43,15 +43,6 @@ struct Model { bool hasMenuKey; }; -static const Model models[] = { - {"SU-18", kModelType770, "770", false, true}, - {"RX-34", kModelTypeN800, "N800", false, true}, - {"RX-44", kModelTypeN810, "N810", true, true}, - {"RX-48", kModelTypeN810, "N810W", true, true}, - {"RX-51", kModelTypeN900, "N900", true, false}, - {0, kModelTypeInvalid, 0, true, true} -}; - enum CustomEventType { kEventClickMode = 1, kEventInvalid = 0 diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp index 209e527e3f..a127926eb0 100644 --- a/backends/platform/maemo/maemo.cpp +++ b/backends/platform/maemo/maemo.cpp @@ -156,10 +156,19 @@ void OSystem_SDL_Maemo::setWindowCaption(const char *caption) { setXWindowName(cap.c_str()); } +static const Model models[] = { + {"SU-18", kModelType770, "770", false, true}, + {"RX-34", kModelTypeN800, "N800", false, true}, + {"RX-44", kModelTypeN810, "N810", true, true}, + {"RX-48", kModelTypeN810, "N810W", true, true}, + {"RX-51", kModelTypeN900, "N900", true, false}, + {0, kModelTypeInvalid, 0, true, true} +}; + const Maemo::Model OSystem_SDL_Maemo::detectModel() { Common::String deviceHwId = Common::String(getenv("SCUMMVM_MAEMO_DEVICE")); const Model *model; - for (model = models; model->hwId; model++) { + for (model = models; model->hwId; ++model) { if (deviceHwId.equals(model->hwId)) return *model; } |