PAL11563: Naming Policy. Suppress renaming to blank names.

This commit is contained in:
jfa 2006-02-20 11:53:55 +00:00
parent d1f28a061f
commit c266b7d970

View File

@ -83,13 +83,14 @@
#include "SalomeApp_Study.h" #include "SalomeApp_Study.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"
#include "SalomeApp_CheckFileDlg.h" #include "SalomeApp_CheckFileDlg.h"
#include "SalomeApp_ImportOperation.h"
#include "LightApp_DataOwner.h" #include "LightApp_DataOwner.h"
#include "LightApp_Preferences.h" #include "LightApp_Preferences.h"
#include "LightApp_VTKSelector.h" #include "LightApp_VTKSelector.h"
#include "LightApp_Operation.h" #include "LightApp_Operation.h"
#include "LightApp_UpdateFlags.h" #include "LightApp_UpdateFlags.h"
#include "LightApp_NameDlg.h"
#include "SalomeApp_ImportOperation.h"
#include <SVTK_ViewWindow.h> #include <SVTK_ViewWindow.h>
#include <SVTK_ViewModel.h> #include <SVTK_ViewModel.h>
@ -125,7 +126,6 @@
#include <qstring.h> #include <qstring.h>
#include <qwidget.h> #include <qwidget.h>
#include <qaction.h> #include <qaction.h>
#include <qinputdialog.h>
// BOOST Includes // BOOST Includes
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
@ -1762,10 +1762,8 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
{ {
aName = anAttr; aName = anAttr;
QString newName = QString(aName->Value().c_str()); QString newName = QString(aName->Value().c_str());
bool ok; newName = LightApp_NameDlg::getName(desktop(), newName);
newName = QInputDialog::getText( tr( "Rename" ), tr( "Enter new name:" ), QLineEdit::Normal, if ( !newName.isEmpty() )
newName, &ok, desktop() );
if ( ok && !newName.isEmpty() )
{ {
//old source: aStudy->renameIObject( IObject, newName ); //old source: aStudy->renameIObject( IObject, newName );
aName->SetValue( newName.latin1() ); aName->SetValue( newName.latin1() );