diff --git a/assignment-client/src/audio/AvatarAudioStream.h b/assignment-client/src/audio/AvatarAudioStream.h index de9577099e..e445dafa5c 100644 --- a/assignment-client/src/audio/AvatarAudioStream.h +++ b/assignment-client/src/audio/AvatarAudioStream.h @@ -23,9 +23,7 @@ public: AvatarAudioStream(bool isStereo, int numStaticJitterFrames = -1); private: - // disallow copying of AvatarAudioStream objects - AvatarAudioStream(const AvatarAudioStream&); - AvatarAudioStream& operator= (const AvatarAudioStream&); + Q_DISABLE_COPY(AvatarAudioStream) int parseStreamProperties(PacketType type, const QByteArray& packetAfterSeqNum, int& numAudioSamples) override; }; diff --git a/interface/src/avatar/MyHead.h b/interface/src/avatar/MyHead.h index c999311b80..31543ccf5c 100644 --- a/interface/src/avatar/MyHead.h +++ b/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 - MyHead(const Head&); - MyHead& operator= (const MyHead&); + Q_DISABLE_COPY(MyHead) }; #endif // hifi_MyHead_h diff --git a/libraries/animation/src/AnimNodeLoader.h b/libraries/animation/src/AnimNodeLoader.h index 3e644bc3f8..ac27402cf7 100644 --- a/libraries/animation/src/AnimNodeLoader.h +++ b/libraries/animation/src/AnimNodeLoader.h @@ -45,10 +45,7 @@ protected: QSharedPointer _resource; private: - - // no copies - AnimNodeLoader(const AnimNodeLoader&) = delete; - AnimNodeLoader& operator=(const AnimNodeLoader&) = delete; + Q_DISABLE_COPY(AnimNodeLoader) }; #endif // hifi_AnimNodeLoader diff --git a/libraries/animation/src/AnimRandomSwitch.h b/libraries/animation/src/AnimRandomSwitch.h index 490e2f86e1..a047be732d 100644 --- a/libraries/animation/src/AnimRandomSwitch.h +++ b/libraries/animation/src/AnimRandomSwitch.h @@ -120,9 +120,7 @@ protected: std::vector _transitions; private: - // no copies - RandomSwitchState(const RandomSwitchState&) = delete; - RandomSwitchState& operator=(const RandomSwitchState&) = delete; + Q_DISABLE_COPY(RandomSwitchState) }; public: @@ -181,9 +179,7 @@ protected: QString _lastPlayedState; private: - // no copies - AnimRandomSwitch(const AnimRandomSwitch&) = delete; - AnimRandomSwitch& operator=(const AnimRandomSwitch&) = delete; + Q_DISABLE_COPY(AnimRandomSwitch) }; #endif // hifi_AnimRandomSwitch_h diff --git a/libraries/animation/src/AnimStateMachine.h b/libraries/animation/src/AnimStateMachine.h index 3998f7e9ef..0a34fc4ebc 100644 --- a/libraries/animation/src/AnimStateMachine.h +++ b/libraries/animation/src/AnimStateMachine.h @@ -107,9 +107,7 @@ protected: std::vector _transitions; private: - // no copies - State(const State&) = delete; - State& operator=(const State&) = delete; + Q_DISABLE_COPY(State) }; public: @@ -152,9 +150,7 @@ protected: QString _currentStateVar; private: - // no copies - AnimStateMachine(const AnimStateMachine&) = delete; - AnimStateMachine& operator=(const AnimStateMachine&) = delete; + Q_DISABLE_COPY(AnimStateMachine) }; #endif // hifi_AnimStateMachine_h diff --git a/libraries/audio/src/AudioInjectorManager.h b/libraries/audio/src/AudioInjectorManager.h index cb243f23de..8fac2b37f2 100644 --- a/libraries/audio/src/AudioInjectorManager.h +++ b/libraries/audio/src/AudioInjectorManager.h @@ -72,8 +72,7 @@ private: bool wouldExceedLimits(); AudioInjectorManager() { createThread(); } - AudioInjectorManager(const AudioInjectorManager&) = delete; - AudioInjectorManager& operator=(const AudioInjectorManager&) = delete; + Q_DISABLE_COPY(AudioInjectorManager) void createThread(); diff --git a/libraries/audio/src/InjectedAudioStream.h b/libraries/audio/src/InjectedAudioStream.h index 990ea81272..467c499fa6 100644 --- a/libraries/audio/src/InjectedAudioStream.h +++ b/libraries/audio/src/InjectedAudioStream.h @@ -28,9 +28,7 @@ public: virtual const QUuid& getStreamIdentifier() const override { return _streamIdentifier; } private: - // disallow copying of InjectedAudioStream objects - InjectedAudioStream(const InjectedAudioStream&); - InjectedAudioStream& operator= (const InjectedAudioStream&); + Q_DISABLE_COPY(InjectedAudioStream) AudioStreamStats getAudioStreamStats() const override; int parseStreamProperties(PacketType type, const QByteArray& packetAfterSeqNum, int& numAudioSamples) override; diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index e17ba8f09d..70f20caa26 100755 --- a/libraries/avatars/src/AvatarData.h +++ b/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*) diff --git a/libraries/avatars/src/HeadData.h b/libraries/avatars/src/HeadData.h index af71fd883d..3ab756ce42 100644 --- a/libraries/avatars/src/HeadData.h +++ b/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 - HeadData(const HeadData&); - HeadData& operator= (const HeadData&); + Q_DISABLE_COPY(HeadData) void setHeadOrientation(const glm::quat& orientation); }; diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h index dda90d0833..bd318e3af5 100644 --- a/libraries/networking/src/AccountManager.h +++ b/libraries/networking/src/AccountManager.h @@ -163,8 +163,7 @@ private slots: void postAccountSettingsError(QNetworkReply::NetworkError error); private: - AccountManager(AccountManager const& other) = delete; - void operator=(AccountManager const& other) = delete; + Q_DISABLE_COPY(AccountManager); void persistAccountToFile(); diff --git a/libraries/networking/src/NLPacketList.h b/libraries/networking/src/NLPacketList.h index bfb6062a1c..d463f43af8 100644 --- a/libraries/networking/src/NLPacketList.h +++ b/libraries/networking/src/NLPacketList.h @@ -28,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 createPacket() override; diff --git a/libraries/networking/src/Node.h b/libraries/networking/src/Node.h index cf2f081da6..70473c678c 100644 --- a/libraries/networking/src/Node.h +++ b/libraries/networking/src/Node.h @@ -109,9 +109,7 @@ public: float getOutboundKbps() const; private: - // privatize copy and assignment operator to disallow Node copying - Node(const Node &otherNode); - Node& operator=(Node otherNode); + Q_DISABLE_COPY(Node) NodeType_t _type; diff --git a/libraries/networking/src/NodeList.h b/libraries/networking/src/NodeList.h index fa6781c4bd..a09ee168ce 100644 --- a/libraries/networking/src/NodeList.h +++ b/libraries/networking/src/NodeList.h @@ -156,10 +156,9 @@ 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(); diff --git a/libraries/networking/src/udt/CongestionControl.h b/libraries/networking/src/udt/CongestionControl.h index bfe7f552d1..f52e646124 100644 --- a/libraries/networking/src/udt/CongestionControl.h +++ b/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; - CongestionControl& operator=(const CongestionControl& other) = delete; + Q_DISABLE_COPY(CongestionControl); }; diff --git a/libraries/networking/src/udt/ControlPacket.h b/libraries/networking/src/udt/ControlPacket.h index 772df41455..d47f05062b 100644 --- a/libraries/networking/src/udt/ControlPacket.h +++ b/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 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(); diff --git a/libraries/networking/src/udt/PacketList.h b/libraries/networking/src/udt/PacketList.h index af2adf1ddb..f8e3c54d04 100644 --- a/libraries/networking/src/udt/PacketList.h +++ b/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; - PacketList& operator=(const PacketList& other) = delete; + + Q_DISABLE_COPY(PacketList) // Takes the first packet of the list and returns it. template std::unique_ptr takeFront(); diff --git a/libraries/networking/src/udt/SendQueue.h b/libraries/networking/src/udt/SendQueue.h index ef3ad8bd16..bd75cbbb7f 100644 --- a/libraries/networking/src/udt/SendQueue.h +++ b/libraries/networking/src/udt/SendQueue.h @@ -90,10 +90,9 @@ private slots: void run(); private: + Q_DISABLE_COPY_MOVE(SendQueue) SendQueue(Socket* socket, SockAddr dest, SequenceNumber currentSequenceNumber, MessageNumber currentMessageNumber, bool hasReceivedHandshakeACK); - SendQueue(SendQueue& other) = delete; - SendQueue(SendQueue&& other) = delete; void sendHandshake(); diff --git a/libraries/shaders/src/shaders/Shaders.h b/libraries/shaders/src/shaders/Shaders.h index 701695c3a8..99060aca29 100644 --- a/libraries/shaders/src/shaders/Shaders.h +++ b/libraries/shaders/src/shaders/Shaders.h @@ -155,8 +155,8 @@ struct Source { static const Source& get(uint32_t shaderId); private: - // Disallow copy construction and assignment - Source(const Source& other) = default; + // Disallow copy construction + Source(const Source& other) = delete; static Source::Pointer loadSource(uint32_t shaderId) ; diff --git a/libraries/ui/src/VrMenu.cpp b/libraries/ui/src/VrMenu.cpp index 867302d955..8003337eac 100644 --- a/libraries/ui/src/VrMenu.cpp +++ b/libraries/ui/src/VrMenu.cpp @@ -141,7 +141,7 @@ public: } private: - MenuUserData(const MenuUserData&); + Q_DISABLE_COPY(MenuUserData); QMetaObject::Connection _shutdownConnection; QMetaObject::Connection _changedConnection;