diff --git a/sheets/FunctionModuleRegistry.cpp b/sheets/FunctionModuleRegistry.cpp --- a/sheets/FunctionModuleRegistry.cpp +++ b/sheets/FunctionModuleRegistry.cpp @@ -23,7 +23,7 @@ #include "Function.h" #include "FunctionRepository.h" -#include +#include #include #ifndef SHEETS_NO_PLUGINMODULES @@ -46,6 +46,8 @@ #include "functions/TrigonometryModule.h" #endif +Q_GLOBAL_STATIC(Calligra::Sheets::FunctionModuleRegistry, s_instance) + using namespace Calligra::Sheets; class Q_DECL_HIDDEN FunctionModuleRegistry::Private @@ -100,7 +102,6 @@ FunctionModuleRegistry* FunctionModuleRegistry::instance() { - K_GLOBAL_STATIC(FunctionModuleRegistry, s_instance) return s_instance; } diff --git a/sheets/FunctionRepository.cpp b/sheets/FunctionRepository.cpp --- a/sheets/FunctionRepository.cpp +++ b/sheets/FunctionRepository.cpp @@ -31,9 +31,11 @@ #include #include -#include +#include #include +Q_GLOBAL_STATIC(Calligra::Sheets::FunctionRepository, s_instance) + using namespace Calligra::Sheets; class Q_DECL_HIDDEN FunctionRepository::Private @@ -48,7 +50,6 @@ FunctionRepository* FunctionRepository::self() { - K_GLOBAL_STATIC(FunctionRepository, s_instance) if (!s_instance.exists()) { *s_instance; // creates the global instance diff --git a/sheets/dialogs/AutoFormatDialog.cpp b/sheets/dialogs/AutoFormatDialog.cpp --- a/sheets/dialogs/AutoFormatDialog.cpp +++ b/sheets/dialogs/AutoFormatDialog.cpp @@ -33,7 +33,6 @@ #include #include -#include #include #include diff --git a/sheets/part/ToolRegistry.cpp b/sheets/part/ToolRegistry.cpp --- a/sheets/part/ToolRegistry.cpp +++ b/sheets/part/ToolRegistry.cpp @@ -25,11 +25,13 @@ #include #include #include -#include +#include #include #include +Q_GLOBAL_STATIC(Calligra::Sheets::ToolRegistry, s_instance) + using namespace Calligra::Sheets; @@ -55,7 +57,6 @@ ToolRegistry* ToolRegistry::instance() { - K_GLOBAL_STATIC(ToolRegistry, s_instance) return s_instance; }