Subversion Repository Public Repository

Fangh

Diff Revisions 41 vs 42 for /trunk/FenetreMap.h

Diff revisions: vs.
  @@ -3,7 +3,10 @@
3 3
4 4 #include <QtGui>
5 5 #include "IWidget.h"
6 + #include <vector>
7 + #include <map>
6 8
9 + using namespace std;
7 10
8 11 class FenetreMap : public IWidget {
9 12
  @@ -15,23 +18,31 @@
15 18 ~FenetreMap();
16 19
17 20 private slots:
18 - void connectEnigmetbd();
19 - void connectEnigmetbg();
20 - void connectEnigmethd();
21 - void connectEnigmethg();
22 - void connectEnigmetch();
21 + void connectEnigme1();
22 + void connectEnigme2();
23 + void connectOffrebd();
24 + void connectOffrebg();
25 + void connectOffrehd();
26 + void connectOffrehg();
27 + void connectOffrech();
28 + void connectMaison();
23 29
24 30 private:
25 31 void creerBoutons();
26 32
33 + QPushButton *maison;
27 34 QPushButton *tourBD;
28 35 QPushButton *tourBG;
29 36 QPushButton *tourHD;
30 37 QPushButton *tourHG;
31 38 QPushButton *chateau;
32 - //QWidget * zonesBoutons;
39 + QPushButton *enigme1;
40 + QPushButton *enigme2;
41 + IWidget * zonesEnigmes;
33 42 QLabel *imgMap;
34 43 QLabel *imgGob;
44 +
45 + std::map<QPushButton *, std::vector<const Tour *> > lesPositions;
35 46 };
36 47
37 48