0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixup! GUI2 Tests: directly initialize a vector

Browse source
This commit is contained in:
Celtic Minstrel 2017-04-28 17:38:12 -04:00
parent e50d9ed417
commit 1916815e38
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/tests/gui/test_gui2.cpp
View file

@ -191,10 +191,10 @@ namespace {
};
typedef std::pair<unsigned, unsigned> resolution;
typedef std::vector<std::pair<unsigned, unsigned> > tresolution_list;
typedef std::vector<std::pair<unsigned, unsigned> > resolution_list;
template<class T>
void test_resolutions(const tresolution_list& resolutions)
void test_resolutions(const resolution_list& resolutions)
{
for(const resolution& resolution : resolutions) {
CVideo& video = test_utils::get_fake_display(resolution.first, resolution.second).video();
@ -231,7 +231,7 @@ namespace {
}
template<class T>
void test_popup_resolutions(const tresolution_list& resolutions)
void test_popup_resolutions(const resolution_list& resolutions)
{
bool interact = false;
for(int i = 0; i < 2; ++i) {
@ -279,7 +279,7 @@ namespace {
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
void test_tip_resolutions(const tresolution_list& resolutions
void test_tip_resolutions(const resolution_list& resolutions
, const std::string& id)
{
for(const resolution& resolution : resolutions) {
@ -322,13 +322,13 @@ namespace {
#pragma warning(pop)
#endif
const tresolution_list& get_gui_resolutions()
const resolution_list& get_gui_resolutions()
{
static tresolution_list result {
{800, 600}
{1024, 768}
{1280, 1024}
{1680, 1050}
static resolution_list result {
{800, 600},
{1024, 768},
{1280, 1024},
{1680, 1050},
};
return result;