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

List:       kde-commits
Subject:    [kconfig] src/core: Remove typedef copy
From:       Stephen Kelly <steveire () gmail ! com>
Date:       2016-05-11 20:37:47
Message-ID: E1b0at9-0005Md-7o () scm ! kde ! org
[Download RAW message or body]

Git commit 1f47df5074e041cad803863e5ef04cb082faf601 by Stephen Kelly.
Committed on 11/05/2016 at 20:35.
Pushed by skelly into branch 'master'.

Remove typedef copy

The typedef is copied here to avoid including the header that contains
it.  However, this confuses sip if binding definitions are generated
from the C++ headers.  Simply inline the typedef instead.

M  +3    -3    src/core/kconfiggroup.h

http://commits.kde.org/kconfig/1f47df5074e041cad803863e5ef04cb082faf601

diff --git a/src/core/kconfiggroup.h b/src/core/kconfiggroup.h
index 9ddf886..3e0052a 100644
--- a/src/core/kconfiggroup.h
+++ b/src/core/kconfiggroup.h
@@ -35,7 +35,7 @@
 class KConfig;
 class KConfigGroupPrivate;
 class KSharedConfig;
-typedef QExplicitlySharedDataPointer<KSharedConfig> KSharedConfigPtr;
+
 /**
  * \class KConfigGroup kconfiggroup.h <KConfigGroup>
  *
@@ -83,9 +83,9 @@ public:
     KConfigGroup(const KConfigBase *master, const char *group);
 =

     /** Overload for KConfigGroup(const KConfigBase*,const QString&) */
-    KConfigGroup(const KSharedConfigPtr &master, const QString &group);
+    KConfigGroup(const QExplicitlySharedDataPointer<KSharedConfig> &master=
, const QString &group);
     /** Overload for KConfigGroup(const KConfigBase*,const QString&) */
-    KConfigGroup(const KSharedConfigPtr &master, const char *group);
+    KConfigGroup(const QExplicitlySharedDataPointer<KSharedConfig> &master=
, const char *group);
 =

     /**
      * Creates a copy of a group.

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