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

List:       kde-commits
Subject:    [kdevplatform/5.0] project: ProjectConfigSkeleton: Remove FIXME
From:       Kevin Funk <kfunk () kde ! org>
Date:       2016-12-09 11:02:15
Message-ID: E1cFIwR-0004KD-C0 () code ! kde ! org
[Download RAW message or body]

Git commit 3fc389e64b2955cd7347d6798202b2bf22ab5643 by Kevin Funk.
Committed on 09/12/2016 at 11:02.
Pushed by kfunk into branch '5.0'.

ProjectConfigSkeleton: Remove FIXME

Code works as expected, just verified. Also fix the visibility of the
other ctor

M  +0    -2    project/projectconfigskeleton.cpp
M  +9    -10   project/projectconfigskeleton.h

https://commits.kde.org/kdevplatform/3fc389e64b2955cd7347d6798202b2bf22ab5643

diff --git a/project/projectconfigskeleton.cpp b/project/projectconfigskeleton.cpp
index c4c97670c..9d37a547c 100644
--- a/project/projectconfigskeleton.cpp
+++ b/project/projectconfigskeleton.cpp
@@ -46,8 +46,6 @@ ProjectConfigSkeleton::ProjectConfigSkeleton( const QString & \
configname )  ProjectConfigSkeleton::ProjectConfigSkeleton( KSharedConfigPtr config )
         : KConfigSkeleton( config ), d( new ProjectConfigSkeletonPrivate )
 {
-    // FIXME: Check if that does the right thing.
-    // https://phabricator.kde.org/D3386 broke source compat in kconfig, thus \
requiring us to make this ctor public  Q_ASSERT(config);
     d->m_developerTempFile = config->name();
 }
diff --git a/project/projectconfigskeleton.h b/project/projectconfigskeleton.h
index c8314df9f..ad3c06359 100644
--- a/project/projectconfigskeleton.h
+++ b/project/projectconfigskeleton.h
@@ -32,17 +32,8 @@ class Path;
 class KDEVPLATFORMPROJECT_EXPORT ProjectConfigSkeleton: public KConfigSkeleton
 {
     Q_OBJECT
-public:
-
-    /**
-     * Constructs a new skeleton, the skeleton will write to the developer
-     * configuration file, which is by default located in projectdir/.kdev4
-     * The defaults will be set from the project file, which is in the projectdir
-     *
-     * @param configname The absolute filename of the developer configuration file
-     */
-    explicit ProjectConfigSkeleton( const QString & configname );
 
+public:
     ~ProjectConfigSkeleton() override;
 
     void setDeveloperTempFile( const QString& );
@@ -58,6 +49,14 @@ public:
 
 protected:
     explicit ProjectConfigSkeleton( KSharedConfigPtr config );
+    /**
+     * Constructs a new skeleton, the skeleton will write to the developer
+     * configuration file, which is by default located in projectdir/.kdev4
+     * The defaults will be set from the project file, which is in the projectdir
+     *
+     * @param configname The absolute filename of the developer configuration file
+     */
+    explicit ProjectConfigSkeleton( const QString & configname );
 
 private:
     struct ProjectConfigSkeletonPrivate * const d;


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