Skip to content

Commit

Permalink
MythGame: Whitespace fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert McNamara committed Dec 14, 2010
1 parent 732cdae commit ac2ae48
Show file tree
Hide file tree
Showing 10 changed files with 79 additions and 81 deletions.
66 changes: 33 additions & 33 deletions mythplugins/mythgame/mythgame/gamehandler.cpp
View file
Expand Up @@ -55,7 +55,7 @@ static void checkHandlers(void)
"WHERE playername <> '';"))
MythDB::DBError("checkHandlers - selecting playername", query);

while (query.next())
while (query.next())
{
QString name = query.value(0).toString();
GameHandler::registerHandler(GameHandler::newHandler(name));
Expand Down Expand Up @@ -110,15 +110,15 @@ uint GameHandler::count(void)
return handlers->count();
}

void GameHandler::InitMetaDataMap(QString GameType)
void GameHandler::InitMetaDataMap(QString GameType)
{
QString key;

MSqlQuery query(MSqlQuery::InitCon());
query.prepare("SELECT crc, category, year, country, name, "
"description, publisher, platform, version, "
"binfile FROM romdb WHERE platform = :GAMETYPE;");

query.bindValue(":GAMETYPE",GameType);

if (query.exec())
Expand Down Expand Up @@ -151,7 +151,7 @@ void GameHandler::InitMetaDataMap(QString GameType)

void GameHandler::GetMetadata(GameHandler *handler, QString rom, QString* Genre, QString* Year,
QString* Country, QString* CRC32, QString* GameName,
QString *Plot, QString *Publisher, QString *Version,
QString *Plot, QString *Publisher, QString *Version,
QString* Fanart, QString* Boxart)
{
QString key;
Expand All @@ -174,7 +174,7 @@ void GameHandler::GetMetadata(GameHandler *handler, QString rom, QString* Genre,

if (!(*CRC32).isEmpty())
{
if (romDB.contains(key))
if (romDB.contains(key))
{
VERBOSE(VB_GENERAL, LOC + QString("ROMDB FOUND for %1 - %2")
.arg(romDB[key].GameName()).arg(key));
Expand All @@ -198,7 +198,7 @@ void GameHandler::GetMetadata(GameHandler *handler, QString rom, QString* Genre,

}

static void purgeGameDB(QString filename, QString RomPath)
static void purgeGameDB(QString filename, QString RomPath)
{
VERBOSE(VB_GENERAL, LOC + QString("Purging %1 - %2").arg(RomPath)
.arg(filename));
Expand Down Expand Up @@ -255,7 +255,7 @@ static void updateDisplayRom(QString romname, int display, QString Systemname)
MSqlQuery query(MSqlQuery::InitCon());
query.prepare("UPDATE gamemetadata SET display = :DISPLAY "
"WHERE romname = :ROMNAME AND system = :SYSTEM");

query.bindValue(":DISPLAY", display);
query.bindValue(":ROMNAME", romname);
query.bindValue(":SYSTEM", Systemname);
Expand Down Expand Up @@ -306,7 +306,7 @@ static void UpdateGameCounts(QStringList updatelist)

QString lastrom, firstname, basename;

for ( QStringList::Iterator it = updatelist.begin(); it != updatelist.end(); ++it )
for ( QStringList::Iterator it = updatelist.begin(); it != updatelist.end(); ++it )
{
diskcount = 0;
QString GameType = *it;
Expand All @@ -320,13 +320,13 @@ static void UpdateGameCounts(QStringList updatelist)
query.bindValue(":GAMETYPE",GameType);

if (query.exec())
{
{
while (query.next())
{
{
QString RomName = query.value(0).toString();
QString System = query.value(1).toString();
int spandisks = query.value(2).toInt();
QString GameName = query.value(3).toString();
QString GameName = query.value(3).toString();
int extlength = 0;

basename = RomName;
Expand Down Expand Up @@ -369,7 +369,7 @@ static void UpdateGameCounts(QStringList updatelist)

if (basename != GameName)
updateGameName(RomName,basename,System);
}
}
else
{
if (basename == lastrom)
Expand Down Expand Up @@ -452,7 +452,7 @@ void GameHandler::UpdateGameDB(GameHandler *handler)
//VERBOSE(VB_GENERAL, QString("screenshot %1").arg(ScreenShot));

query.prepare("INSERT INTO gamemetadata "
"(system, romname, gamename, genre, year, gametype, "
"(system, romname, gamename, genre, year, gametype, "
"rompath, country, crc_value, diskcount, display, plot, "
"publisher, version, fanart, boxart, screenshot) "
"VALUES (:SYSTEM, :ROMNAME, :GAMENAME, :GENRE, :YEAR, "
Expand All @@ -475,10 +475,10 @@ void GameHandler::UpdateGameDB(GameHandler *handler)
query.bindValue(":BOXART", Boxart);
query.bindValue(":SCREENSHOT", ScreenShot);

if (!query.exec())
MythDB::DBError("GameHandler::UpdateGameDB - "
"insert gamemetadata", query);
}
if (!query.exec())
MythDB::DBError("GameHandler::UpdateGameDB - "
"insert gamemetadata", query);
}
else if ((iter.value().FoundLoc() == inDatabase) && (removalprompt))
{

Expand Down Expand Up @@ -549,7 +549,7 @@ int GameHandler::buildFileCount(QString directory, GameHandler *handler)
QDir RomDir(directory);

// If we can't read it's contents move on
if (!RomDir.isReadable())
if (!RomDir.isReadable())
return 0;

QFileInfoList List = RomDir.entryInfoList();
Expand Down Expand Up @@ -585,7 +585,7 @@ int GameHandler::buildFileCount(QString directory, GameHandler *handler)
if (extension.contains(r))
result.append(extension);
}
if (result.isEmpty())
if (result.isEmpty())
continue;
}

Expand Down Expand Up @@ -626,13 +626,13 @@ void GameHandler::clearAllGameData(void)
};
}

void GameHandler::buildFileList(QString directory, GameHandler *handler,
void GameHandler::buildFileList(QString directory, GameHandler *handler,
MythProgressDialog *pdial, int* filecount)
{
QDir RomDir(directory);

// If we can't read it's contents move on
if (!RomDir.isReadable())
if (!RomDir.isReadable())
return;

RomDir.setSorting( QDir:: DirsFirst | QDir::Name );
Expand Down Expand Up @@ -672,7 +672,7 @@ void GameHandler::buildFileList(QString directory, GameHandler *handler,
result.append(extension);
}

if (result.isEmpty())
if (result.isEmpty())
continue;
}

Expand Down Expand Up @@ -700,7 +700,7 @@ void GameHandler::processGames(GameHandler *handler)
QDir d(handler->SystemRomPath());
if (d.exists())
maxcount = buildFileCount(handler->SystemRomPath(),handler);
else
else
{
VERBOSE(VB_GENERAL, LOC_ERR + QString("Rom Path does not exist: %1")
.arg(handler->SystemRomPath()));
Expand All @@ -715,9 +715,9 @@ void GameHandler::processGames(GameHandler *handler)
maxcount);
pdial->setProgress(0);

if (handler->GameType() == "PC")
if (handler->GameType() == "PC")
{
m_GameMap[handler->SystemCmdLine()] =
m_GameMap[handler->SystemCmdLine()] =
GameScan(handler->SystemCmdLine(),
handler->SystemCmdLine(),
inFileSystem,
Expand All @@ -730,7 +730,7 @@ void GameHandler::processGames(GameHandler *handler)

}
else
{
{
int filecount = 0;
buildFileList(handler->SystemRomPath(), handler, pdial, &filecount);
}
Expand All @@ -746,7 +746,7 @@ void GameHandler::processGames(GameHandler *handler)

romDB.clear();
handler->setRebuild(true);
}
}
else
handler->setRebuild(false);

Expand Down Expand Up @@ -774,7 +774,7 @@ void GameHandler::processAllGames(void)
}
}

if (!updatelist.isEmpty())
if (!updatelist.isEmpty())
UpdateGameCounts(updatelist);
}

Expand Down Expand Up @@ -819,7 +819,7 @@ void GameHandler::Launchgame(RomInfo *romdata, QString systemname)
{
GameHandler *handler;

if (!systemname.isEmpty() && !systemname.isNull())
if (!systemname.isEmpty() && !systemname.isNull())
{
handler = GetHandlerByName(systemname);
}
Expand Down Expand Up @@ -849,9 +849,9 @@ void GameHandler::Launchgame(RomInfo *romdata, QString systemname)
{
QRegExp rxp = QRegExp( "%d[0-4]", Qt::CaseSensitive, QRegExp::RegExp);

if (exec.contains(rxp))
if (exec.contains(rxp))
{
if (romdata->DiskCount() > 1)
if (romdata->DiskCount() > 1)
{
// Chop off the extension, . and last character of the name which we are assuming is the disk #
QString basename = romdata->Romname().left(romdata->Romname().length() - (romdata->getExtension().length() + 2));
Expand All @@ -877,15 +877,15 @@ void GameHandler::Launchgame(RomInfo *romdata, QString systemname)
}
else
{
exec = exec + " \"" +
exec = exec + " \"" +
romdata->Rompath() + "/" +
romdata->Romname() + "\"";
}
}

QString savedir = QDir::current().path();
QDir d;
if (!handler->SystemWorkingPath().isEmpty())
if (!handler->SystemWorkingPath().isEmpty())
{
if (!d.cd(handler->SystemWorkingPath()))
{
Expand Down
8 changes: 4 additions & 4 deletions mythplugins/mythgame/mythgame/gamehandler.h
View file
Expand Up @@ -21,7 +21,7 @@ enum GameFound
inNone,
inFileSystem,
inDatabase,
inBoth
inBoth
};

class GameScan
Expand Down Expand Up @@ -71,7 +71,7 @@ class GameHandler : public QObject
static GameHandler *newHandler(QString name);
static uint count(void);
void InitMetaDataMap(QString GameType);
void GetMetadata(GameHandler *handler, QString rom,
void GetMetadata(GameHandler *handler, QString rom,
QString* Genre, QString* Year, QString* Country,
QString* CRC32, QString* GameName,
QString* Plot, QString* Publisher, QString* Version,
Expand All @@ -81,10 +81,10 @@ class GameHandler : public QObject
void UpdateGameDB(GameHandler *handler);
void VerifyGameDB(GameHandler *handler);

static void clearAllGameData(void);
static void clearAllGameData(void);

static int buildFileCount(QString directory, GameHandler *handler);
void buildFileList(QString directory, GameHandler *handler,
void buildFileList(QString directory, GameHandler *handler,
MythProgressDialog *pdial, int* filecount);

void processGames(GameHandler *);
Expand Down
2 changes: 1 addition & 1 deletion mythplugins/mythgame/mythgame/gamesettings.h
View file
Expand Up @@ -19,7 +19,7 @@ struct GameTypes {
// TODO FIXME Can't initialize translated values statically. They are only
// translated if you get lucky with dynamic linking order.
const GameTypes GameTypeList[MAX_GAME_TYPES] =
{
{
{ QObject::tr("OTHER"), "OTHER", "" },
{ QObject::tr("AMIGA"), "AMIGA", "adf,ipf" },
{ QObject::tr("ATARI"), "ATARI", "bin,a26" },
Expand Down
16 changes: 8 additions & 8 deletions mythplugins/mythgame/mythgame/gameui.cpp
View file
Expand Up @@ -19,7 +19,7 @@
#include "romedit.h"
#include "gameui.h"

class GameTreeInfo
class GameTreeInfo
{
public:
GameTreeInfo(const QString& levels, const QString& filter)
Expand Down Expand Up @@ -606,7 +606,7 @@ void GameUI::searchStart(void)
for (it = children->begin(); it != children->end(); ++it)
{
MythGenericTree *child = *it;
childList << child->getString();
childList << child->getString();
}

MythScreenStack *popupStack =
Expand Down Expand Up @@ -793,21 +793,21 @@ QString GameUI::getFillSql(MythGenericTree *node) const
filter += " and romname like '" + layer + "%'";

}
else if ((childLevel == "gamename") && (layer.length() == 1))
else if ((childLevel == "gamename") && (layer.length() == 1))
{
columns = childIsLeaf
? childLevel + ",system,year,genre,gamename"
: childLevel;

if (m_showHashed)
if (m_showHashed)
filter += " and gamename like '" + layer + "%'";

}
else if (childLevel == "hash")
else if (childLevel == "hash")
{
columns = "left(gamename,1)";
}
else
else
{

columns = childIsLeaf
Expand All @@ -817,7 +817,7 @@ QString GameUI::getFillSql(MythGenericTree *node) const

// this whole section ought to be in rominfo.cpp really, but I've put it
// in here for now to minimise the number of files changed by this mod
if (romInfo)
if (romInfo)
{
if (!romInfo->System().isEmpty())
{
Expand Down Expand Up @@ -864,7 +864,7 @@ QString GameUI::getFillSql(MythGenericTree *node) const
+ " order by romname"
+ ";";
}
else if (childLevel == "hash")
else if (childLevel == "hash")
{
sql = "select distinct "
+ columns
Expand Down
2 changes: 1 addition & 1 deletion mythplugins/mythgame/mythgame/gameui.h
View file
Expand Up @@ -82,7 +82,7 @@ class GameUI : public MythScreenType
MythUIText *m_gameGenreText;
MythUIText *m_gamePlotText;
MythUIStateType *m_gameFavouriteState;
MythUIImage *m_gameImage;
MythUIImage *m_gameImage;
MythUIImage *m_fanartImage;
MythUIImage *m_boxImage;

Expand Down

0 comments on commit ac2ae48

Please sign in to comment.