Changeset 148 for trunk

Timestamp:

30/01/08 14:40:23 (5 years ago)

Author:

guyru

Message:

updates to Makefile.am and some small fixes

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• src/ScoreDice.cpp (modified) (3 diffs)
• src/ScoreDice.h (modified) (3 diffs)

trunk/Makefile.am

@@ -5 +5 @@
 SUBDIRS = src
 
-appicondir = $(datadir)/pixmaps
+appicondir = $(datarootdir)/pixmaps
 dist_appicon_DATA = icons/openyahtzee.png
 
-menudir = $(datadir)/applications
+menudir = $(datarootdir)/applications
 dist_menu_DATA = openyahtzee.desktop
 

trunk/src/ScoreDice.cpp

@@ -46 +46 @@
  * \param dice An array of 5 short ints containing the values of the dice.
  */
-void ScoreDice::SetDice(short int dice[5])
+void ScoreDice::SetDice(const short int dice[5])
 {
         for (int i=0; i<5; i++) 
@@ -67 +67 @@
  * \see MainFrame::YahtzeeJoker()
  */
-void ScoreDice::SetYahtzeeJoker(bool is_yahtzee_joker)
+void ScoreDice::SetYahtzeeJoker(const bool is_yahtzee_joker)
 {
         m_yahtzee_joker = is_yahtzee_joker;
@@ -77 +77 @@
  * \return the value of the dice. 0 if wrong input.
  */
-short int ScoreDice::GetDice(short int number)
+short int ScoreDice::GetDice(const short int number)
 {
         if (number<=5 && number >=1)

trunk/src/ScoreDice.h

@@ -19 +19 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-
+#ifndef SCORE_DICE_H
+#define SCORE_DICE_H
 
 class ScoreDice {
@@ -25 +26 @@
         ScoreDice();
         ScoreDice(short int dice[5]);
-        void SetDice(short int dice[5]);
+        void SetDice(const short int dice[5]);
         void SetYahtzeeJoker(bool is_yahtzee_joker);
         short int GetDice(short int number);
@@ -52 +53 @@
 
 };
+
+#endif //SCORE_DICE_H