* #7133: renamed libs/utilspp to lowercase

daemon/libs/utilspp/Makefile.am

@@ -3,8 +3,8 @@ SUBDIRS = singleton
 noinst_LTLIBRARIES = libutilspp.la
 
 libutilspp_la_SOURCES = \
-	NullType.hpp \
-	Singleton.hpp \
-	ThreadingSingle.hpp ThreadingSingle.inl
+	null_type.hpp \
+	singleton.hpp \
+	threading_single.hpp threading_single.inl
 
 libutilspp_la_LIBADD = ./singleton/libsingleton.la

daemon/libs/utilspp/Singleton.hpp

-#include "ThreadingSingle.hpp"
-#include "singleton/SingletonHolder.hpp"

daemon/libs/utilspp/singleton.hpp

+#include "threading_single.hpp"
+#include "singleton/singleton_holder.hpp"

daemon/libs/utilspp/singleton/Makefile.am

 noinst_LTLIBRARIES = libsingleton.la
 
 libsingleton_la_SOURCES = \
-	CreationUsingNew.hpp CreationUsingNew.inl \
-	LifetimeDefault.hpp LifetimeDefault.inl \
-	SingletonHolder.hpp SingletonHolder.inl 
-
-
-#pkginclude_HEADERS = \
-#	CreationStatic.hpp CreationStatic.inl \
-#	CreationUsingNew.hpp CreationUsingNew.inl \
-#	LifetimeDefault.hpp LifetimeDefault.inl \
-#	LifetimeLibrary.hpp LifetimeLibrary.inl \
-#	LifetimeWithLongevity.hpp LifetimeWithLongevity.inl \
-#	PrivateMembers.hpp PrivateMembers.inl \
-#	SingletonHolder.hpp SingletonHolder.inl 
-
-#pkgincludedir=$(includedir)/utilspp/singleton
-
+	creation_using_new.hpp creation_using_new.inl \
+	lifetime_default.hpp lifetime_default.inl \
+	singleton_holder.hpp singleton_holder.inl

daemon/libs/utilspp/singleton/CreationUsingNew.hpp → daemon/libs/utilspp/singleton/creation_using_new.hpp

@@ -21,8 +21,8 @@
  *    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef CREATION_USING_NEW_HPP
-#define CREATION_USING_NEW_HPP
+#ifndef __CREATION_USING_NEW_HPP__
+#define __CREATION_USING_NEW_HPP__
 
 /**
  * This class is a creation policy for the utilspp::singleton_holder. The
@@ -38,6 +38,5 @@ namespace utilspp
    };
 }
 
-#include "CreationUsingNew.inl"
-
-#endif
+#include "creation_using_new.inl"
+#endif // __CREATION_USING_NEW_HPP__

daemon/libs/utilspp/singleton/LifetimeDefault.hpp → daemon/libs/utilspp/singleton/lifetime_default.hpp

@@ -24,9 +24,6 @@
 #ifndef LIFETIME_DEFAULT_HPP
 #define LIFETIME_DEFAULT_HPP
 
-#include <stdexcept>
-#include <cstdlib>
-
 namespace utilspp
 {
    template< typename T >
@@ -38,6 +35,6 @@ namespace utilspp
    };
 }
 
-#include "LifetimeDefault.inl"
+#include "lifetime_default.inl"
 
 #endif

daemon/libs/utilspp/singleton/LifetimeDefault.inl → daemon/libs/utilspp/singleton/lifetime_default.inl

@@ -21,8 +21,11 @@
  *    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef LIFETIME_DEFAULT_INL
-#define LIFETIME_DEFAULT_INL
+#ifndef __LIFETIME_DEFAULT_INL__
+#define __LIFETIME_DEFAULT_INL__
+
+#include <cstdlib>
+#include <stdexcept>
 
 template< typename T >
 void 
@@ -35,8 +38,7 @@ template< typename T >
 void
 utilspp::LifetimeDefault< T >::onDeadReference()
 {
-   throw std::logic_error( "Dead reference detected" );
+   throw std::logic_error("Dead reference detected");
 }
 
-
-#endif
+#endif // __LIFETIME_DEFAULT_INL__

daemon/libs/utilspp/singleton/SingletonHolder.hpp → daemon/libs/utilspp/singleton/singleton_holder.hpp

@@ -21,14 +21,12 @@
  *    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SINGLETON_HOLDER_HPP
-#define SINGLETON_HOLDER_HPP
+#ifndef __SINGLETON_HOLDER_HPP__
+#define __SINGLETON_HOLDER_HPP__
 
-#include <cassert>
-
-#include "CreationUsingNew.hpp"
-#include "LifetimeDefault.hpp"
-#include "../ThreadingSingle.hpp"
+#include "creation_using_new.hpp"
+#include "lifetime_default.hpp"
+#include "../threading_single.hpp"
 
 namespace utilspp
 {
@@ -60,6 +58,6 @@ namespace utilspp
 
 }
 
-#include "SingletonHolder.inl"
+#include "singleton_holder.inl"
 
 #endif

daemon/libs/utilspp/singleton/SingletonHolder.inl → daemon/libs/utilspp/singleton/singleton_holder.inl

@@ -21,9 +21,10 @@
  *    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SINGLETON_HOLDER_INL
-#define SINGLETON_HOLDER_INL
+#ifndef __SINGLETON_HOLDER_INL__
+#define __SINGLETON_HOLDER_INL__
 
+#include <cassert>
 template
 <
 class T,
@@ -123,4 +124,4 @@ template < class > class M
 >
 bool utilspp::SingletonHolder< T, C, L, M >::mDestroyed;
 
-#endif
+#endif // __SINGLETON_HOLDER_INL__

daemon/libs/utilspp/ThreadingSingle.hpp → daemon/libs/utilspp/threading_single.hpp

@@ -21,10 +21,10 @@
  *    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SINGLE_THREADED_HPP
-#define SINGLE_THREADED_HPP
+#ifndef __THREADING_SINGLE_HPP__
+#define __THREADING_SINGLE_HPP__
 
-#include "NullType.hpp"
+#include "null_type.hpp"
 
 namespace utilspp
 {
@@ -47,6 +47,6 @@ namespace utilspp
       };
 }
 
-#include "ThreadingSingle.inl"
+#include "threading_single.inl"
 
-#endif
+#endif // __THREADING_SINGLE_HPP__

daemon/libs/utilspp/ThreadingSingle.inl → daemon/libs/utilspp/threading_single.inl

@@ -21,8 +21,8 @@
  *    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SINGLE_THREADED_INL
-#define SINGLE_THREADED_INL
+#ifndef __THREADING_SINGLE_INL__
+#define __THREADING_SINGLE_INL__
 
 template< typename T >
 inline
@@ -47,4 +47,4 @@ void
 utilspp::ThreadingSingle< T >::mutex::unlock()
 {}
 
-#endif
+#endif // __THREADING_SINGLE_INL__

daemon/src/manager.h

@@ -32,7 +32,7 @@
 #ifndef SFLPHONE_MANAGER_H
 #define SFLPHONE_MANAGER_H
 
-#include "utilspp/Singleton.hpp"
+#include "utilspp/singleton.hpp"
 #include "managerimpl.h"
 
 typedef utilspp::SingletonHolder<ManagerImpl> Manager;