daniel/QTeletextMaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove struct from triplet class

Browse Source
This commit is contained in:
G.K.MacGregor
2020-10-18 20:56:16 +01:00
parent 5d7175f75f
commit af6ec1cac9
2 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
x26triplets.cpp
View File

@@ -19,8 +19,34 @@
#include "x26triplets.h"
void X26Triplet::setAddress(int newAddress) { myTriplet.m_address = newAddress; }
void X26Triplet::setMode(int newMode) { myTriplet.m_mode = newMode; }
void X26Triplet::setData(int newData) { myTriplet.m_data = newData; }
void X26Triplet::setAddressRow(int newAddressRow) { myTriplet.m_address = (newAddressRow == 24) ? 40 : newAddressRow+40; }
void X26Triplet::setAddressColumn(int newAddressColumn) { myTriplet.m_address = newAddressColumn; }
X26Triplet::X26Triplet(int address, int mode, int data)
{
m_address = address;
m_mode = mode;
m_data = data;
}
void X26Triplet::setAddress(int address)
{
m_address = address;
}
void X26Triplet::setMode(int mode)
{
m_mode = mode;
}
void X26Triplet::setData(int data)
{
m_data = data;
}
void X26Triplet::setAddressRow(int addressRow)
{
m_address = (addressRow == 24) ? 40 : addressRow+40;
}
void X26Triplet::setAddressColumn(int addressColumn)
{
m_address = addressColumn;
}

24
x26triplets.h
View File

@@ -23,17 +23,20 @@
class X26Triplet
{
public:
// X26Triplet() {}
X26Triplet() {}
// X26Triplet(const X26Triplet &other);
// X26Triplet &operator=(const X26Triplet &other);
int address() const { return myTriplet.m_address; }
int mode() const { return myTriplet.m_mode; }
int data() const { return myTriplet.m_data; }
int addressRow() const { return (myTriplet.m_address == 40) ? 24 : myTriplet.m_address-40; }
int addressColumn() const { return (myTriplet.m_address); }
bool isRowTriplet() const { return (myTriplet.m_address >= 40); }
X26Triplet(int, int, int);
int address() const { return m_address; }
int mode() const { return m_mode; }
int modeExt() const { return (m_address >= 40) ? m_mode : (m_mode | 0x20); }
int data() const { return m_data; }
int addressRow() const { return (m_address == 40) ? 24 :m_address-40; }
int addressColumn() const { return (m_address); }
bool isRowTriplet() const { return (m_address >= 40); }
void setAddress(int);
void setMode(int);
@@ -42,11 +45,8 @@ public:
void setAddressColumn(int);
private:
struct x26TripletStruct {
int m_address;
int m_mode;
int m_data;
} myTriplet;
int m_address, m_mode, m_data;
};
#endif