QtBluetooth - get rid of Q_FUNC_INFO (OS X/iOS)

Since now the use of Q_FUNC_INFO is not recommended (and indeed can
mix ugly with QT_MESSAGE_PATTERN), remove it (it now stays only in
3-parameter Q_ASSERTs and NSLogs.
The next patch will do the same kind of cleanup in C++ part.

Change-Id: Ief8bd7c90ea2ff2a99f246885691102062aa5e54
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

1 files changed, 17 insertions, 21 deletions

diff --git a/src/bluetooth/osx/osxbtobexsession.mm b/src/bluetooth/osx/osxbtobexsession.mm
index 4e4013f3..9fd82487 100644
--- a/src/bluetooth/osx/osxbtobexsession.mm
+++ b/src/bluetooth/osx/osxbtobexsession.mm
@@ -203,7 +203,7 @@ QList<OBEXHeader> qt_bluetooth_headers(const uint8_t *data, std::size_t length)
             break;
         }
         default:
-            qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "invalid header format";
+            qCWarning(QT_BT_OSX) << "invalid header format";
             return empty;
         }
 
@@ -358,7 +358,7 @@ bool check_connect_event(const OBEXSessionEvent *e, OBEXError &error, OBEXOpCode
         response = e->u.connectCommandResponseData.serverResponseOpCode;
         return response == kOBEXResponseCodeSuccessWithFinalBit;
     } else {
-        qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "unexpected event type";
+        qCWarning(QT_BT_OSX) << "unexpected event type";
         error = kOBEXGeneralError;
         return false;
     }
@@ -378,7 +378,7 @@ bool check_put_event(const OBEXSessionEvent *e, OBEXError &error, OBEXOpCode &re
         return response == kOBEXResponseCodeContinueWithFinalBit ||
                response == kOBEXResponseCodeSuccessWithFinalBit;
     } else {
-        qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "unexpected event type";
+        qCWarning(QT_BT_OSX) << "unexpected event type";
         error = kOBEXGeneralError;
         return false;
     }
@@ -395,7 +395,7 @@ bool check_abort_event(const OBEXSessionEvent *e, OBEXError &error, OBEXOpCode &
         response = e->u.abortCommandResponseData.serverResponseOpCode;
         return response == kOBEXResponseCodeSuccessWithFinalBit;
     } else {
-        qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "unexpected event type";
+        qCWarning(QT_BT_OSX) << "unexpected event type";
         return false;
     }
 }
@@ -447,13 +447,13 @@ using namespace QT_NAMESPACE;
         const BluetoothDeviceAddress addr(OSXBluetooth::iobluetooth_address(deviceAddress));
         device = [[IOBluetoothDevice deviceWithAddress:&addr] retain];
         if (!device) {
-            qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "failed to create an IOBluetoothDevice";
+            qCWarning(QT_BT_OSX) << "failed to create an IOBluetoothDevice";
             return self;
         }
 
         session = [[IOBluetoothOBEXSession alloc] initWithDevice:device channelID:port];
         if (!session) {
-            qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "failed to create an OBEX session";
+            qCWarning(QT_BT_OSX) << "failed to create an OBEX session";
             return self;
         }
 
@@ -478,7 +478,7 @@ using namespace QT_NAMESPACE;
 - (OBEXError)OBEXConnect
 {
     if (!session) {
-        qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "invalid session (nil)";
+        qCWarning(QT_BT_OSX) << "invalid session (nil)";
         return kOBEXGeneralError;
     }
 
@@ -521,7 +521,7 @@ using namespace QT_NAMESPACE;
     }
 
     if (currentRequest != OBEXConnect) {
-        qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "called while there is no "
+        qCWarning(QT_BT_OSX) << "called while there is no "
                                 "active connect request";
         return;
     }
@@ -600,7 +600,7 @@ using namespace QT_NAMESPACE;
     Q_ASSERT_X(session, Q_FUNC_INFO, "invalid OBEX session (nil)");
 
     if (currentRequest != OBEXAbort) {
-        qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "called while there "
+        qCWarning(QT_BT_OSX) << "called while there "
                                 "is no ABORT request";
         return;
     }
@@ -632,13 +632,13 @@ using namespace QT_NAMESPACE;
     // a payload.
     const qint64 fileSize = input->size();
     if (fileSize <= 0 || fileSize >= std::numeric_limits<uint32_t>::max()) {
-        qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "invalid input file size";
+        qCWarning(QT_BT_OSX) << "invalid input file size";
         return kOBEXBadArgumentError;
     }
 
     ObjCStrongReference<NSMutableData> headers([[NSMutableData alloc] init], false);
     if (!headers) {
-        qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "failed to allocate headers";
+        qCWarning(QT_BT_OSX) << "failed to allocate headers";
         return kOBEXNoResourcesError;
     }
 
@@ -648,16 +648,14 @@ using namespace QT_NAMESPACE;
 
     if (connectionIDFound) {
         if (!append_four_byte_header(headers, kOBEXHeaderIDConnectionID, connectionID)) {
-            qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "failed to "
-                                    "append connection ID header";
+            qCWarning(QT_BT_OSX) << "failed to append connection ID header";
             return kOBEXNoResourcesError;
         }
     }
 
     if (name.length()) {
         if (!append_unicode_header(headers, kOBEXHeaderIDName, name)) {
-            qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "failed to append "
-                                    "a unicode string";
+            qCWarning(QT_BT_OSX) << "failed to append a unicode string";
             return kOBEXNoResourcesError;
         }
     }
@@ -670,7 +668,7 @@ using namespace QT_NAMESPACE;
     if (!chunk || ![chunk length]) {
         // We do not support PUT-DELETE (?)
         // At least the first chunk is expected to be non-empty.
-        qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "invalid input stream";
+        qCWarning(QT_BT_OSX) << "invalid input stream";
         return kOBEXBadArgumentError;
     }
 
@@ -717,7 +715,7 @@ using namespace QT_NAMESPACE;
     }
 
     if (currentRequest != OBEXPut) {
-        qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "called while the current "
+        qCWarning(QT_BT_OSX) << "called while the current "
                                 "request is not a put request";
         return;
     }
@@ -739,8 +737,7 @@ using namespace QT_NAMESPACE;
         // 0 for the headers length, no more headers.
         ObjCStrongReference<NSMutableData> chunk(next_data_chunk(*inputStream, session, 0, lastChunk));
         if (!chunk && !lastChunk) {
-            qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "failed to "
-                                    "allocate the next memory chunk";
+            qCWarning(QT_BT_OSX) << "failed to allocate the next memory chunk";
             return;
         }
 
@@ -756,8 +753,7 @@ using namespace QT_NAMESPACE;
                                           refCon:Q_NULLPTR];
 
         if (status != kOBEXSuccess) {
-            qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "failed to "
-                                    "send the next memory chunk";
+            qCWarning(QT_BT_OSX) << "failed to send the next memory chunk";
             currentRequest = OBEXNoop;
             if (delegate) // Response code is not important here.
                 delegate->OBEXPutError(kOBEXNoResourcesError, 0);