[Wesnoth-commits] r27382 - in /trunk/src: video.cpp video.hpp

[koraq]

Author: mordante
Date: Sun Jun 22 08:51:29 2008
New Revision: 27382

URL: http://svn.gna.org/viewcvs/wesnoth?rev=27382&view=rev
Log:
Add underscore to private members.

Modified:
    trunk/src/video.cpp
    trunk/src/video.hpp

Modified: trunk/src/video.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/video.cpp?rev=27382&r1=27381&r2=27382&view=diff
==============================================================================
--- trunk/src/video.cpp (original)
+++ trunk/src/video.cpp Sun Jun 22 08:51:29 2008
@@ -230,7 +230,7 @@
 {
        update_all = true;
 }
-CVideo::CVideo() : mode_changed_(false), bpp(0), fake_screen(false), 
help_string_(0), updatesLocked_(0)
+CVideo::CVideo() : mode_changed_(false), bpp_(0), fake_screen_(false), 
help_string_(0), updatesLocked_(0)
 {
        const int res = SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
 
@@ -241,7 +241,7 @@
 }
 
 CVideo::CVideo( int x, int y, int bits_per_pixel, int flags)
-                : mode_changed_(false), bpp(0), fake_screen(false), 
help_string_(0), updatesLocked_(0)
+                : mode_changed_(false), bpp_(0), fake_screen_(false), 
help_string_(0), updatesLocked_(0)
 {
        const int res = SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
        if(res < 0) {
@@ -278,7 +278,7 @@
 
 void CVideo::make_fake()
 {
-       fake_screen = true;
+       fake_screen_ = true;
        frameBuffer = 
SDL_CreateRGBSurface(SDL_SWSURFACE,16,16,24,0xFF0000,0xFF00,0xFF,0);
        image::set_pixel_format(frameBuffer->format);
 }
@@ -291,7 +291,7 @@
 int CVideo::setMode( int x, int y, int bits_per_pixel, int flags )
 {
        update_rects.clear();
-       if (fake_screen) return 0;
+       if (fake_screen_) return 0;
        mode_changed_ = true;
 
        flags = get_flags(flags);
@@ -360,7 +360,7 @@
 
 void CVideo::flip()
 {
-       if(fake_screen)
+       if(fake_screen_)
                return;
 
        if(update_all) {
@@ -421,12 +421,12 @@
 
 void CVideo::setBpp( int bpp )
 {
-       this->bpp = bpp;
-}
-
-int CVideo::getBpp( void )
-{
-       return bpp;
+       bpp_ = bpp;
+}
+
+int CVideo::getBpp()
+{
+       return bpp_;
 }
 
 int CVideo::set_help_string(const std::string& str)

Modified: trunk/src/video.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/video.hpp?rev=27382&r1=27381&r2=27382&view=diff
==============================================================================
--- trunk/src/video.hpp (original)
+++ trunk/src/video.hpp Sun Jun 22 08:51:29 2008
@@ -79,7 +79,7 @@
        int getBpp();
 
        void make_fake();
-       bool faked() const { return fake_screen; }
+       bool faked() const { return fake_screen_; }
 
        //functions to set and clear 'help strings'. A 'help string' is like a 
tooltip, but it appears
        //at the bottom of the screen, so as to not be intrusive. Setting a 
help string sets what
@@ -100,10 +100,10 @@
 
        bool mode_changed_;
 
-       int bpp;        // Store real bits per pixel
+       int bpp_;       // Store real bits per pixel
 
        //if there is no display at all, but we 'fake' it for clients
-       bool fake_screen;
+       bool fake_screen_;
 
        //variables for help strings
        int help_string_;


_______________________________________________
Wesnoth-commits mailing list
Wesnoth-commits@gna.org
https://mail.gna.org/listinfo/wesnoth-commits