Big-Ugly Style Update (#278)
* Bulk replaced tabs with spaces * Bulk removed trailing whitespace from lines * Replaced c-style comments with c++-style comments in file banners * Replace nested namespace definitions with single concise definitions (C++17), this keeps the indentation more manageable * Cleanup ordering and spacing of include directives * Bulk renaming of header file extensions from '.h' to '.hpp'. * Update CODING-STYLE.md * Update target_compile_features from cxx_std_11 to cxx_std_20. * Refresh .clang-format file. Still needs a lot of tweaking.
This commit is contained in:
+109
-112
@@ -1,139 +1,136 @@
|
||||
/* TextNode.cpp
|
||||
*
|
||||
* Copyright (C) 2017 Jaye Evins <evins@snaught.com>
|
||||
*
|
||||
* This file is part of gLabels-qt.
|
||||
*
|
||||
* gLabels-qt is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* gLabels-qt is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
// TextNode.cpp
|
||||
//
|
||||
// Copyright (C) 2017 Jaye Evins <evins@snaught.com>
|
||||
//
|
||||
// This file is part of gLabels-qt.
|
||||
//
|
||||
// gLabels-qt is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// gLabels-qt is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
|
||||
//
|
||||
|
||||
|
||||
#include "TextNode.h"
|
||||
#include "TextNode.hpp"
|
||||
|
||||
|
||||
namespace glabels
|
||||
namespace glabels::model
|
||||
{
|
||||
namespace model
|
||||
{
|
||||
|
||||
///
|
||||
/// Default Constructor
|
||||
///
|
||||
TextNode::TextNode()
|
||||
: mIsField(false), mData("")
|
||||
{
|
||||
// empty
|
||||
}
|
||||
///
|
||||
/// Default Constructor
|
||||
///
|
||||
TextNode::TextNode()
|
||||
: mIsField(false), mData("")
|
||||
{
|
||||
// empty
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Constructor from Data
|
||||
///
|
||||
TextNode::TextNode( bool isField, const QString &data )
|
||||
: mIsField(isField), mData(data)
|
||||
{
|
||||
// empty
|
||||
}
|
||||
///
|
||||
/// Constructor from Data
|
||||
///
|
||||
TextNode::TextNode( bool isField, const QString &data )
|
||||
: mIsField(isField), mData(data)
|
||||
{
|
||||
// empty
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// == Operator
|
||||
///
|
||||
bool TextNode::operator==( const TextNode& other )
|
||||
{
|
||||
return (mIsField == other.mIsField) &&
|
||||
(mData == other.mData);
|
||||
}
|
||||
///
|
||||
/// == Operator
|
||||
///
|
||||
bool TextNode::operator==( const TextNode& other )
|
||||
{
|
||||
return (mIsField == other.mIsField) &&
|
||||
(mData == other.mData);
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// != Operator
|
||||
///
|
||||
bool TextNode::operator!=( const TextNode& other )
|
||||
{
|
||||
return (mIsField != other.mIsField) ||
|
||||
(mData != other.mData);
|
||||
}
|
||||
///
|
||||
/// != Operator
|
||||
///
|
||||
bool TextNode::operator!=( const TextNode& other )
|
||||
{
|
||||
return (mIsField != other.mIsField) ||
|
||||
(mData != other.mData);
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// isField? Property Getter
|
||||
///
|
||||
bool TextNode::isField() const
|
||||
{
|
||||
return mIsField;
|
||||
}
|
||||
///
|
||||
/// isField? Property Getter
|
||||
///
|
||||
bool TextNode::isField() const
|
||||
{
|
||||
return mIsField;
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// isField Flag Property Setter
|
||||
///
|
||||
void TextNode::setField( bool isField )
|
||||
{
|
||||
mIsField = isField;
|
||||
}
|
||||
///
|
||||
/// isField Flag Property Setter
|
||||
///
|
||||
void TextNode::setField( bool isField )
|
||||
{
|
||||
mIsField = isField;
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Data Property Getter
|
||||
///
|
||||
const QString& TextNode::data() const
|
||||
{
|
||||
return mData;
|
||||
}
|
||||
///
|
||||
/// Data Property Getter
|
||||
///
|
||||
const QString& TextNode::data() const
|
||||
{
|
||||
return mData;
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Data Property Setter
|
||||
///
|
||||
void TextNode::setData( const QString& data )
|
||||
{
|
||||
mData = data;
|
||||
}
|
||||
///
|
||||
/// Data Property Setter
|
||||
///
|
||||
void TextNode::setData( const QString& data )
|
||||
{
|
||||
mData = data;
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Get text, expand if necessary
|
||||
///
|
||||
QString TextNode::text( const merge::Record& record,
|
||||
const Variables& variables ) const
|
||||
{
|
||||
QString value("");
|
||||
|
||||
bool haveRecordField = mIsField &&
|
||||
record.contains(mData) &&
|
||||
!record.value(mData).isEmpty();
|
||||
bool haveVariable = mIsField &&
|
||||
variables.contains(mData) &&
|
||||
!variables[mData].value().isEmpty();
|
||||
///
|
||||
/// Get text, expand if necessary
|
||||
///
|
||||
QString TextNode::text( const merge::Record& record,
|
||||
const Variables& variables ) const
|
||||
{
|
||||
QString value("");
|
||||
|
||||
if ( haveRecordField )
|
||||
{
|
||||
value = record.value(mData);
|
||||
}
|
||||
else if ( haveVariable )
|
||||
{
|
||||
value = variables[mData].value();
|
||||
}
|
||||
else if ( !mIsField )
|
||||
{
|
||||
value = mData;
|
||||
}
|
||||
bool haveRecordField = mIsField &&
|
||||
record.contains(mData) &&
|
||||
!record.value(mData).isEmpty();
|
||||
bool haveVariable = mIsField &&
|
||||
variables.contains(mData) &&
|
||||
!variables[mData].value().isEmpty();
|
||||
|
||||
return value;
|
||||
}
|
||||
if ( haveRecordField )
|
||||
{
|
||||
value = record.value(mData);
|
||||
}
|
||||
else if ( haveVariable )
|
||||
{
|
||||
value = variables[mData].value();
|
||||
}
|
||||
else if ( !mIsField )
|
||||
{
|
||||
value = mData;
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user