Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
introduction of penta18 in VTK viewer
[modules/gui.git]
/
src
/
Qtx
/
QtxComboBox.h
diff --git
a/src/Qtx/QtxComboBox.h
b/src/Qtx/QtxComboBox.h
index 240bcc7b703bec9f65085b79636413ecb20e5ef0..52f1595420dda8868d4d3753b437ed5920e20170 100755
(executable)
--- a/
src/Qtx/QtxComboBox.h
+++ b/
src/Qtx/QtxComboBox.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-49,17
+49,19
@@
public:
bool isCleared() const;
void setCleared( const bool );
bool isCleared() const;
void setCleared( const bool );
-
int
currentId() const;
- void setCurrentId(
int
);
+
QVariant
currentId() const;
+ void setCurrentId(
const QVariant&
);
-
int
id( const int ) const;
- int index( const
int
) const;
+
QVariant
id( const int ) const;
+ int index( const
QVariant&
) const;
bool hasId( const int ) const;
bool hasId( const int ) const;
- void setId( const int, const
int
);
+ void setId( const int, const
QVariant&
);
signals:
signals:
+ void activatedId( QVariant );
void activatedId( int );
void activatedId( int );
+ void activatedId( QString );
private slots:
void onCurrentChanged( int );
private slots:
void onCurrentChanged( int );