diff -r 1de2b8d64e9f -r 98906a94732f src/colors.cpp --- a/src/colors.cpp Tue Jan 28 23:34:49 2020 +0200 +++ b/src/colors.cpp Thu Jan 30 19:20:11 2020 +0200 @@ -18,14 +18,14 @@ #include "colors.h" -const ColorTable::ColorDefinition ColorTable::unknownColor{{}, {}, "Unknown"}; +const ldraw::ColorTable::ColorDefinition ldraw::ColorTable::unknownColor{{}, {}, "Unknown"}; -void ColorTable::clear() +void ldraw::ColorTable::clear() { definitions = {}; } -Result ColorTable::load(QIODevice& device, QTextStream& errors) +Result ldraw::ColorTable::load(QIODevice& device, QTextStream& errors) { this->clear(); if (device.isReadable()) @@ -45,7 +45,7 @@ } } -const ColorTable::ColorDefinition& ColorTable::operator[](Color color) const +const ldraw::ColorTable::ColorDefinition& ldraw::ColorTable::operator[](Color color) const { auto it = this->definitions.find(color.index); if (it != this->definitions.end()) @@ -58,7 +58,7 @@ } } -void ColorTable::loadColorFromString(const QString& string) +void ldraw::ColorTable::loadColorFromString(const QString& string) { const QRegExp pattern{ R"(^\s*0 \!COLOUR\s+([^\s]+)\s+)"_q +