From f604541812d357ef76dc0d5217c8ddba72d74e71 Mon Sep 17 00:00:00 2001
From: emeric <itmfr@yahoo.fr>
Date: Tue, 10 Apr 2018 13:45:56 +0200
Subject: [PATCH] Renamed refresh to refreshView to avoid base class overrides

---
 src/ui/admin/UserView.cpp  | 6 +++---
 src/ui/admin/UserView.hpp  | 2 +-
 src/ui/admin/UsersView.cpp | 6 +++---
 src/ui/admin/UsersView.hpp | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ui/admin/UserView.cpp b/src/ui/admin/UserView.cpp
index 3d466b5e..e2d54c58 100644
--- a/src/ui/admin/UserView.cpp
+++ b/src/ui/admin/UserView.cpp
@@ -183,14 +183,14 @@ UserView::UserView(Wt::WContainerWidget* parent)
 {
 	wApp->internalPathChanged().connect(std::bind([=]
 	{
-		refresh();
+		refreshView();
 	}));
 
-	refresh();
+	refreshView();
 }
 
 void
-UserView::refresh()
+UserView::refreshView()
 {
 	if (!wApp->internalPathMatches("/admin/user"))
 		return;
diff --git a/src/ui/admin/UserView.hpp b/src/ui/admin/UserView.hpp
index 723c0f13..b081d745 100644
--- a/src/ui/admin/UserView.hpp
+++ b/src/ui/admin/UserView.hpp
@@ -29,7 +29,7 @@ class UserView : public Wt::WContainerWidget
 		UserView(Wt::WContainerWidget *parent = 0);
 
 	private:
-		void refresh();
+		void refreshView();
 };
 
 } // namespace UserInterface
diff --git a/src/ui/admin/UsersView.cpp b/src/ui/admin/UsersView.cpp
index 6c0a4153..bdba16b5 100644
--- a/src/ui/admin/UsersView.cpp
+++ b/src/ui/admin/UsersView.cpp
@@ -47,14 +47,14 @@ UsersView::UsersView(Wt::WContainerWidget *parent)
 
 	wApp->internalPathChanged().connect(std::bind([=]
 	{
-		refresh();
+		refreshView();
 	}));
 
-	refresh();
+	refreshView();
 }
 
 void
-UsersView::refresh()
+UsersView::refreshView()
 {
 	if (!wApp->internalPathMatches("/admin/users"))
 		return;
diff --git a/src/ui/admin/UsersView.hpp b/src/ui/admin/UsersView.hpp
index a642ef10..45717f34 100644
--- a/src/ui/admin/UsersView.hpp
+++ b/src/ui/admin/UsersView.hpp
@@ -29,7 +29,7 @@ class UsersView : public Wt::WContainerWidget
 		UsersView(Wt::WContainerWidget *parent = 0);
 
 	private:
-		void refresh();
+		void refreshView();
 
 		Wt::WContainerWidget* _container;
 };