summaryrefslogtreecommitdiff
path: root/platform/default/headless_display.cpp
diff options
context:
space:
mode:
authorLeith Bade <leith@mapbox.com>2014-12-22 18:08:48 +1300
committerLeith Bade <leith@mapbox.com>2014-12-23 09:29:45 +1300
commit0771e5046064875d323245873f457b87e8c4b447 (patch)
tree3d493f764a393afb3c4e934281aff519612bc966 /platform/default/headless_display.cpp
parent2731b582f24063e339c047635c6d7b2316eb8037 (diff)
downloadqtlocation-mapboxgl-0771e5046064875d323245873f457b87e8c4b447.tar.gz
Rename View functions to match conventions. Also tidy up view classes and remove C style casts. Closes #656
Diffstat (limited to 'platform/default/headless_display.cpp')
-rw-r--r--platform/default/headless_display.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/default/headless_display.cpp b/platform/default/headless_display.cpp
index 40cc0640a9..4756c8d2cb 100644
--- a/platform/default/headless_display.cpp
+++ b/platform/default/headless_display.cpp
@@ -11,9 +11,9 @@ HeadlessDisplay::HeadlessDisplay() {
// If it is, use kCGLOGLPVersion_3_2_Core and enable that extension.
CGLPixelFormatAttribute attributes[] = {
kCGLPFAOpenGLProfile,
- (CGLPixelFormatAttribute) kCGLOGLPVersion_Legacy,
+ static_cast<CGLPixelFormatAttribute>(kCGLOGLPVersion_Legacy),
kCGLPFAAccelerated,
- (CGLPixelFormatAttribute) 0
+ static_cast<CGLPixelFormatAttribute>(0)
};
GLint num;
@@ -38,7 +38,7 @@ HeadlessDisplay::HeadlessDisplay() {
throw std::runtime_error("Failed to open X display.");
}
- const char *extensions = (char *)glXQueryServerString(xDisplay, DefaultScreen(xDisplay), GLX_EXTENSIONS);
+ const char *extensions = reinterpret_cast<const char *>(glXQueryServerString(xDisplay, DefaultScreen(xDisplay), GLX_EXTENSIONS));
if (!extensions) {
throw std::runtime_error("Cannot read GLX extensions.");
}