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

List:       kde-commits
Subject:    KDE/kdelibs/kdecore
From:       David Faure <faure () kde ! org>
Date:       2007-02-02 15:17:46
Message-ID: 1170429466.412715.13568.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 629378 by dfaure:

more EBN fixes


 M  +4 -4      services/kservicetypetrader.cpp  
 M  +0 -3      services/kservicetypetrader.h  
 M  +21 -0     util/kstaticdeleter.cpp  


--- trunk/KDE/kdelibs/kdecore/services/kservicetypetrader.cpp #629377:629378
@@ -33,15 +33,15 @@
 
 // --------------------------------------------------
 
-KServiceTypeTrader* KServiceTypeTrader::s_self = 0;
+static KServiceTypeTrader* s_globalServiceTypeTrader = 0;
 static KStaticDeleter<KServiceTypeTrader> ktradersd;
 
 KServiceTypeTrader* KServiceTypeTrader::self()
 {
-    if ( !s_self )
-	ktradersd.setObject( s_self, new KServiceTypeTrader );
+    if ( !s_globalServiceTypeTrader )
+	ktradersd.setObject( s_globalServiceTypeTrader, new KServiceTypeTrader );
 
-    return s_self;
+    return s_globalServiceTypeTrader;
 }
 
 KServiceTypeTrader::KServiceTypeTrader()
--- trunk/KDE/kdelibs/kdecore/services/kservicetypetrader.h #629377:629378
@@ -192,9 +192,6 @@
      * @internal
      */
     KServiceTypeTrader();
-
-private:
-    static KServiceTypeTrader* s_self;
 };
 
 #endif
--- trunk/KDE/kdelibs/kdecore/util/kstaticdeleter.cpp #629377:629378
@@ -1,3 +1,24 @@
+/*
+ * This file is part of the KDE Libraries
+ * Copyright (C) 2000 Stephan Kulow <coolo@kde.org>
+ *               2001 KDE Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
 
 #include <kstaticdeleter.h>
 
[prev in list] [next in list] [prev in thread] [next in thread]