summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pacman-c++/client.cpp10
-rw-r--r--pacman-c++/mainwidget.cpp2
2 files changed, 6 insertions, 6 deletions
diff --git a/pacman-c++/client.cpp b/pacman-c++/client.cpp
index a5cb7c5..cf3c291 100644
--- a/pacman-c++/client.cpp
+++ b/pacman-c++/client.cpp
@@ -4,10 +4,10 @@ Client::Client()
4{ 4{
5 QAction *quitAction = new QAction("E&xit", this); 5 QAction *quitAction = new QAction("E&xit", this);
6 connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); 6 connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
7 7
8 QMenu *fileMenu = menuBar()->addMenu("File"); 8 QMenu *fileMenu = menuBar()->addMenu("File");
9 fileMenu->addAction(quitAction); 9 fileMenu->addAction(quitAction);
10 10
11 mainWidget = new MainWidget(); 11 mainWidget = new MainWidget();
12 setCentralWidget(mainWidget); 12 setCentralWidget(mainWidget);
13} 13}
@@ -16,11 +16,11 @@ Client::Client()
16int main(int argc, char ** argv) { 16int main(int argc, char ** argv) {
17 QApplication app(argc, argv); 17 QApplication app(argc, argv);
18 app.setApplicationName("pacman-client"); 18 app.setApplicationName("pacman-client");
19 19
20 qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); 20 qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime()));
21 21
22 Client client; 22 Client client;
23 client.show(); 23 client.show();
24 24
25 return app.exec(); 25 return app.exec();
26} 26}
diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp
index 819088c..343fe4c 100644
--- a/pacman-c++/mainwidget.cpp
+++ b/pacman-c++/mainwidget.cpp
@@ -236,6 +236,7 @@ void MainWidget::createGui()
236 window->setAlignment(Qt::AlignLeft | Qt::AlignTop); 236 window->setAlignment(Qt::AlignLeft | Qt::AlignTop);
237 //window->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); 237 //window->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
238 //window->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); 238 //window->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
239 window->setFixedSize(Constants::map_size_pixel.width, Constants::map_size_pixel.height);
239 240
240 layout->addLayout(m_scoreLayout); 241 layout->addLayout(m_scoreLayout);
241 layout->addWidget(window); 242 layout->addWidget(window);
@@ -244,7 +245,6 @@ void MainWidget::createGui()
244 setWindowTitle("pacman client"); 245 setWindowTitle("pacman client");
245} 246}
246 247
247
248void MainWidget::updateScore() 248void MainWidget::updateScore()
249{ 249{
250 QMapIterator<Color::Color, Actor*> i(m_actors); 250 QMapIterator<Color::Color, Actor*> i(m_actors);