18 changes: 9 additions & 9 deletions mythtv/programs/mythfrontend/progfind.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ class JaProgFinder : public ProgFinder
{
public:
explicit JaProgFinder(MythScreenStack *parentStack, bool gg = false,
TV *player = nullptr, bool embedVideo = false);
TV *player = nullptr, bool embedVideo = false)
: ProgFinder(parentStack, gg, player, embedVideo) {}

protected:
void initAlphabetList() override; // ProgFinder
Expand All @@ -103,15 +104,15 @@ class JaProgFinder : public ProgFinder
void whereClauseGetSearchData(QString &where, MSqlBindings &bindings) override; // ProgFinder

private:
static const QChar kSearchChars[];
int m_numberOfSearchChars;
static const std::vector<QChar> kSearchChars;
};

class HeProgFinder : public ProgFinder
{
public:
explicit HeProgFinder(MythScreenStack *parentStack, bool gg = false,
TV *player = nullptr, bool embedVideo = false);
TV *player = nullptr, bool embedVideo = false)
: ProgFinder(parentStack, gg, player, embedVideo) {}

protected:
void initAlphabetList() override; // ProgFinder
Expand All @@ -121,15 +122,15 @@ class HeProgFinder : public ProgFinder
void whereClauseGetSearchData(QString &where, MSqlBindings &bindings) override; // ProgFinder

private:
static const QChar kSearchChars[];
int m_numberOfSearchChars;
static const std::vector<QChar> kSearchChars;
};
///////////////////////////////
class RuProgFinder : public ProgFinder
{
public:
explicit RuProgFinder(MythScreenStack *parentStack, bool gg = false,
TV *player = nullptr, bool embedVideo = false);
TV *player = nullptr, bool embedVideo = false)
: ProgFinder(parentStack, gg, player, embedVideo) {}

protected:
void initAlphabetList() override; // ProgFinder
Expand All @@ -139,8 +140,7 @@ class RuProgFinder : public ProgFinder
void whereClauseGetSearchData(QString &where, MSqlBindings &bindings) override; // ProgFinder

private:
static const QChar kSearchChars[];
int m_numberOfSearchChars;
static const std::vector<QChar> kSearchChars;
};
///////////////////////////////////

Expand Down
4 changes: 2 additions & 2 deletions mythtv/programs/mythfrontend/proglist.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ bool ProgLister::PowerStringToSQL(
return false;
};

static const QString kBindingList[6] =
static const std::array<QString,6> kBindingList
{
":POWERTITLE",
":POWERSUB",
Expand All @@ -547,7 +547,7 @@ bool ProgLister::PowerStringToSQL(
":POWERCALLSIGN",
};

static const QString kOutputList[6] =
static const std::array<QString,6> kOutputList
{
"program.title LIKE :POWERTITLE ",
"program.subtitle LIKE :POWERSUB ",
Expand Down