Reformat all the things. Have fun with merge conflicts.

This commit is contained in:
Pierre Bourdon
2016-06-24 10:43:46 +02:00
parent 2115e8a4a6
commit 3570c7f03a
1116 changed files with 187405 additions and 180344 deletions

View File

@ -7,25 +7,26 @@
#include <string>
#include "VideoCommon/VideoBackendBase.h"
namespace MMIO { class Mapping; }
namespace MMIO
{
class Mapping;
}
namespace SW
{
class VideoSoftware : public VideoBackendBase
{
bool Initialize(void *window_handle) override;
void Shutdown() override;
bool Initialize(void* window_handle) override;
void Shutdown() override;
std::string GetName() const override;
std::string GetDisplayName() const override;
std::string GetName() const override;
std::string GetDisplayName() const override;
void Video_Prepare() override;
void Video_Cleanup() override;
void Video_Prepare() override;
void Video_Cleanup() override;
void ShowConfig(void* parent) override;
void ShowConfig(void* parent) override;
unsigned int PeekMessages() override;
unsigned int PeekMessages() override;
};
}