TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-06 22:10:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rest of virtuals removed

Browse source 
virtuals removed and replaced with override where necessary on the rest of the code base, clang-tidy to the rescue.
This commit is contained in:
marauder2k7 2024-03-18 18:40:22 +00:00
parent efbe5e90f5
commit 2b295fb7f0
454 changed files with 4162 additions and 4156 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Engine/source/windowManager/sdl/sdlCursorController.h
View file

@ -34,17 +34,17 @@ public:
pushCursor( PlatformCursorController::curArrow );
};
virtual void setCursorPosition( S32 x, S32 y );
virtual void getCursorPosition( Point2I &point );
virtual void setCursorVisible( bool visible );
virtual bool isCursorVisible();
void setCursorPosition( S32 x, S32 y ) override;
void getCursorPosition( Point2I &point ) override;
void setCursorVisible( bool visible ) override;
bool isCursorVisible() override;
void setCursorShape( U32 cursorID );
void setCursorShape( const UTF8 *fileName, bool reload );
void setCursorShape( U32 cursorID ) override;
void setCursorShape( const UTF8 *fileName, bool reload ) override;
U32 getDoubleClickTime();
S32 getDoubleClickWidth();
S32 getDoubleClickHeight();
U32 getDoubleClickTime() override;
S32 getDoubleClickWidth() override;
S32 getDoubleClickHeight() override;
};

78
Engine/source/windowManager/sdl/sdlWindow.h
View file

@ -104,7 +104,7 @@ public:
PlatformWindowSDL();
~PlatformWindowSDL();
virtual void* getSystemWindow(const WindowSystem system);
void* getSystemWindow(const WindowSystem system) override;
void* &getMenuHandle()
{
@ -116,62 +116,62 @@ public:
mMenuHandle = menuHandle;
}
virtual GFXDevice *getGFXDevice();
virtual GFXWindowTarget *getGFXTarget();
GFXDevice *getGFXDevice() override;
GFXWindowTarget *getGFXTarget() override;
virtual void _setVideoMode(const GFXVideoMode &mode);
virtual const GFXVideoMode &getVideoMode();
virtual bool clearFullscreen();
virtual bool isFullscreen();
virtual void _setFullscreen(const bool fullscreen);
void _setVideoMode(const GFXVideoMode &mode) override;
const GFXVideoMode &getVideoMode() override;
bool clearFullscreen() override;
bool isFullscreen() override;
void _setFullscreen(const bool fullscreen) override;
virtual bool setCaption(const char *cap);
virtual const char *getCaption();
bool setCaption(const char *cap) override;
const char *getCaption() override;
// Window Client Area Extent
virtual void setClientExtent( const Point2I newExtent );
virtual const Point2I getClientExtent();
void setClientExtent( const Point2I newExtent ) override;
const Point2I getClientExtent() override;
// Window Bounds
virtual void setBounds(const RectI &newBounds);
virtual const RectI getBounds() const;
void setBounds(const RectI &newBounds) override;
const RectI getBounds() const override;
// Window Position
virtual void setPosition( const Point2I newPosition );
virtual const Point2I getPosition();
virtual void centerWindow();
virtual bool setSize(const Point2I &newSize);
void setPosition( const Point2I newPosition ) override;
const Point2I getPosition() override;
void centerWindow() override;
bool setSize(const Point2I &newSize) override;
// Coordinate space conversion.
virtual Point2I clientToScreen( const Point2I& pos );
virtual Point2I screenToClient( const Point2I& pos );
Point2I clientToScreen( const Point2I& pos ) override;
Point2I screenToClient( const Point2I& pos ) override;
virtual bool isOpen();
virtual bool isVisible();
virtual bool isFocused();
virtual bool isMinimized();
virtual bool isMaximized();
bool isOpen() override;
bool isVisible() override;
bool isFocused() override;
bool isMinimized() override;
bool isMaximized() override;
virtual void minimize();
virtual void maximize();
virtual void hide();
virtual void show();
virtual void close();
virtual void restore();
virtual void setFocus();
void minimize() override;
void maximize() override;
void hide() override;
void show() override;
void close() override;
void restore() override;
void setFocus() override;
virtual void setMouseLocked(bool enable);
virtual bool isMouseLocked() const { return mMouseLocked; };
virtual bool shouldLockMouse() const { return mShouldLockMouse; };
void setMouseLocked(bool enable) override;
bool isMouseLocked() const override { return mMouseLocked; };
bool shouldLockMouse() const override { return mShouldLockMouse; };
/// Set if relevant keypress events should be translated into character input events.
virtual void setKeyboardTranslation(const bool enabled);
void setKeyboardTranslation(const bool enabled) override;
virtual WindowId getWindowId();
WindowId getWindowId() override;
SDL_Window* getSDLWindow() const { return mWindowHandle; }
virtual PlatformWindow * getNextWindow() const
PlatformWindow * getNextWindow() const override
{
return mNextWindow;
}
@ -187,6 +187,6 @@ public:
/// Return the platform specific object needed to create or attach an
/// accelerated graohics drawing context on or to the window
virtual void* getPlatformDrawable() const { return mWindowHandle; }
void* getPlatformDrawable() const override { return mWindowHandle; }
};
#endif

46
Engine/source/windowManager/sdl/sdlWindowMgr.h
View file

@ -61,7 +61,7 @@ protected:
friend class PlatformWindowSDL;
friend class FileDialog; // TODO SDL REMOVE
virtual void _processCmdLineArgs(const S32 argc, const char **argv);
void _processCmdLineArgs(const S32 argc, const char **argv) override;
/// Link the specified window into the window list.
void linkWindow(PlatformWindowSDL *w);
@ -101,34 +101,34 @@ public:
PlatformWindowManagerSDL();
~PlatformWindowManagerSDL();
virtual RectI getPrimaryDesktopArea();
virtual S32 getDesktopBitDepth();
virtual Point2I getDesktopResolution();
RectI getPrimaryDesktopArea() override;
S32 getDesktopBitDepth() override;
Point2I getDesktopResolution() override;
virtual S32 findFirstMatchingMonitor(const char* name);
virtual U32 getMonitorCount();
virtual const char* getMonitorName(U32 index);
virtual RectI getMonitorRect(U32 index);
virtual RectI getMonitorUsableRect(U32 index);
virtual U32 getMonitorModeCount(U32 monitorIndex);
virtual const String getMonitorMode(U32 monitorIndex, U32 modeIndex);
virtual const String getMonitorDesktopMode(U32 monitorIndex);
S32 findFirstMatchingMonitor(const char* name) override;
U32 getMonitorCount() override;
const char* getMonitorName(U32 index) override;
RectI getMonitorRect(U32 index) override;
RectI getMonitorUsableRect(U32 index) override;
U32 getMonitorModeCount(U32 monitorIndex) override;
const String getMonitorMode(U32 monitorIndex, U32 modeIndex) override;
const String getMonitorDesktopMode(U32 monitorIndex) override;
virtual void getMonitorRegions(Vector<RectI> &regions);
virtual PlatformWindow *createWindow(GFXDevice *device, const GFXVideoMode &mode);
virtual void getWindows(VectorPtr<PlatformWindow*> &windows);
void getMonitorRegions(Vector<RectI> &regions) override;
PlatformWindow *createWindow(GFXDevice *device, const GFXVideoMode &mode) override;
void getWindows(VectorPtr<PlatformWindow*> &windows) override;
virtual void setParentWindow(void* newParent);
virtual void* getParentWindow();
void setParentWindow(void* newParent) override;
void* getParentWindow() override;
virtual PlatformWindow *getWindowById(WindowId id);
virtual PlatformWindow *getFirstWindow();
virtual PlatformWindow* getFocusedWindow();
PlatformWindow *getWindowById(WindowId id) override;
PlatformWindow *getFirstWindow() override;
PlatformWindow* getFocusedWindow() override;
virtual void lowerCurtain();
virtual void raiseCurtain();
void lowerCurtain() override;
void raiseCurtain() override;
virtual void setDisplayWindow(bool set) { mDisplayWindow = set; }
void setDisplayWindow(bool set) override { mDisplayWindow = set; }
/// Stores the input state so that the event loop will fire a check if we need
/// to change how keyboard input is being handled.

76
Engine/source/windowManager/win32/win32Window.h
View file

@ -136,7 +136,7 @@ public:
return mWindowHandle;
}
virtual void* getSystemWindow(const WindowSystem system);
void* getSystemWindow(const WindowSystem system) override;
HMENU &getMenuHandle()
{
@ -161,57 +161,57 @@ public:
/// Allow windows to translate messages. Used for accelerators.
bool translateMessage(MSG &msg);
virtual GFXDevice *getGFXDevice();
virtual GFXWindowTarget *getGFXTarget();
GFXDevice *getGFXDevice() override;
GFXWindowTarget *getGFXTarget() override;
virtual void _setVideoMode(const GFXVideoMode &mode);
virtual const GFXVideoMode &getVideoMode();
virtual bool clearFullscreen();
virtual bool isFullscreen();
virtual void _setFullscreen(const bool fullscreen);
void _setVideoMode(const GFXVideoMode &mode) override;
const GFXVideoMode &getVideoMode() override;
bool clearFullscreen() override;
bool isFullscreen() override;
void _setFullscreen(const bool fullscreen) override;
virtual bool setCaption(const char *cap);
virtual const char *getCaption();
bool setCaption(const char *cap) override;
const char *getCaption() override;
// Window Client Area Extent
virtual void setClientExtent( const Point2I newExtent );
virtual const Point2I getClientExtent();
void setClientExtent( const Point2I newExtent ) override;
const Point2I getClientExtent() override;
// Window Bounds
virtual void setBounds(const RectI &newBounds);
virtual const RectI getBounds() const;
void setBounds(const RectI &newBounds) override;
const RectI getBounds() const override;
// Window Position
virtual void setPosition( const Point2I newPosition );
virtual const Point2I getPosition();
virtual void centerWindow();
virtual bool setSize(const Point2I &newSize);
void setPosition( const Point2I newPosition ) override;
const Point2I getPosition() override;
void centerWindow() override;
bool setSize(const Point2I &newSize) override;
// Coordinate space conversion.
virtual Point2I clientToScreen( const Point2I& pos );
virtual Point2I screenToClient( const Point2I& pos );
Point2I clientToScreen( const Point2I& pos ) override;
Point2I screenToClient( const Point2I& pos ) override;
virtual bool isOpen();
virtual bool isVisible();
virtual bool isFocused();
virtual bool isMinimized();
virtual bool isMaximized();
bool isOpen() override;
bool isVisible() override;
bool isFocused() override;
bool isMinimized() override;
bool isMaximized() override;
virtual void minimize();
virtual void maximize();
virtual void hide();
virtual void show();
virtual void close();
virtual void restore();
virtual void setFocus();
void minimize() override;
void maximize() override;
void hide() override;
void show() override;
void close() override;
void restore() override;
void setFocus() override;
virtual void setMouseLocked(bool enable);
virtual bool isMouseLocked() const { return mMouseLocked; };
virtual bool shouldLockMouse() const { return mShouldLockMouse; };
void setMouseLocked(bool enable) override;
bool isMouseLocked() const override { return mMouseLocked; };
bool shouldLockMouse() const override { return mShouldLockMouse; };
virtual WindowId getWindowId();
WindowId getWindowId() override;
virtual PlatformWindow * getNextWindow() const
PlatformWindow * getNextWindow() const override
{
return mNextWindow;
}
@ -227,6 +227,6 @@ public:
/// Return the platform specific object needed to create or attach an
/// accelerated graohics drawing context on or to the window
virtual void* getPlatformDrawable() const { return mWindowHandle; }
void* getPlatformDrawable() const override { return mWindowHandle; }
};
#endif