diff --git a/src/plugin/kplugintrader.h b/src/plugin/kplugintrader.h --- a/src/plugin/kplugintrader.h +++ b/src/plugin/kplugintrader.h @@ -261,8 +261,6 @@ KPluginTrader &operator=(const KPluginTrader &rhs); KPluginTraderPrivate *const d; - - friend class KPluginTraderSingleton; }; #endif diff --git a/src/plugin/kplugintrader.cpp b/src/plugin/kplugintrader.cpp --- a/src/plugin/kplugintrader.cpp +++ b/src/plugin/kplugintrader.cpp @@ -27,17 +27,10 @@ using namespace KTraderParse; -class KPluginTraderSingleton -{ -public: - KPluginTrader instance; -}; - -Q_GLOBAL_STATIC(KPluginTraderSingleton, s_globalPluginTrader) - KPluginTrader *KPluginTrader::self() { - return &s_globalPluginTrader()->instance; + static KPluginTrader trader; + return &trader; } KPluginTrader::KPluginTrader()