Ticket #5550: mythgame-defects.patch

File mythgame-defects.patch, 4.0 KB (added by Erik Hovland <erik@…>, 16 years ago)

fixes three defects found in mythgame

  • mythplugins/mythgame/mythgame/gamehandler.cpp 

    1. The assignment to handler is unnecessary.

2. The ctor for GameHandler missed gameplayerid and spandisks

3. GameTree::GameTree assigns node several times but doesn't
   always use it. Any unused assignment is removed.

4. The conditional for nodeInt is unnecessary since nodeInt is
   guaranteed to be not zero because of the conditional just
   before it.

Signed-off-by: Erik Hovland <erik@hovland.org>

---

 mythplugins/mythgame/mythgame/gamehandler.cpp |    4 ++--
 mythplugins/mythgame/mythgame/gamehandler.h   |    8 +++-----
 mythplugins/mythgame/mythgame/gametree.cpp    |   13 ++++++-------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/mythplugins/mythgame/mythgame/gamehandler.cpp b/mythplugins/mythgame/mythgame/gamehandler.cpp
index 7eb1871..9b1e48b 100644
    a b void GameHandler::Launchgame(RomInfo *romdata, QString systemname) 
    879879
    880880RomInfo* GameHandler::CreateRomInfo(RomInfo* parent)
    881881{
    882     GameHandler *handler;
    883     if((handler = GetHandler(parent)))
     882    if(GetHandler(parent))
    884883        return new RomInfo(*parent);
     884
    885885    return NULL;
    886886}
    887887

  • mythplugins/mythgame/mythgame/gamehandler.h 

    diff --git a/mythplugins/mythgame/mythgame/gamehandler.h b/mythplugins/mythgame/mythgame/gamehandler.h
index 1d25f45..122dfba 100644
    a b class GameHandler 
    5757{
    5858  public:
    5959    GameHandler()
    60     {
    61         m_RemoveAll = false;
    62         m_KeepAll = false;
    63         rebuild = false;
    64     }
     60        : rebuild(false),  spandisks(0),
     61          gameplayerid(0), m_RemoveAll(false),
     62          m_KeepAll(false) {}
    6563
    6664    static void updateSettings(GameHandler*);
    6765    static GameHandler* getHandler(uint i);

  • mythplugins/mythgame/mythgame/gametree.cpp 

    diff --git a/mythplugins/mythgame/mythgame/gametree.cpp b/mythplugins/mythgame/mythgame/gametree.cpp
index a0a32c5..f139c23 100644
    a b GameTree::GameTree(MythMainWindow *parent, QString windowName, 
    227227    root = new GameTreeRoot(levels, systemFilter);
    228228    m_gameTreeRoots.push_back(root);
    229229    m_gameTreeItems.push_back(new GameTreeItem(root, m_showHashed));
    230     node = m_gameTree->addNode(tr("All Games"), m_gameTreeItems.size(), false);
     230    m_gameTree->addNode(tr("All Games"), m_gameTreeItems.size(), false);
    231231
    232232    root = new GameTreeRoot("genre gamename", systemFilter);
    233233    m_gameTreeRoots.push_back(root);
    234234    m_gameTreeItems.push_back(new GameTreeItem(root));
    235     node = m_gameTree->addNode(tr("-   By Genre"), m_gameTreeItems.size(), false);
     235    m_gameTree->addNode(tr("-   By Genre"), m_gameTreeItems.size(), false);
    236236
    237237    root = new GameTreeRoot("year gamename", systemFilter);
    238238    m_gameTreeRoots.push_back(root);
    239239    m_gameTreeItems.push_back(new GameTreeItem(root));
    240     node = m_gameTree->addNode(tr("-   By Year"), m_gameTreeItems.size(), false);
     240    m_gameTree->addNode(tr("-   By Year"), m_gameTreeItems.size(), false);
    241241
    242242    root = new GameTreeRoot("gamename", systemFilter);
    243243    m_gameTreeRoots.push_back(root);
    244244    m_gameTreeItems.push_back(new GameTreeItem(root));
    245     node = m_gameTree->addNode(tr("-   By Name"), m_gameTreeItems.size(), false);
     245    m_gameTree->addNode(tr("-   By Name"), m_gameTreeItems.size(), false);
    246246
    247247    root = new GameTreeRoot("publisher gamename", systemFilter);
    248248    m_gameTreeRoots.push_back(root);
    249249    m_gameTreeItems.push_back(new GameTreeItem(root));
    250     node = m_gameTree->addNode(tr("-   By Publisher"), m_gameTreeItems.size(), false);
    251 
     250    m_gameTree->addNode(tr("-   By Publisher"), m_gameTreeItems.size(), false);
    252251
    253252    m_gameTreeUI->assignTreeData(m_gameTree);
    254253    m_gameTreeUI->enter();
    … … void GameTree::handleTreeListSelection(int nodeInt, IntVector *) 
    371370{
    372371    if (nodeInt > 0)
    373372    {
    374         GameTreeItem *item = nodeInt ? m_gameTreeItems[nodeInt - 1] : 0;
     373        GameTreeItem *item = m_gameTreeItems[nodeInt - 1];
    375374
    376375        if (item->isLeaf())
    377376        {