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