Changeset 95 for trunk

Timestamp:

06/03/13 01:33:29 (12 years ago)

Author:

epyon

Message:

• order of includes fixed
• logger bug fixed

Location:

trunk

Files:

• nv/gfx/texture_font.hh (modified) (1 diff)
• nv/interface/image_data.hh (modified) (1 diff)
• nv/logger.hh (modified) (1 diff)
• nv/logging.hh (modified) (1 diff)
• src/gfx/texture_font.cc (modified) (1 diff)

trunk/nv/gfx/texture_font.hh

@@ -8 +8 @@
 #define NV_GL_TEXTURE_FONT_HH
 
+#include <nv/common.hh>
 #include <string>
-
-#include <nv/common.hh>
 #include <nv/gfx/texture_atlas.hh>
 #include <glm/glm.hpp>

trunk/nv/interface/image_data.hh

@@ -14 +14 @@
 #define NV_IMAGE_DATA_HH
 
+#include <nv/common.hh>
 #include <algorithm>
-#include <nv/common.hh>
 #include <glm/glm.hpp>
 

trunk/nv/logger.hh

@@ -64 +64 @@
                 explicit logger( int llevel )
                 {
-                        level = llevel;
+                        m_level = llevel;
                 }
 

trunk/nv/logging.hh

@@ -39 +39 @@
                 unsigned int get_level()
                 {
-                        return level;
+                        return m_level;
                 };
                 void set_level( unsigned int level )
                 {
-                        level = level;
+                        m_level = level;
                 };
                 virtual void log( log_level level, const std::string& message ) = 0;
         protected:
-                unsigned int level;
+                unsigned int m_level;
         };
 

trunk/src/gfx/texture_font.cc

@@ -4 +4 @@
 // This file is part of NV Libraries.
 // For conditions of distribution and use, see copyright notice in nv.hh
+#include "nv/gfx/texture_font.hh"
+
 #include <sstream>
 #include <stdexcept>
-
-#include "nv/gfx/texture_font.hh"
 #include "nv/lib/freetype2.hh"