Merge branch 'development'

1 files changed, 9 insertions, 14 deletions

diff --git a/canevas.h b/canevas.h
index 64b833a..6ccd68a 100644
--- a/canevas.h
+++ b/canevas.h
@@ -22,22 +22,17 @@ class Canevas {
 public:

    Canevas();

    ~Canevas();

-

-   bool reinitialiser();

-

-   bool activerCouche(int index);

-   bool cacherCouche(int index);

-

-   bool ajouterForme(Forme *p_forme);

-   bool retirerForme(int index);

-

+   bool   reinitialiser();

+   bool   activerCouche(int index);

+   bool   ajouterForme(Forme *p_forme);

+   bool   retirerForme(int index);

    double aire();

-   bool translater(int deltaX, int deltaY);

-   void afficher(ostream & s);

-   bool reinitialiserCouche(int index);

-

+   bool   translater(int deltaX, int deltaY);

+   void   afficher(ostream &s);

+   void   getEtats(ostream &s);

+   bool   reinitialiserCouche(int index);

 private:

-     Couche couches[MAX_COUCHES];

+   Couche couches[MAX_COUCHES];

 };

 

 #endif