qiurui
/
qtgrpc
mirror of https://github.com/qt/qtgrpc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename the TransparentWrapper::_t member to t 

C++ advices not to use the underscore prefixed identifiers. Rename
TransparentWrapper::_t accordingly.

Pick-to: 6.8
Task-number: QTBUG-123626
Change-Id: Iaee3260f7c253a631dab014e3ec523f8b02b49f9
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Alexey Edelev 2024-07-08 12:20:52 +02:00
parent e4d77f8f10
commit af29af57f4
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/protobuf/qprotobufregistration.h
View File

@ -132,7 +132,7 @@ static std::optional<QList<T>> intToEnumList(QList<QtProtobuf::int64> v)
{
QList<T> enumList;
for (const auto &intValue : v)
enumList.append(static_cast<T>(intValue._t));
enumList.append(static_cast<T>(intValue.t));
return enumList;
}

4
src/protobuf/qprotobufserializer.cpp
View File

@ -449,10 +449,10 @@ qsizetype QProtobufSerializerPrivate::skipSerializedFieldBytes(QProtobufSelfchec
skipVarint(it);
break;
case QtProtobuf::WireTypes::Fixed32:
it += sizeof(decltype(QtProtobuf::fixed32::_t));
it += sizeof(decltype(QtProtobuf::fixed32::t));
break;
case QtProtobuf::WireTypes::Fixed64:
it += sizeof(decltype(QtProtobuf::fixed64::_t));
it += sizeof(decltype(QtProtobuf::fixed64::t));
break;
case QtProtobuf::WireTypes::LengthDelimited:
skipLengthDelimited(it);

20
src/protobuf/qtprotobuftypes.h
View File

@ -38,26 +38,26 @@ Q_ENUM_NS(WireTypes)
template<typename T, typename tag>
struct TransparentWrapper
{
TransparentWrapper(T t = T()) : _t(t) { }
T _t;
operator T &() { return _t; }
operator T() const { return _t; }
TransparentWrapper &operator=(T t)
TransparentWrapper(T t_ = T()) : t(t_) { }
T t;
operator T &() { return t; }
operator T() const { return t; }
TransparentWrapper &operator=(T t_)
{
_t = t;
t = t_;
return *this;
}
static T toType(TransparentWrapper t) { return t._t; }
static TransparentWrapper fromType(T _t) { return TransparentWrapper(_t); }
static T toType(TransparentWrapper t) { return t.t; }
static TransparentWrapper fromType(T t) { return TransparentWrapper(t); }
static QString toString(TransparentWrapper t) { return QString::number(t._t); }
static QString toString(TransparentWrapper t) { return QString::number(t.t); }
};
template<typename T, typename tag>
constexpr TransparentWrapper<T, tag> qbswap(TransparentWrapper<T, tag> source)
{
return { QT_PREPEND_NAMESPACE(qbswap)(source._t) };
return { QT_PREPEND_NAMESPACE(qbswap)(source.t) };
}
using int32 = TransparentWrapper<int32_t, struct int_tag>;

12
tests/auto/protobuf/converters/tst_protobuf_converter.cpp
View File

@ -27,22 +27,22 @@ void QtProtobufConverterTest::testFromTypeConverters()
QVariant testVariant;
testVariant.setValue<uint32_t>(42);
QCOMPARE(testVariant.value<QtProtobuf::fixed32>()._t, quint32(42));
QCOMPARE(testVariant.value<QtProtobuf::fixed32>().t, quint32(42));
testVariant.setValue<uint64_t>(43);
QCOMPARE(testVariant.value<QtProtobuf::fixed64>()._t, quint64(43));
QCOMPARE(testVariant.value<QtProtobuf::fixed64>().t, quint64(43));
testVariant.setValue<int32_t>(44);
QCOMPARE(testVariant.value<QtProtobuf::sfixed32>()._t, 44);
QCOMPARE(testVariant.value<QtProtobuf::sfixed32>().t, 44);
testVariant.setValue<int64_t>(45);
QCOMPARE(testVariant.value<QtProtobuf::sfixed64>()._t, 45);
QCOMPARE(testVariant.value<QtProtobuf::sfixed64>().t, 45);
testVariant.setValue<int32_t>(46);
QCOMPARE(testVariant.value<QtProtobuf::int32>()._t, 46);
QCOMPARE(testVariant.value<QtProtobuf::int32>().t, 46);
testVariant.setValue<int64_t>(47);
QCOMPARE(testVariant.value<QtProtobuf::int64>()._t, 47);
QCOMPARE(testVariant.value<QtProtobuf::int64>().t, 47);
}
void QtProtobufConverterTest::testToTypeConverters()