X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fprop%2Fstring.cpp;h=a488e89a3b1fd5d7e30dd615e619ee248f8d908b;hb=1887da2169397774c9563e9bf44c51ed7efc3646;hp=ebad62ba03510f8b8213c272b17d6cf462b77c51;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;p=pulseview.git
diff --git a/pv/prop/string.cpp b/pv/prop/string.cpp
index ebad62b..a488e89 100644
--- a/pv/prop/string.cpp
+++ b/pv/prop/string.cpp
@@ -14,16 +14,15 @@
* 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;
@@ -36,7 +35,7 @@ String::String(QString name,
Getter getter,
Setter setter) :
Property(name, getter, setter),
- line_edit_(NULL)
+ line_edit_(nullptr)
{
}
@@ -46,11 +45,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();