diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-12 08:41:39 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-12 08:41:39 +0200 |
| commit | 47995b3678c54b00755ee1e9f279ee822264370b (patch) | |
| tree | aee7c7c36549662fe4825a664cb98be71e322af1 /facetracknoir | |
| parent | 543545c41940c5f0df2543ad0730e33e9571b02e (diff) | |
| parent | 604fb7c18170b039d9d3d5818af8bd7c21d407ae (diff) | |
Merge branch 'unstable' into trackhat
* unstable:
version: drop volatile, not needed
Diffstat (limited to 'facetracknoir')
| -rw-r--r-- | facetracknoir/ui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp index 486cd2c4..ba8c5531 100644 --- a/facetracknoir/ui.cpp +++ b/facetracknoir/ui.cpp @@ -209,7 +209,7 @@ void MainWindow::open_config_directory() } } -extern "C" volatile const char* opentrack_version; +extern "C" const char* opentrack_version; void MainWindow::refresh_config_list() { @@ -356,7 +356,7 @@ void MainWindow::set_title(const QString& game_title_) if (game_title_ != "") game_title = " :: " + game_title_; QString current = group::ini_filename(); - setWindowTitle(const_cast<const char*>(opentrack_version) + QStringLiteral(" opentrack") + QStringLiteral(" :: ") + current + game_title); + setWindowTitle(opentrack_version + QStringLiteral(" opentrack") + QStringLiteral(" :: ") + current + game_title); } void MainWindow::showHeadPose() |