Browse Source

Use Q_DISABLE_COPY Qt macro everywhere in CTK

Julien Finet 12 years ago
parent
commit
84c7742bcd
31 changed files with 34 additions and 90 deletions
  1. 3 31
      Libs/DICOM/Core/ctkDcmSCU.h
  2. 1 2
      Libs/Visualization/VTK/Widgets/ctkVTKRenderViewEventPlayer.h
  3. 1 2
      Libs/Visualization/VTK/Widgets/ctkVTKRenderViewEventTranslator.h
  4. 1 2
      Libs/Widgets/ctkAxesWidgetEventPlayer.h
  5. 1 2
      Libs/Widgets/ctkAxesWidgetEventTranslator.h
  6. 1 2
      Libs/Widgets/ctkCheckableComboBoxEventPlayer.h
  7. 1 2
      Libs/Widgets/ctkCheckableComboBoxEventTranslator.h
  8. 1 2
      Libs/Widgets/ctkCheckableHeaderViewEventPlayer.h
  9. 1 2
      Libs/Widgets/ctkCheckableHeaderViewEventTranslator.h
  10. 1 2
      Libs/Widgets/ctkConsoleEventPlayer.h
  11. 2 3
      Libs/Widgets/ctkConsoleEventTranslator.h
  12. 1 1
      Libs/Widgets/ctkDoubleRangeSlider.cpp
  13. 1 2
      Libs/Widgets/ctkDoubleRangeSliderEventPlayer.h
  14. 1 2
      Libs/Widgets/ctkDoubleRangeSliderEventTranslator.h
  15. 1 2
      Libs/Widgets/ctkFileDialogEventPlayer.h
  16. 1 2
      Libs/Widgets/ctkFileDialogEventTranslator.h
  17. 1 2
      Libs/Widgets/ctkFontButtonEventPlayer.h
  18. 1 2
      Libs/Widgets/ctkFontButtonEventTranslator.h
  19. 1 2
      Libs/Widgets/ctkMatrixWidgetEventPlayer.h
  20. 1 2
      Libs/Widgets/ctkMatrixWidgetEventTranslator.h
  21. 1 2
      Libs/Widgets/ctkMenuComboBoxEventPlayer.h
  22. 1 2
      Libs/Widgets/ctkMenuComboBoxEventTranslator.h
  23. 1 2
      Libs/Widgets/ctkPathLineEditEventPlayer.h
  24. 1 2
      Libs/Widgets/ctkPathLineEditEventTranslator.h
  25. 1 2
      Libs/Widgets/ctkPopupWidgetEventPlayer.h
  26. 1 2
      Libs/Widgets/ctkPopupWidgetEventTranslator.h
  27. 1 1
      Libs/Widgets/ctkRangeSlider.cpp
  28. 1 2
      Libs/Widgets/ctkRangeSliderEventPlayer.h
  29. 1 2
      Libs/Widgets/ctkRangeSliderEventTranslator.h
  30. 1 2
      Libs/Widgets/ctkTreeComboBoxEventPlayer.h
  31. 1 2
      Libs/Widgets/ctkTreeComboBoxEventTranslator.h

+ 3 - 31
Libs/DICOM/Core/ctkDcmSCU.h

@@ -136,16 +136,7 @@ class QRResponse
   DcmDataset *m_statusDetail;
 
 private:
-
-  /** Private undefined copy constructor.
-   * @param other The find response to copy from
-   */
-  QRResponse(const QRResponse &other);
-
-  /** Private undefined assignment operator.
-   *  @param other The find response that should be assigned from
-   */
-  QRResponse &operator=(const QRResponse &other);
+  Q_DISABLE_COPY(QRResponse);
 };
 
 
@@ -190,16 +181,7 @@ public:
   Uint16 m_numberOfWarningSubops;
 
 private:
-
-  /** Private undefined copy constructor
-   *  @param other Response to copy from
-   */
-  RetrieveResponse(const RetrieveResponse &other);
-
-  /** Private undefined assignment operator
-   *  @param other Response that should be assigned from
-   */
-  RetrieveResponse &operator=(const RetrieveResponse &other);
+  Q_DISABLE_COPY(RetrieveResponse);
 };
 
 
@@ -935,17 +917,7 @@ protected:
                                       unsigned long byteCount);
 
 private:
-
-  /** Private undefined copy-constructor. Shall never be called.
-   *  @param src Source object
-   */
-  DcmSCU(const DcmSCU &src);
-
-  /** Private undefined operator=. Shall never be called.
-   *  @param src Source object
-   *  @return Reference to this
-   */
-  DcmSCU &operator=(const DcmSCU &src);
+  Q_DISABLE_COPY(DcmSCU);
 
   /// Associaton of this SCU. This class only handles 1 association at a time.
   T_ASC_Association *m_assoc;

+ 1 - 2
Libs/Visualization/VTK/Widgets/ctkVTKRenderViewEventPlayer.h

@@ -44,8 +44,7 @@ protected:
   QByteArray mClassType;
 
 private:
-  ctkVTKRenderViewEventPlayer(const ctkVTKRenderViewEventPlayer&); // NOT implemented
-  ctkVTKRenderViewEventPlayer& operator=(const ctkVTKRenderViewEventPlayer&); // NOT implemented
+  Q_DISABLE_COPY(ctkVTKRenderViewEventPlayer);
 
 };
 

+ 1 - 2
Libs/Visualization/VTK/Widgets/ctkVTKRenderViewEventTranslator.h

@@ -49,8 +49,7 @@ protected:
   QMouseEvent  lastMouseEvent;
 
 private:
-  ctkVTKRenderViewEventTranslator(const ctkVTKRenderViewEventTranslator&); // NOT implemented
-  ctkVTKRenderViewEventTranslator& operator=(const ctkVTKRenderViewEventTranslator&); // NOT implemented
+  Q_DISABLE_COPY(ctkVTKRenderViewEventTranslator);
 };
 
 #endif

+ 1 - 2
Libs/Widgets/ctkAxesWidgetEventPlayer.h

@@ -42,8 +42,7 @@ public:
   bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error);
 
 private:
-  ctkAxesWidgetEventPlayer(const ctkAxesWidgetEventPlayer&); // NOT implemented
-  ctkAxesWidgetEventPlayer& operator=(const ctkAxesWidgetEventPlayer&); // NOT implemented
+  Q_DISABLE_COPY(ctkAxesWidgetEventPlayer);
 
 };
 

+ 1 - 2
Libs/Widgets/ctkAxesWidgetEventTranslator.h

@@ -39,8 +39,7 @@ public:
   virtual bool translateEvent(QObject *Object, QEvent *Event, bool &Error);
 
 private:
-  ctkAxesWidgetEventTranslator(const ctkAxesWidgetEventTranslator&); // NOT implemented
-  ctkAxesWidgetEventTranslator& operator=(const ctkAxesWidgetEventTranslator&); // NOT implemented
+  Q_DISABLE_COPY(ctkAxesWidgetEventTranslator);
 };
 
 #endif

+ 1 - 2
Libs/Widgets/ctkCheckableComboBoxEventPlayer.h

@@ -42,8 +42,7 @@ public:
   bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error);
 
 private:
-  ctkCheckableComboBoxEventPlayer(const ctkCheckableComboBoxEventPlayer&); // NOT implemented
-  ctkCheckableComboBoxEventPlayer& operator=(const ctkCheckableComboBoxEventPlayer&); // NOT implemented
+  Q_DISABLE_COPY(ctkCheckableComboBoxEventPlayer);
 
 };
 

+ 1 - 2
Libs/Widgets/ctkCheckableComboBoxEventTranslator.h

@@ -43,8 +43,7 @@ public:
   virtual bool translateEvent(QObject *Object, QEvent *Event, bool &Error);
 
 private:
-  ctkCheckableComboBoxEventTranslator(const ctkCheckableComboBoxEventTranslator&); // NOT implemented
-  ctkCheckableComboBoxEventTranslator& operator=(const ctkCheckableComboBoxEventTranslator&); // NOT implemented
+  Q_DISABLE_COPY(ctkCheckableComboBoxEventTranslator);
 
   QObject* CurrentObject;
   QModelIndexList OldIndexList;

+ 1 - 2
Libs/Widgets/ctkCheckableHeaderViewEventPlayer.h

@@ -42,8 +42,7 @@ public:
   bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error);
 
 private:
-  ctkCheckableHeaderViewEventPlayer(const ctkCheckableHeaderViewEventPlayer&); // NOT implemented
-  ctkCheckableHeaderViewEventPlayer& operator=(const ctkCheckableHeaderViewEventPlayer&); // NOT implemented
+  Q_DISABLE_COPY(ctkCheckableHeaderViewEventPlayer);
 
 };
 

+ 1 - 2
Libs/Widgets/ctkCheckableHeaderViewEventTranslator.h

@@ -40,8 +40,7 @@ public:
   virtual bool translateEvent(QObject *Object, QEvent *Event, bool &Error);
 
 private:
-  ctkCheckableHeaderViewEventTranslator(const ctkCheckableHeaderViewEventTranslator&); // NOT implemented
-  ctkCheckableHeaderViewEventTranslator& operator=(const ctkCheckableHeaderViewEventTranslator&); // NOT implemented
+  Q_DISABLE_COPY(ctkCheckableHeaderViewEventTranslator);
 
   QObject* CurrentObject;
 

+ 1 - 2
Libs/Widgets/ctkConsoleEventPlayer.h

@@ -38,8 +38,7 @@ public:
                  const QString &Arguments, bool &Error);
 
 private:
-  ctkConsoleEventPlayer(const ctkConsoleEventPlayer&); // Not Implemented
-  ctkConsoleEventPlayer& operator=(const ctkConsoleEventPlayer&); // Not Implemented
+  Q_DISABLE_COPY(ctkConsoleEventPlayer);
 };
 
 #endif // __ctkConsoleEventPlayer_h

+ 2 - 3
Libs/Widgets/ctkConsoleEventTranslator.h

@@ -39,9 +39,8 @@ public:
 
   virtual bool translateEvent(QObject *Object, QEvent *Event, bool &Error);
 
-private :
-  ctkConsoleEventTranslator(const ctkConsoleEventTranslator&); // Not implemented
-  ctkConsoleEventTranslator& operator=(const ctkConsoleEventTranslator&); // Not implemented
+private:
+  Q_DISABLE_COPY(ctkConsoleEventTranslator);
 
   QObject* CurrentObject;
   QObject* CurrentCompleter;

+ 1 - 1
Libs/Widgets/ctkDoubleRangeSlider.cpp

@@ -63,7 +63,7 @@ public:
   double MaxValue;
 
 private:
-  ctkDoubleRangeSliderPrivate & operator=(const ctkDoubleRangeSliderPrivate &);
+  Q_DISABLE_COPY(ctkDoubleRangeSliderPrivate);
 };
 
 // --------------------------------------------------------------------------

+ 1 - 2
Libs/Widgets/ctkDoubleRangeSliderEventPlayer.h

@@ -42,8 +42,7 @@ public:
   bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error);
 
 private:
-  ctkDoubleRangeSliderEventPlayer(const ctkDoubleRangeSliderEventPlayer&); // NOT implemented
-  ctkDoubleRangeSliderEventPlayer& operator=(const ctkDoubleRangeSliderEventPlayer&); // NOT implemented
+  Q_DISABLE_COPY(ctkDoubleRangeSliderEventPlayer);
 
 };
 

+ 1 - 2
Libs/Widgets/ctkDoubleRangeSliderEventTranslator.h

@@ -41,8 +41,7 @@ public:
   virtual bool translateEvent(QObject *Object, QEvent *Event, bool &Error);
 
 private:
-  ctkDoubleRangeSliderEventTranslator(const ctkDoubleRangeSliderEventTranslator&); // NOT implemented
-  ctkDoubleRangeSliderEventTranslator& operator=(const ctkDoubleRangeSliderEventTranslator&); // NOT implemented
+  Q_DISABLE_COPY(ctkDoubleRangeSliderEventTranslator);
 
   QObject* CurrentObject;
 

+ 1 - 2
Libs/Widgets/ctkFileDialogEventPlayer.h

@@ -43,8 +43,7 @@ public:
   bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error);
 
 private:
-  ctkFileDialogEventPlayer(const ctkFileDialogEventPlayer&); // NOT implemented
-  ctkFileDialogEventPlayer& operator=(const ctkFileDialogEventPlayer&); // NOT implemented
+  Q_DISABLE_COPY(ctkFileDialogEventPlayer);
 
 };
 

+ 1 - 2
Libs/Widgets/ctkFileDialogEventTranslator.h

@@ -45,8 +45,7 @@ public:
   virtual bool translateEvent(QObject *Object, QEvent *Event, bool &Error);
 
 private:
-  ctkFileDialogEventTranslator(const ctkFileDialogEventTranslator&); // NOT implemented
-  ctkFileDialogEventTranslator& operator=(const ctkFileDialogEventTranslator&); // NOT implemented
+  Q_DISABLE_COPY(ctkFileDialogEventTranslator);
 
   QObject* CurrentObject;
 

+ 1 - 2
Libs/Widgets/ctkFontButtonEventPlayer.h

@@ -42,8 +42,7 @@ public:
   bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error);
 
 private:
-  ctkFontButtonEventPlayer(const ctkFontButtonEventPlayer&); // NOT implemented
-  ctkFontButtonEventPlayer& operator=(const ctkFontButtonEventPlayer&); // NOT implemented
+  Q_DISABLE_COPY(ctkFontButtonEventPlayer);
 
 };
 

+ 1 - 2
Libs/Widgets/ctkFontButtonEventTranslator.h

@@ -43,8 +43,7 @@ public:
   virtual bool translateEvent(QObject *Object, QEvent *Event, bool &Error);
 
 private:
-  ctkFontButtonEventTranslator(const ctkFontButtonEventTranslator&); // NOT implemented
-  ctkFontButtonEventTranslator& operator=(const ctkFontButtonEventTranslator&); // NOT implemented
+  Q_DISABLE_COPY(ctkFontButtonEventTranslator);
 
   QObject* CurrentObject;
 

+ 1 - 2
Libs/Widgets/ctkMatrixWidgetEventPlayer.h

@@ -42,8 +42,7 @@ public:
   bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error);
 
 private:
-  ctkMatrixWidgetEventPlayer(const ctkMatrixWidgetEventPlayer&); // NOT implemented
-  ctkMatrixWidgetEventPlayer& operator=(const ctkMatrixWidgetEventPlayer&); // NOT implemented
+  Q_DISABLE_COPY(ctkMatrixWidgetEventPlayer);
 
 };
 

+ 1 - 2
Libs/Widgets/ctkMatrixWidgetEventTranslator.h

@@ -41,8 +41,7 @@ public:
   virtual bool translateEvent(QObject *Object, QEvent *Event, bool &Error);
 
 private:
-  ctkMatrixWidgetEventTranslator(const ctkMatrixWidgetEventTranslator&); // NOT implemented
-  ctkMatrixWidgetEventTranslator& operator=(const ctkMatrixWidgetEventTranslator&); // NOT implemented
+  Q_DISABLE_COPY(ctkMatrixWidgetEventTranslator);
 
   QObject* CurrentObject;
 

+ 1 - 2
Libs/Widgets/ctkMenuComboBoxEventPlayer.h

@@ -42,8 +42,7 @@ public:
   bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error);
 
 private:
-  ctkMenuComboBoxEventPlayer(const ctkMenuComboBoxEventPlayer&); // NOT implemented
-  ctkMenuComboBoxEventPlayer& operator=(const ctkMenuComboBoxEventPlayer&); // NOT implemented
+  Q_DISABLE_COPY(ctkMenuComboBoxEventPlayer);
 
 };
 

+ 1 - 2
Libs/Widgets/ctkMenuComboBoxEventTranslator.h

@@ -45,8 +45,7 @@ public:
   virtual bool translateEvent(QObject *Object, QEvent *Event, bool &Error);
 
 private:
-  ctkMenuComboBoxEventTranslator(const ctkMenuComboBoxEventTranslator&); // NOT implemented
-  ctkMenuComboBoxEventTranslator& operator=(const ctkMenuComboBoxEventTranslator&); // NOT implemented
+  Q_DISABLE_COPY(ctkMenuComboBoxEventTranslator);
 
   QObject*            CurrentObject;
   QAbstractItemView*  CurrentView;

+ 1 - 2
Libs/Widgets/ctkPathLineEditEventPlayer.h

@@ -42,8 +42,7 @@ public:
   bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error);
 
 private:
-  ctkPathLineEditEventPlayer(const ctkPathLineEditEventPlayer&); // NOT implemented
-  ctkPathLineEditEventPlayer& operator=(const ctkPathLineEditEventPlayer&); // NOT implemented
+  Q_DISABLE_COPY(ctkPathLineEditEventPlayer);
 
 };
 

+ 1 - 2
Libs/Widgets/ctkPathLineEditEventTranslator.h

@@ -41,8 +41,7 @@ public:
   virtual bool translateEvent(QObject *Object, QEvent *Event, bool &Error);
 
 private:
-  ctkPathLineEditEventTranslator(const ctkPathLineEditEventTranslator&); // NOT implemented
-  ctkPathLineEditEventTranslator& operator=(const ctkPathLineEditEventTranslator&); // NOT implemented
+  Q_DISABLE_COPY(ctkPathLineEditEventTranslator);
 
   QObject* CurrentObject;
 

+ 1 - 2
Libs/Widgets/ctkPopupWidgetEventPlayer.h

@@ -42,8 +42,7 @@ public:
   bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error);
 
 private:
-  ctkPopupWidgetEventPlayer(const ctkPopupWidgetEventPlayer&); // NOT implemented
-  ctkPopupWidgetEventPlayer& operator=(const ctkPopupWidgetEventPlayer&); // NOT implemented
+  Q_DISABLE_COPY(ctkPopupWidgetEventPlayer);
 
 };
 

+ 1 - 2
Libs/Widgets/ctkPopupWidgetEventTranslator.h

@@ -41,8 +41,7 @@ public:
   virtual bool translateEvent(QObject *Object, QEvent *Event, bool &Error);
 
 private:
-  ctkPopupWidgetEventTranslator(const ctkPopupWidgetEventTranslator&); // NOT implemented
-  ctkPopupWidgetEventTranslator& operator=(const ctkPopupWidgetEventTranslator&); // NOT implemented
+  Q_DISABLE_COPY(ctkPopupWidgetEventTranslator);
 
   QObject* CurrentObject;
 

+ 1 - 1
Libs/Widgets/ctkRangeSlider.cpp

@@ -95,7 +95,7 @@ public:
   QString m_HandleToolTip;
 
 private:
-  ctkRangeSliderPrivate & operator=(const ctkRangeSliderPrivate &);
+  Q_DISABLE_COPY(ctkRangeSliderPrivate);
 };
 
 // --------------------------------------------------------------------------

+ 1 - 2
Libs/Widgets/ctkRangeSliderEventPlayer.h

@@ -42,8 +42,7 @@ public:
   bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error);
 
 private:
-  ctkRangeSliderEventPlayer(const ctkRangeSliderEventPlayer&); // NOT implemented
-  ctkRangeSliderEventPlayer& operator=(const ctkRangeSliderEventPlayer&); // NOT implemented
+  Q_DISABLE_COPY(ctkRangeSliderEventPlayer);
 
 };
 

+ 1 - 2
Libs/Widgets/ctkRangeSliderEventTranslator.h

@@ -41,8 +41,7 @@ public:
   virtual bool translateEvent(QObject *Object, QEvent *Event, bool &Error);
 
 private:
-  ctkRangeSliderEventTranslator(const ctkRangeSliderEventTranslator&); // NOT implemented
-  ctkRangeSliderEventTranslator& operator=(const ctkRangeSliderEventTranslator&); // NOT implemented
+  Q_DISABLE_COPY(ctkRangeSliderEventTranslator);
 
   QObject* CurrentObject;
 

+ 1 - 2
Libs/Widgets/ctkTreeComboBoxEventPlayer.h

@@ -42,8 +42,7 @@ public:
   bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error);
 
 private:
-  ctkTreeComboBoxEventPlayer(const ctkTreeComboBoxEventPlayer&); // NOT implemented
-  ctkTreeComboBoxEventPlayer& operator=(const ctkTreeComboBoxEventPlayer&); // NOT implemented
+  Q_DISABLE_COPY(ctkTreeComboBoxEventPlayer);
 
 };
 

+ 1 - 2
Libs/Widgets/ctkTreeComboBoxEventTranslator.h

@@ -43,8 +43,7 @@ public:
   virtual bool translateEvent(QObject *Object, QEvent *Event, bool &Error);
 
 private:
-  ctkTreeComboBoxEventTranslator(const ctkTreeComboBoxEventTranslator&); // NOT implemented
-  ctkTreeComboBoxEventTranslator& operator=(const ctkTreeComboBoxEventTranslator&); // NOT implemented
+  Q_DISABLE_COPY(ctkTreeComboBoxEventTranslator);
 
   QObject* CurrentObject;