Просмотр исходного кода

Fix different compilation warnings

Unused variable warnings and sign-promo warnings
Add more documentation to ctkToolTipTrapper
Julien Finet лет назад: 14
Родитель
Сommit
5871fea397

+ 1 - 0
Libs/Visualization/VTK/Widgets/ctkVTKDataSetModel.cpp

@@ -319,6 +319,7 @@ void ctkVTKDataSetModel::updateArrayFromItem(vtkDataArray* dataArray, QStandardI
 //------------------------------------------------------------------------------
 void ctkVTKDataSetModel::onDataSetModified(vtkObject* dataSet)
 {
+  Q_UNUSED(dataSet);
   this->updateDataSet();
 }
 

+ 0 - 1
Libs/Visualization/VTK/Widgets/ctkVTKSurfaceMaterialPropertyWidget.cpp

@@ -65,7 +65,6 @@ ctkVTKSurfaceMaterialPropertyWidget::ctkVTKSurfaceMaterialPropertyWidget(vtkProp
   : Superclass(parentWidget)
   , d_ptr(new ctkVTKSurfaceMaterialPropertyWidgetPrivate(*this))
 {
-  Q_D(ctkVTKSurfaceMaterialPropertyWidget);
   this->setProperty(property);
 }
 

+ 1 - 1
Libs/Widgets/ctkSettingsPanel.cpp

@@ -187,7 +187,7 @@ void ctkSettingsPanel::setSetting(const QString& key, const QVariant& newVal)
   if (d->Settings->status() != QSettings::NoError)
     {
     logger.warn( QString("Error %1 while writing setting %1")
-      .arg(d->Settings->status())
+      .arg(static_cast<int>(d->Settings->status()))
       .arg(key));
     }
   if (oldVal != newVal)

+ 8 - 1
Libs/Widgets/ctkToolTipTrapper.cpp

@@ -78,11 +78,18 @@ ctkToolTipTrapper::ctkToolTipTrapper(QObject * newParent)
   : Superclass(newParent)
   , d_ptr(new ctkToolTipTrapperPrivate(*this))
 {
-  Q_D(ctkToolTipTrapper);
   this->setEnabled(true);
 }
 
 //------------------------------------------------------------------------------
+ctkToolTipTrapper::ctkToolTipTrapper(bool enable, QObject * newParent)
+  : Superclass(newParent)
+  , d_ptr(new ctkToolTipTrapperPrivate(*this))
+{
+  this->setEnabled(enable);
+}
+
+//------------------------------------------------------------------------------
 ctkToolTipTrapper::~ctkToolTipTrapper()
 {
 }

+ 13 - 1
Libs/Widgets/ctkToolTipTrapper.h

@@ -66,14 +66,26 @@ class CTK_WIDGETS_EXPORT ctkToolTipTrapper : public QObject
   Q_PROPERTY( bool enabled READ isEnabled WRITE setEnabled)
 public:
   typedef QObject Superclass;
-  explicit ctkToolTipTrapper(QObject * newParent = 0);
+  /// Constructs a ToolTip trapper which is a child of objectParent
+  /// The trapper is enabled by default 
+  explicit ctkToolTipTrapper(QObject* objectParent = 0);
+  /// Constructs a ToolTip trapper which is a child of objectParent
+  /// If enable is false, the trapper doesn't install the event filter
+  explicit ctkToolTipTrapper(bool enable, QObject* objectParent = 0);
   virtual ~ctkToolTipTrapper();
 
+  /// Returns true if the eventFilter is installed and ToolTip events are
+  /// filtered
   bool isEnabled()const;
 
+  /// Automatically called when the tooltip is enabled. It prevents the
+  /// tooltips events from being processed. You shouldn't have to call
+  /// it manually.
   bool eventFilter(QObject* watched, QEvent* event);
 
 public slots:
+  /// If true, it installs the eventFilter on the application. Otherwise
+  /// it removes it.
   void setEnabled(bool enable);
 
 protected: