summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Buhr <andreas.buhr@qt.io>2021-07-23 09:37:06 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-07-23 13:54:37 +0000
commitefa262cbb8037b4324f502387c1aa174ae23568e (patch)
tree087cb8ec1270449202a462107d192b30e4d416d3 /src
parent5cf1863991767f8aadd1178043cd0574fcd002f5 (diff)
Rename streamingoperator to adhere to camelCase
operator<< was changed to be a hidden friend in QtBluetooth. Two properties of operator<< were desired: First, it should be a hidden friend. This implies that it is defined inline. Second, its implementation should not part of the public interface. To achieve both, an indirection and the static method streamingoperator() were introduced. This patch changes its name to streamingOperator() to adhere to Qt's camelCase coding style. Change-Id: I4e01a81eac8261c5198cdb832c1345efbf647419 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit cef4a5e9d55940140f27d98931b2a6778d154209) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/bluetooth/qbluetoothaddress.cpp2
-rw-r--r--src/bluetooth/qbluetoothaddress.h4
-rw-r--r--src/bluetooth/qbluetoothserviceinfo.cpp2
-rw-r--r--src/bluetooth/qbluetoothserviceinfo.h4
-rw-r--r--src/bluetooth/qbluetoothuuid.cpp2
-rw-r--r--src/bluetooth/qbluetoothuuid.h4
6 files changed, 9 insertions, 9 deletions
diff --git a/src/bluetooth/qbluetoothaddress.cpp b/src/bluetooth/qbluetoothaddress.cpp
index cdc113d1..e6249ca4 100644
--- a/src/bluetooth/qbluetoothaddress.cpp
+++ b/src/bluetooth/qbluetoothaddress.cpp
@@ -182,7 +182,7 @@ QString QBluetoothAddress::toString() const
*/
#ifndef QT_NO_DEBUG_STREAM
-QDebug QBluetoothAddress::streamingoperator(QDebug debug, const QBluetoothAddress &address)
+QDebug QBluetoothAddress::streamingOperator(QDebug debug, const QBluetoothAddress &address)
{
debug << address.toString();
return debug;
diff --git a/src/bluetooth/qbluetoothaddress.h b/src/bluetooth/qbluetoothaddress.h
index 58fff5d4..eaf27e6b 100644
--- a/src/bluetooth/qbluetoothaddress.h
+++ b/src/bluetooth/qbluetoothaddress.h
@@ -85,9 +85,9 @@ private:
#ifndef QT_NO_DEBUG_STREAM
friend QDebug operator<<(QDebug d, const QBluetoothAddress &a)
{
- return streamingoperator(d, a);
+ return streamingOperator(d, a);
}
- static QDebug streamingoperator(QDebug, const QBluetoothAddress &address);
+ static QDebug streamingOperator(QDebug, const QBluetoothAddress &address);
#endif
};
diff --git a/src/bluetooth/qbluetoothserviceinfo.cpp b/src/bluetooth/qbluetoothserviceinfo.cpp
index 2514df66..b5890746 100644
--- a/src/bluetooth/qbluetoothserviceinfo.cpp
+++ b/src/bluetooth/qbluetoothserviceinfo.cpp
@@ -637,7 +637,7 @@ static void dumpAttributeVariant(QDebug dbg, const QVariant &var, const QString&
}
#ifndef QT_NO_DEBUG_STREAM
-QDebug QBluetoothServiceInfo::streamingoperator(QDebug dbg, const QBluetoothServiceInfo &info)
+QDebug QBluetoothServiceInfo::streamingOperator(QDebug dbg, const QBluetoothServiceInfo &info)
{
QDebugStateSaver saver(dbg);
dbg.noquote() << "\n";
diff --git a/src/bluetooth/qbluetoothserviceinfo.h b/src/bluetooth/qbluetoothserviceinfo.h
index fc106f68..991aa864 100644
--- a/src/bluetooth/qbluetoothserviceinfo.h
+++ b/src/bluetooth/qbluetoothserviceinfo.h
@@ -151,9 +151,9 @@ private:
#ifndef QT_NO_DEBUG_STREAM
friend QDebug operator<<(QDebug d, const QBluetoothServiceInfo &i)
{
- return streamingoperator(d, i);
+ return streamingOperator(d, i);
}
- static QDebug streamingoperator(QDebug, const QBluetoothServiceInfo &);
+ static QDebug streamingOperator(QDebug, const QBluetoothServiceInfo &);
#endif
protected:
QSharedPointer<QBluetoothServiceInfoPrivate> d_ptr;
diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp
index 0192134b..afd32e71 100644
--- a/src/bluetooth/qbluetoothuuid.cpp
+++ b/src/bluetooth/qbluetoothuuid.cpp
@@ -1096,7 +1096,7 @@ QString QBluetoothUuid::descriptorToString(QBluetoothUuid::DescriptorType uuid)
*/
#ifndef QT_NO_DEBUG_STREAM
-QDebug QBluetoothUuid::streamingoperator(QDebug debug, const QBluetoothUuid &uuid)
+QDebug QBluetoothUuid::streamingOperator(QDebug debug, const QBluetoothUuid &uuid)
{
debug << uuid.toString();
return debug;
diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h
index af98c71b..46504eda 100644
--- a/src/bluetooth/qbluetoothuuid.h
+++ b/src/bluetooth/qbluetoothuuid.h
@@ -396,9 +396,9 @@ public:
#ifndef QT_NO_DEBUG_STREAM
friend QDebug operator<<(QDebug debug, const QBluetoothUuid &uuid)
{
- return streamingoperator(debug, uuid);
+ return streamingOperator(debug, uuid);
}
- static QDebug streamingoperator(QDebug debug, const QBluetoothUuid &uuid);
+ static QDebug streamingOperator(QDebug debug, const QBluetoothUuid &uuid);
#endif
int minimumSize() const;