Browse Source

Fixes warnings.
* explicits type conversion.
* use of tr().
* removes duplicate Q_PROPERTY (regression from 70ea952)

Nicolas Vuaille 8 years ago
parent
commit
5db3f9320e
3 changed files with 2 additions and 3 deletions
  1. 1 1
      Libs/Core/ctkBackTrace.cpp
  2. 1 1
      Libs/Widgets/ctkPathLineEdit.cpp
  3. 0 1
      Libs/Widgets/ctkPathLineEdit.h

+ 1 - 1
Libs/Core/ctkBackTrace.cpp

@@ -170,7 +170,7 @@ int ctkBackTracePrivate::trace(void** array, size_t n) const
   }
 
   if (s_pfnCaptureStackBackTrace != 0) {
-    return s_pfnCaptureStackBackTrace(0, n, array, 0);
+    return s_pfnCaptureStackBackTrace(0, static_cast<ULONG>(n), array, 0);
   }
   return 0;
 }

+ 1 - 1
Libs/Widgets/ctkPathLineEdit.cpp

@@ -116,7 +116,7 @@ void ctkPathLineEditPrivate::init()
   this->BrowseButton->setText("...");
   // Don't vertically stretch the path line edit unnecessary
   this->BrowseButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Ignored));
-  this->BrowseButton->setToolTip(q->tr("Open a dialog"));
+  this->BrowseButton->setToolTip(ctkPathLineEdit::tr("Open a dialog"));
 
   QObject::connect(this->BrowseButton,SIGNAL(clicked()),
                    q, SLOT(browse()));

+ 0 - 1
Libs/Widgets/ctkPathLineEdit.h

@@ -64,7 +64,6 @@ class CTK_WIDGETS_EXPORT ctkPathLineEdit: public QWidget
   Q_FLAGS(Filters)
   Q_PROPERTY ( QString label READ label WRITE setLabel )
 
-  Q_PROPERTY ( QStringList nameFilters READ nameFilters WRITE setNameFilters)
   Q_PROPERTY ( Filters filters READ filters WRITE setFilters)
   Q_PROPERTY ( QString currentPath READ currentPath WRITE setCurrentPath USER true )
   /// Qt versions prior to 4.7.0 didn't expose QFileDialog::Options in the