mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-11-15 01:58:36 +05:00
Fix compilation problems on Win32 Platform:
- double value name in one scope
This commit is contained in:
parent
bd7c31d320
commit
23e3b1b978
@ -32,7 +32,7 @@
|
|||||||
#include <qlayout.h>
|
#include <qlayout.h>
|
||||||
#include <qmessagebox.h>
|
#include <qmessagebox.h>
|
||||||
#include <SUIT_MessageBox.h>
|
#include <SUIT_MessageBox.h>
|
||||||
|
|
||||||
static bool isEntryLess( const QString& e1, const QString& e2 )
|
static bool isEntryLess( const QString& e1, const QString& e2 )
|
||||||
{
|
{
|
||||||
QStringList el1 = QStringList::split(":", e1);
|
QStringList el1 = QStringList::split(":", e1);
|
||||||
@ -50,14 +50,14 @@ static bool isEntryLess( const QString& e1, const QString& e2 )
|
|||||||
static QStringList objectsToNames( const QMap<QString, QString>& objects )
|
static QStringList objectsToNames( const QMap<QString, QString>& objects )
|
||||||
{
|
{
|
||||||
QStringList entries;
|
QStringList entries;
|
||||||
for ( QMap<QString, QString>::ConstIterator it = objects.begin(); it != objects.end(); ++it ) {
|
for ( QMap<QString, QString>::ConstIterator cit = objects.begin(); cit != objects.end(); ++cit ) {
|
||||||
QString entry = it.key();
|
QString entry = cit.key();
|
||||||
QStringList::Iterator it;
|
QStringList::Iterator it;
|
||||||
bool added = false;
|
bool added = false;
|
||||||
for ( it = entries.begin(); it != entries.end() && !added; ++it ) {
|
for ( it = entries.begin(); it != entries.end() && !added; ++it ) {
|
||||||
if ( isEntryLess( entry, *it ) ) {
|
if ( isEntryLess( entry, *it ) ) {
|
||||||
entries.insert( it, entry );
|
entries.insert( it, entry );
|
||||||
added = true;
|
added = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ( !added )
|
if ( !added )
|
||||||
@ -73,13 +73,13 @@ static QStringList objectsToNames( const QMap<QString, QString>& objects )
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\brief Constructor.
|
\brief Constructor.
|
||||||
\param parent parent widget
|
\param parent parent widget
|
||||||
*/
|
*/
|
||||||
GEOMToolsGUI_DeleteDlg::GEOMToolsGUI_DeleteDlg( QWidget* parent,
|
GEOMToolsGUI_DeleteDlg::GEOMToolsGUI_DeleteDlg( QWidget* parent,
|
||||||
const QMap<QString, QString>& objects,
|
const QMap<QString, QString>& objects,
|
||||||
bool deleteAll )
|
bool deleteAll )
|
||||||
: QDialog( parent, "GEOMToolsGUI_DeleteDlg", true )
|
: QDialog( parent, "GEOMToolsGUI_DeleteDlg", true )
|
||||||
{
|
{
|
||||||
setCaption( tr( "GEOM_DELETE_OBJECTS" ) );
|
setCaption( tr( "GEOM_DELETE_OBJECTS" ) );
|
||||||
setSizeGripEnabled( true );
|
setSizeGripEnabled( true );
|
||||||
|
Loading…
Reference in New Issue
Block a user