X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fprop%2Fenum.hpp;h=b3ce26cc488ad73d99f845c3f5ba57b77697f9d7;hb=15a69e5484a26428d7540cf644300cd707a31104;hp=7b7fcc5dc73329a7e0289276762f48959066c789;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git
diff --git a/pv/prop/enum.hpp b/pv/prop/enum.hpp
index 7b7fcc5..b3ce26c 100644
--- a/pv/prop/enum.hpp
+++ b/pv/prop/enum.hpp
@@ -14,12 +14,11 @@
* 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 .
*/
-#ifndef PULSEVIEW_PV_PROP_ENUM_H
-#define PULSEVIEW_PV_PROP_ENUM_H
+#ifndef PULSEVIEW_PV_PROP_ENUM_HPP
+#define PULSEVIEW_PV_PROP_ENUM_HPP
#include
#include
@@ -28,6 +27,9 @@
#include
+using std::pair;
+using std::vector;
+
Q_DECLARE_METATYPE(Glib::VariantBase);
class QComboBox;
@@ -40,10 +42,10 @@ class Enum : public Property
Q_OBJECT;
public:
- Enum(QString name, std::vector > values,
+ Enum(QString name, vector > values,
Getter getter, Setter setter);
- virtual ~Enum();
+ virtual ~Enum() = default;
QWidget* get_widget(QWidget *parent, bool auto_commit);
@@ -53,7 +55,7 @@ private Q_SLOTS:
void on_current_item_changed(int);
private:
- const std::vector< std::pair > values_;
+ const vector< pair > values_;
QComboBox *selector_;
};
@@ -61,4 +63,4 @@ private:
} // prop
} // pv
-#endif // PULSEVIEW_PV_PROP_ENUM_H
+#endif // PULSEVIEW_PV_PROP_ENUM_HPP