[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bgluon=5D_/=3A_Use_the_newly_implemented_GLUON=5FDEF?=
From:       Laszlo Papp <djszapi () archlinux ! us>
Date:       2011-01-26 1:28:40
Message-ID: 20110126012840.7B139A6094 () git ! kde ! org
[Download RAW message or body]

Git commit 068fdf121bce405c0b504a1ee1d96075a5d03b8d by Laszlo Papp.
Pushed by lpapp into branch 'master'.

Use the newly implemented GLUON_DEFINE_SINGLETON macro instead of the hack.

M  +1    -5    creator/lib/widgets/propertywidgetitemfactory.cpp     
M  +1    -1    player/lib/authentication.cpp     

http://commits.kde.org/fad2ae7b/068fdf121bce405c0b504a1ee1d96075a5d03b8d

diff --git a/creator/lib/widgets/propertywidgetitemfactory.cpp \
b/creator/lib/widgets/propertywidgetitemfactory.cpp index c09ae9b..2f9b539 100644
--- a/creator/lib/widgets/propertywidgetitemfactory.cpp
+++ b/creator/lib/widgets/propertywidgetitemfactory.cpp
@@ -29,11 +29,7 @@
 
 using namespace GluonCreator;
 
-template<>
-#ifndef WIN32
-GLUONCREATOR_EXPORT
-#endif
-PropertyWidgetItemFactory* \
GluonCore::Singleton<PropertyWidgetItemFactory>::m_instance = 0; \
+GLUON_DEFINE_SINGLETON(PropertyWidgetItemFactory)  
 PropertyWidgetItem*
 PropertyWidgetItemFactory::create( const QObject* object, const QString& type, \
                QWidget* parent )
diff --git a/player/lib/authentication.cpp b/player/lib/authentication.cpp
index 9f6ba60..1937b49 100644
--- a/player/lib/authentication.cpp
+++ b/player/lib/authentication.cpp
@@ -26,7 +26,7 @@
 
 using namespace GluonPlayer;
 
-template<> GLUON_PLAYER_STATIC_EXPORT Authentication* \
GluonCore::Singleton<Authentication>::m_instance = 0; \
+GLUON_DEFINE_SINGLETON(Authentication)  
 Authentication::Authentication()
     : m_initialized( false )


[prev in list] [next in list] [prev in thread] [next in thread]