diff options
author | David Faure <faure@kde.org> | 2016-12-07 09:29:31 +0100 |
---|---|---|
committer | David Faure <faure@kde.org> | 2016-12-07 09:29:38 +0100 |
commit | 4f9d7dde3a06da26d93e8f7ec98a283111a2d8c9 (patch) | |
tree | 519ffaac87f803d54731f1831cb0e9867c504e4e /autotests/kconfig_compiler/test8c.cpp.ref | |
parent | ebcaf997ca4e7cf687604ccb081d577f87b08008 (diff) | |
download | kconfig-4f9d7dde3a06da26d93e8f7ec98a283111a2d8c9.tar.gz kconfig-4f9d7dde3a06da26d93e8f7ec98a283111a2d8c9.tar.bz2 |
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.
Diffstat (limited to 'autotests/kconfig_compiler/test8c.cpp.ref')
-rw-r--r-- | autotests/kconfig_compiler/test8c.cpp.ref | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/autotests/kconfig_compiler/test8c.cpp.ref b/autotests/kconfig_compiler/test8c.cpp.ref deleted file mode 100644 index 7c7799bc..00000000 --- a/autotests/kconfig_compiler/test8c.cpp.ref +++ /dev/null @@ -1,65 +0,0 @@ -// This file is generated by kconfig_compiler_kf5 from test8a.kcfg. -// All changes you do to this file will be lost. - -#include "test8c.h" - -#include <qglobal.h> -#include <QtCore/QFile> - -#include <QDebug> - -class Test8cHelper -{ - public: - Test8cHelper() : q(0) {} - ~Test8cHelper() { delete q; } - Test8c *q; -}; -Q_GLOBAL_STATIC(Test8cHelper, s_globalTest8c) -Test8c *Test8c::self() -{ - if (!s_globalTest8c()->q) - qFatal("you need to call Test8c::instance before using"); - return s_globalTest8c()->q; -} - -void Test8c::instance(const QString& cfgfilename) -{ - if (s_globalTest8c()->q) { - qDebug() << "Test8c::instance called after the first use - ignoring"; - return; - } - new Test8c(KSharedConfig::openConfig(cfgfilename)); - s_globalTest8c()->q->read(); -} - -void Test8c::instance(KSharedConfig::Ptr config) -{ - if (s_globalTest8c()->q) { - qDebug() << "Test8c::instance called after the first use - ignoring"; - return; - } - new Test8c(config); - s_globalTest8c()->q->read(); -} - -Test8c::Test8c( KSharedConfig::Ptr config ) - : KConfigSkeleton( config ) -{ - Q_ASSERT(!s_globalTest8c()->q); - s_globalTest8c()->q = this; - setCurrentGroup( QStringLiteral( "Group" ) ); - - KConfigSkeleton::ItemFont *itemFont; - itemFont = new KConfigSkeleton::ItemFont( currentGroup(), QStringLiteral( "Font" ), mFont, QFont() ); - addItem( itemFont, QStringLiteral( "Font" ) ); - KConfigSkeleton::ItemFont *itemTitleFont; - itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), QStringLiteral( "TitleFont" ), mTitleFont, QFont() ); - addItem( itemTitleFont, QStringLiteral( "TitleFont" ) ); -} - -Test8c::~Test8c() -{ - s_globalTest8c()->q = 0; -} - |