qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-22 23:52:48 +02:00
Code

The "tr1" namespace is no longer needed now that we're on C++11

Browse Source
This commit is contained in:
Maarten ter Huurne 2013-08-01 14:11:21 +02:00
parent de9b3cd27d
commit fb8f4e6e72
6 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gmenu2x.h
View File

@ -29,8 +29,8 @@
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <unordered_map>
#include <vector> #include <vector>
#include <tr1/unordered_map>
class ASFont; class ASFont;
class Button; class Button;
@ -58,8 +58,8 @@ enum color {
NUM_COLORS, NUM_COLORS,
}; };
typedef std::tr1::unordered_map<std::string, std::string, std::tr1::hash<std::string> > ConfStrHash; typedef std::unordered_map<std::string, std::string, std::hash<std::string> > ConfStrHash;
typedef std::tr1::unordered_map<std::string, int, std::tr1::hash<std::string> > ConfIntHash; typedef std::unordered_map<std::string, int, std::hash<std::string> > ConfIntHash;
class GMenu2X { class GMenu2X {
private: private:

1
src/selector.cpp
View File

@ -38,7 +38,6 @@
#include <fstream> #include <fstream>
using namespace std; using namespace std;
using std::tr1::unordered_map;
#define SELECTOR_ELEMENTS 11 #define SELECTOR_ELEMENTS 11

4
src/selector.h
View File

@ -24,8 +24,8 @@
#include "dialog.h" #include "dialog.h"
#include <string> #include <string>
#include <unordered_map>
#include <vector> #include <vector>
#include <tr1/unordered_map>
class LinkApp; class LinkApp;
class FileLister; class FileLister;
@ -35,7 +35,7 @@ private:
int selRow; int selRow;
LinkApp *link; LinkApp *link;
std::string file, dir; std::string file, dir;
std::tr1::unordered_map<std::string, std::string> aliases; std::unordered_map<std::string, std::string> aliases;
void loadAliases(); void loadAliases();
std::string getAlias(const std::string &key); std::string getAlias(const std::string &key);

4
src/surfacecollection.h
View File

@ -21,11 +21,11 @@
#define SURFACECOLLECTION_H #define SURFACECOLLECTION_H
#include <string> #include <string>
#include <tr1/unordered_map> #include <unordered_map>
class Surface; class Surface;
typedef std::tr1::unordered_map<std::string, Surface *> SurfaceHash; typedef std::unordered_map<std::string, Surface *> SurfaceHash;
/** /**
Hash Map of surfaces that loads surfaces not already loaded and reuses already loaded ones. Hash Map of surfaces that loads surfaces not already loaded and reuses already loaded ones.

1
src/translator.cpp
View File

@ -30,7 +30,6 @@
#include <stdarg.h> #include <stdarg.h>
using namespace std; using namespace std;
using std::tr1::unordered_map;
Translator::Translator(const string &lang) { Translator::Translator(const string &lang) {
_lang = ""; _lang = "";

4
src/translator.h
View File

@ -22,7 +22,7 @@
#define TRANSLATOR_H #define TRANSLATOR_H
#include <string> #include <string>
#include <tr1/unordered_map> #include <unordered_map>
/** /**
Hash Map of translation strings. Hash Map of translation strings.
@ -32,7 +32,7 @@ Hash Map of translation strings.
class Translator { class Translator {
private: private:
std::string _lang; std::string _lang;
std::tr1::unordered_map<std::string, std::string> translations; std::unordered_map<std::string, std::string> translations;
public: public:
Translator(const std::string &lang=""); Translator(const std::string &lang="");