mirror of
https://github.com/libretro/scummvm.git
synced 2025-02-10 04:43:26 +00:00
JANITORIAL: Replaced repetitive 'typdef's with 'using'
This commit is contained in:
parent
89c589aa11
commit
0f9d0000f7
@ -27,6 +27,13 @@
|
||||
#include "gui/dialog.h"
|
||||
#include "engines/game.h"
|
||||
|
||||
using Common::String;
|
||||
using Common::U32String;
|
||||
using Common::Array;
|
||||
|
||||
typedef Array<String> StringArray;
|
||||
typedef Array<U32String> U32StringArray;
|
||||
|
||||
namespace GUI {
|
||||
|
||||
// Disable the grid for platforms that disable fancy themes
|
||||
@ -61,11 +68,7 @@ class EditTextWidget;
|
||||
class SaveLoadChooser;
|
||||
|
||||
class LauncherDialog : protected Dialog {
|
||||
typedef Common::String String;
|
||||
typedef Common::Array<Common::String> StringArray;
|
||||
|
||||
typedef Common::U32String U32String;
|
||||
typedef Common::Array<Common::U32String> U32StringArray;
|
||||
public:
|
||||
LauncherDialog(const Common::String &dialogName);
|
||||
~LauncherDialog() override;
|
||||
@ -164,11 +167,6 @@ private:
|
||||
};
|
||||
|
||||
class LauncherSimple : public LauncherDialog {
|
||||
typedef Common::String String;
|
||||
typedef Common::Array<Common::String> StringArray;
|
||||
|
||||
typedef Common::U32String U32String;
|
||||
typedef Common::Array<Common::U32String> U32StringArray;
|
||||
public:
|
||||
LauncherSimple(const U32String &title);
|
||||
|
||||
@ -196,11 +194,6 @@ private:
|
||||
|
||||
#ifndef DISABLE_LAUNCHERDISPLAY_GRID
|
||||
class LauncherGrid : public LauncherDialog {
|
||||
typedef Common::String String;
|
||||
typedef Common::Array<Common::String> StringArray;
|
||||
|
||||
typedef Common::U32String U32String;
|
||||
typedef Common::Array<Common::U32String> U32StringArray;
|
||||
public:
|
||||
LauncherGrid(const U32String &title);
|
||||
|
||||
|
@ -31,6 +31,12 @@
|
||||
#include "image/png.h"
|
||||
#include "graphics/svg.h"
|
||||
|
||||
using Common::String;
|
||||
using Common::U32String;
|
||||
using Common::Array;
|
||||
|
||||
typedef Array<String> StringArray;
|
||||
|
||||
namespace GUI {
|
||||
|
||||
class ScrollBarWidget;
|
||||
@ -60,8 +66,6 @@ enum {
|
||||
|
||||
/* GridItemInfo */
|
||||
struct GridItemInfo {
|
||||
typedef Common::String String;
|
||||
|
||||
String engineid;
|
||||
String gameid;
|
||||
String language;
|
||||
@ -93,12 +97,6 @@ class GridItemTray: public Dialog, public CommandSender {
|
||||
GridWidget *_grid;
|
||||
GuiObject *_boss;
|
||||
public:
|
||||
typedef Common::String String;
|
||||
typedef Common::Array<Common::String> StringArray;
|
||||
|
||||
typedef Common::U32String U32String;
|
||||
typedef Common::Array<Common::U32String> U32StringArray;
|
||||
|
||||
GridItemTray(GuiObject *boss, int x, int y, int w, int h, int entryID, GridWidget *grid);
|
||||
|
||||
void handleCommand(CommandSender *sender, uint32 cmd, uint32 data) override;
|
||||
@ -110,13 +108,6 @@ public:
|
||||
|
||||
/* GridWidget */
|
||||
class GridWidget : public ContainerWidget, public CommandSender {
|
||||
public:
|
||||
typedef Common::String String;
|
||||
typedef Common::Array<Common::String> StringArray;
|
||||
|
||||
typedef Common::U32String U32String;
|
||||
typedef Common::Array<Common::U32String> U32StringArray;
|
||||
|
||||
protected:
|
||||
Common::Array<const Graphics::ManagedSurface *> _platformIcons;
|
||||
|
||||
@ -196,13 +187,6 @@ public:
|
||||
|
||||
/* GridItemWidget */
|
||||
class GridItemWidget : public ContainerWidget, public CommandSender {
|
||||
public:
|
||||
typedef Common::String String;
|
||||
typedef Common::Array<Common::String> StringArray;
|
||||
|
||||
typedef Common::U32String U32String;
|
||||
typedef Common::Array<Common::U32String> U32StringArray;
|
||||
|
||||
protected:
|
||||
Graphics::ManagedSurface _thumbGfx;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user