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

In C++11, it is no longer necessary to avoid ">>" in nested templates

Browse Source
This commit is contained in:
Maarten ter Huurne 2014-08-16 05:25:23 +02:00
parent 891525aa94
commit e5a432cb6b
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/buttonbox.h
View File

@ -21,7 +21,7 @@ public:
void handleTS(); void handleTS();
private: private:
std::vector<std::unique_ptr<IconButton> > buttons; std::vector<std::unique_ptr<IconButton>> buttons;
GMenu2X *gmenu2x; GMenu2X *gmenu2x;
}; };

2
src/inputdialog.h
View File

@ -55,7 +55,7 @@ private:
bool close, ok; bool close, ok;
std::string title, text, icon; std::string title, text, icon;
short curKeyboard; short curKeyboard;
std::vector< std::vector<std::string> > keyboard; std::vector<std::vector<std::string>> keyboard;
std::vector<std::string> *kb; std::vector<std::string> *kb;
int kbLength, kbWidth, kbHeight, kbLeft; int kbLength, kbWidth, kbHeight, kbLeft;
SDL_Rect kbRect; SDL_Rect kbRect;

2
src/menu.h
View File

@ -59,7 +59,7 @@ private:
int iSection, iLink; int iSection, iLink;
uint iFirstDispRow; uint iFirstDispRow;
std::vector<std::string> sections; std::vector<std::string> sections;
std::vector< std::vector<Link*> > links; std::vector<std::vector<Link*>> links;
uint linkColumns, linkRows; uint linkColumns, linkRows;

4
src/utilities.h
View File

@ -27,8 +27,8 @@
#include "inputmanager.h" #include "inputmanager.h"
typedef std::unordered_map<std::string, std::string, std::hash<std::string> > ConfStrHash; 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; typedef std::unordered_map<std::string, int, std::hash<std::string>> ConfIntHash;
class case_less { class case_less {
public: public: