[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdegames
From:       Nicolas Hadacek <hadacek () kde ! org>
Date:       2004-03-11 3:19:31
Message-ID: 20040311031931.CB2BD99A2 () office ! kde ! org
[Download RAW message or body]

CVS commit by hadacek: 

backport fix for bug #77170


  M +6 -0      kfouleggs/piece.cpp   1.11.2.1
  M +1 -2      kfouleggs/piece.h   1.7.2.1
  M +6 -0      klickety/piece.cpp   1.4.2.1
  M +1 -2      klickety/piece.h   1.3.2.1
  M +5 -0      ksirtet/ksirtet/piece.cpp   1.10.2.1
  M +1 -2      ksirtet/ksirtet/piece.h   1.8.2.1


--- kdegames/kfouleggs/piece.cpp  #1.11:1.11.2.1
@@ -20,4 +20,10 @@ const char *FEPieceInfo::DEFAULT_COLORS[
 };
 
+QColor FEPieceInfo::defaultColor(uint i) const
+{ 
+  if ( i>=nbColors() ) return QColor();
+  return QColor(DEFAULT_COLORS[i]);
+}
+
 QString FEPieceInfo::colorLabel(uint i) const
 {

--- kdegames/kfouleggs/piece.h  #1.7:1.7.2.1
@@ -29,6 +29,5 @@ class FEPieceInfo : public GPieceInfo
     virtual uint nbColors() const { return NB_NORM_BLOCK_TYPES + 1; }
     virtual QString colorLabel(uint i) const;
-    virtual QColor defaultColor(uint i) const
-        { return QColor(DEFAULT_COLORS[i]); }
+    virtual QColor defaultColor(uint i) const;
 
  private:

--- kdegames/klickety/piece.cpp  #1.4:1.4.2.1
@@ -10,4 +10,10 @@ const char *KLPieceInfo::DEFAULT_COLORS[
 };
 
+QColor KLPieceInfo::defaultColor(uint i) const
+{
+  if ( i>=nbColors() ) return QColor();
+  return QColor(DEFAULT_COLORS[i]);
+}
+
 QString KLPieceInfo::colorLabel(uint i) const
 {

--- kdegames/klickety/piece.h  #1.3:1.3.2.1
@@ -26,6 +26,5 @@ class KLPieceInfo : public GPieceInfo
     virtual uint nbColors() const             { return NB_BLOCK_TYPES; }
     virtual QString colorLabel(uint i) const;
-    virtual QColor defaultColor(uint i) const
-        { return QColor(DEFAULT_COLORS[i]); }
+    virtual QColor defaultColor(uint i) const;
 
  protected:

--- kdegames/ksirtet/ksirtet/piece.cpp  #1.10:1.10.2.1
@@ -55,4 +55,9 @@ const char *KSPieceInfo::DEFAULT_COLORS[
 };
 
+QColor KSPieceInfo::defaultColor(uint i) const
+{
+  if ( i>=nbColors() ) return QColor();
+  return QColor(DEFAULT_COLORS[i]);
+}
 
 void KSPieceInfo::draw(QPixmap *pixmap, uint blockType, uint,

--- kdegames/ksirtet/ksirtet/piece.h  #1.8:1.8.2.1
@@ -33,6 +33,5 @@ class KSPieceInfo : public GPieceInfo
     virtual uint nbColors() const { return NB_FORMS + 1; }
     virtual QString colorLabel(uint i) const { return i18n(COLOR_LABELS[i]); }
-    virtual QColor defaultColor(uint i) const
-        { return QColor(DEFAULT_COLORS[i]); }
+    virtual QColor defaultColor(uint i) const;
 
  private:


[prev in list] [next in list] [prev in thread] [next in thread]