Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-25 23:45:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renamed RsCollectionErrorCode::NO_ERROR to COLLECTION_NO_ERROR because of double define of NO_ERROR in winerror.h

Browse source
This commit is contained in:
thunder2 2024-04-02 14:44:34 +02:00
parent 16d6d4d597
commit 5a24fad354
8 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/common/RsCollection.cpp
View file

@ -164,7 +164,7 @@ QString RsCollection::errorString(RsCollectionErrorCode code)
{
default: [[fallthrough]] ;
case RsCollectionErrorCode::UNKNOWN_ERROR: return QObject::tr("Unknown error");
case RsCollectionErrorCode::NO_ERROR: return QObject::tr("No error");
case RsCollectionErrorCode::COLLECTION_NO_ERROR: return QObject::tr("No error");
case RsCollectionErrorCode::FILE_READ_ERROR: return QObject::tr("Error while openning file");
case RsCollectionErrorCode::FILE_CONTAINS_HARMFUL_STRINGS: return QObject::tr("Collection file contains potentially harmful code");
case RsCollectionErrorCode::INVALID_ROOT_NODE: return QObject::tr("Invalid root node. RsCollection node was expected.");
@ -214,7 +214,7 @@ RsCollection::RsCollection(const QString& fileName, RsCollectionErrorCode& error
if(!recursParseXml(xml_doc,root,0))
error = RsCollectionErrorCode::XML_PARSING_ERROR;
else
error = RsCollectionErrorCode::NO_ERROR;
error = RsCollectionErrorCode::COLLECTION_NO_ERROR;
}
// check that the file is a valid rscollection file, and not a lol bomb or some shit like this
@ -222,7 +222,7 @@ RsCollection::RsCollection(const QString& fileName, RsCollectionErrorCode& error
bool RsCollection::checkFile(const QString& fileName, RsCollectionErrorCode& error)
{
QFile file(fileName);
error = RsCollectionErrorCode::NO_ERROR;
error = RsCollectionErrorCode::COLLECTION_NO_ERROR;
if (!file.open(QIODevice::ReadOnly))
{