svn merge ^/trunk/blender -r48415:48469
[blender.git] / intern / ghost / intern / GHOST_ISystemPaths.cpp
index 5241cbbf1972444e2b9c72b110a9cde3fab47885..f84c50770f0abff6a0ea97a72aee027d0f8081f4 100644 (file)
@@ -1,5 +1,4 @@
-/**
- * $Id: GHOST_ISystem.cpp 28254 2010-04-18 10:28:37Z campbellbarton $
+/*
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/**
+/** \file ghost/intern/GHOST_ISystemPaths.cpp
+ *  \ingroup GHOST
+ */
 
- * $Id: GHOST_ISystem.cpp 28254 2010-04-18 10:28:37Z campbellbarton $
+
+/**
  * Copyright (C) 2001 NaN Technologies B.V.
  * @author     Maarten Gribnau
  * @date       May 7, 2001
 #include "GHOST_ISystemPaths.h"
 
 #ifdef WIN32
-#      include "GHOST_SystemPathsWin32.h"
+#  include "GHOST_SystemPathsWin32.h"
 #else
-#      ifdef __APPLE__
-#              ifdef GHOST_COCOA
-#                      include "GHOST_SystemPathsCocoa.h"
-#              else
-#                      include "GHOST_SystemPathsCarbon.h"
-#              endif
-#      else
-#              include "GHOST_SystemPathsX11.h"
-#      endif
+#  ifdef __APPLE__
+#    ifdef GHOST_COCOA
+#      include "GHOST_SystemPathsCocoa.h"
+#    else
+#      include "GHOST_SystemPathsCarbon.h"
+#    endif
+#  else
+#    include "GHOST_SystemPathsX11.h"
+#  endif
 #endif
 
 
-GHOST_ISystemPathsGHOST_ISystemPaths::m_systemPaths = 0;
+GHOST_ISystemPaths *GHOST_ISystemPaths::m_systemPaths = 0;
 
 
 GHOST_TSuccess GHOST_ISystemPaths::create()
@@ -59,17 +61,17 @@ GHOST_TSuccess GHOST_ISystemPaths::create()
        GHOST_TSuccess success;
        if (!m_systemPaths) {
 #ifdef WIN32
-               m_systemPaths = new GHOST_SystemPathsWin32 ();
+               m_systemPaths = new GHOST_SystemPathsWin32();
 #else
-#      ifdef __APPLE__
-#              ifdef GHOST_COCOA
-                       m_systemPaths = new GHOST_SystemPathsCocoa ();
-#              else
-                       m_systemPaths = new GHOST_SystemPathsarbon ();
-#              endif
-#      else 
-               m_systemPaths = new GHOST_SystemPathsX11 ();
-#      endif
+#  ifdef __APPLE__
+#    ifdef GHOST_COCOA
+               m_systemPaths = new GHOST_SystemPathsCocoa();
+#    else
+               m_systemPaths = new GHOST_SystemPathsCarbon();
+#    endif
+#  else
+               m_systemPaths = new GHOST_SystemPathsX11();
+#  endif
 #endif 
                success = m_systemPaths != 0 ? GHOST_kSuccess : GHOST_kFailure;
        }
@@ -92,7 +94,7 @@ GHOST_TSuccess GHOST_ISystemPaths::dispose()
        return success;
 }
 
-GHOST_ISystemPathsGHOST_ISystemPaths::get()
+GHOST_ISystemPaths *GHOST_ISystemPaths::get()
 {
        if (!m_systemPaths) {
                create();