Removed C++17 nested namespace definitions. Should build on trusty again.

This commit is contained in:
Jim Evins
2017-11-24 15:49:26 -05:00
parent 4821e103bc
commit c9f2b91daf
129 changed files with 18995 additions and 18592 deletions
+47 -44
View File
@@ -27,67 +27,70 @@
#include <QString>
namespace glabels::model
namespace glabels
{
///
/// Text Node Type
///
struct TextNode
namespace model
{
/////////////////////////////////
// Life Cycle
/////////////////////////////////
public:
TextNode();
///
/// Text Node Type
///
struct TextNode
{
TextNode( bool isField, const QString &data );
/////////////////////////////////
// Life Cycle
/////////////////////////////////
public:
TextNode();
TextNode( bool isField, const QString &data );
/////////////////////////////////
// Operators
/////////////////////////////////
public:
bool operator==( const TextNode& other );
/////////////////////////////////
// Operators
/////////////////////////////////
public:
bool operator==( const TextNode& other );
bool operator!=( const TextNode& other );
bool operator!=( const TextNode& other );
/////////////////////////////////
// Properties
/////////////////////////////////
public:
//
// is field? Property
//
bool isField() const;
void setField( bool isField );
/////////////////////////////////
// Properties
/////////////////////////////////
public:
//
// is field? Property
//
bool isField() const;
void setField( bool isField );
//
// Data Property
//
const QString& data() const;
void setData( const QString& data );
//
// Data Property
//
const QString& data() const;
void setData( const QString& data );
/////////////////////////////////
// Misc. Methods
/////////////////////////////////
QString text( merge::Record* record ) const;
bool isEmptyField( merge::Record* record ) const;
/////////////////////////////////
// Misc. Methods
/////////////////////////////////
QString text( merge::Record* record ) const;
bool isEmptyField( merge::Record* record ) const;
/////////////////////////////////
// Private Data
/////////////////////////////////
private:
/////////////////////////////////
// Private Data
/////////////////////////////////
private:
bool mIsField;
QString mData;
bool mIsField;
QString mData;
};
};
}
}