Commit b3538a42 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

COMP: Fixed warnings

Change-Id: Ief3f927ce032f38ef302237dc86d08d6729018e5
parent c6d017a4
......@@ -76,6 +76,7 @@ int vtkSMChartRepresentationProxy::ReadXMLAttributes(
}
}
}
return 1;
}
//----------------------------------------------------------------------------
......
......@@ -355,6 +355,7 @@ int vtkSMChartSeriesSelectionDomain::SetDefaultValues(vtkSMProperty* property)
}
this->UpdateDefaultValues(property, false);
return 1;
}
//----------------------------------------------------------------------------
......@@ -376,7 +377,7 @@ void vtkSMChartSeriesSelectionDomain::UpdateDefaultValues(
for (unsigned int cc=0; (cc+stepSize) <= numElems; cc+=stepSize)
{
seriesNames.insert(vp->GetElement(cc)? vp->GetElement(cc) : "");
for (unsigned int kk=0; kk < stepSize; kk++)
for (int kk=0; kk < stepSize; kk++)
{
values->AddString(vp->GetElement(cc+kk));
}
......@@ -412,14 +413,14 @@ void vtkSMChartSeriesSelectionDomain::UpdateDefaultValues(
void vtkSMChartSeriesSelectionDomain::AddSeriesVisibilityDefault(
const char* name, bool value)
{
AddSeriesVisibilityDefault(name, value);
::AddSeriesVisibilityDefault(name, value);
}
//----------------------------------------------------------------------------
bool vtkSMChartSeriesSelectionDomain::GetDefaultSeriesVisibility(const char* name)
{
bool result;
if (GetSeriesVisibilityDefault(name, result))
if (::GetSeriesVisibilityDefault(name, result))
{
return result;
}
......
......@@ -950,7 +950,7 @@ void pqSeriesEditorPropertyWidget::refreshPropertiesWidgets()
pqSeriesParametersModel& model = this->Internals->Model;
QModelIndex idx = this->Internals->modelIndex(ui.SeriesTable->currentIndex());
QString key = this->Internals->Model.seriesName(idx);
QString key = model.seriesName(idx);
if (!idx.isValid() || key.isEmpty())
{
// nothing is selected, disable all properties widgets.
......
......@@ -370,7 +370,6 @@ void pqPipelineSource::setDefaultPropertyValues()
// Create any internal proxies needed by any property
// that has a vtkSMProxyListDomain.
this->createProxiesForProxyListDomains();
vtkSMProxy* proxy = this->getProxy();
this->Superclass::setDefaultPropertyValues();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment