Merge branch 'master' into dev/webapp-master-update

# Conflicts:
#	libraries/networking/src/NodeList.h
#	libraries/shared/src/shared/WebRTC.h

.github/workflows/pr_build.yml

@@ -46,6 +46,10 @@ jobs:
             - os: ubuntu-18.04
               build_type: android
               apt-dependencies: mesa-common-dev libegl1 libglvnd-dev libdouble-conversion1 libpulse0
+            # Do not change the names of self-hosted runners without knowing what you are doing, as they correspond to labels that have to be set on the runner.
+            - os: self-hosted_debian-11_aarch64
+              build_type: full
+              apt-dependencies: qtbase5-dev qtbase5-private-dev qtwebengine5-dev qtwebengine5-dev-tools qtmultimedia5-dev libqt5opengl5-dev qtscript5-dev libqt5scripttools5 libqt5webchannel5-dev libqt5websockets5-dev qtxmlpatterns5-dev-tools qttools5-dev libqt5xmlpatterns5-dev libqt5svg5-dev qml-module-qtwebchannel build-essential cmake curl freeglut3-dev git libasound2 libasound2-dev libdouble-conversion-dev libdrm-dev libfontconfig1 libgl1-mesa-dev libglvnd-dev libharfbuzz-dev libjack-dev libjack0 libnspr4 libnss3 libpcre2-16-0 libpulse0 libsdl2-dev libssl-dev libudev-dev libxcb-xinerama0-dev libxcb-xinput0 libxcomposite1 libxcursor1 libxi-dev libxmu-dev libxrandr-dev libxslt1.1 libxtst6 make mesa-common-dev mesa-utils nodejs npm patchelf python2 python3 python3-distro xdg-user-dirs zlib1g-dev ninja-build zip
         fail-fast: false
     runs-on: ${{matrix.os}}
     if: github.event.action != 'labeled' || github.event.label.name == 'rebuild'
@@ -59,10 +63,17 @@ jobs:
         echo "APP_TARGET_NAME=$APP_NAME" >> $GITHUB_ENV
 
         # Linux build variables
-        if [[ "${{ matrix.os }}" = "ubuntu-"* ]]; then
+        if [[ "${{ matrix.os }}" = "ubuntu-"* || "${{ matrix.os }}" = *"debian"* ]]; then
           echo "PYTHON_EXEC=python3" >> $GITHUB_ENV
           echo "INSTALLER_EXT=*" >> $GITHUB_ENV
-          echo "CMAKE_BUILD_EXTRA=-- -j3" >> $GITHUB_ENV
+          echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV
+          if [ "${{ matrix.os }}" = "self-hosted_debian-11_aarch64" ]; then
+            echo "VIRCADIA_USE_SYSTEM_QT=true" >> $GITHUB_ENV
+            echo "CI_WORKSPACE=${{runner.workspace}}" >> $GITHUB_ENV
+          fi
+          if [[ "${{ matrix.os }}" = *"aarch64" ]]; then
+            echo "VCPKG_FORCE_SYSTEM_BINARIES=true" >> $GITHUB_ENV
+          fi
           if [ "${{ matrix.build_type }}" = "full" ]; then
             echo "CMAKE_EXTRA=-DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
           else
@@ -97,6 +108,7 @@ jobs:
           mkdir $HIFI_ANDROID_PRECOMPILED
           echo "INSTALLER_EXT=apk" >> $GITHUB_ENV
         fi
+
     # Configuration is broken into two steps because you can't set an env var and also reference it in the same step
     - name: Configure Build Environment 2
       shell: bash
@@ -114,8 +126,9 @@ jobs:
         else
           echo "ARTIFACT_PATTERN=*.$INSTALLER_EXT" >> $GITHUB_ENV
         fi
+
     - name: Clear Working Directory
-      if: startsWith(matrix.os, 'windows')
+      if: startsWith(matrix.os, 'windows') || contains(matrix.os, 'self-hosted')
       shell: bash
       working-directory: ${{runner.workspace}}
       run: rm -rf ./*
@@ -123,9 +136,10 @@ jobs:
       with:
         submodules: false
         fetch-depth: 1
+
     - name: Install dependencies
       shell: bash
-      if: startsWith(matrix.os, 'ubuntu')
+      if: startsWith(matrix.os, 'ubuntu') || contains(matrix.os, 'debian')
       run: |
         echo "Installing Python Modules:"
         pip3 install distro || exit 1
@@ -135,13 +149,16 @@ jobs:
 
         echo "Installing apt packages"
         sudo apt install -y ${{ matrix.apt-dependencies }} || exit 1
+
     - name: Create Build Environment
       shell: bash
       run: cmake -E make_directory "${{runner.workspace}}/build"
+
     - name: Configure CMake
       working-directory: ${{runner.workspace}}/build
       shell: bash
       run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DVCPKG_BUILD_TYPE=release $CMAKE_EXTRA
+
     - name: Compress cmake logs
       if: always()
       shell: bash
@@ -152,7 +169,12 @@ jobs:
           TAR=tar
         fi
 
-        find "$HOME/vircadia-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
+        if [ ${{ env.CI_WORKSPACE }} ]; then
+          find "$CI_WORKSPACE/vircadia-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
+        else
+          find "$HOME/vircadia-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
+        fi
+
     - name: Archive cmake logs
       if: always()
       uses: actions/upload-artifact@v2
@@ -160,26 +182,31 @@ jobs:
         name: cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz
         path: ${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz
         if-no-files-found: error
+
     - name: Build Application
       if: matrix.build_type == 'full' || matrix.build_type == 'client'
       working-directory: ${{runner.workspace}}/build
       shell: bash
       run: cmake --build . --config $BUILD_TYPE --target $APP_TARGET_NAME $CMAKE_BUILD_EXTRA
+
     - name: Build Domain Server
       if: matrix.build_type == 'full'
       working-directory: ${{runner.workspace}}/build
       shell: bash
       run: cmake --build . --config $BUILD_TYPE --target domain-server $CMAKE_BUILD_EXTRA
+
     - name: Build Assignment Client
       if: matrix.build_type == 'full'
       working-directory: ${{runner.workspace}}/build
       shell: bash
       run: cmake --build . --config $BUILD_TYPE --target assignment-client $CMAKE_BUILD_EXTRA
+
     - name: Build Console
       if: matrix.build_type == 'full' || matrix.os == 'windows-latest'
       working-directory: ${{runner.workspace}}/build
       shell: bash
       run: cmake --build . --config $BUILD_TYPE --target packaged-server-console $CMAKE_BUILD_EXTRA
+
     - name: Build Installer
       if: matrix.build_type != 'android'
       working-directory: ${{runner.workspace}}/build
@@ -218,6 +245,7 @@ jobs:
       working-directory: ${{runner.workspace}}/vircadia
       run: |
         /usr/local/lib/android/sdk/tools/bin/sdkmanager --uninstall 'cmake;3.18.1'
+
     - name: Build for Android + Quest
       if: matrix.build_type == 'android'
       shell: bash
@@ -230,6 +258,7 @@ jobs:
         ./gradlew -m tasks -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED
         # Build!
         ./build_android.sh
+
     - name: Output system stats
       if: ${{ always() }}
       working-directory: ${{runner.workspace}}/build
@@ -237,11 +266,13 @@ jobs:
       run: |
         echo "Disk usage:"
         df -h
+
     - name: Output Installer Logs
       if: failure() && matrix.os == 'windows-latest'
       shell: bash
       working-directory: ${{runner.workspace}}/build
       run: cat ./_CPack_Packages/win64/NSIS/NSISOutput.log
+
     - name: Upload Artifact
       shell: bash
       working-directory: ${{runner.workspace}}/build

.grenrc.js

@@ -19,6 +19,8 @@ module.exports = {
     "ignoreLabels": [
         "enhancement",
         "bugfix",
+        "CMake",
+        "unmerged-dev",
         "CR Approved",
         "QA Approved",
         "allow-build-upload",
@@ -33,11 +35,12 @@ module.exports = {
         "rebuild",
         "merge right before snip"
     ],
-    "onlyMilestones": true,
+    "onlyMilestones": false,
     "groupBy": {
         "Enhancements": ["enhancement"],
         "Bug Fixes": ["bugfix"],
-        "Docs": ["docs"]
+        "Docs": ["docs"],
+        "In Development": ["unmerged-dev"]
     },
     "changelogFilename": "CHANGELOG.md"
 }

assignment-client/src/Agent.h

@@ -17,6 +17,7 @@
 
 #include <QtScript/QScriptEngine>
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QUrl>
 #include <QtCore/QTimer>
 #include <QUuid>

assignment-client/src/AssignmentClient.h

@@ -15,6 +15,7 @@
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QPointer>
+#include <QtCore/QSharedPointer>
 
 #include <shared/WebRTC.h>
 

assignment-client/src/AssignmentClientMonitor.h

@@ -17,6 +17,7 @@
 #include <QtCore/qpointer.h>
 #include <QtCore/QProcess>
 #include <QtCore/QDateTime>
+#include <QtCore/QSharedPointer>
 #include <QDir>
 
 #include <Assignment.h>

assignment-client/src/assets/AssetServer.h

@@ -13,6 +13,7 @@
 #define hifi_AssetServer_h
 
 #include <QtCore/QDir>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QThreadPool>
 #include <QRunnable>
 

assignment-client/src/audio/AudioMixer.h

@@ -12,6 +12,8 @@
 #ifndef hifi_AudioMixer_h
 #define hifi_AudioMixer_h
 
+#include <QtCore/QSharedPointer>
+
 #include <AABox.h>
 #include <AudioHRTF.h>
 #include <AudioRingBuffer.h>

assignment-client/src/audio/AudioMixerClientData.h

@@ -20,6 +20,7 @@
 #endif
 
 #include <QtCore/QJsonObject>
+#include <QtCore/QSharedPointer>
 
 #include <AABox.h>
 #include <AudioHRTF.h>

assignment-client/src/audio/AvatarAudioStream.h

@@ -23,9 +23,7 @@ public:
     AvatarAudioStream(bool isStereo, int numStaticJitterFrames = -1);
 
 private:
-    // disallow copying of AvatarAudioStream objects
+    Q_DISABLE_COPY(AvatarAudioStream)
-    AvatarAudioStream(const AvatarAudioStream&);
-    AvatarAudioStream& operator= (const AvatarAudioStream&);
 
     int parseStreamProperties(PacketType type, const QByteArray& packetAfterSeqNum, int& numAudioSamples) override;
 };

assignment-client/src/avatars/AvatarMixer.h

@@ -16,6 +16,8 @@
 #ifndef hifi_AvatarMixer_h
 #define hifi_AvatarMixer_h
 
+#include <QtCore/QSharedPointer>
+
 #include <set>
 #include <shared/RateCounter.h>
 #include <PortableHighResolutionClock.h>

assignment-client/src/avatars/AvatarMixerClientData.h

@@ -19,6 +19,7 @@
 #include <queue>
 
 #include <QtCore/QJsonObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QUrl>
 
 #include "MixerAvatar.h"

assignment-client/src/entities/EntityServer.h

@@ -14,6 +14,8 @@
 
 #include "../octree/OctreeServer.h"
 
+#include <QtCore/QSharedPointer>
+
 #include <memory>
 
 #include <EntityItem.h>

assignment-client/src/messages/MessagesMixer.h

@@ -15,6 +15,8 @@
 #ifndef hifi_MessagesMixer_h
 #define hifi_MessagesMixer_h
 
+#include <QtCore/QSharedPointer>
+
 #include <ThreadedAssignment.h>
 
 /// Handles assignments of type MessagesMixer - distribution of avatar data to various clients

assignment-client/src/octree/OctreeHeadlessViewer.h

@@ -12,6 +12,8 @@
 #ifndef hifi_OctreeHeadlessViewer_h
 #define hifi_OctreeHeadlessViewer_h
 
+#include <QtCore/QSharedPointer>
+
 #include <OctreeProcessor.h>
 #include <OctreeQuery.h>
 

assignment-client/src/octree/OctreeInboundPacketProcessor.h

@@ -14,6 +14,8 @@
 #ifndef hifi_OctreeInboundPacketProcessor_h
 #define hifi_OctreeInboundPacketProcessor_h
 
+#include <QtCore/QSharedPointer>
+
 #include <ReceivedPacketProcessor.h>
 
 #include "SequenceNumberStats.h"

assignment-client/src/octree/OctreeServer.h

@@ -17,6 +17,7 @@
 #include <QStringList>
 #include <QDateTime>
 #include <QtCore/QCoreApplication>
+#include <QtCore/QSharedPointer>
 
 #include <HTTPManager.h>
 

assignment-client/src/scripts/EntityScriptServer.h

@@ -16,6 +16,7 @@
 #include <vector>
 
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QUuid>
 
 #include <EntityEditPacketSender.h>

cmake/macros/TargetWebRTC.cmake

@@ -13,6 +13,9 @@ macro(TARGET_WEBRTC)
         # set(WEBRTC_LIBRARY_DEBUG ${INSTALL_DIR}/debug/lib/libwebrtc.a)
         # set(WEBRTC_LIBRARY_RELEASE ${INSTALL_DIR}/lib/libwebrtc.a)
         # select_library_configurations(WEBRTC)
+    elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+        # WebRTC is basically impossible to build on aarch64 Linux.
+        # I am looking at https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing for an alternative.
     else()
         set(WEBRTC_INCLUDE_DIRS "${VCPKG_INSTALL_ROOT}/include/webrtc")
         target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${WEBRTC_INCLUDE_DIRS})

cmake/ports/hifi-deps/CONTROL

@@ -1,4 +1,4 @@
 Source: hifi-deps
 Version: 0.1.5-github-actions
 Description: Collected dependencies for High Fidelity applications
-Build-Depends: bullet3, draco, etc2comp, glad, glm, nvtt, openexr (!android), openssl (windows), opus, polyvox, tbb (!android), vhacd, webrtc (!android), zlib
+Build-Depends: bullet3, draco, etc2comp, glad, glm, nvtt, openexr (!android), openssl (windows), opus, polyvox, tbb (!android), vhacd, webrtc (!android|!(linux&arm)), zlib

cmake/ports/openvr/CONTROL

@@ -1,3 +1,3 @@
 Source: openvr
-Version: 1.0.16
+Version: 1.16.8
 Description: an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.

cmake/ports/openvr/portfile.cmake

@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ValveSoftware/openvr
-    REF v1.11.11
+    REF v1.16.8
-    SHA512 25bddb0e82eea091fe5101d0d3de1de7bb81b4504adc0c8d8e687d2502c0167bc5a11e68bc343d7563fb4db7c917e9d0e2ea99bc1d8016d479874b0c6bd7f121
+    SHA512 bc65fd2fc2aab870c7fee98f5211b7d88cd30511ce5b23fa2ac05454969b6ee56b42e422e44a16a833b317bb1328e0ed986c926e3d78abddf5fd5788ff74de91
     HEAD_REF master
 )
 

domain-server/src/DomainGatekeeper.h

@@ -20,6 +20,7 @@
 
 #include <QtCore/QObject>
 #include <QtNetwork/QNetworkReply>
+#include <QtCore/QSharedPointer>
 
 #include <DomainHandler.h>
 

domain-server/src/DomainServerSettingsManager.h

@@ -17,6 +17,7 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonDocument>
 #include <QtNetwork/QNetworkReply>
+#include <QtCore/QSharedPointer>
 
 #include <HifiConfigVariantMap.h>
 #include <HTTPManager.h>

hifi_qt.py

@@ -169,11 +169,9 @@ endif()
 
                 elif distro.id() == 'debian':
                     u_major = int( distro.major_version() )
-                    u_minor = int( distro.minor_version() )
 
                     if u_major == 10:
-                        #self.qtUrl = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-16.04-with-symbols.tar.gz'
+                        self.qtUrl = 'https://data.moto9000.moe/vircadia_packages/qt5-install-5.15.2-debian-10-aarch64.tar.xz'
-                        self.__no_qt_package_error()
                     elif u_major > 10:
                         self.__no_qt_package_error()
                     else:

hifi_vcpkg.py

@@ -61,7 +61,10 @@ endif()
             self.noClean = True
         else:
             defaultBasePath = os.path.expanduser('~/vircadia-files/vcpkg')
-            self.basePath = os.getenv('HIFI_VCPKG_BASE', defaultBasePath)
+            if 'CI_WORKSPACE' in os.environ:
+                self.basePath = os.path.join(os.getenv('CI_WORKSPACE'), 'vircadia-files/vcpkg')
+            else:
+                self.basePath = os.getenv('HIFI_VCPKG_BASE', defaultBasePath)
             if self.args.android:
                 self.basePath = os.path.join(self.basePath, 'android')
             if (not os.path.isdir(self.basePath)):
@@ -109,8 +112,8 @@ endif()
         elif 'Linux' == system and 'aarch64' == machine:
             self.exe = os.path.join(self.path, 'vcpkg')
             self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.sh'), '-disableMetrics' ]
-            self.vcpkgUrl = 'http://motofckr9k.ddns.net/vircadia_packages/vcpkg-2020.11-1_arm64.tar.xz'
+            self.vcpkgUrl = self.assets_url + '/dependencies/vcpkg/vcpkg-linux_aarch64_2021.05.12.tar.xz'
-            self.vcpkgHash = 'f39fa1c34d2ba820954b8ce4acc05e3d0ce5fa5efe5440516ba910ff222c85c658ba4bbfc92b3fa6cbb594f99be115cda69ebe44ed38d4d3988058fb1faefbb3'
+            self.vcpkgHash = '7abb7aa96200e3cb5a6d0ec1c6ee63aa7886df2d1fecf8f9ee41ebe4d2cea0d4143274222c4941cb7aca61e4048229fdfe9eb2cd36dd559dd26db871a3b3ed61'
             self.hostTriplet = 'arm64-linux'
         else:
             self.exe = os.path.join(self.path, 'vcpkg')

ice-server/src/IceServer.cpp

@@ -20,6 +20,7 @@
 #include <QtCore/QTimer>
 #include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QNetworkRequest>
+#include <QtCore/QSharedPointer>
 
 #include <LimitedNodeList.h>
 #include <NetworkAccessManager.h>

ice-server/src/IceServer.h

@@ -14,7 +14,6 @@
 #define hifi_IceServer_h
 
 #include <QtCore/QCoreApplication>
-#include <QtCore/QSharedPointer>
 #include <QUdpSocket>
 
 #include <openssl/rsa.h>

interface/CMakeLists.txt

@@ -236,7 +236,7 @@ target_openssl()
 
 target_bullet()
 
-set(OpenGL_GL_PREFERENCE "LEGACY")
+set(OpenGL_GL_PREFERENCE "GLVND")
 target_opengl()
 add_crashpad()
 target_breakpad()

interface/src/Application.h

@@ -18,6 +18,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QPointer>
 #include <QtCore/QSet>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QStringList>
 #include <QtQuick/QQuickItem>
 
@@ -647,7 +648,7 @@ private:
 
     EntityTreePointer _entityClipboard;
 
-    mutable QMutex _viewMutex { QMutex::Recursive };
+    mutable QRecursiveMutex _viewMutex;
     ViewFrustum _viewFrustum; // current state of view frustum, perspective, orientation, etc.
     ViewFrustum _displayViewFrustum;
 
@@ -773,7 +774,7 @@ private:
     bool _isMissingSequenceNumbers { false };
 
     void checkChangeCursor();
-    mutable QMutex _changeCursorLock { QMutex::Recursive };
+    mutable QRecursiveMutex _changeCursorLock;
     Qt::CursorShape _desiredCursor{ Qt::BlankCursor };
     bool _cursorNeedsChanging { false };
 

interface/src/InterfaceParentFinder.cpp

@@ -11,6 +11,8 @@
 
 #include "InterfaceParentFinder.h"
 
+#include <QtCore/QSharedPointer>
+
 #include <Application.h>
 #include <AvatarData.h>
 #include <avatar/AvatarManager.h>

interface/src/LoginStateManager.h

@@ -11,7 +11,6 @@
 #ifndef hifi_LoginStateManager_h
 #define hifi_LoginStateManager_h
 #include <QtCore/QList>
-#include <QtCore/QSharedPointer>
 #include <QtCore/QVariant>
 
 #include <PointerEvent.h>

interface/src/avatar/AvatarManager.h

@@ -16,7 +16,6 @@
 
 #include <QtCore/QHash>
 #include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
 
 #include <AvatarHashMap.h>
 #include <PhysicsEngine.h>

interface/src/avatar/GrabManager.cpp

@@ -11,6 +11,7 @@
 
 
 #include "GrabManager.h"
+#include <QtCore/QSharedPointer>
 
 void GrabManager::simulateGrabs() {
     QSharedPointer<AvatarManager> avatarManager = DependencyManager::get<AvatarManager>();

interface/src/avatar/MyHead.h

@@ -22,9 +22,7 @@ public:
     void simulate(float deltaTime) override;
 
 private:
-    // disallow copies of the Head, copy of owning Avatar is disallowed too
+    Q_DISABLE_COPY(MyHead)
-    MyHead(const Head&);
-    MyHead& operator= (const MyHead&);
 };
 
 #endif // hifi_MyHead_h

interface/src/commerce/Wallet.h

@@ -14,6 +14,8 @@
 #ifndef hifi_Wallet_h
 #define hifi_Wallet_h
 
+#include <QtCore/QSharedPointer>
+
 #include <DependencyManager.h>
 #include <Node.h>
 #include <ReceivedMessage.h>

interface/src/graphics/GraphicsEngine.h

@@ -69,7 +69,7 @@ private:
 
 protected:
 
-    mutable QMutex _renderArgsMutex{ QMutex::Recursive };
+    mutable QRecursiveMutex _renderArgsMutex;
     AppRenderArgs _appRenderArgs;
 
     RateCounter<500> _renderLoopCounter;

interface/src/octree/OctreePacketProcessor.h

@@ -12,6 +12,8 @@
 #ifndef hifi_OctreePacketProcessor_h
 #define hifi_OctreePacketProcessor_h
 
+#include <QtCore/QSharedPointer>
+
 #include <ReceivedPacketProcessor.h>
 #include <ReceivedMessage.h>
 

interface/src/raypick/CollisionPick.h

@@ -8,6 +8,8 @@
 #ifndef hifi_CollisionPick_h
 #define hifi_CollisionPick_h
 
+#include <QtCore/QSharedPointer>
+
 #include <PhysicsEngine.h>
 #include <model-networking/ModelCache.h>
 #include <RegisteredMetaTypes.h>

interface/src/scripting/ScreenshareScriptingInterface.h

@@ -16,6 +16,7 @@
 #include <QProcess>
 #include <QtCore/QCoreApplication>
 #include <QNetworkReply>
+#include <QtCore/QSharedPointer>
 
 #include <PathUtils.h>
 #include <ReceivedMessage.h>

interface/src/scripting/SelectionScriptingInterface.h

@@ -14,6 +14,7 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QMap>
+#include <QtCore/QSharedPointer>
 #include <DependencyManager.h>
 
 #include <AbstractViewStateInterface.h>

interface/src/scripting/WalletScriptingInterface.cpp

@@ -10,6 +10,7 @@
 //
 
 #include "WalletScriptingInterface.h"
+#include <QtCore/QSharedPointer>
 #include <SettingHandle.h>
 
 CheckoutProxy::CheckoutProxy(QObject* qmlObject, QObject* parent) : QmlWrapper(qmlObject, parent) {

interface/src/ui/JSConsole.h

@@ -14,7 +14,6 @@
 
 #include <QFutureWatcher>
 #include <QObject>
-#include <QSharedPointer>
 #include <QCompleter>
 #include <QtCore/QJsonArray>
 

interface/src/ui/SnapshotAnimated.h

@@ -12,6 +12,7 @@
 #ifndef hifi_SnapshotAnimated_h
 #define hifi_SnapshotAnimated_h
 
+#include <QtCore/QSharedPointer>
 #include <QtCore/QVector>
 #include <Application.h>
 #include <DependencyManager.h>

interface/src/ui/overlays/ContextOverlayInterface.h

@@ -15,6 +15,7 @@
 
 #include <QtCore/QObject>
 #include <QUuid>
+#include <QtCore/QSharedPointer>
 
 #include <DependencyManager.h>
 #include <PointerEvent.h>

interface/src/ui/overlays/Overlays.h

@@ -746,7 +746,7 @@ signals:
 private:
     void cleanupOverlaysToDelete();
 
-    mutable QMutex _mutex { QMutex::Recursive };
+    mutable QRecursiveMutex _mutex;
     QMap<QUuid, Overlay::Pointer> _overlays;
     QList<Overlay::Pointer> _overlaysToDelete;
 

libraries/animation/src/AnimNodeLoader.h

@@ -14,6 +14,7 @@
 #include <memory>
 
 #include <QNetworkReply>
+#include <QtCore/QSharedPointer>
 #include <QString>
 #include <QUrl>
 
@@ -44,10 +45,7 @@ protected:
     QSharedPointer<Resource> _resource;
 
 private:
-
+    Q_DISABLE_COPY(AnimNodeLoader)
-    // no copies
-    AnimNodeLoader(const AnimNodeLoader&) = delete;
-    AnimNodeLoader& operator=(const AnimNodeLoader&) = delete;
 };
 
 #endif // hifi_AnimNodeLoader

libraries/animation/src/AnimRandomSwitch.h

@@ -120,9 +120,7 @@ protected:
         std::vector<Transition> _transitions;
 
     private:
-        // no copies
+        Q_DISABLE_COPY(RandomSwitchState)
-        RandomSwitchState(const RandomSwitchState&) = delete;
-        RandomSwitchState& operator=(const RandomSwitchState&) = delete;
     };
 
 public:
@@ -181,9 +179,7 @@ protected:
     QString _lastPlayedState;
 
 private:
-    // no copies
+    Q_DISABLE_COPY(AnimRandomSwitch)
-    AnimRandomSwitch(const AnimRandomSwitch&) = delete;
-    AnimRandomSwitch& operator=(const AnimRandomSwitch&) = delete;
 };
 
 #endif // hifi_AnimRandomSwitch_h

libraries/animation/src/AnimStateMachine.h

@@ -107,9 +107,7 @@ protected:
         std::vector<Transition> _transitions;
 
     private:
-        // no copies
+        Q_DISABLE_COPY(State)
-        State(const State&) = delete;
-        State& operator=(const State&) = delete;
     };
 
 public:
@@ -152,9 +150,7 @@ protected:
     QString _currentStateVar;
 
 private:
-    // no copies
+    Q_DISABLE_COPY(AnimStateMachine)
-    AnimStateMachine(const AnimStateMachine&) = delete;
-    AnimStateMachine& operator=(const AnimStateMachine&) = delete;
 };
 
 #endif // hifi_AnimStateMachine_h

libraries/animation/src/AnimationCache.h

@@ -13,6 +13,7 @@
 #define hifi_AnimationCache_h
 
 #include <QtCore/QRunnable>
+#include <QtCore/QSharedPointer>
 #include <QtScript/QScriptEngine>
 #include <QtScript/QScriptValue>
 

libraries/audio-client/src/AudioClient.h

@@ -24,6 +24,7 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QElapsedTimer>
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QVector>
 #include <QtMultimedia/QAudio>
 #include <QtMultimedia/QAudioFormat>

libraries/audio-client/src/AudioIOStats.h

@@ -15,6 +15,7 @@
 #include "MovingMinMaxAvg.h"
 
 #include <QObject>
+#include <QtCore/QSharedPointer>
 
 #include <AudioStreamStats.h>
 #include <Node.h>

libraries/audio/src/AbstractAudioInterface.cpp

@@ -8,8 +8,6 @@
 
 #include "AbstractAudioInterface.h"
 
-#include <QtCore/QSharedPointer>
-
 #include <Node.h>
 #include <NodeType.h>
 #include <DependencyManager.h>

libraries/audio/src/AudioInjectorManager.cpp

@@ -12,6 +12,7 @@
 #include "AudioInjectorManager.h"
 
 #include <QtCore/QCoreApplication>
+#include <QtCore/QSharedPointer>
 
 #include <SharedUtil.h>
 #include <shared/QtHelpers.h>

libraries/audio/src/AudioInjectorManager.h

@@ -72,8 +72,7 @@ private:
     bool wouldExceedLimits();
 
     AudioInjectorManager() { createThread(); }
-    AudioInjectorManager(const AudioInjectorManager&) = delete;
+    Q_DISABLE_COPY(AudioInjectorManager)
-    AudioInjectorManager& operator=(const AudioInjectorManager&) = delete;
 
     void createThread();
 

libraries/audio/src/InjectedAudioStream.h

@@ -28,9 +28,7 @@ public:
     virtual const QUuid& getStreamIdentifier() const override { return _streamIdentifier; }
 
 private:
-    // disallow copying of InjectedAudioStream objects
+    Q_DISABLE_COPY(InjectedAudioStream)
-    InjectedAudioStream(const InjectedAudioStream&);
-    InjectedAudioStream& operator= (const InjectedAudioStream&);
 
     AudioStreamStats getAudioStreamStats() const override;
     int parseStreamProperties(PacketType type, const QByteArray& packetAfterSeqNum, int& numAudioSamples) override;

libraries/audio/src/Sound.h

@@ -14,6 +14,7 @@
 
 #include <QRunnable>
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtNetwork/QNetworkReply>
 #include <QtScript/qscriptengine.h>
 

libraries/audio/src/SoundCache.h

@@ -12,6 +12,8 @@
 #ifndef hifi_SoundCache_h
 #define hifi_SoundCache_h
 
+#include <QtCore/QSharedPointer>
+
 #include <ResourceCache.h>
 
 #include "Sound.h"

libraries/avatars/src/AvatarData.h

@@ -1887,11 +1887,10 @@ protected:
     virtual void clearAvatarGrabData(const QUuid& grabID);
 
 private:
+    Q_DISABLE_COPY(AvatarData)
+
     friend void avatarStateFromFrame(const QByteArray& frameData, AvatarData* _avatar);
     static QUrl _defaultFullAvatarModelUrl;
-    // privatize the copy constructor and assignment operator so they cannot be called
-    AvatarData(const AvatarData&);
-    AvatarData& operator= (const AvatarData&);
 };
 Q_DECLARE_METATYPE(AvatarData*)
 

libraries/avatars/src/ClientTraitsHandler.h

@@ -12,6 +12,8 @@
 #ifndef hifi_ClientTraitsHandler_h
 #define hifi_ClientTraitsHandler_h
 
+#include <QtCore/QSharedPointer>
+
 #include <ReceivedMessage.h>
 
 #include "AssociatedTraitValues.h"

libraries/avatars/src/HeadData.h

@@ -128,9 +128,7 @@ protected:
     AvatarData* _owningAvatar;
 
 private:
-    // privatize copy ctor and assignment operator so copies of this object cannot be made
+    Q_DISABLE_COPY(HeadData)
-    HeadData(const HeadData&);
-    HeadData& operator= (const HeadData&);
 
     void setHeadOrientation(const glm::quat& orientation);
 };

libraries/baking/src/MaterialBaker.h

@@ -12,6 +12,8 @@
 #ifndef hifi_MaterialBaker_h
 #define hifi_MaterialBaker_h
 
+#include <QtCore/QSharedPointer>
+
 #include "Baker.h"
 
 #include "TextureBaker.h"

libraries/baking/src/ModelBaker.h

@@ -17,6 +17,7 @@
 #include <QtCore/QUrl>
 #include <QtNetwork/QNetworkReply>
 #include <QJsonArray>
+#include <QtCore/QSharedPointer>
 
 #include "Baker.h"
 #include "MaterialBaker.h"

libraries/display-plugins/CMakeLists.txt

@@ -13,7 +13,7 @@ include_hifi_library_headers(ktx)
 include_hifi_library_headers(render)
 include_hifi_library_headers(procedural)
 
-set(OpenGL_GL_PREFERENCE "LEGACY")
+set(OpenGL_GL_PREFERENCE "GLVND")
 target_opengl()
 
 GroupSources("src/display-plugins")

libraries/display-plugins/src/display-plugins/CompositorHelper.h

@@ -161,7 +161,7 @@ private:
     // application specific position, when it's in desktop mode, the reticle position will simply move
     // the system mouse.
     glm::vec2 _reticlePositionInHMD { 0.0f, 0.0f };
-    mutable QMutex _reticleLock { QMutex::Recursive };
+    mutable QRecursiveMutex _reticleLock;
 
     QPointF _lastKnownRealMouse;
     bool _ignoreMouseMove { false };

libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp

@@ -14,6 +14,7 @@
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QBuffer>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QThread>
 #include <QtCore/QTimer>
 #include <QtCore/QFileInfo>

libraries/entities-renderer/src/EntityTreeRenderer.h

@@ -15,6 +15,7 @@
 #include <QtCore/QSet>
 #include <QtCore/QStack>
 #include <QtGui/QMouseEvent>
+#include <QtCore/QSharedPointer>
 
 #include <AudioInjectorManager.h>
 #include <EntityScriptingInterface.h> // for RayToEntityIntersectionResult

libraries/entities-renderer/src/RenderableWebEntityItem.h

@@ -10,6 +10,7 @@
 #ifndef hifi_RenderableWebEntityItem_h
 #define hifi_RenderableWebEntityItem_h
 
+#include <QtCore/QSharedPointer>
 #include <WebEntityItem.h>
 #include "RenderableEntityItem.h"
 

libraries/entities/src/EntityEditPacketSender.h

@@ -12,6 +12,8 @@
 #ifndef hifi_EntityEditPacketSender_h
 #define hifi_EntityEditPacketSender_h
 
+#include <QtCore/QSharedPointer>
+
 #include <OctreeEditPacketSender.h>
 
 #include <mutex>

libraries/entities/src/EntityItemProperties.cpp

@@ -688,8 +688,8 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
  * @property {Uuid} owningAvatarID=Uuid.NULL - The session ID of the owning avatar if <code>avatarEntity</code> is
  *     <code>true</code>, otherwise {@link Uuid(0)|Uuid.NULL}. <em>Read-only.</em>
  *
- * @property {string} created - The UTC date and time that the entity was created, in ISO 8601 format as
+ * @property {number} created - When the entity was created, expressed as the number of microseconds since
- *     <code>yyyy-MM-ddTHH:mm:ssZ</code>. <em>Read-only.</em>
+ *     1970-01-01T00:00:00 UTC. <em>Read-only.</em>
  * @property {number} age - The age of the entity in seconds since it was created. <em>Read-only.</em>
  * @property {string} ageAsText - The age of the entity since it was created, formatted as <code>h hours m minutes s
  *     seconds</code>.

libraries/entities/src/EntityScriptServerLogClient.h

@@ -13,6 +13,7 @@
 #define hifi_EntityScriptServerLogClient_h
 
 #include <QObject>
+#include <QtCore/QSharedPointer>
 
 #include <NodeList.h>
 

libraries/entities/src/EntityScriptingInterface.h

@@ -17,6 +17,7 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
+#include <QtCore/QSharedPointer>
 #include <QtQml/QJSValue>
 #include <QtQml/QJSValueList>
 

libraries/entities/src/EntitySimulation.h

@@ -44,7 +44,7 @@ const int DIRTY_SIMULATION_FLAGS =
 
 class EntitySimulation : public QObject, public std::enable_shared_from_this<EntitySimulation> {
 public:
-    EntitySimulation() : _mutex(QMutex::Recursive), _nextExpiry(std::numeric_limits<uint64_t>::max()), _entityTree(nullptr) { }
+    EntitySimulation() : _mutex(), _nextExpiry(std::numeric_limits<uint64_t>::max()), _entityTree(nullptr) { }
     virtual ~EntitySimulation() { setEntityTree(nullptr); }
 
     inline EntitySimulationPointer getThisPointer() const {
@@ -90,7 +90,7 @@ protected:
     void callUpdateOnEntitiesThatNeedIt(uint64_t now);
     virtual void sortEntitiesThatMoved();
 
-    QMutex _mutex{ QMutex::Recursive };
+    QRecursiveMutex _mutex;
 
     SetOfEntities _entitiesToSort; // entities moved by simulation (and might need resort in EntityTree)
     SetOfEntities _simpleKinematicEntities; // entities undergoing non-colliding kinematic motion

libraries/gl/CMakeLists.txt

@@ -2,6 +2,6 @@ set(TARGET_NAME gl)
 setup_hifi_library(Gui Widgets)
 link_hifi_libraries(shared)
 
-set(OpenGL_GL_PREFERENCE "LEGACY")
+set(OpenGL_GL_PREFERENCE "GLVND")
 target_opengl()
 

libraries/gpu-gl-common/CMakeLists.txt

@@ -3,6 +3,6 @@ setup_hifi_library(Concurrent)
 link_hifi_libraries(shared gl gpu shaders)
 GroupSources("src")
 
-set(OpenGL_GL_PREFERENCE "LEGACY")
+set(OpenGL_GL_PREFERENCE "GLVND")
 target_opengl()
 

libraries/gpu-gl/CMakeLists.txt

@@ -6,6 +6,6 @@ if (UNIX AND NOT VIRCADIA_THREAD_DEBUGGING)
 endif(UNIX AND NOT VIRCADIA_THREAD_DEBUGGING)
 GroupSources("src")
 
-set(OpenGL_GL_PREFERENCE "LEGACY")
+set(OpenGL_GL_PREFERENCE "GLVND")
 target_opengl()
 

libraries/gpu-gles/CMakeLists.txt

@@ -2,4 +2,5 @@ set(TARGET_NAME gpu-gles)
 setup_hifi_library(Gui Concurrent)
 link_hifi_libraries(shared shaders gl gpu gpu-gl-common)
 GroupSources("src")
+set(OpenGL_GL_PREFERENCE "GLVND")
 target_opengl()

libraries/material-networking/src/material-networking/ShaderCache.h

@@ -9,6 +9,7 @@
 #ifndef hifi_ShaderCache_h
 #define hifi_ShaderCache_h
 
+#include <QtCore/QSharedPointer>
 #include <ResourceCache.h>
 
 class NetworkShader : public Resource {

libraries/material-networking/src/material-networking/TextureCache.h

@@ -18,6 +18,7 @@
 #include <QMap>
 #include <QColor>
 #include <QMetaEnum>
+#include <QtCore/QSharedPointer>
 
 #include <DependencyManager.h>
 #include <ResourceCache.h>

libraries/model-networking/src/model-networking/ModelCache.h

@@ -12,6 +12,8 @@
 #ifndef hifi_ModelCache_h
 #define hifi_ModelCache_h
 
+#include <QtCore/QSharedPointer>
+
 #include <DependencyManager.h>
 #include <ResourceCache.h>
 

libraries/networking/src/AccountManager.h

@@ -163,8 +163,7 @@ private slots:
     void postAccountSettingsError(QNetworkReply::NetworkError error);
 
 private:
-    AccountManager(AccountManager const& other) = delete;
+    Q_DISABLE_COPY(AccountManager);
-    void operator=(AccountManager const& other) = delete;
 
     void persistAccountToFile();
 

libraries/networking/src/AssetClient.h

@@ -15,6 +15,7 @@
 #include <QStandardItemModel>
 #include <QtQml/QJSEngine>
 #include <QString>
+#include <QtCore/QSharedPointer>
 
 #include <map>
 

libraries/networking/src/BaseAssetScriptingInterface.h

@@ -15,6 +15,7 @@
 #define hifi_BaseAssetScriptingInterface_h
 
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QThread>
 #include "AssetClient.h"
 #include <shared/MiniPromises.h>

libraries/networking/src/DomainHandler.h

@@ -17,6 +17,7 @@
 
 #include <QtCore/QJsonObject>
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QTimer>
 #include <QtCore/QUuid>
 #include <QtCore/QUrl>

libraries/networking/src/EntityScriptClient.h

@@ -12,6 +12,8 @@
 #ifndef hifi_EntityScriptClient_h
 #define hifi_EntityScriptClient_h
 
+#include <QtCore/QSharedPointer>
+
 #include "ClientServerUtils.h"
 #include "LimitedNodeList.h"
 #include "ReceivedMessage.h"

libraries/networking/src/HMACAuth.h

@@ -39,7 +39,7 @@ public:
     HMACHash result();
 
 private:
-    QMutex _lock { QMutex::Recursive };
+    QRecursiveMutex _lock;
     struct hmac_ctx_st* _hmacContext;
     AuthMethod _authMethod;
 };

libraries/networking/src/LimitedNodeList.h

@@ -29,6 +29,7 @@
 #include <QtCore/QReadWriteLock>
 #include <QtCore/QSet>
 #include <QtCore/QSharedMemory>
+#include <QtCore/QSharedPointer>
 #include <QtNetwork/QUdpSocket>
 #include <QtNetwork/QHostAddress>
 

libraries/networking/src/MappingRequest.cpp

@@ -11,6 +11,7 @@
 
 #include "MappingRequest.h"
 
+#include <QtCore/QSharedPointer>
 #include <QtCore/QThread>
 
 #include <DependencyManager.h>

libraries/networking/src/MessagesClient.h

@@ -15,6 +15,7 @@
 
 #include <QString>
 #include <QByteArray>
+#include <QtCore/QSharedPointer>
 
 #include <DependencyManager.h>
 

libraries/networking/src/NLPacket.h

@@ -13,8 +13,6 @@
 #ifndef hifi_NLPacket_h
 #define hifi_NLPacket_h
 
-#include <QtCore/QSharedPointer>
-
 #include <UUID.h>
 
 #include "udt/Packet.h"

libraries/networking/src/NLPacketList.h

@@ -12,6 +12,7 @@
 #ifndef hifi_NLPacketList_h
 #define hifi_NLPacketList_h
 
+#include <QtCore/QSharedPointer>
 #include "udt/PacketList.h"
 
 #include "NLPacket.h"
@@ -27,11 +28,10 @@ public:
     qint64 getMaxSegmentSize() const override { return NLPacket::maxPayloadSize(_packetType, _isOrdered); }
     
 private:
+    Q_DISABLE_COPY(NLPacketList)
     NLPacketList(PacketType packetType, QByteArray extendedHeader = QByteArray(), bool isReliable = false,
                  bool isOrdered = false);
     NLPacketList(udt::PacketList&& packetList);
-    NLPacketList(const NLPacketList& other) = delete;
-    NLPacketList& operator=(const NLPacketList& other) = delete;
 
     virtual std::unique_ptr<udt::Packet> createPacket() override;
 

libraries/networking/src/NetworkPeer.h

@@ -16,6 +16,7 @@
 #include <atomic>
 
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QTimer>
 #include <QtCore/QUuid>
 

libraries/networking/src/Node.h

@@ -109,9 +109,7 @@ public:
     float getOutboundKbps() const;
 
 private:
-    // privatize copy and assignment operator to disallow Node copying
+    Q_DISABLE_COPY(Node)
-    Node(const Node &otherNode);
-    Node& operator=(Node otherNode);
 
     NodeType_t _type;
 

libraries/networking/src/NodeData.h

@@ -14,7 +14,6 @@
 
 #include <QtCore/QMutex>
 #include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
 
 #include "NetworkPeer.h"
 #include "NLPacket.h"

libraries/networking/src/NodeList.h

@@ -156,12 +156,11 @@ private slots:
     void maybeSendIgnoreSetToNode(SharedNodePointer node);
 
 private:
+    Q_DISABLE_COPY(NodeList)
     NodeList() : LimitedNodeList(INVALID_PORT, INVALID_PORT) { 
         assert(false);  // Not implemented, needed for DependencyManager templates compile
     }
     NodeList(char ownerType, int socketListenPort = INVALID_PORT, int dtlsListenPort = INVALID_PORT);
-    NodeList(NodeList const&) = delete; // Don't implement, needed to avoid copies of singleton
-    void operator=(NodeList const&) = delete; // Don't implement, needed to avoid copies of singleton
 
     void processDomainServerAuthRequest(const QByteArray& packet);
     void requestAuthForDomainServer();

libraries/networking/src/ReceivedMessage.cpp

@@ -15,8 +15,6 @@
 #include <algorithm>
 #include <chrono>
 
-#include "QSharedPointer"
-
 int receivedMessageMetaTypeId = qRegisterMetaType<ReceivedMessage*>("ReceivedMessage*");
 int sharedPtrReceivedMessageMetaTypeId = qRegisterMetaType<QSharedPointer<ReceivedMessage>>("QSharedPointer<ReceivedMessage>");
 

libraries/networking/src/ReceivedMessage.h

@@ -15,6 +15,7 @@
 
 #include <QByteArray>
 #include <QObject>
+#include <QtCore/QSharedPointer>
 
 #include <atomic>
 

libraries/networking/src/ReceivedPacketProcessor.h

@@ -12,6 +12,7 @@
 #ifndef hifi_ReceivedPacketProcessor_h
 #define hifi_ReceivedPacketProcessor_h
 
+#include <QtCore/QSharedPointer>
 #include <QWaitCondition>
 
 #include "NodeList.h"

libraries/networking/src/udt/CongestionControl.h

@@ -64,8 +64,7 @@ protected:
     SequenceNumber _sendCurrSeqNum; // current maximum seq num sent out
     
 private:
-    CongestionControl(const CongestionControl& other) = delete;
+    Q_DISABLE_COPY(CongestionControl);
-    CongestionControl& operator=(const CongestionControl& other) = delete;
 };
     
     

libraries/networking/src/udt/ControlPacket.h

@@ -48,13 +48,12 @@ public:
     void setType(Type type);
     
 private:
+    Q_DISABLE_COPY(ControlPacket)
     ControlPacket(Type type, qint64 size = -1);
     ControlPacket(std::unique_ptr<char[]> data, qint64 size, const SockAddr& senderSockAddr);
     ControlPacket(ControlPacket&& other);
-    ControlPacket(const ControlPacket& other) = delete;
     
     ControlPacket& operator=(ControlPacket&& other);
-    ControlPacket& operator=(const ControlPacket& other) = delete;
     
     // Header read/write
     void readType();

libraries/networking/src/udt/PacketList.h

@@ -84,9 +84,8 @@ private:
     friend class PacketQueue;
     friend class SendQueue;
     friend class Socket;
-    
+
-    PacketList(const PacketList& other) = delete;
+    Q_DISABLE_COPY(PacketList)
-    PacketList& operator=(const PacketList& other) = delete;
     
     // Takes the first packet of the list and returns it.
     template<typename T> std::unique_ptr<T> takeFront();