[patch] patches from kde bugzilla

libksirtet-default-colours.patch (text/plain), 4.00 KB, created by John Steele Scott on 2004-03-13 15:13:03 UTC

Index: piece.cpp
===================================================================
RCS file: /home/kde/kdegames/klickety/piece.cpp,v
retrieving revision 1.4
diff -u -3 -p -r1.4 piece.cpp
--- klickety/piece.cpp	26 Oct 2003 09:57:01 -0000	1.4
+++ klickety/piece.cpp	10 Mar 2004 15:56:59 -0000
@@ -9,6 +9,12 @@ const char *KLPieceInfo::DEFAULT_COLORS[
     "#C86464", "#64C864", "#6464C8", "#C8C864", "#C864C8"
 };
 
+QColor KLPieceInfo::defaultColor(uint i) const
+{
+  if ( i>=nbColors() ) return QColor();
+  return QColor(DEFAULT_COLORS[i]);
+}
+
 QString KLPieceInfo::colorLabel(uint i) const
 {
     return i18n("Color #%1:").arg(i+1);
Index: piece.h
===================================================================
RCS file: /home/kde/kdegames/klickety/piece.h,v
retrieving revision 1.3
diff -u -3 -p -r1.3 piece.h
--- klickety/piece.h	8 Jun 2003 01:40:54 -0000	1.3
+++ klickety/piece.h	10 Mar 2004 15:56:59 -0000
@@ -25,8 +25,7 @@ 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:
     void draw(QPixmap *, uint blockType, uint blockMode,
Index: ksirtet/ksirtet/piece.cpp
===================================================================
RCS file: /home/kde/kdegames/ksirtet/ksirtet/piece.cpp,v
retrieving revision 1.10
diff -u -3 -p -r1.10 piece.cpp
--- ksirtet/ksirtet/piece.cpp	26 Oct 2003 09:57:01 -0000	1.10
+++ ksirtet/ksirtet/piece.cpp	10 Mar 2004 16:06:36 -0000
@@ -54,6 +54,11 @@ const char *KSPieceInfo::DEFAULT_COLORS[
     "#C8C8C8"
 };
 
+QColor KSPieceInfo::defaultColor(uint i) const
+{
+  if ( i>=nbColors() ) return QColor();
+  return QColor(DEFAULT_COLORS[i]);
+}
 
 void KSPieceInfo::draw(QPixmap *pixmap, uint blockType, uint,
                        bool lighted) const
Index: ksirtet/ksirtet/piece.h
===================================================================
RCS file: /home/kde/kdegames/ksirtet/ksirtet/piece.h,v
retrieving revision 1.8
diff -u -3 -p -r1.8 piece.h
--- ksirtet/ksirtet/piece.h	8 Jun 2003 01:40:54 -0000	1.8
+++ ksirtet/ksirtet/piece.h	10 Mar 2004 16:06:36 -0000
@@ -32,8 +32,7 @@ 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:
     virtual void draw(QPixmap *, uint blockType, uint blockMode,
Index: kfouleggs/piece.cpp
===================================================================
RCS file: /home/kde/kdegames/kfouleggs/piece.cpp,v
retrieving revision 1.11
diff -u -3 -p -r1.11 piece.cpp
--- kfouleggs/piece.cpp	26 Oct 2003 09:57:01 -0000	1.11
+++ kfouleggs/piece.cpp	10 Mar 2004 16:06:36 -0000
@@ -19,6 +19,12 @@ const char *FEPieceInfo::DEFAULT_COLORS[
     "#64C864", "#64C8C8", "#C86464", "#C864C8", "#C8C8C8"
 };
 
+QColor FEPieceInfo::defaultColor(uint i) const
+{ 
+  if ( i>=nbColors() ) return QColor();
+  return QColor(DEFAULT_COLORS[i]);
+}
+
 QString FEPieceInfo::colorLabel(uint i) const
 {
     return (i==NB_NORM_BLOCK_TYPES ? i18n("Garbage color:")
Index: kfouleggs/piece.h
===================================================================
RCS file: /home/kde/kdegames/kfouleggs/piece.h,v
retrieving revision 1.7
diff -u -3 -p -r1.7 piece.h
--- kfouleggs/piece.h	8 Jun 2003 01:40:54 -0000	1.7
+++ kfouleggs/piece.h	10 Mar 2004 16:06:36 -0000
@@ -28,8 +28,7 @@ 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:
     void draw(QPixmap *, uint blockType, uint blockMode, bool lighted) const;