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