mirror of
git://projects.qi-hardware.com/gmenu2x.git
synced 2024-12-25 20:45:32 +02:00
The "tr1" namespace is no longer needed now that we're on C++11
This commit is contained in:
parent
de9b3cd27d
commit
fb8f4e6e72
@ -29,8 +29,8 @@
|
||||
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
#include <tr1/unordered_map>
|
||||
|
||||
class ASFont;
|
||||
class Button;
|
||||
@ -58,8 +58,8 @@ enum color {
|
||||
NUM_COLORS,
|
||||
};
|
||||
|
||||
typedef std::tr1::unordered_map<std::string, std::string, std::tr1::hash<std::string> > ConfStrHash;
|
||||
typedef std::tr1::unordered_map<std::string, int, std::tr1::hash<std::string> > ConfIntHash;
|
||||
typedef std::unordered_map<std::string, std::string, std::hash<std::string> > ConfStrHash;
|
||||
typedef std::unordered_map<std::string, int, std::hash<std::string> > ConfIntHash;
|
||||
|
||||
class GMenu2X {
|
||||
private:
|
||||
|
@ -38,7 +38,6 @@
|
||||
#include <fstream>
|
||||
|
||||
using namespace std;
|
||||
using std::tr1::unordered_map;
|
||||
|
||||
#define SELECTOR_ELEMENTS 11
|
||||
|
||||
|
@ -24,8 +24,8 @@
|
||||
#include "dialog.h"
|
||||
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
#include <tr1/unordered_map>
|
||||
|
||||
class LinkApp;
|
||||
class FileLister;
|
||||
@ -35,7 +35,7 @@ private:
|
||||
int selRow;
|
||||
LinkApp *link;
|
||||
std::string file, dir;
|
||||
std::tr1::unordered_map<std::string, std::string> aliases;
|
||||
std::unordered_map<std::string, std::string> aliases;
|
||||
|
||||
void loadAliases();
|
||||
std::string getAlias(const std::string &key);
|
||||
|
@ -21,11 +21,11 @@
|
||||
#define SURFACECOLLECTION_H
|
||||
|
||||
#include <string>
|
||||
#include <tr1/unordered_map>
|
||||
#include <unordered_map>
|
||||
|
||||
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.
|
||||
|
@ -30,7 +30,6 @@
|
||||
#include <stdarg.h>
|
||||
|
||||
using namespace std;
|
||||
using std::tr1::unordered_map;
|
||||
|
||||
Translator::Translator(const string &lang) {
|
||||
_lang = "";
|
||||
|
@ -22,7 +22,7 @@
|
||||
#define TRANSLATOR_H
|
||||
|
||||
#include <string>
|
||||
#include <tr1/unordered_map>
|
||||
#include <unordered_map>
|
||||
|
||||
/**
|
||||
Hash Map of translation strings.
|
||||
@ -32,7 +32,7 @@ Hash Map of translation strings.
|
||||
class Translator {
|
||||
private:
|
||||
std::string _lang;
|
||||
std::tr1::unordered_map<std::string, std::string> translations;
|
||||
std::unordered_map<std::string, std::string> translations;
|
||||
|
||||
public:
|
||||
Translator(const std::string &lang="");
|
||||
|
Loading…
Reference in New Issue
Block a user