Some namespace cleanup.

This commit is contained in:
Jim Evins
2016-03-27 00:14:38 -04:00
parent 5b7e031c52
commit 7559544b06
156 changed files with 9732 additions and 10126 deletions
+101 -105
View File
@@ -18,8 +18,8 @@
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef glabels_Merge_h
#define glabels_Merge_h
#ifndef Merge_h
#define Merge_h
#include <QObject>
#include <QString>
@@ -28,121 +28,117 @@
#include "MergeRecord.h"
namespace glabels
///
/// Merge Record Structure
///
struct Merge : QObject
{
///
/// Merge Record Structure
///
struct Merge : QObject
{
Q_OBJECT
/////////////////////////////////
// Source Type
/////////////////////////////////
enum SourceType { NONE, FIXED, FILE };
/////////////////////////////////
// Life Cycle
/////////////////////////////////
protected:
Merge( QString id, QString name, SourceType type );
virtual ~Merge();
/////////////////////////////////
// Properties
/////////////////////////////////
public:
inline QString id() const;
inline QString name() const;
inline SourceType type() const;
inline QString source() const;
void setSource( const QString& source );
inline const QList<MergeRecord*>& recordList( void ) const;
/////////////////////////////////
// Selection methods
/////////////////////////////////
public:
void select( MergeRecord* record );
void unselect( MergeRecord* record );
void selectAll();
void unselectAll();
const QList<MergeRecord*> selectedRecords() const;
/////////////////////////////////
// Virtual methods
/////////////////////////////////
public:
virtual QList<QString> keyList() const = 0;
virtual QString primaryKey() const = 0;
protected:
virtual void open() = 0;
virtual void close() = 0;
virtual MergeRecord* readNextRecord() = 0;
/////////////////////////////////
// Signals
/////////////////////////////////
signals:
void sourceChanged();
void selectionChanged();
/////////////////////////////////
// Private data
/////////////////////////////////
private:
QString mId;
QString mName;
SourceType mType;
QString mSource;
bool mSelected;
QList<MergeRecord*> mRecordList;
};
Q_OBJECT
/////////////////////////////////
// INLINE METHODS
// Source Type
/////////////////////////////////
QString Merge::id() const
{
return mId;
}
enum SourceType { NONE, FIXED, FILE };
/////////////////////////////////
// Life Cycle
/////////////////////////////////
protected:
Merge( QString id, QString name, SourceType type );
virtual ~Merge();
QString Merge::name() const
{
return mId;
}
/////////////////////////////////
// Properties
/////////////////////////////////
public:
inline QString id() const;
inline QString name() const;
inline SourceType type() const;
inline QString source() const;
void setSource( const QString& source );
inline const QList<MergeRecord*>& recordList( void ) const;
Merge::SourceType Merge::type() const
{
return mType;
}
/////////////////////////////////
// Selection methods
/////////////////////////////////
public:
void select( MergeRecord* record );
void unselect( MergeRecord* record );
void selectAll();
void unselectAll();
const QList<MergeRecord*> selectedRecords() const;
QString Merge::source() const
{
return mSource;
}
/////////////////////////////////
// Virtual methods
/////////////////////////////////
public:
virtual QList<QString> keyList() const = 0;
virtual QString primaryKey() const = 0;
protected:
virtual void open() = 0;
virtual void close() = 0;
virtual MergeRecord* readNextRecord() = 0;
/////////////////////////////////
// Signals
/////////////////////////////////
signals:
void sourceChanged();
void selectionChanged();
/////////////////////////////////
// Private data
/////////////////////////////////
private:
QString mId;
QString mName;
SourceType mType;
QString mSource;
bool mSelected;
QList<MergeRecord*> mRecordList;
};
const QList<MergeRecord*>& Merge::recordList( void ) const
{
return mRecordList;
}
/////////////////////////////////
// INLINE METHODS
/////////////////////////////////
QString Merge::id() const
{
return mId;
}
#endif // glabels_Merge_h
QString Merge::name() const
{
return mId;
}
Merge::SourceType Merge::type() const
{
return mType;
}
QString Merge::source() const
{
return mSource;
}
const QList<MergeRecord*>& Merge::recordList( void ) const
{
return mRecordList;
}
#endif // Merge_h