[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 28/473: Replace unordered_map with map.
noreply at xfce.org
noreply at xfce.org
Mon Feb 16 23:53:18 CET 2015
This is an automated email from the git hooks/post-receive script.
gottcode pushed a commit to branch master
in repository panel-plugins/xfce4-whiskermenu-plugin.
commit 7e96351266de715f971d85c45cc4bb82a2d83012
Author: Graeme Gott <graeme at gottcode.org>
Date: Wed Jun 26 14:53:50 2013 -0400
Replace unordered_map with map.
Downgrade to C++98.
---
src/applications_page.hpp | 8 ++++----
src/list_page.cpp | 2 +-
src/list_page.hpp | 4 ++--
src/menu.cpp | 2 +-
src/menu.hpp | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/applications_page.hpp b/src/applications_page.hpp
index 990799d..7fb1897 100644
--- a/src/applications_page.hpp
+++ b/src/applications_page.hpp
@@ -20,8 +20,8 @@
#include "filter_page.hpp"
#include "slot.hpp"
+#include <map>
#include <string>
-#include <unordered_map>
#include <vector>
extern "C"
@@ -77,9 +77,9 @@ private:
private:
GarconMenu* m_garcon_menu;
Category* m_current_category;
- std::unordered_map<GtkRadioButton*, Category*> m_category_buttons;
- std::unordered_map<Category*, std::vector<Launcher*>> m_categories;
- std::unordered_map<std::string, Launcher*> m_items;
+ std::map<GtkRadioButton*, Category*> m_category_buttons;
+ std::map<Category*, std::vector<Launcher*> > m_categories;
+ std::map<std::string, Launcher*> m_items;
};
}
diff --git a/src/list_page.cpp b/src/list_page.cpp
index c5c751e..8489d42 100644
--- a/src/list_page.cpp
+++ b/src/list_page.cpp
@@ -94,7 +94,7 @@ void ListPage::save(XfceRc* settings)
//-----------------------------------------------------------------------------
-void ListPage::set_menu_items(std::unordered_map<std::string, Launcher*> items)
+void ListPage::set_menu_items(std::map<std::string, Launcher*> items)
{
// Create new model for treeview
LauncherModel model;
diff --git a/src/list_page.hpp b/src/list_page.hpp
index 28be059..a761ed7 100644
--- a/src/list_page.hpp
+++ b/src/list_page.hpp
@@ -20,8 +20,8 @@
#include "page.hpp"
#include "slot.hpp"
+#include <map>
#include <string>
-#include <unordered_map>
#include <vector>
extern "C"
@@ -50,7 +50,7 @@ public:
virtual void add(Launcher* launcher)=0;
void remove(Launcher* launcher);
void save(XfceRc* settings);
- void set_menu_items(std::unordered_map<std::string, Launcher*> items);
+ void set_menu_items(std::map<std::string, Launcher*> items);
void unset_menu_items();
private:
diff --git a/src/menu.cpp b/src/menu.cpp
index 066df59..9678ee8 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -417,7 +417,7 @@ void Menu::set_categories(std::vector<GtkRadioButton*> categories)
//-----------------------------------------------------------------------------
-void Menu::set_items(std::unordered_map<std::string, Launcher*> items)
+void Menu::set_items(std::map<std::string, Launcher*> items)
{
m_search_results->set_menu_items(m_applications->get_model());
m_favorites->set_menu_items(items);
diff --git a/src/menu.hpp b/src/menu.hpp
index 6fc00ad..6dc9d87 100644
--- a/src/menu.hpp
+++ b/src/menu.hpp
@@ -19,8 +19,8 @@
#include "slot.hpp"
+#include <map>
#include <string>
-#include <unordered_map>
#include <vector>
extern "C"
@@ -74,7 +74,7 @@ public:
void show(GtkWidget* parent, bool horizontal);
void save(XfceRc* settings);
void set_categories(std::vector<GtkRadioButton*> categories);
- void set_items(std::unordered_map<std::string, Launcher*> items);
+ void set_items(std::map<std::string, Launcher*> items);
void unset_items();
private:
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list