connect(myFileName, SIGNAL(returnPressed()), this, SLOT(onReturnPressed()));
connect(myOpenBtn, SIGNAL(clicked()), this, SLOT(onBrowse()));
- connect(myListBox, SIGNAL(currentTextChanged(const QString&)),
- this, SLOT(onFilterChanged(const QString&)));
+ connect(myListBox, SIGNAL( currentItemChanged( QListWidgetItem*, QListWidgetItem* ) ),
+ this, SLOT( onFilterChanged( QListWidgetItem*, QListWidgetItem* ) ) );
connect(myAddBtn, SIGNAL(clicked()), this, SLOT(onAddBtnPressed()));
connect(myDeleteBtn, SIGNAL(clicked()), this, SLOT(onDeleteBtnPressed()));
}
if (myFileName->text() != myLibrary->GetFileName())
- myLibrary->SetFileName(myFileName->text().toLatin1().data());
+ myLibrary->SetFileName( myFileName->text().toLatin1().constData() );
bool aResult = false;
aResult = true;
} else if (myMode == EDIT || myMode == ADD_TO) {
SMESH::Filter_var aFilter = createFilter();
- if (!myLibrary->Replace(myCurrFilterName.toLatin1().data(),
- myName->text().toLatin1().data(),
+ if (!myLibrary->Replace(myCurrFilterName.toLatin1().constData(),
+ myName->text().toLatin1().constData(),
aFilter.in())) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"),
tr("ERROR_OF_EDITING"));
setFileName(fName);
- QString aName = myListBox->item(myListBox->count() - 1)->text();
+ QListWidgetItem* item = myListBox->item( myListBox->count()-1 );
+ QString aName = item ? item->text() : QString::null;
processNewLibrary();
if (myMode == ADD_TO)
if (aFilterMgr->_is_nil())
return;
- myLibrary = aFilterMgr->LoadLibrary(autoExtension(getFileName()).toLatin1().data());
+ myLibrary = aFilterMgr->LoadLibrary(autoExtension(getFileName()).toLatin1().constData());
if (myLibrary->_is_nil()) {
if (myMode == COPY_FROM) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"),
return;
} else {
myLibrary = aFilterMgr->CreateLibrary();
- myLibrary->SetFileName(getFileName().toLatin1().data());
+ myLibrary->SetFileName(getFileName().toLatin1().constData());
}
}
// name : SMESHGUI_FilterLibraryDlg::onFilterChanged
// Purpose : SLOT. Called when selected filter of library changed
//=======================================================================
-void SMESHGUI_FilterLibraryDlg::onFilterChanged(const QString& theName)
+void SMESHGUI_FilterLibraryDlg::onFilterChanged( QListWidgetItem* item, QListWidgetItem* )
{
+ QString theName = item ? item->text() : QString::null;
if (myLibrary->_is_nil())
return;
}
SMESH::Filter_var aFilter = createFilter();
- myLibrary->Replace(myCurrFilterName.toLatin1().data(),
- myName->text().toLatin1().data(),
+ myLibrary->Replace(myCurrFilterName.toLatin1().constData(),
+ myName->text().toLatin1().constData(),
aFilter);
}
// Fill table with filter parameters
- SMESH::Filter_var aFilter = myLibrary->Copy(theName.toLatin1().data());
+ SMESH::Filter_var aFilter = myLibrary->Copy(theName.toLatin1().constData());
myCurrFilterName = theName;
myCurrFilter = myListBox->currentRow();
myName->setText(theName);
myTable->Clear(myTable->GetType());
- if (!aFilter->GetCriteria(aCriteria))
+ if (CORBA::is_nil( aFilter ) || !aFilter->GetCriteria(aCriteria))
return;
for (int i = 0, n = aCriteria->length(); i < n; i++)
//=======================================================================
void SMESHGUI_FilterLibraryDlg::onReturnPressed()
{
- QString aName = myListBox->item(myListBox->count() - 1)->text();
+ QListWidgetItem* item = myListBox->item( myListBox->count()-1 );
+ QString aName = item ? item->text() : QString::null;
processNewLibrary();
{
if (!isValid(true))
return;
-
+ }
+ {
SMESH::Filter_var aFilter = createFilter();
- myLibrary->Replace(myCurrFilterName.toLatin1().data(),
- myName->text().toLatin1().data(),
+ myLibrary->Replace(myCurrFilterName.toLatin1().constData(),
+ myName->text().toLatin1().constData(),
aFilter);
}
// add new filter in library
bool aResult = !aFilter->GetPredicate()->_is_nil()
- ? myLibrary->Add(aName.toLatin1().data(), aFilter)
- : myLibrary->AddEmpty(aName.toLatin1().data(), (SMESH::ElementType)myTable->GetType());
+ ? myLibrary->Add(aName.toLatin1().constData(), aFilter)
+ : myLibrary->AddEmpty(aName.toLatin1().constData(), (SMESH::ElementType)myTable->GetType());
if (!aResult) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"),
int anIndex = getIndex(myCurrFilterName);
- if (anIndex == -1 || !myLibrary->Delete(myCurrFilterName.toLatin1().data())) {
+ if (anIndex == -1 || !myLibrary->Delete(myCurrFilterName.toLatin1().constData())) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"),
tr("ERROR_OF_DELETING"));
} else {
if (valid)
{
SMESH::Filter_var aFilter = createFilter(myTable->GetType());
- myLibrary->Replace(myCurrFilterName.toLatin1().data(),
- myName->text().toLatin1().data(),
+ myLibrary->Replace(myCurrFilterName.toLatin1().constData(),
+ myName->text().toLatin1().constData(),
aFilter);
}
}