X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fstring.cpp;h=96a83422e0a3e2a026336845ac20c72c876e7d35;hb=ca1d6d5f466272ac7e906b589e2804b12568fa96;hp=b8ecf738630bdea67568e9781357211145215db8;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git
diff --git a/pv/prop/string.cpp b/pv/prop/string.cpp
index b8ecf73..96a8342 100644
--- a/pv/prop/string.cpp
+++ b/pv/prop/string.cpp
@@ -14,11 +14,10 @@
* 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
@@ -33,10 +32,11 @@ namespace pv {
namespace prop {
String::String(QString name,
+ QString desc,
Getter getter,
Setter setter) :
- Property(name, getter, setter),
- line_edit_(NULL)
+ Property(name, desc, getter, setter),
+ line_edit_(nullptr)
{
}
@@ -46,11 +46,11 @@ QWidget* String::get_widget(QWidget *parent, bool auto_commit)
return line_edit_;
if (!getter_)
- return NULL;
+ return nullptr;
Glib::VariantBase variant = getter_();
if (!variant.gobj())
- return NULL;
+ return nullptr;
string value = Glib::VariantBase::cast_dynamic>(
variant).get();
@@ -81,5 +81,5 @@ void String::on_text_edited(const QString&)
commit();
}
-} // prop
-} // pv
+} // namespace prop
+} // namespace pv