diff --git a/src/gmenu2x.h b/src/gmenu2x.h index 3fe750e..65ebec9 100644 --- a/src/gmenu2x.h +++ b/src/gmenu2x.h @@ -29,8 +29,8 @@ #include #include +#include #include -#include class ASFont; class Button; @@ -58,8 +58,8 @@ enum color { NUM_COLORS, }; -typedef std::tr1::unordered_map > ConfStrHash; -typedef std::tr1::unordered_map > ConfIntHash; +typedef std::unordered_map > ConfStrHash; +typedef std::unordered_map > ConfIntHash; class GMenu2X { private: diff --git a/src/selector.cpp b/src/selector.cpp index cb00706..cde60da 100644 --- a/src/selector.cpp +++ b/src/selector.cpp @@ -38,7 +38,6 @@ #include using namespace std; -using std::tr1::unordered_map; #define SELECTOR_ELEMENTS 11 diff --git a/src/selector.h b/src/selector.h index b445933..31d6f79 100644 --- a/src/selector.h +++ b/src/selector.h @@ -24,8 +24,8 @@ #include "dialog.h" #include +#include #include -#include class LinkApp; class FileLister; @@ -35,7 +35,7 @@ private: int selRow; LinkApp *link; std::string file, dir; - std::tr1::unordered_map aliases; + std::unordered_map aliases; void loadAliases(); std::string getAlias(const std::string &key); diff --git a/src/surfacecollection.h b/src/surfacecollection.h index 4841ecb..1209dd6 100644 --- a/src/surfacecollection.h +++ b/src/surfacecollection.h @@ -21,11 +21,11 @@ #define SURFACECOLLECTION_H #include -#include +#include class Surface; -typedef std::tr1::unordered_map SurfaceHash; +typedef std::unordered_map SurfaceHash; /** Hash Map of surfaces that loads surfaces not already loaded and reuses already loaded ones. diff --git a/src/translator.cpp b/src/translator.cpp index 4a37ffb..fec6135 100644 --- a/src/translator.cpp +++ b/src/translator.cpp @@ -30,7 +30,6 @@ #include using namespace std; -using std::tr1::unordered_map; Translator::Translator(const string &lang) { _lang = ""; diff --git a/src/translator.h b/src/translator.h index 278e341..a1ddffd 100644 --- a/src/translator.h +++ b/src/translator.h @@ -22,7 +22,7 @@ #define TRANSLATOR_H #include -#include +#include /** Hash Map of translation strings. @@ -32,7 +32,7 @@ Hash Map of translation strings. class Translator { private: std::string _lang; - std::tr1::unordered_map translations; + std::unordered_map translations; public: Translator(const std::string &lang="");