From ebcaf997ca4e7cf687604ccb081d577f87b08008 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 7 Dec 2016 09:29:27 +0100 Subject: Revert "[autotest] Fix stupidity" This reverts commit 71f16741a0288d8587876dcc7dbb33ba8f00546a. --- autotests/kconfig_compiler/test8c.h.ref | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'autotests/kconfig_compiler/test8c.h.ref') diff --git a/autotests/kconfig_compiler/test8c.h.ref b/autotests/kconfig_compiler/test8c.h.ref index 8ed9962c..95464e5a 100644 --- a/autotests/kconfig_compiler/test8c.h.ref +++ b/autotests/kconfig_compiler/test8c.h.ref @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler_kf5 from test8c.kcfg. +// This file is generated by kconfig_compiler_kf5 from test8a.kcfg. // All changes you do to this file will be lost. #ifndef TEST8C_H #define TEST8C_H -- cgit v1.2.1 From 4f9d7dde3a06da26d93e8f7ec98a283111a2d8c9 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 7 Dec 2016 09:29:31 +0100 Subject: Revert "Generate an instance with KSharedConfig::Ptr for singleton and arg" This reverts commit cd4e6504dfbdface00037625f0cedda511e6d839. As suggested by Martin on release-team@kde.org, given that it breaks SC. --- autotests/kconfig_compiler/test8c.h.ref | 70 --------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 autotests/kconfig_compiler/test8c.h.ref (limited to 'autotests/kconfig_compiler/test8c.h.ref') diff --git a/autotests/kconfig_compiler/test8c.h.ref b/autotests/kconfig_compiler/test8c.h.ref deleted file mode 100644 index 95464e5a..00000000 --- a/autotests/kconfig_compiler/test8c.h.ref +++ /dev/null @@ -1,70 +0,0 @@ -// This file is generated by kconfig_compiler_kf5 from test8a.kcfg. -// All changes you do to this file will be lost. -#ifndef TEST8C_H -#define TEST8C_H - -#include -#include -#include - -class Test8c : public KConfigSkeleton -{ - public: - - static Test8c *self(); - static void instance(const QString& cfgfilename); - static void instance(KSharedConfig::Ptr config); - ~Test8c(); - - /** - Set Font - */ - static - void setFont( const QFont & v ) - { - if (!self()->isImmutable( QStringLiteral( "Font" ) )) - self()->mFont = v; - } - - /** - Get Font - */ - static - QFont font() - { - return self()->mFont; - } - - /** - Set TitleFont - */ - static - void setTitleFont( const QFont & v ) - { - if (!self()->isImmutable( QStringLiteral( "TitleFont" ) )) - self()->mTitleFont = v; - } - - /** - Get TitleFont - */ - static - QFont titleFont() - { - return self()->mTitleFont; - } - - protected: - Test8c(KSharedConfig::Ptr config); - friend class Test8cHelper; - - - // Group - QFont mFont; - QFont mTitleFont; - - private: -}; - -#endif - -- cgit v1.2.1