Rename '*_osx' files to '*_macos'

Since this is how we call this OS these days.

Change-Id: I679fbe888c0b695e2eefe5369c095c5dcab01600
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>

11 files changed, 13 insertions, 13 deletions

diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro
index e1e4d7a2..7729b6ae 100644
--- a/src/bluetooth/bluetooth.pro
+++ b/src/bluetooth/bluetooth.pro
@@ -161,17 +161,17 @@ qtConfig(bluez) {
 
     include(osx/osxbt.pri)
     OBJECTIVE_SOURCES += \
-        qbluetoothlocaldevice_osx.mm \
+        qbluetoothlocaldevice_macos.mm \
         qbluetoothdevicediscoveryagent_darwin.mm \
-        qbluetoothserviceinfo_osx.mm \
-        qbluetoothservicediscoveryagent_osx.mm \
-        qbluetoothsocket_osx.mm \
-        qbluetoothserver_osx.mm \
-        qbluetoothtransferreply_osx.mm \
+        qbluetoothserviceinfo_macos.mm \
+        qbluetoothservicediscoveryagent_macos.mm \
+        qbluetoothsocket_macos.mm \
+        qbluetoothserver_macos.mm \
+        qbluetoothtransferreply_macos.mm \
         qlowenergycontroller_darwin.mm
 
-    PRIVATE_HEADERS += qbluetoothsocket_osx_p.h \
-                       qbluetoothtransferreply_osx_p.h \
+    PRIVATE_HEADERS += qbluetoothsocket_macos_p.h \
+                       qbluetoothtransferreply_macos_p.h \
                        qlowenergycontroller_darwin_p.h
 } else:ios|tvos {
     DEFINES += QT_IOS_BLUETOOTH
diff --git a/src/bluetooth/qbluetoothlocaldevice_osx.mm b/src/bluetooth/qbluetoothlocaldevice_macos.mm
index c39ae100..c39ae100 100644
--- a/src/bluetooth/qbluetoothlocaldevice_osx.mm
+++ b/src/bluetooth/qbluetoothlocaldevice_macos.mm
diff --git a/src/bluetooth/qbluetoothserver_osx.mm b/src/bluetooth/qbluetoothserver_macos.mm
index 0970dac9..a9bd3002 100644
--- a/src/bluetooth/qbluetoothserver_osx.mm
+++ b/src/bluetooth/qbluetoothserver_macos.mm
@@ -44,7 +44,7 @@
 // a private header included by private header
 // (incorrectly handled dependencies).
 #include "qbluetoothsocketbase_p.h"
-#include "qbluetoothsocket_osx_p.h"
+#include "qbluetoothsocket_macos_p.h"
 
 #include "qbluetoothlocaldevice.h"
 #include "osx/osxbtutility_p.h"
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm b/src/bluetooth/qbluetoothservicediscoveryagent_macos.mm
index 6c3ed79d..6c3ed79d 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_macos.mm
diff --git a/src/bluetooth/qbluetoothserviceinfo_osx.mm b/src/bluetooth/qbluetoothserviceinfo_macos.mm
index ac8e6b33..ac8e6b33 100644
--- a/src/bluetooth/qbluetoothserviceinfo_osx.mm
+++ b/src/bluetooth/qbluetoothserviceinfo_macos.mm
diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp
index e4d85447..972706bd 100644
--- a/src/bluetooth/qbluetoothsocket.cpp
+++ b/src/bluetooth/qbluetoothsocket.cpp
@@ -50,7 +50,7 @@
 #elif defined(QT_WIN_BLUETOOTH)
 #include "qbluetoothsocket_win_p.h"
 #elif defined(QT_OSX_BLUETOOTH)
-#include "qbluetoothsocket_osx_p.h"
+#include "qbluetoothsocket_macos_p.h"
 #else
 #include "qbluetoothsocket_dummy_p.h"
 #endif
diff --git a/src/bluetooth/qbluetoothsocket_osx.mm b/src/bluetooth/qbluetoothsocket_macos.mm
index cd1206cc..4f784fa1 100644
--- a/src/bluetooth/qbluetoothsocket_osx.mm
+++ b/src/bluetooth/qbluetoothsocket_macos.mm
@@ -42,7 +42,7 @@
 // the base class for a private socket) - workaround for
 // dependencies problem.
 #include "qbluetoothsocketbase_p.h"
-#include "qbluetoothsocket_osx_p.h"
+#include "qbluetoothsocket_macos_p.h"
 
 #include "osx/osxbtrfcommchannel_p.h"
 #include "osx/osxbtl2capchannel_p.h"
diff --git a/src/bluetooth/qbluetoothsocket_osx_p.h b/src/bluetooth/qbluetoothsocket_macos_p.h
index 1291878c..1291878c 100644
--- a/src/bluetooth/qbluetoothsocket_osx_p.h
+++ b/src/bluetooth/qbluetoothsocket_macos_p.h
diff --git a/src/bluetooth/qbluetoothtransfermanager.cpp b/src/bluetooth/qbluetoothtransfermanager.cpp
index d84f726c..53798e55 100644
--- a/src/bluetooth/qbluetoothtransfermanager.cpp
+++ b/src/bluetooth/qbluetoothtransfermanager.cpp
@@ -43,7 +43,7 @@
 #if QT_CONFIG(bluez)
 #include "qbluetoothtransferreply_bluez_p.h"
 #elif QT_OSX_BLUETOOTH
-#include "qbluetoothtransferreply_osx_p.h"
+#include "qbluetoothtransferreply_macos_p.h"
 #else
 #if !defined(QT_ANDROID_BLUETOOTH) && !defined(QT_IOS_BLUETOOTH)
 #include "dummy/dummy_helper_p.h"
diff --git a/src/bluetooth/qbluetoothtransferreply_osx.mm b/src/bluetooth/qbluetoothtransferreply_macos.mm
index af357d53..8ba06c05 100644
--- a/src/bluetooth/qbluetoothtransferreply_osx.mm
+++ b/src/bluetooth/qbluetoothtransferreply_macos.mm
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "qbluetoothservicediscoveryagent.h"
-#include "qbluetoothtransferreply_osx_p.h"
+#include "qbluetoothtransferreply_macos_p.h"
 #include "osx/osxbtobexsession_p.h"
 #include "qbluetoothserviceinfo.h"
 #include "osx/osxbtutility_p.h"
diff --git a/src/bluetooth/qbluetoothtransferreply_osx_p.h b/src/bluetooth/qbluetoothtransferreply_macos_p.h
index e7b6f683..e7b6f683 100644
--- a/src/bluetooth/qbluetoothtransferreply_osx_p.h
+++ b/src/bluetooth/qbluetoothtransferreply_macos_p.h