projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move trace view files
[pulseview.git]
/
pv
/
prop
/
enum.cpp
diff --git
a/pv/prop/enum.cpp
b/pv/prop/enum.cpp
index 473e3d5f1a3ad36582a3d5c770d4793f607b6124..d5d571a9ec487396b921cdae5b45855bb7bbabde 100644
(file)
--- a/
pv/prop/enum.cpp
+++ b/
pv/prop/enum.cpp
@@
-14,15
+14,14
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
*/
-#include <
assert.h
>
+#include <
cassert
>
#include <QComboBox>
#include <QComboBox>
-#include "enum.h"
+#include "enum.h
pp
"
using std::pair;
using std::vector;
using std::pair;
using std::vector;
@@
-30,16
+29,12
@@
using std::vector;
namespace pv {
namespace prop {
namespace pv {
namespace prop {
-Enum::Enum(QString name,
+Enum::Enum(QString name,
QString desc,
vector<pair<Glib::VariantBase, QString> > values,
Getter getter, Setter setter) :
vector<pair<Glib::VariantBase, QString> > values,
Getter getter, Setter setter) :
- Property(name, getter, setter),
+ Property(name,
desc,
getter, setter),
values_(values),
values_(values),
- selector_(NULL)
-{
-}
-
-Enum::~Enum()
+ selector_(nullptr)
{
}
{
}
@@
-49,11
+44,11
@@
QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
return selector_;
if (!getter_)
return selector_;
if (!getter_)
- return
NULL
;
+ return
nullptr
;
Glib::VariantBase variant = getter_();
if (!variant.gobj())
Glib::VariantBase variant = getter_();
if (!variant.gobj())
- return
NULL
;
+ return
nullptr
;
selector_ = new QComboBox(parent);
for (unsigned int i = 0; i < values_.size(); i++) {
selector_ = new QComboBox(parent);
for (unsigned int i = 0; i < values_.size(); i++) {
@@
-89,5
+84,5
@@
void Enum::on_current_item_changed(int)
commit();
}
commit();
}
-}
//
prop
-}
//
pv
+}
// namespace
prop
+}
// namespace
pv