diff options
| author | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
| commit | 00279659b22cbd5db739d5351e83a9fc2a2ae408 (patch) | |
| tree | 497f06f46820043cbdf1725652b8f0073223e24a /backends/platform/bada/system.h | |
| parent | d932df79bed5aac97e17c0920a5e75cb5ce733ee (diff) | |
| parent | d1628feb761acc9f4607f64de3eb620fea53bcc9 (diff) | |
| download | scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.gz scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.bz2 scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'backends/platform/bada/system.h')
| -rw-r--r-- | backends/platform/bada/system.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/backends/platform/bada/system.h b/backends/platform/bada/system.h index a091f952e5..c28686cb3d 100644 --- a/backends/platform/bada/system.h +++ b/backends/platform/bada/system.h @@ -74,7 +74,7 @@ public: bool isClosing() { return _appForm->isClosing(); } BadaGraphicsManager *getGraphics() { - return (BadaGraphicsManager*)_graphicsManager; + return (BadaGraphicsManager *)_graphicsManager; } private: @@ -88,8 +88,9 @@ private: void getTimeAndDate(TimeDate &t) const; void fatalError(); void logMessage(LogMessageType::Type type, const char *message); + void addSysArchivesToSearchSet(Common::SearchSet &s, int priority); - Common::EventSource *getDefaultEventSource() {return this;} + Common::EventSource *getDefaultEventSource() { return this; } Common::SeekableReadStream *createConfigReadStream(); Common::WriteStream *createConfigWriteStream(); |