1From 19cc10dc4378e9eda15b58f3673f686c4ff845e2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 31 Jan 2019 22:17:56 -0800
4Subject: [PATCH] Do not use tr1 namespace
5
6This is not a standard in C++11
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 maliit-keyboard/lib/logic/layouthelper.cpp | 16 ++++++++--------
12 1 file changed, 8 insertions(+), 8 deletions(-)
13
14diff --git a/maliit-keyboard/lib/logic/layouthelper.cpp b/maliit-keyboard/lib/logic/layouthelper.cpp
15index a8bd995f..f694e819 100644
16--- a/maliit-keyboard/lib/logic/layouthelper.cpp
17+++ b/maliit-keyboard/lib/logic/layouthelper.cpp
18@@ -31,7 +31,7 @@
19  */
20
21 #include <algorithm>
22-#include <tr1/functional>
23+#include <functional>
24
25 #include "layouthelper.h"
26 #include "coreutils.h"
27@@ -76,7 +76,7 @@ struct KeyPredicate
28
29 } // namespace
30
31-typedef std::tr1::function<void(const KeyArea &, const KeyOverrides &)> EmitFunc;
32+typedef std::function<void(const KeyArea &, const KeyOverrides &)> EmitFunc;
33
34 class LayoutHelperPrivate
35 {
36@@ -468,13 +468,13 @@ void LayoutHelper::onKeysOverriden(const KeyOverrides &overriden_keys,
37         d->overriden_keys = overriden_keys;
38     }
39
40-    using std::tr1::placeholders::_1;
41-    using std::tr1::placeholders::_2;
42+    using std::placeholders::_1;
43+    using std::placeholders::_2;
44
45-    d->overrideCheck(changed_ids, d->left, std::tr1::bind(&LayoutHelper::leftPanelChanged, this, _1, _2));
46-    d->overrideCheck(changed_ids, d->right, std::tr1::bind(&LayoutHelper::rightPanelChanged, this, _1, _2));
47-    d->overrideCheck(changed_ids, d->center, std::tr1::bind(&LayoutHelper::centerPanelChanged, this, _1, _2));
48-    d->overrideCheck(changed_ids, d->extended, std::tr1::bind(&LayoutHelper::extendedPanelChanged, this, _1, _2));
49+    d->overrideCheck(changed_ids, d->left, std::bind(&LayoutHelper::leftPanelChanged, this, _1, _2));
50+    d->overrideCheck(changed_ids, d->right, std::bind(&LayoutHelper::rightPanelChanged, this, _1, _2));
51+    d->overrideCheck(changed_ids, d->center, std::bind(&LayoutHelper::centerPanelChanged, this, _1, _2));
52+    d->overrideCheck(changed_ids, d->extended, std::bind(&LayoutHelper::extendedPanelChanged, this, _1, _2));
53 }
54
55 }} // namespace Logic, MaliitKeyboard
56--
572.20.1
58
59