diff options
| author | Manuel Schneider | 2014-09-04 15:30:24 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-09-04 15:30:24 +0200 |
| commit | 960207522ac2b5f48ac0f3a3ead8b070d42035ab (patch) | |
| tree | 32eb2cf7debbedccbf7f987976c6cf77cad7f8ac /src/server | |
| parent | Let client and server use the config file in the "pvs2" folder. (diff) | |
| parent | Adjust helpwindow to reload button plus adding some more translations. (diff) | |
| download | pvs2-960207522ac2b5f48ac0f3a3ead8b070d42035ab.tar.gz pvs2-960207522ac2b5f48ac0f3a3ead8b070d42035ab.tar.xz pvs2-960207522ac2b5f48ac0f3a3ead8b070d42035ab.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/helpwindow/helpwindow.cpp | 6 | ||||
| -rw-r--r-- | src/server/helpwindow/helpwindow.h | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/server/helpwindow/helpwindow.cpp b/src/server/helpwindow/helpwindow.cpp index b209080..bc04d30 100644 --- a/src/server/helpwindow/helpwindow.cpp +++ b/src/server/helpwindow/helpwindow.cpp @@ -13,12 +13,6 @@ HelpWindow::~HelpWindow() delete ui; } -/*void HelpWindow::show() -{ - this->showNormal(); -} -*/ - /* * Slots */ diff --git a/src/server/helpwindow/helpwindow.h b/src/server/helpwindow/helpwindow.h index 9a40299..b2aeab7 100644 --- a/src/server/helpwindow/helpwindow.h +++ b/src/server/helpwindow/helpwindow.h @@ -14,12 +14,11 @@ class HelpWindow : public QDialog public: explicit HelpWindow(QWidget *parent = 0); ~HelpWindow(); + Ui::Help *ui; // void show(); private: - Ui::Help *ui; - private slots: void onButtonCancel(); |