Commit c5f8864e authored by Boudewijn Rempt's avatar Boudewijn Rempt

warning--

parent 33cd363e
...@@ -42,7 +42,7 @@ public: ...@@ -42,7 +42,7 @@ public:
/// Provides access to the shape writer /// Provides access to the shape writer
KoXmlWriter &shapeWriter(); KoXmlWriter &shapeWriter();
private: private:
Q_DISABLE_COPY(HtmlSavingContext); Q_DISABLE_COPY(HtmlSavingContext)
private: private:
struct Private; struct Private;
const QScopedPointer<Private> d; const QScopedPointer<Private> d;
......
...@@ -62,7 +62,7 @@ private: ...@@ -62,7 +62,7 @@ private:
KisOptimizedByteArray::MemoryAllocatorSP m_allocator; KisOptimizedByteArray::MemoryAllocatorSP m_allocator;
}; };
Q_GLOBAL_STATIC(DefaultMemoryAllocatorStore, s_instance); Q_GLOBAL_STATIC(DefaultMemoryAllocatorStore, s_instance)
DefaultMemoryAllocatorStore *DefaultMemoryAllocatorStore::instance() DefaultMemoryAllocatorStore *DefaultMemoryAllocatorStore::instance()
{ {
......
...@@ -46,7 +46,7 @@ public: ...@@ -46,7 +46,7 @@ public:
KisPropertiesConfigurationSP lockedProperties(); KisPropertiesConfigurationSP lockedProperties();
private: private:
Q_DISABLE_COPY(KisLockedProperties); Q_DISABLE_COPY(KisLockedProperties)
KisPropertiesConfigurationSP m_lockedProperties; KisPropertiesConfigurationSP m_lockedProperties;
}; };
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <QGlobalStatic> #include <QGlobalStatic>
Q_GLOBAL_STATIC(KisLockedPropertiesServer, s_instance); Q_GLOBAL_STATIC(KisLockedPropertiesServer, s_instance)
......
...@@ -57,7 +57,7 @@ struct KisATanTable { ...@@ -57,7 +57,7 @@ struct KisATanTable {
qreal* ATanTable; qreal* ATanTable;
}; };
Q_GLOBAL_STATIC(KisATanTable, kisATanTable); Q_GLOBAL_STATIC(KisATanTable, kisATanTable)
/// private functions /// private functions
......
...@@ -219,6 +219,6 @@ namespace KisLayerUtils ...@@ -219,6 +219,6 @@ namespace KisLayerUtils
KisNodeSP KRITAIMAGE_EXPORT findNodeByUuid(KisNodeSP root, const QUuid &uuid); KisNodeSP KRITAIMAGE_EXPORT findNodeByUuid(KisNodeSP root, const QUuid &uuid);
KisImageSP KRITAIMAGE_EXPORT findImageByHierarchy(KisNodeSP node); KisImageSP KRITAIMAGE_EXPORT findImageByHierarchy(KisNodeSP node);
}; }
#endif /* __KIS_LAYER_UTILS_H */ #endif /* __KIS_LAYER_UTILS_H */
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "kis_image_config.h" #include "kis_image_config.h"
#include "kis_raster_keyframe_channel.h" #include "kis_raster_keyframe_channel.h"
Q_GLOBAL_STATIC(KisOnionSkinCompositor, s_instance); Q_GLOBAL_STATIC(KisOnionSkinCompositor, s_instance)
struct KisOnionSkinCompositor::Private struct KisOnionSkinCompositor::Private
{ {
......
...@@ -88,8 +88,8 @@ protected: ...@@ -88,8 +88,8 @@ protected:
private: private:
Q_PRIVATE_SLOT(m_d, void slotSelectionChangedCompressed()); Q_PRIVATE_SLOT(m_d, void slotSelectionChangedCompressed())
Q_PRIVATE_SLOT(m_d, void slotConfigChanged()); Q_PRIVATE_SLOT(m_d, void slotConfigChanged())
KisImageWSP image() const; KisImageWSP image() const;
......
...@@ -145,7 +145,7 @@ namespace KisDomUtils { ...@@ -145,7 +145,7 @@ namespace KisDomUtils {
Q_DECLARE_METATYPE(KisTimeRange); Q_DECLARE_METATYPE(KisTimeRange)
KRITAIMAGE_EXPORT QDebug operator<<(QDebug dbg, const KisTimeRange &r); KRITAIMAGE_EXPORT QDebug operator<<(QDebug dbg, const KisTimeRange &r);
......
...@@ -93,6 +93,6 @@ namespace KisLazyFillTools ...@@ -93,6 +93,6 @@ namespace KisLazyFillTools
qreal fuzzyRadius = 0; qreal fuzzyRadius = 0;
qreal cleanUpAmount = 0.0; qreal cleanUpAmount = 0.0;
}; };
}; }
#endif /* __KIS_LAZY_FILL_TOOLS_H */ #endif /* __KIS_LAZY_FILL_TOOLS_H */
...@@ -61,7 +61,7 @@ struct DefaultKoColorInitializer ...@@ -61,7 +61,7 @@ struct DefaultKoColorInitializer
KoColor *value = 0; KoColor *value = 0;
}; };
Q_GLOBAL_STATIC(DefaultKoColorInitializer, s_defaultKoColor); Q_GLOBAL_STATIC(DefaultKoColorInitializer, s_defaultKoColor)
} }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <QString> #include <QString>
Q_GLOBAL_STATIC(KoColorSpaceEngineRegistry, s_instance); Q_GLOBAL_STATIC(KoColorSpaceEngineRegistry, s_instance)
struct Q_DECL_HIDDEN KoColorSpaceEngine::Private { struct Q_DECL_HIDDEN KoColorSpaceEngine::Private {
QString id; QString id;
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "KoMD5Generator.h" #include "KoMD5Generator.h"
KoHashGeneratorProvider *KoHashGeneratorProvider::instance_var = 0; KoHashGeneratorProvider *KoHashGeneratorProvider::instance_var = 0;
Q_GLOBAL_STATIC(KoHashGeneratorProvider, s_instance); Q_GLOBAL_STATIC(KoHashGeneratorProvider, s_instance)
KoHashGeneratorProvider::KoHashGeneratorProvider() KoHashGeneratorProvider::KoHashGeneratorProvider()
{ {
......
...@@ -153,7 +153,7 @@ KoResourceServerProvider::~KoResourceServerProvider() ...@@ -153,7 +153,7 @@ KoResourceServerProvider::~KoResourceServerProvider()
delete d; delete d;
} }
Q_GLOBAL_STATIC(KoResourceServerProvider, s_instance); Q_GLOBAL_STATIC(KoResourceServerProvider, s_instance)
KoResourceServerProvider* KoResourceServerProvider::instance() KoResourceServerProvider* KoResourceServerProvider::instance()
{ {
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "kis_debug.h" #include "kis_debug.h"
Q_GLOBAL_STATIC(KoResourcePaths, s_instance); Q_GLOBAL_STATIC(KoResourcePaths, s_instance)
static QString cleanup(const QString &path) static QString cleanup(const QString &path)
{ {
......
...@@ -88,6 +88,6 @@ void KisShortcutsDialog::KisShortcutsDialogPrivate::undo() ...@@ -88,6 +88,6 @@ void KisShortcutsDialog::KisShortcutsDialogPrivate::undo()
void KisShortcutsDialog::KisShortcutsDialogPrivate::save() void KisShortcutsDialog::KisShortcutsDialogPrivate::save()
{ {
m_shortcutsEditor->save(); m_shortcutsEditor->save();
}; }
#include "moc_KisShortcutsDialog_p.cpp" #include "moc_KisShortcutsDialog_p.cpp"
...@@ -146,7 +146,7 @@ KActionCategory *KActionCollection::getCategory(const QString &name) { ...@@ -146,7 +146,7 @@ KActionCategory *KActionCollection::getCategory(const QString &name) {
category = new KActionCategory(name, this); category = new KActionCategory(name, this);
} }
return category; return category;
}; }
void KActionCollection::clear() void KActionCollection::clear()
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "kis_config_notifier.h" #include "kis_config_notifier.h"
#include "kis_config.h" #include "kis_config.h"
Q_GLOBAL_STATIC(KisSelectionModifierMapper, s_instance); Q_GLOBAL_STATIC(KisSelectionModifierMapper, s_instance)
// This numerically serializes modifier flags... let's keep it around for later. // This numerically serializes modifier flags... let's keep it around for later.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment