X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fprop%2Fstring.cpp;h=a488e89a3b1fd5d7e30dd615e619ee248f8d908b;hb=c063290ac7189bdd15221450f598504f43286b43;hp=37efc148255848be1103e8cb5beca9ea48485c20;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;p=pulseview.git
diff --git a/pv/prop/string.cpp b/pv/prop/string.cpp
index 37efc14..a488e89 100644
--- a/pv/prop/string.cpp
+++ b/pv/prop/string.cpp
@@ -14,16 +14,19 @@
* 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 .
*/
-#include
+#include
#include
#include
-#include "string.h"
+#include "string.hpp"
+
+using std::string;
+
+using Glib::ustring;
namespace pv {
namespace prop {
@@ -32,40 +35,44 @@ String::String(QString name,
Getter getter,
Setter setter) :
Property(name, getter, setter),
- _line_edit(NULL)
+ line_edit_(nullptr)
{
}
QWidget* String::get_widget(QWidget *parent, bool auto_commit)
{
- if (_line_edit)
- return _line_edit;
+ if (line_edit_)
+ return line_edit_;
+
+ if (!getter_)
+ return nullptr;
+
+ Glib::VariantBase variant = getter_();
+ if (!variant.gobj())
+ return nullptr;
- _line_edit = new QLineEdit(parent);
+ string value = Glib::VariantBase::cast_dynamic>(
+ variant).get();
- GVariant *const value = _getter ? _getter() : NULL;
- if (value) {
- _line_edit->setText(QString::fromUtf8(
- g_variant_get_string(value, NULL)));
- g_variant_unref(value);
- }
+ line_edit_ = new QLineEdit(parent);
+ line_edit_->setText(QString::fromStdString(value));
if (auto_commit)
- connect(_line_edit, SIGNAL(textEdited(const QString&)),
+ connect(line_edit_, SIGNAL(textEdited(const QString&)),
this, SLOT(on_text_edited(const QString&)));
- return _line_edit;
+ return line_edit_;
}
void String::commit()
{
- assert(_setter);
+ assert(setter_);
- if (!_line_edit)
+ if (!line_edit_)
return;
- QByteArray ba = _line_edit->text().toLocal8Bit();
- _setter(g_variant_new_string(ba.data()));
+ QByteArray ba = line_edit_->text().toLocal8Bit();
+ setter_(Glib::Variant::create(ba.data()));
}
void String::on_text_edited(const QString&)