소스 검색

Remove ctkColorDialog warnings when not using nameSignal

If not provided, the nameSignal property is const char* 0. It is a valid
QVariant, but it can't be used to connect/disconnect.
Julien Finet 12 년 전
부모
커밋
75287ac036
1개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 4
      Libs/Widgets/ctkColorDialog.cpp

+ 4 - 4
Libs/Widgets/ctkColorDialog.cpp

@@ -151,12 +151,12 @@ QColor ctkColorDialog::getColor(const QColor &initial, QWidget *parent, const QS
   foreach(QWidget* tab, ctkColorDialog::DefaultTabs)
     {
     dlg.insertTab(tab->property("tabIndex").toInt(), tab, tab->windowTitle());
-    if (tab->property("colorSignal").isValid())
+    if (!tab->property("colorSignal").isNull())
       {
       QObject::connect(tab, tab->property("colorSignal").toString().toLatin1(),
                        &dlg, SLOT(setColor(QColor)));
       }
-    if (tab->property("nameSignal").isValid())
+    if (!tab->property("nameSignal").isNull())
       {
       QObject::connect(tab, tab->property("nameSignal").toString().toLatin1(),
                        &dlg, SLOT(setColorName(QString)));
@@ -167,12 +167,12 @@ QColor ctkColorDialog::getColor(const QColor &initial, QWidget *parent, const QS
   foreach(QWidget* tab, ctkColorDialog::DefaultTabs)
     {
     dlg.removeTab(dlg.indexOf(tab));
-    if (tab->property("colorSignal").isValid())
+    if (!tab->property("colorSignal").isNull())
       {
       QObject::disconnect(tab, tab->property("colorSignal").toString().toLatin1(),
                           &dlg, SLOT(setColor(QColor)));
       }
-    if (tab->property("nameSignal").isValid())
+    if (!tab->property("nameSignal").isNull())
       {
       QObject::disconnect(tab, tab->property("nameSignal").toString().toLatin1(),
                           &dlg, SLOT(setColorName(QString)));