[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [qtcurve] /: Remove constructor inheritance
From:       Yichao Yu <yyc1992 () gmail ! com>
Date:       2015-03-04 1:38:35
Message-ID: E1YSyGh-0004SK-5P () scm ! kde ! org
[Download RAW message or body]

Git commit 4869ad8c40c21dde37e69c03e8402975f9821ebd by Yichao Yu.
Committed on 04/03/2015 at 01:35.
Pushed by yuyichao into branch 'master'.

Remove constructor inheritance

BUG: 344796

M  +4    -1    gtk2/style/tab.cpp
M  +1    -4    lib/utils/gtkutils.h
M  +2    -1    lib/utils/strs.h

http://commits.kde.org/qtcurve/4869ad8c40c21dde37e69c03e8402975f9821ebd

diff --git a/gtk2/style/tab.cpp b/gtk2/style/tab.cpp
index 3cffe13..c35d687 100644
--- a/gtk2/style/tab.cpp
+++ b/gtk2/style/tab.cpp
@@ -46,7 +46,10 @@ Info::Info(GtkWidget *notebook)
 
 class TabMap: public std::unordered_map<GtkWidget*, Info> {
 public:
-    using std::unordered_map<GtkWidget*, Info>::unordered_map;
+    // TODO Use constructor inheritance when we drop gcc 4.7 support
+    TabMap()
+        : std::unordered_map<GtkWidget*, Info>()
+    {}
     Info*
     lookup(GtkWidget *hash, bool create=false)
     {
diff --git a/lib/utils/gtkutils.h b/lib/utils/gtkutils.h
index dbdd7da..7c360b7 100644
--- a/lib/utils/gtkutils.h
+++ b/lib/utils/gtkutils.h
@@ -135,10 +135,7 @@ public:
 };
 
 template<typename ObjType=GObject>
-class GObjPtr: public RefPtr<ObjType, GObjectDeleter> {
-public:
-    using RefPtr<ObjType, GObjectDeleter>::RefPtr;
-};
+using GObjPtr = RefPtr<ObjType, GObjectDeleter>;
 
 }
 
diff --git a/lib/utils/strs.h b/lib/utils/strs.h
index 5bd81e7..780af07 100644
--- a/lib/utils/strs.h
+++ b/lib/utils/strs.h
@@ -34,7 +34,8 @@ namespace QtCurve {
 
 class uniqueStr : public uniqueCPtr<char> {
 public:
-    using uniqueCPtr<char>::uniqueCPtr;
+    // TODO add back when when we drop gcc 4.7 support.
+    // using uniqueCPtr<char>::uniqueCPtr;
     uniqueStr(char *p)
         : uniqueCPtr<char>(p)
     {
[prev in list] [next in list] [prev in thread] [next in thread]