From 4ddc18984774ae448dd2f8d808eb2fd2633d3344 Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Wed, 28 Jul 2010 03:31:41 +0200
Subject: [PATCH] Use tr1::unordered_map instead of google::dense_hash_map in
 class GMenu2X.

This reduces the binary size by about 260K.
---
 src/gmenu2x.cpp                | 10 +---------
 src/gmenu2x.h                  | 15 ++++++++-------
 src/menusettingmultistring.cpp |  3 +++
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/gmenu2x.cpp b/src/gmenu2x.cpp
index 9619e04..d7484e2 100644
--- a/src/gmenu2x.cpp
+++ b/src/gmenu2x.cpp
@@ -21,6 +21,7 @@
 #include <iostream>
 #include <sstream>
 #include <fstream>
+#include <algorithm>
 #include <stdlib.h>
 #include <unistd.h>
 #include <math.h>
@@ -170,15 +171,6 @@ GMenu2X::GMenu2X() {
 	f200 = true;
 #endif
 
-	confStr.set_empty_key(" ");
-	confStr.set_deleted_key("");
-	confInt.set_empty_key(" ");
-	confInt.set_deleted_key("");
-	skinConfInt.set_empty_key(" ");
-	skinConfInt.set_deleted_key("");
-	skinConfStr.set_empty_key(" ");
-	skinConfStr.set_deleted_key("");
-
 	//open2x
 	savedVolumeMode = 0;
 	volumeMode = VOLUME_MODE_NORMAL;
diff --git a/src/gmenu2x.h b/src/gmenu2x.h
index 01db7ea..dd0be68 100644
--- a/src/gmenu2x.h
+++ b/src/gmenu2x.h
@@ -21,10 +21,6 @@
 #ifndef GMENU2X_H
 #define GMENU2X_H
 
-#include <string>
-#include <iostream>
-
-#include "google/dense_hash_map"
 #include "surfacecollection.h"
 #include "iconbutton.h"
 #include "translator.h"
@@ -35,6 +31,11 @@
 #include "asfont.h"
 #include "surface.h"
 
+#include <iostream>
+#include <string>
+#include <vector>
+#include <tr1/unordered_map>
+
 const int MAX_VOLUME_SCALE_FACTOR = 200;
 // Default values - going to add settings adjustment, saving, loading and such
 const int VOLUME_SCALER_MUTE = 0;
@@ -63,12 +64,12 @@ enum color {
 };
 
 using std::string;
+using std::vector;
 using fastdelegate::FastDelegate0;
-using google::dense_hash_map;
 
 typedef FastDelegate0<> MenuAction;
-typedef dense_hash_map<string, string, hash<string> > ConfStrHash;
-typedef dense_hash_map<string, int, hash<string> > ConfIntHash;
+typedef unordered_map<string, string, hash<string> > ConfStrHash;
+typedef unordered_map<string, int, hash<string> > ConfIntHash;
 
 typedef struct {
 	unsigned short batt;
diff --git a/src/menusettingmultistring.cpp b/src/menusettingmultistring.cpp
index dd3d8a9..eda8059 100644
--- a/src/menusettingmultistring.cpp
+++ b/src/menusettingmultistring.cpp
@@ -22,6 +22,9 @@
 #include "iconbutton.h"
 #include "FastDelegate.h"
 
+#include <algorithm>
+
+using std::find;
 using std::string;
 using std::vector;
 using fastdelegate::MakeDelegate;