1*4882a593SmuzhiyunFrom 60e7464fe2b75bb7187a4be0d6ba944d2b46f93e Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com>
3*4882a593SmuzhiyunDate: Thu, 31 Jan 2019 22:02:32 -0800
4*4882a593SmuzhiyunSubject: [PATCH] Drop tr1 namespace its not there in c++11 and newer
5*4882a593Smuzhiyun
6*4882a593Smuzhiyuncompile as C++11 code
7*4882a593Smuzhiyunlibc++'s tr1 headers don't actually make a tr1 namespace.
8*4882a593Smuzhiyun
9*4882a593SmuzhiyunUpstream-Status: Pending
10*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com>
11*4882a593Smuzhiyun---
12*4882a593Smuzhiyun src/mimonscreenplugins.cpp                             | 10 +++++-----
13*4882a593Smuzhiyun .../ut_mimpluginmanagerconfig.cpp                      |  2 +-
14*4882a593Smuzhiyun .../ut_mimpluginmanagerconfig.h                        |  2 +-
15*4882a593Smuzhiyun 3 files changed, 7 insertions(+), 7 deletions(-)
16*4882a593Smuzhiyun
17*4882a593Smuzhiyundiff --git a/src/mimonscreenplugins.cpp b/src/mimonscreenplugins.cpp
18*4882a593Smuzhiyunindex da6e937e..b830e1bf 100644
19*4882a593Smuzhiyun--- a/src/mimonscreenplugins.cpp
20*4882a593Smuzhiyun+++ b/src/mimonscreenplugins.cpp
21*4882a593Smuzhiyun@@ -21,9 +21,9 @@
22*4882a593Smuzhiyun #include <QDebug>
23*4882a593Smuzhiyun
24*4882a593Smuzhiyun #include <algorithm>
25*4882a593Smuzhiyun-#include <tr1/functional>
26*4882a593Smuzhiyun+#include <functional>
27*4882a593Smuzhiyun
28*4882a593Smuzhiyun-using namespace std::tr1::placeholders;
29*4882a593Smuzhiyun+using namespace std::placeholders;
30*4882a593Smuzhiyun
31*4882a593Smuzhiyun namespace
32*4882a593Smuzhiyun {
33*4882a593Smuzhiyun@@ -118,10 +118,10 @@ bool MImOnScreenPlugins::isEnabled(const QString &plugin) const
34*4882a593Smuzhiyun
35*4882a593Smuzhiyun     std::remove_copy_if(mEnabledSubViews.begin(), mEnabledSubViews.end(),
36*4882a593Smuzhiyun                         std::back_inserter(mEnabledAndAvailableSubViews),
37*4882a593Smuzhiyun-                        std::tr1::bind(&MImOnScreenPlugins::isSubViewUnavailable, this, _1));
38*4882a593Smuzhiyun+                        std::bind(&MImOnScreenPlugins::isSubViewUnavailable, this, _1));
39*4882a593Smuzhiyun
40*4882a593Smuzhiyun     return std::find_if(mEnabledAndAvailableSubViews.begin(), mEnabledAndAvailableSubViews.end(),
41*4882a593Smuzhiyun-                        std::tr1::bind(equalPlugin, _1, plugin)) != mEnabledAndAvailableSubViews.end();
42*4882a593Smuzhiyun+                        std::bind(equalPlugin, _1, plugin)) != mEnabledAndAvailableSubViews.end();
43*4882a593Smuzhiyun }
44*4882a593Smuzhiyun
45*4882a593Smuzhiyun bool MImOnScreenPlugins::isSubViewEnabled(const SubView &subView) const
46*4882a593Smuzhiyun@@ -138,7 +138,7 @@ QList<MImOnScreenPlugins::SubView> MImOnScreenPlugins::enabledSubViews(const QSt
47*4882a593Smuzhiyun {
48*4882a593Smuzhiyun     QList<MImOnScreenPlugins::SubView> result;
49*4882a593Smuzhiyun     std::remove_copy_if(mEnabledSubViews.begin(), mEnabledSubViews.end(),
50*4882a593Smuzhiyun-                        std::back_inserter(result), std::tr1::bind(notEqualPlugin, _1, plugin));
51*4882a593Smuzhiyun+                        std::back_inserter(result), std::bind(notEqualPlugin, _1, plugin));
52*4882a593Smuzhiyun     return result;
53*4882a593Smuzhiyun }
54*4882a593Smuzhiyun
55*4882a593Smuzhiyundiff --git a/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.cpp b/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.cpp
56*4882a593Smuzhiyunindex dea443e3..677dd689 100644
57*4882a593Smuzhiyun--- a/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.cpp
58*4882a593Smuzhiyun+++ b/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.cpp
59*4882a593Smuzhiyun@@ -39,7 +39,7 @@
60*4882a593Smuzhiyun #include "mattributeextensionmanager.h"
61*4882a593Smuzhiyun #include "msharedattributeextensionmanager.h"
62*4882a593Smuzhiyun
63*4882a593Smuzhiyun-using namespace std::tr1;
64*4882a593Smuzhiyun+using namespace std;
65*4882a593Smuzhiyun
66*4882a593Smuzhiyun typedef QSet<Maliit::HandlerState> HandlerStates;
67*4882a593Smuzhiyun Q_DECLARE_METATYPE(HandlerStates);
68*4882a593Smuzhiyundiff --git a/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.h b/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.h
69*4882a593Smuzhiyunindex 5b1b691b..3ea18747 100644
70*4882a593Smuzhiyun--- a/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.h
71*4882a593Smuzhiyun+++ b/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.h
72*4882a593Smuzhiyun@@ -16,7 +16,7 @@
73*4882a593Smuzhiyun
74*4882a593Smuzhiyun #include "mimserveroptions.h"
75*4882a593Smuzhiyun #include "mimsettingsqsettings.h"
76*4882a593Smuzhiyun-#include <tr1/memory>
77*4882a593Smuzhiyun+#include <memory>
78*4882a593Smuzhiyun
79*4882a593Smuzhiyun #include <QtTest/QtTest>
80*4882a593Smuzhiyun #include <QObject>
81*4882a593Smuzhiyun--
82*4882a593Smuzhiyun2.20.1
83*4882a593Smuzhiyun
84