diff options
| author | Michael Lutz <michi@icosahedron.de> | 2020-05-17 23:32:08 +0200 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2020-05-21 20:02:34 +0200 |
| commit | 37bc2f806462b3c2a84891b3aad6db00e935da86 (patch) | |
| tree | 9f832e8646ec0c4a4038f6c0642c853fbe02038a /src/video/cocoa | |
| parent | a49fdb7ebbb8d8ce96bcd7bd779b18bcd86d0643 (diff) | |
| download | openttd-37bc2f806462b3c2a84891b3aad6db00e935da86.tar.xz | |
Codechange: Use std::string in the driver and blitter selection code.
Diffstat (limited to 'src/video/cocoa')
| -rw-r--r-- | src/video/cocoa/cocoa_v.h | 2 | ||||
| -rw-r--r-- | src/video/cocoa/cocoa_v.mm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/video/cocoa/cocoa_v.h b/src/video/cocoa/cocoa_v.h index 7286c685b..3da6848d0 100644 --- a/src/video/cocoa/cocoa_v.h +++ b/src/video/cocoa/cocoa_v.h @@ -14,7 +14,7 @@ class VideoDriver_Cocoa : public VideoDriver { public: - const char *Start(const char * const *param) override; + const char *Start(const StringList ¶m) override; /** Stop the video driver */ void Stop() override; diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm index 13a9cc9c4..10f30027b 100644 --- a/src/video/cocoa/cocoa_v.mm +++ b/src/video/cocoa/cocoa_v.mm @@ -396,7 +396,7 @@ void VideoDriver_Cocoa::Stop() /** * Initialize a cocoa video subdriver. */ -const char *VideoDriver_Cocoa::Start(const char * const *parm) +const char *VideoDriver_Cocoa::Start(const StringList &parm) { if (!MacOSVersionIsAtLeast(10, 6, 0)) return "The Cocoa video driver requires Mac OS X 10.6 or later."; @@ -520,7 +520,7 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel bool wasstarted = _cocoa_video_started; if (VideoDriver::GetInstance() == NULL) { setupApplication(); // Setup application before showing dialog - } else if (!_cocoa_video_started && VideoDriver::GetInstance()->Start(NULL) != NULL) { + } else if (!_cocoa_video_started && VideoDriver::GetInstance()->Start(StringList()) != NULL) { fprintf(stderr, "%s: %s\n", title, message); return; } |