Converts from wstring to regular string.
Cleans up empty test suites to return no tests instead of a single pass.
This commit is contained in:
@@ -9,24 +9,24 @@ namespace SBF {
|
||||
#include <cstdint>
|
||||
|
||||
namespace SBF {
|
||||
using std::wstring;
|
||||
using std::string;
|
||||
|
||||
struct MenuStyle {
|
||||
int idWidth;
|
||||
int labelWidth;
|
||||
int valueWidth;
|
||||
int screenWidth;
|
||||
wstring randomItemName;
|
||||
string randomItemName;
|
||||
int randomItemId;
|
||||
wstring idLabelSeparator;
|
||||
wstring labelValueSeparator;
|
||||
wstring menuItemSpacer;
|
||||
string idLabelSeparator;
|
||||
string labelValueSeparator;
|
||||
string menuItemSpacer;
|
||||
bool showRandom;
|
||||
bool useColors;
|
||||
};
|
||||
|
||||
struct MenuItem {
|
||||
wstring label;
|
||||
string label;
|
||||
int id;
|
||||
int value;
|
||||
int color;
|
||||
@@ -34,17 +34,17 @@ namespace SBF {
|
||||
};
|
||||
|
||||
int GetRandomMenuItemId (std::vector<MenuItem> items);
|
||||
void BuildMenu(std::vector<MenuItem> items, std::vector<wstring> labels);
|
||||
void BuildMenuWithValues(std::vector<MenuItem> items, std::vector<wstring> labels, std::vector<int> values);
|
||||
void BuildMenuWithColors(std::vector<MenuItem> items, std::vector<wstring> labels, std::vector<uint8_t> colors);
|
||||
void BuildMenu(std::vector<MenuItem> items, std::vector<string> labels);
|
||||
void BuildMenuWithValues(std::vector<MenuItem> items, std::vector<string> labels, std::vector<int> values);
|
||||
void BuildMenuWithColors(std::vector<MenuItem> items, std::vector<string> labels, std::vector<uint8_t> colors);
|
||||
void AdjustMenuStyle(MenuStyle& style, std::vector<MenuItem> items, bool ignoreValue);
|
||||
void PrintMenu(std::vector<MenuItem> items, MenuStyle style);
|
||||
wstring GetTitle(MenuItem item, MenuStyle style);
|
||||
wstring GetTitleWithoutValue(MenuItem item, MenuStyle style);
|
||||
string GetTitle(MenuItem item, MenuStyle style);
|
||||
string GetTitleWithoutValue(MenuItem item, MenuStyle style);
|
||||
void NewMenuStyle(MenuStyle& style);
|
||||
void NewMenuItem(MenuItem& item, wstring label, int id);
|
||||
void NewMenuItemWithValue(MenuItem& item, wstring label, int id, int value);
|
||||
void NewMenuItemWithColor(MenuItem& item, wstring label, int id, uint8_t color);
|
||||
void NewMenuItem(MenuItem& item, string label, int id);
|
||||
void NewMenuItemWithValue(MenuItem& item, string label, int id, int value);
|
||||
void NewMenuItemWithColor(MenuItem& item, string label, int id, uint8_t color);
|
||||
|
||||
} // End namespace SBF
|
||||
|
||||
|
||||
Reference in New Issue
Block a user