Skip to content

Commit

Permalink
SDL: Rename SdlGraphicsManager to SurfaceSdlGraphicsManager to reflec…
Browse files Browse the repository at this point in the history 
…t its purpose.

Hopefully I catched all uses of the old name in our ports...
  • Loading branch information
Johannes Schickel committed Jun 19, 2011
1 parent 2067bec commit 1c21232
Show file tree
Hide file tree
Showing 18 changed files with 126 additions and 126 deletions.
10 changes: 5 additions & 5 deletions backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
View file
Expand Up @@ -36,7 +36,7 @@ static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
};

DINGUXSdlGraphicsManager::DINGUXSdlGraphicsManager(SdlEventSource *boss)
: SdlGraphicsManager(boss) {
: SurfaceSdlGraphicsManager(boss) {
}

const OSystem::GraphicsMode *DINGUXSdlGraphicsManager::getSupportedGraphicsModes() const {
Expand Down Expand Up @@ -415,15 +415,15 @@ void DINGUXSdlGraphicsManager::showOverlay() {
_mouseCurState.x = _mouseCurState.x / 2;
_mouseCurState.y = _mouseCurState.y / 2;
}
SdlGraphicsManager::showOverlay();
SurfaceSdlGraphicsManager::showOverlay();
}

void DINGUXSdlGraphicsManager::hideOverlay() {
if (_videoMode.mode == GFX_HALF) {
_mouseCurState.x = _mouseCurState.x * 2;
_mouseCurState.y = _mouseCurState.y * 2;
}
SdlGraphicsManager::hideOverlay();
SurfaceSdlGraphicsManager::hideOverlay();
}

bool DINGUXSdlGraphicsManager::loadGFXMode() {
Expand Down Expand Up @@ -462,7 +462,7 @@ bool DINGUXSdlGraphicsManager::loadGFXMode() {
}


return SdlGraphicsManager::loadGFXMode();
return SurfaceSdlGraphicsManager::loadGFXMode();
}

bool DINGUXSdlGraphicsManager::hasFeature(OSystem::Feature f) {
Expand Down Expand Up @@ -507,7 +507,7 @@ void DINGUXSdlGraphicsManager::warpMouse(int x, int y) {
y = y / 2;
}
}
SdlGraphicsManager::warpMouse(x, y);
SurfaceSdlGraphicsManager::warpMouse(x, y);
}

void DINGUXSdlGraphicsManager::adjustMouseEvent(const Common::Event &event) {
Expand Down
8 changes: 4 additions & 4 deletions backends/graphics/dinguxsdl/dinguxsdl-graphics.h
View file
Expand Up @@ -23,7 +23,7 @@
#ifndef BACKENDS_GRAPHICS_SDL_DINGUX_H
#define BACKENDS_GRAPHICS_SDL_DINGUX_H

#include "backends/graphics/sdl/sdl-graphics.h"
#include "backends/graphics/surfacesdl/surfacesdl-graphics.h"

#include "graphics/scaler/aspect.h" // for aspect2Real
#include "graphics/scaler/downscaler.h"
Expand All @@ -32,7 +32,7 @@ enum {
GFX_HALF = 12
};

class DINGUXSdlGraphicsManager : public SdlGraphicsManager {
class DINGUXSdlGraphicsManager : public SurfaceSdlGraphicsManager {
public:
DINGUXSdlGraphicsManager(SdlEventSource *boss);

Expand All @@ -54,8 +54,8 @@ class DINGUXSdlGraphicsManager : public SdlGraphicsManager {
void undrawMouse();
virtual void warpMouse(int x, int y);

SdlGraphicsManager::MousePos *getMouseCurState();
SdlGraphicsManager::VideoState *getVideoMode();
SurfaceSdlGraphicsManager::MousePos *getMouseCurState();
SurfaceSdlGraphicsManager::VideoState *getVideoMode();

virtual void adjustMouseEvent(const Common::Event &event);
};
Expand Down
12 changes: 6 additions & 6 deletions backends/graphics/gph/gph-graphics.cpp
View file
Expand Up @@ -36,7 +36,7 @@ static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
};

GPHGraphicsManager::GPHGraphicsManager(SdlEventSource *sdlEventSource)
: SdlGraphicsManager(sdlEventSource) {
: SurfaceSdlGraphicsManager(sdlEventSource) {
}

const OSystem::GraphicsMode *GPHGraphicsManager::getSupportedGraphicsModes() const {
Expand Down Expand Up @@ -443,15 +443,15 @@ void GPHGraphicsManager::showOverlay() {
_mouseCurState.x = _mouseCurState.x / 2;
_mouseCurState.y = _mouseCurState.y / 2;
}
SdlGraphicsManager::showOverlay();
SurfaceSdlGraphicsManager::showOverlay();
}

void GPHGraphicsManager::hideOverlay() {
if (_videoMode.mode == GFX_HALF){
_mouseCurState.x = _mouseCurState.x * 2;
_mouseCurState.y = _mouseCurState.y * 2;
}
SdlGraphicsManager::hideOverlay();
SurfaceSdlGraphicsManager::hideOverlay();
}


Expand Down Expand Up @@ -503,7 +503,7 @@ void GPHGraphicsManager::hideOverlay() {
//
// }

// return SdlGraphicsManager::loadGFXMode();
// return SurfaceSdlGraphicsManager::loadGFXMode();
//}

bool GPHGraphicsManager::loadGFXMode() {
Expand Down Expand Up @@ -531,7 +531,7 @@ bool GPHGraphicsManager::loadGFXMode() {
_videoMode.hardwareWidth = _videoMode.screenWidth * _videoMode.scaleFactor;
_videoMode.hardwareHeight = effectiveScreenHeight();
}
return SdlGraphicsManager::loadGFXMode();
return SurfaceSdlGraphicsManager::loadGFXMode();
}

bool GPHGraphicsManager::hasFeature(OSystem::Feature f) {
Expand Down Expand Up @@ -576,7 +576,7 @@ void GPHGraphicsManager::warpMouse(int x, int y) {
y = y / 2;
}
}
SdlGraphicsManager::warpMouse(x, y);
SurfaceSdlGraphicsManager::warpMouse(x, y);
}

void GPHGraphicsManager::adjustMouseEvent(const Common::Event &event) {
Expand Down
8 changes: 4 additions & 4 deletions backends/graphics/gph/gph-graphics.h
View file
Expand Up @@ -23,15 +23,15 @@
#ifndef BACKENDS_GRAPHICS_GPH_H
#define BACKENDS_GRAPHICS_GPH_H

#include "backends/graphics/sdl/sdl-graphics.h"
#include "backends/graphics/surfacesdl/surfacesdl-graphics.h"
#include "graphics/scaler/aspect.h" // for aspect2Real
#include "graphics/scaler/downscaler.h"

enum {
GFX_HALF = 12
};

class GPHGraphicsManager : public SdlGraphicsManager {
class GPHGraphicsManager : public SurfaceSdlGraphicsManager {
public:
GPHGraphicsManager(SdlEventSource *boss);

Expand All @@ -53,8 +53,8 @@ class GPHGraphicsManager : public SdlGraphicsManager {
void undrawMouse();
virtual void warpMouse(int x, int y);

SdlGraphicsManager::MousePos *getMouseCurState();
SdlGraphicsManager::VideoState *getVideoMode();
SurfaceSdlGraphicsManager::MousePos *getMouseCurState();
SurfaceSdlGraphicsManager::VideoState *getVideoMode();

virtual void adjustMouseEvent(const Common::Event &event);
};
Expand Down
10 changes: 5 additions & 5 deletions backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
View file
Expand Up @@ -46,7 +46,7 @@ static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
};

LinuxmotoSdlGraphicsManager::LinuxmotoSdlGraphicsManager(SdlEventSource *sdlEventSource)
: SdlGraphicsManager(sdlEventSource) {
: SurfaceSdlGraphicsManager(sdlEventSource) {
}

const OSystem::GraphicsMode *LinuxmotoSdlGraphicsManager::getSupportedGraphicsModes() const {
Expand Down Expand Up @@ -166,7 +166,7 @@ bool LinuxmotoSdlGraphicsManager::loadGFXMode() {
_videoMode.hardwareHeight = effectiveScreenHeight();
}

return SdlGraphicsManager::loadGFXMode();
return SurfaceSdlGraphicsManager::loadGFXMode();
}

void LinuxmotoSdlGraphicsManager::drawMouse() {
Expand Down Expand Up @@ -457,15 +457,15 @@ void LinuxmotoSdlGraphicsManager::showOverlay() {
_mouseCurState.x = _mouseCurState.x / 2;
_mouseCurState.y = _mouseCurState.y / 2;
}
SdlGraphicsManager::showOverlay();
SurfaceSdlGraphicsManager::showOverlay();
}

void LinuxmotoSdlGraphicsManager::hideOverlay() {
if (_videoMode.mode == GFX_HALF) {
_mouseCurState.x = _mouseCurState.x * 2;
_mouseCurState.y = _mouseCurState.y * 2;
}
SdlGraphicsManager::hideOverlay();
SurfaceSdlGraphicsManager::hideOverlay();
}

void LinuxmotoSdlGraphicsManager::warpMouse(int x, int y) {
Expand All @@ -475,7 +475,7 @@ void LinuxmotoSdlGraphicsManager::warpMouse(int x, int y) {
y = y / 2;
}
}
SdlGraphicsManager::warpMouse(x, y);
SurfaceSdlGraphicsManager::warpMouse(x, y);
}

void LinuxmotoSdlGraphicsManager::adjustMouseEvent(const Common::Event &event) {
Expand Down
4 changes: 2 additions & 2 deletions backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h
View file
Expand Up @@ -23,9 +23,9 @@
#ifndef BACKENDS_GRAPHICS_SDL_LINUXMOTO_H
#define BACKENDS_GRAPHICS_SDL_LINUXMOTO_H

#include "backends/graphics/sdl/sdl-graphics.h"
#include "backends/graphics/surfacesdl/surfacesdl-graphics.h"

class LinuxmotoSdlGraphicsManager : public SdlGraphicsManager {
class LinuxmotoSdlGraphicsManager : public SurfaceSdlGraphicsManager {
public:
LinuxmotoSdlGraphicsManager(SdlEventSource *sdlEventSource);

Expand Down
4 changes: 2 additions & 2 deletions backends/graphics/openpandora/op-graphics.cpp
View file
Expand Up @@ -32,7 +32,7 @@
#include "common/textconsole.h"

OPGraphicsManager::OPGraphicsManager(SdlEventSource *sdlEventSource)
: SdlGraphicsManager(sdlEventSource) {
: SurfaceSdlGraphicsManager(sdlEventSource) {
}

bool OPGraphicsManager::loadGFXMode() {
Expand All @@ -47,7 +47,7 @@ bool OPGraphicsManager::loadGFXMode() {
if (_videoMode.screenHeight != 200 && _videoMode.screenHeight != 400)
_videoMode.aspectRatioCorrection = false;

return SdlGraphicsManager::loadGFXMode();
return SurfaceSdlGraphicsManager::loadGFXMode();
}

#endif
8 changes: 4 additions & 4 deletions backends/graphics/openpandora/op-graphics.h
View file
Expand Up @@ -23,15 +23,15 @@
#ifndef BACKENDS_GRAPHICS_OP_H
#define BACKENDS_GRAPHICS_OP_H

#include "backends/graphics/sdl/sdl-graphics.h"
#include "backends/graphics/surfacesdl/surfacesdl-graphics.h"
#include "graphics/scaler/aspect.h" // for aspect2Real
#include "graphics/scaler/downscaler.h"

enum {
GFX_HALF = 12
};

class OPGraphicsManager : public SdlGraphicsManager {
class OPGraphicsManager : public SurfaceSdlGraphicsManager {
public:
OPGraphicsManager(SdlEventSource *sdlEventSource);

Expand All @@ -53,8 +53,8 @@ class OPGraphicsManager : public SdlGraphicsManager {
// void undrawMouse();
// virtual void warpMouse(int x, int y);

// SdlGraphicsManager::MousePos *getMouseCurState();
// SdlGraphicsManager::VideoState *getVideoMode();
// SurfaceSdlGraphicsManager::MousePos *getMouseCurState();
// SurfaceSdlGraphicsManager::VideoState *getVideoMode();

// virtual void adjustMouseEvent(const Common::Event &event);
};
Expand Down
6 changes: 3 additions & 3 deletions backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
View file
Expand Up @@ -29,7 +29,7 @@
#include "backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h"

SamsungTVSdlGraphicsManager::SamsungTVSdlGraphicsManager(SdlEventSource *sdlEventSource)
: SdlGraphicsManager(sdlEventSource) {
: SurfaceSdlGraphicsManager(sdlEventSource) {
}

bool SamsungTVSdlGraphicsManager::hasFeature(OSystem::Feature f) {
Expand All @@ -41,7 +41,7 @@ bool SamsungTVSdlGraphicsManager::hasFeature(OSystem::Feature f) {
void SamsungTVSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) {
switch (f) {
case OSystem::kFeatureAspectRatioCorrection:
SdlGraphicsManager::setFeatureState(f, enable);
SurfaceSdlGraphicsManager::setFeatureState(f, enable);
break;
default:
break;
Expand All @@ -51,7 +51,7 @@ void SamsungTVSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enabl
bool SamsungTVSdlGraphicsManager::getFeatureState(OSystem::Feature f) {
switch (f) {
case OSystem::kFeatureAspectRatioCorrection:
return SdlGraphicsManager::getFeatureState(f);
return SurfaceSdlGraphicsManager::getFeatureState(f);
default:
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h
View file
Expand Up @@ -25,9 +25,9 @@

#if defined(SAMSUNGTV)

#include "backends/graphics/sdl/sdl-graphics.h"
#include "backends/graphics/surfacesdl/surfacesdl-graphics.h"

class SamsungTVSdlGraphicsManager : public SdlGraphicsManager {
class SamsungTVSdlGraphicsManager : public SurfaceSdlGraphicsManager {
public:
SamsungTVSdlGraphicsManager(SdlEventSource *sdlEventSource);

Expand Down

0 comments on commit 1c21232

Please sign in to comment.