ldforge: comparison src/colors.cpp

-:a66d943591d8
+:ef475e07482e
 #include <QMessageBox>
 #include "colors.h"
 #include "ldpaths.h"
 ColorData* LDColor::colorData = nullptr;
-const LDColor LDColor::nullColor {-1};
+const LDColor LDColor::nullColor = -1;
 /*
-* initColors
-*
 * Initializes the color information module.
 */
 void LDColor::initColors()
 {
-	print ("Initializing color information.\n");
+	print("Initializing color information.\n");
 	static ColorData colors;
 	LDColor::colorData = &colors;
 }
 /*
-* LDColor :: LDColor
+* Default-constructs an LDColor to 0(black).
-*
-* Default-constructs an LDColor to 0 (black).
 */
 LDColor::LDColor() :
-m_index (0) {}
+m_index {0} {}
 /*
-* LDColor :: LDColor
-*
 * Constructs an LDColor by index.
 */
-LDColor::LDColor (qint32 index)
+LDColor::LDColor(qint32 index) :
-: m_index (index) {}
+m_index {index} {}
 /*
-* LDColor :: isValid
-*
 * Returns whether or not the color is valid.
 */
 bool LDColor::isValid() const
 {
 	if (isLDConfigColor() and data().name.isEmpty())
 	else
 		return m_index != -1;
 }
 /*
-* LDColor :: isLDConfigColor
-*
 * Returns whether or not this color is defined in LDConfig.ldr.
 * This is false for e.g. direct colors.
 */
 bool LDColor::isLDConfigColor() const
 {
 	return colorData->contains(index());
 }
 /*
-* LDColor :: data
-*
 * Returns the ColorData entry for this color.
 */
 const ColorData::Entry& LDColor::data() const
 {
 	return colorData->get(index());
 }
 /*
-* LDColor :: name
-*
 * Returns the name of this color.
 */
 QString LDColor::name() const
 {
 	if (isDirect())
-		return "0x" + QString::number (index(), 16).toUpper();
+		return "0x" + QString::number(index(), 16).toUpper();
 	else if (isLDConfigColor())
 		return data().name;
 	else if (index() == -1)
 		return "null color";
 	else
 		return "unknown";
 }
 /*
-* LDColor :: hexcode
-*
 * Returns the hexadecimal code of this color.
 */
 QString LDColor::hexcode() const
 {
 	return faceColor().name();
 }
 /*
-* LDColor :: faceColor
-*
 * Returns the color used for surfaces.
 */
 QColor LDColor::faceColor() const
 {
 	if (isDirect())
 		return Qt::black;
 	}
 }
 /*
-* LDColor :: edgeColor
-*
 * Returns the color used for edge lines.
 */
 QColor LDColor::edgeColor() const
 {
 	if (isDirect())
 	else
 		return Qt::black;
 }
 /*
-* LDColor :: index
-*
 * Returns the index number of this color.
 */
 qint32 LDColor::index() const
 {
 	return m_index;
 }
 /*
-* LDColor :: indexString
-*
 * Returns a string containing the preferred representation of the index.
 */
 QString LDColor::indexString() const
 {
 	if (isDirect())
 		return QString::number(index());
 	}
 }
 /*
-* LDColor :: isDirect
-*
 * Returns whether or not this color is a direct color.
 * Direct colors are picked by RGB value and are not defined in LDConfig.ldr.
 */
 bool LDColor::isDirect() const
 {
 	return index() >= 0x02000000;
 }
 /*
-* qHash
-*
 * LDColors are hashed by their index.
 */
 uint qHash(LDColor color)
 {
 	return color.index();
 }
 /*
-* luma
-*
 * Calculates the luma-value for the given color.
 * c.f. https://en.wikipedia.org/wiki/Luma_(video)
 */
-int luma (const QColor& color)
+int luma(const QColor& color)
 {
-	return round((0.2126 * color.red()) + (0.7152 * color.green()) + (0.0722 * color.blue()));
+	return static_cast<int>(round(0.2126 * color.red() + 0.7152 * color.green() + 0.0722 * color.blue()));
 }
 /*
-* ColorData :: ColorData
-*
 * Constructs the color data array.
 */
 ColorData::ColorData()
 {
 	// Initialize main and edge colors, they're special like that.
 	m_data[MainColor].faceColor = "#AAAAAA";
 	m_data[MainColor].edgeColor = Qt::black;
 	m_data[MainColor].name = "Main color";
-	m_data[EdgeColor].faceColor =
+	m_data[EdgeColor].faceColor = Qt::black;
-	m_data[EdgeColor].edgeColor = "#000000";
+	m_data[EdgeColor].edgeColor = Qt::black;
 	m_data[EdgeColor].name = "Edge color";
 	// Load the rest from LDConfig.ldr.
 	loadFromLdconfig();
 }
 {
 	return code >= 0 and code < countof(m_data);
 }
 /*
-* ColorData :: get
-*
 * Returns an entry in the color array.
 */
 const ColorData::Entry& ColorData::get(int code) const
 {
 	if (not contains(code))
 	return m_data[code];
 }
 /*
-* ColorData :: loadFromLdconfig
-*
 * Loads color information from LDConfig.ldr.
 */
 void ColorData::loadFromLdconfig()
 {
 	QString path = LDPaths::ldConfigPath();
 	QFile file {path};
-	if (not file.open (QIODevice::ReadOnly))
+	if (not file.open(QIODevice::ReadOnly))
 	{
 		QMessageBox::critical(nullptr, "Error", "Unable to open LDConfig.ldr for parsing: " + file.errorString());
 		return;
 	}
 	// TODO: maybe LDConfig can be loaded as a Document? Or would that be overkill?
 	while (not file.atEnd())
 	{
-		QString line = QString::fromUtf8 (file.readLine());
+		QString line = QString::fromUtf8(file.readLine());
 		if (line.isEmpty() or line[0] != '0')
 			continue; // empty or illogical
 		line.remove('\r');
 			continue;
 		// Replace underscores in the name with spaces for readability
 		name.replace("_", " ");
-		if (not parser.parseTag ("CODE", codestring))
+		if (not parser.parseTag("CODE", codestring))
 			continue;
 		bool ok;
 		int code = codestring.toShort(&ok);
 			entry.faceColor.setAlpha(qBound(0, codestring.toInt(), 255));
 	}
 }
 /*
-* LDConfigParser :: LDConfigParser
-*
 * Constructs the LDConfig.ldr parser.
 */
 LDConfigParser::LDConfigParser(QString inputText)
 {
-	m_tokens = inputText.split (' ', QString::SkipEmptyParts);
+	m_tokens = inputText.split(' ', QString::SkipEmptyParts);
 }
 /*
-* LDConfigParser :: getToken
-*
 * Returns whether or not there is a token at the given position.
 * If there is, fills in the value parameter with it.
 */
 bool LDConfigParser::getToken(QString& tokenText, int position)
 {
 		return true;
 	}
 }
 /*
-* LDConfigParser :: findToken
-*
 * Attempts to find the provided token in the parsed LDConfig.ldr line.
 * If found, fills in the first parameter with the position of the token.
 *
 * The args parameter specifies how many arguments (i.e. following tokens) the token needs to have.
 */
 	return false;
 }
 /*
-* LDConfigParser :: compareToken
-*
 * Returns whether or not the token at the given position has the given text value.
 */
-bool LDConfigParser::compareToken (int position, QString text)
+bool LDConfigParser::compareToken(int position, QString text)
 {
 	QString token;
+	return getToken(token, position) and (token == text);
-	if (not getToken(token, position))
+}
-		return false;
-	else
+/*
-		return (token == text);
-}
-/*
-* LDConfig :: parseTag
-*
 * Finds an attribute in the line, and fills in its value.
 * For instance, if the line contains "ALPHA 128", this function can find the "128" for "ALPHA".
 * Returns whether or not the attribute was found.
 */
-bool LDConfigParser::parseTag (QString key, QString& value)
+bool LDConfigParser::parseTag(QString key, QString& value)
 {
 	int position;
 	// Try find the token and get its position
-	if (not findToken (position, key, 1))
+	if (not findToken(position, key, 1))
 	{
 		return false;
 	}
 	else
 	{
 		// Get the token after it and store it in.
-		return getToken (value, position + 1);
+		return getToken(value, position + 1);
 	}
 }

Mercurial > ldforge / file comparison

comparison: src/colors.cpp

src/colors.cpp