SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

macros rename

Browse Source
This commit is contained in:
Пелипенко Иван
2022-05-11 16:49:33 +03:00
parent fa19ad1093
commit 0897a8369f
20 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/main/core/pibinarystream.h
View File

@@ -35,9 +35,9 @@
#define BINARY_STREAM_FRIEND(T) \
template<typename P> friend PIBinaryStream<P> & operator <<(PIBinaryStream<P> & s, const T & v); \
template<typename P> friend PIBinaryStream<P> & operator >>(PIBinaryStream<P> & s, T & v);
#define BINARY_STREAM_STORE(T) \
#define BINARY_STREAM_WRITE(T) \
template<typename P> inline PIBinaryStream<P> & operator <<(PIBinaryStream<P> & s, const T & v)
#define BINARY_STREAM_RESTORE(T) \
#define BINARY_STREAM_READ(T) \
template<typename P> inline PIBinaryStream<P> & operator >>(PIBinaryStream<P> & s, T & v)

4
libs/main/core/pibytearray.h
View File

@@ -219,12 +219,12 @@ inline std::ostream & operator <<(std::ostream & s, const PIByteArray & ba);
PIP_EXPORT PICout operator <<(PICout s, const PIByteArray & ba);
BINARY_STREAM_STORE(PIByteArray) {
BINARY_STREAM_WRITE(PIByteArray) {
s.binaryStreamAppend((int)v.size_s());
s.binaryStreamAppend(v.data(), v.size());
return s;
}
BINARY_STREAM_RESTORE(PIByteArray) {
BINARY_STREAM_READ(PIByteArray) {
v.resize(s.binaryStreamTakeInt());
s.binaryStreamTake(v.data(), v.size());
return s;

8
libs/main/core/pipropertystorage.h
View File

@@ -271,11 +271,11 @@ protected:
};
BINARY_STREAM_STORE (PIPropertyStorage::Property) {s << v.name << v.value << v.comment << v.flags; return s;}
BINARY_STREAM_RESTORE(PIPropertyStorage::Property) {s >> v.name >> v.value >> v.comment >> v.flags; return s;}
BINARY_STREAM_WRITE(PIPropertyStorage::Property) {s << v.name << v.value << v.comment << v.flags; return s;}
BINARY_STREAM_READ (PIPropertyStorage::Property) {s >> v.name >> v.value >> v.comment >> v.flags; return s;}
BINARY_STREAM_STORE (PIPropertyStorage) {s << v.properties(); return s;}
BINARY_STREAM_RESTORE(PIPropertyStorage) {s >> v.properties(); return s;}
BINARY_STREAM_WRITE(PIPropertyStorage) {s << v.properties(); return s;}
BINARY_STREAM_READ (PIPropertyStorage) {s >> v.properties(); return s;}
#endif // PIPROPERTYSTORAGE_H

4
libs/main/core/pistring.h
View File

@@ -1582,12 +1582,12 @@ PIP_EXPORT PICout operator <<(PICout s, const PIString & v);
//! \relatesalso PIByteArray
//! \~english Store operator.
//! \~russian Оператор сохранения.
BINARY_STREAM_STORE(PIString) {s << v.d; return s;}
BINARY_STREAM_WRITE(PIString) {s << v.d; return s;}
//! \relatesalso PIByteArray
//! \~english Restore operator.
//! \~russian Оператор извлечения.
BINARY_STREAM_RESTORE(PIString) {v.d.clear(); s >> v.d; return s;}
BINARY_STREAM_READ(PIString) {v.d.clear(); s >> v.d; return s;}
//! \~english Returns concatenated string.

4
libs/main/core/pistringlist.h
View File

@@ -126,13 +126,13 @@ public:
};
BINARY_STREAM_STORE(PIStringList) {
BINARY_STREAM_WRITE(PIStringList) {
s.binaryStreamAppend(v.size());
for (int i = 0; i < v.size_s(); ++i)
s << v[i];
return s;
}
BINARY_STREAM_RESTORE(PIStringList) {
BINARY_STREAM_READ(PIStringList) {
v.resize(s.binaryStreamTakeInt());
for (int i = 0; i < v.size_s(); ++i)
s >> v[i];

4
libs/main/core/pivariant.h
View File

@@ -773,7 +773,7 @@ REGISTER_VARIANT(PIMathVectord)
REGISTER_VARIANT(PIMathMatrixd)
BINARY_STREAM_STORE(PIVariant) {
BINARY_STREAM_WRITE(PIVariant) {
s << v._content << v._type;
if (v._type == PIVariant::pivCustom) {
#ifdef CUSTOM_PIVARIANT
@@ -788,7 +788,7 @@ BINARY_STREAM_STORE(PIVariant) {
}
return s;
}
BINARY_STREAM_RESTORE(PIVariant) {
BINARY_STREAM_READ(PIVariant) {
s >> v._content >> v._type;
if (v._type == PIVariant::pivCustom) {
PIString tn;

24
libs/main/core/pivarianttypes.h
View File

@@ -176,22 +176,22 @@ inline PICout operator <<(PICout s, const PIVariantTypes::Color & v) {s.saveCont
inline PICout operator <<(PICout s, const PIVariantTypes::IODevice & v) {s << v.toPICout(); return s;}
BINARY_STREAM_STORE (PIVariantTypes::Enumerator) {s << v.value << v.name; return s;}
BINARY_STREAM_RESTORE(PIVariantTypes::Enumerator) {s >> v.value >> v.name; return s;}
BINARY_STREAM_WRITE(PIVariantTypes::Enumerator) {s << v.value << v.name; return s;}
BINARY_STREAM_READ (PIVariantTypes::Enumerator) {s >> v.value >> v.name; return s;}
BINARY_STREAM_STORE (PIVariantTypes::Enum) {s << v.enum_name << v.selected << v.enum_list; return s;}
BINARY_STREAM_RESTORE(PIVariantTypes::Enum) {s >> v.enum_name >> v.selected >> v.enum_list; return s;}
BINARY_STREAM_WRITE(PIVariantTypes::Enum) {s << v.enum_name << v.selected << v.enum_list; return s;}
BINARY_STREAM_READ (PIVariantTypes::Enum) {s >> v.enum_name >> v.selected >> v.enum_list; return s;}
BINARY_STREAM_STORE (PIVariantTypes::File) {s << v.file << v.filter << uchar((v.is_abs ? 1 : 0) + (v.is_save ? 2 : 0)); return s;}
BINARY_STREAM_RESTORE(PIVariantTypes::File) {uchar f(0); s >> v.file >> v.filter >> f; v.is_abs = ((f & 1) == 1); v.is_save = ((f & 2) == 2); return s;}
BINARY_STREAM_WRITE(PIVariantTypes::File) {s << v.file << v.filter << uchar((v.is_abs ? 1 : 0) + (v.is_save ? 2 : 0)); return s;}
BINARY_STREAM_READ (PIVariantTypes::File) {uchar f(0); s >> v.file >> v.filter >> f; v.is_abs = ((f & 1) == 1); v.is_save = ((f & 2) == 2); return s;}
BINARY_STREAM_STORE (PIVariantTypes::Dir) {s << v.dir << v.is_abs; return s;}
BINARY_STREAM_RESTORE(PIVariantTypes::Dir) {s >> v.dir >> v.is_abs; return s;}
BINARY_STREAM_WRITE(PIVariantTypes::Dir) {s << v.dir << v.is_abs; return s;}
BINARY_STREAM_READ (PIVariantTypes::Dir) {s >> v.dir >> v.is_abs; return s;}
BINARY_STREAM_STORE (PIVariantTypes::Color) {s << v.rgba; return s;}
BINARY_STREAM_RESTORE(PIVariantTypes::Color) {s >> v.rgba; return s;}
BINARY_STREAM_WRITE(PIVariantTypes::Color) {s << v.rgba; return s;}
BINARY_STREAM_READ (PIVariantTypes::Color) {s >> v.rgba; return s;}
BINARY_STREAM_STORE (PIVariantTypes::IODevice) {s << v.prefix << v.mode << v.options << v.props; return s;}
BINARY_STREAM_RESTORE(PIVariantTypes::IODevice) {s >> v.prefix >> v.mode >> v.options >> v.props; return s;}
BINARY_STREAM_WRITE(PIVariantTypes::IODevice) {s << v.prefix << v.mode << v.options << v.props; return s;}
BINARY_STREAM_READ (PIVariantTypes::IODevice) {s >> v.prefix >> v.mode >> v.options >> v.props; return s;}
#endif // PIVARIANTYPES_H