summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pacman-c++/client.cpp9
-rw-r--r--pacman-c++/client.h7
-rw-r--r--pacman-c++/mainwidget.cpp2
3 files changed, 9 insertions, 9 deletions
diff --git a/pacman-c++/client.cpp b/pacman-c++/client.cpp
index ebbcff2..814e5e1 100644
--- a/pacman-c++/client.cpp
+++ b/pacman-c++/client.cpp
@@ -8,12 +8,12 @@ Client::Client()
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 m_mainWidget = new MainWidget();
12 setCentralWidget(mainWidget); 12 setCentralWidget(m_mainWidget);
13} 13}
14 14
15 15int main(int argc, char ** argv)
16int main(int argc, char ** argv) { 16{
17 QApplication app(argc, argv); 17 QApplication app(argc, argv);
18 app.setApplicationName("Pacman Client"); 18 app.setApplicationName("Pacman Client");
19 app.setWindowIcon(QIcon(":/appicon")); 19 app.setWindowIcon(QIcon(":/appicon"));
@@ -22,6 +22,7 @@ int main(int argc, char ** argv) {
22 22
23 Client client; 23 Client client;
24 client.show(); 24 client.show();
25 client.setWindowTitle(app.applicationName());
25 26
26 return app.exec(); 27 return app.exec();
27} 28}
diff --git a/pacman-c++/client.h b/pacman-c++/client.h
index 272d110..476b972 100644
--- a/pacman-c++/client.h
+++ b/pacman-c++/client.h
@@ -5,13 +5,14 @@
5#include <QtGui> 5#include <QtGui>
6 6
7class Client 7class Client
8 : public QMainWindow { 8 : public QMainWindow
9 Q_OBJECT 9{
10 Q_OBJECT
10public: 11public:
11 Client(); 12 Client();
12 13
13private: 14private:
14 MainWidget *mainWidget; 15 MainWidget *m_mainWidget;
15}; 16};
16 17
17#endif // CLIENT_H 18#endif // CLIENT_H
diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp
index 537c5ad..ddce051 100644
--- a/pacman-c++/mainwidget.cpp
+++ b/pacman-c++/mainwidget.cpp
@@ -144,8 +144,6 @@ void MainWidget::createGui()
144 qApp->setStyleSheet(QLatin1String(css.readAll())); 144 qApp->setStyleSheet(QLatin1String(css.readAll()));
145 145
146 setLayout(layout); 146 setLayout(layout);
147 //TODO: this doesn't work?!?!
148 setWindowTitle("FOOP Pacman Client");
149} 147}
150 148
151void MainWidget::updateScore() 149void MainWidget::updateScore()