summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-10-12 08:40:07 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-10-12 08:40:11 +0200
commit604fb7c18170b039d9d3d5818af8bd7c21d407ae (patch)
tree75371843ca99a9309c62a7369690ab6fa49f220a
parent009b46ad75319b268566cace02db3bd448a213f4 (diff)
version: drop volatile, not needed
-rw-r--r--facetracknoir/ui.cpp4
-rw-r--r--opentrack/version.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp
index fd20084d..d0a5e93c 100644
--- a/facetracknoir/ui.cpp
+++ b/facetracknoir/ui.cpp
@@ -216,7 +216,7 @@ void MainWindow::open_config_directory()
}
}
-extern "C" volatile const char* opentrack_version;
+extern "C" const char* opentrack_version;
void MainWindow::refresh_config_list()
{
@@ -379,7 +379,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(" :: ") + current + game_title);
+ setWindowTitle(opentrack_version + QStringLiteral(" :: ") + current + game_title);
}
void MainWindow::showHeadPose()
diff --git a/opentrack/version.cc b/opentrack/version.cc
index 13bc5dc5..9e75a336 100644
--- a/opentrack/version.cc
+++ b/opentrack/version.cc
@@ -4,6 +4,6 @@
extern "C"
#endif
OPENTRACK_EXPORT
-volatile const char* opentrack_version;
+const char* opentrack_version;
-volatile const char* opentrack_version = OPENTRACK_VERSION;
+const char* opentrack_version = OPENTRACK_VERSION;