[Paintown-list] SF.net SVN: paintown:[7702] trunk/src/util

[<ka...@us...>]

Revision: 7702
          http://paintown.svn.sourceforge.net/paintown/?rev=7702&view=rev
Author:   kazzmir
Date:     2012-12-28 06:44:14 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
silence compiler warnings

Modified Paths:
--------------
    trunk/src/util/graphics/bitmap.h
    trunk/src/util/menu/options.cpp

Modified: trunk/src/util/graphics/bitmap.h
===================================================================
--- trunk/src/util/graphics/bitmap.h	2012-12-28 06:25:20 UTC (rev 7701)
+++ trunk/src/util/graphics/bitmap.h	2012-12-28 06:44:14 UTC (rev 7702)
@@ -508,6 +508,7 @@
 public:
     PaletteBitmap();
     virtual ~PaletteBitmap();
+    using Bitmap::operator=;
 
 protected:
     Color palette[256];
@@ -541,6 +542,7 @@
     using Bitmap::drawHVFlip;
     virtual void drawHVFlip( const int x, const int y, const Bitmap & where ) const;
     virtual void drawHVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;
+    using Bitmap::operator=;
 };
 
 class StretchedBitmap: public Bitmap {
@@ -550,6 +552,7 @@
     void start();
     virtual int getWidth() const;
     virtual int getHeight() const;
+    using Bitmap::operator=;
 
     virtual double getScaleWidth() const;
     virtual double getScaleHeight() const;
@@ -566,6 +569,7 @@
 class TranslatedBitmap: public Bitmap {
 public:
     TranslatedBitmap(int x, int y, const Bitmap & where);
+    using Bitmap::operator=;
     using Bitmap::BlitToScreen;
     virtual void BlitToScreen() const;
     virtual ~TranslatedBitmap();
@@ -579,6 +583,7 @@
     TranslucentBitmap();
     virtual ~TranslucentBitmap();
 
+    using Bitmap::operator=;
     virtual Color blendColor(const Color & color) const;
     virtual void startDrawing() const;
     virtual void endDrawing() const;

Modified: trunk/src/util/menu/options.cpp
===================================================================
--- trunk/src/util/menu/options.cpp	2012-12-28 06:25:20 UTC (rev 7701)
+++ trunk/src/util/menu/options.cpp	2012-12-28 06:44:14 UTC (rev 7702)
@@ -998,7 +998,7 @@
 }
 
 static void setKey(int player, OptionJoystick::JoystickType k, Configuration::JoystickInput key){
-    /*
+    / *
     switch(k){
         case OptionJoystick::Up:
             Configuration::setJoystickUp(player, key);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.