crtxcr/qsrun
1
0
Derivar 0
Código Questões 29 Pedidos de integração 1 Lançamentos Trabalho

EntryProvider: Don't use 'new' when throwing exceptions

Ver a proveniência
Este cometimento está contido em:
Albert S. 2020-10-19 21:45:18 +02:00
ascendente 042b53a0be
cometimento f9038f3098
1 ficheiros modificados com 7 adições e 7 eliminações
Mostrar estatísticas Descarregar ficheiro patch Descarregar ficheiro diff Expandir todos os ficheiros Colapsar todos os ficheiros

14
entryprovider.cpp
Ver ficheiro

@ -25,7 +25,7 @@ EntryConfig EntryProvider::readFromDesktopFile(const QString &path)
if(!file.open(QIODevice::ReadOnly | QIODevice::Text))
{
// TODO: better exception class
throw new std::runtime_error("Failed to open file");
throw std::runtime_error("Failed to open file");
}
QTextStream stream(&file);
// There should be nothing preceding this group in the desktop entry file but possibly one or more comments.
@ -120,7 +120,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
if(!file.open(QIODevice::ReadOnly | QIODevice::Text))
{
// TODO: better exception class
throw new std::runtime_error("Failed to open file");
throw std::runtime_error("Failed to open file");
}
QHash<QString, QString> map;
QTextStream stream(&file);
@ -131,7 +131,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
int spacePos = line.indexOf(' ');
if(spacePos == -1)
{
throw new ConfigFormatException("misformated line in .qsrun config file " + path.toStdString());
throw ConfigFormatException("misformated line in .qsrun config file " + path.toStdString());
}
QString key = line.mid(0, spacePos);
@ -139,7 +139,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
if(key == "" || value == "")
{
throw new ConfigFormatException("empty key or value in .qsrun config file " + path.toStdString());
throw ConfigFormatException("empty key or value in .qsrun config file " + path.toStdString());
}
map[key] = value;
}
@ -154,7 +154,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
}
else
{
throw new ConfigFormatException("Error attempting to read inherited entry");
throw ConfigFormatException("Error attempting to read inherited entry");
}
}
QString type = map["type"];
@ -162,7 +162,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
{
if(type == "system")
{
throw new ConfigFormatException(".qsrun files cannot be designated as system entries " +
throw ConfigFormatException(".qsrun files cannot be designated as system entries " +
path.toStdString());
}
else if(type == "inherit")
@ -175,7 +175,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
}
else
{
throw new ConfigFormatException("Invalid value for type provided in file: " + path.toStdString());
throw ConfigFormatException("Invalid value for type provided in file: " + path.toStdString());
}
}
else