[Scummvm-cvs-logs] scummvm master -> 3edd4180f3fe9fb098a33870d25f7a4fc53eb96e

tsoliman tarek at bashasoliman.com
Sat Feb 25 04:51:39 CET 2012


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3edd4180f3 MAEMO: Move static table out of .h file


Commit: 3edd4180f3fe9fb098a33870d25f7a4fc53eb96e
    https://github.com/scummvm/scummvm/commit/3edd4180f3fe9fb098a33870d25f7a4fc53eb96e
Author: Tarek Soliman (tsoliman at scummvm.org)
Date: 2012-02-24T19:43:08-08:00

Commit Message:
MAEMO: Move static table out of .h file

Thanks fuzzie & LordHoto for pointing this out

Changed paths:
    backends/platform/maemo/maemo-common.h
    backends/platform/maemo/maemo.cpp



diff --git a/backends/platform/maemo/maemo-common.h b/backends/platform/maemo/maemo-common.h
index 453c70c..0442b9c 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 209e527..a127926 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;
 	}






More information about the Scummvm-git-logs mailing list