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/3fc389e64b2955cd7347d6798202b2bf22ab56= 43 diff --git a/project/projectconfigskeleton.cpp b/project/projectconfigskele= ton.cpp index c4c97670c..9d37a547c 100644 --- a/project/projectconfigskeleton.cpp +++ b/project/projectconfigskeleton.cpp @@ -46,8 +46,6 @@ ProjectConfigSkeleton::ProjectConfigSkeleton( const QStri= ng & 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, t= hus requiring us to make this ctor public Q_ASSERT(config); d->m_developerTempFile =3D config->name(); } diff --git a/project/projectconfigskeleton.h b/project/projectconfigskeleto= n.h index c8314df9f..ad3c06359 100644 --- a/project/projectconfigskeleton.h +++ b/project/projectconfigskeleton.h @@ -32,17 +32,8 @@ class Path; class KDEVPLATFORMPROJECT_EXPORT ProjectConfigSkeleton: public KConfigSkel= eton { 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 pro= jectdir - * - * @param configname The absolute filename of the developer configurat= ion 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 pro= jectdir + * + * @param configname The absolute filename of the developer configurat= ion file + */ + explicit ProjectConfigSkeleton( const QString & configname ); = private: struct ProjectConfigSkeletonPrivate * const d;