Build fixes for Qt5 Windows/mingw/MXE support.

[pulseview.git] / pv / prop / string.cpp

diff --git a/pv/prop/string.cpp b/pv/prop/string.cpp
index ebad62ba03510f8b8213c272b17d6cf462b77c51..1cba8e4a7c2341103be17cfe7b2d214ad2aecaf7 100644 (file)
--- a/pv/prop/string.cpp
+++ b/pv/prop/string.cpp
@@ -14,8 +14,7 @@
  * 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>
@@ -23,7 +22,7 @@
 #include <QLineEdit>
 #include <QSpinBox>
 
-#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<Glib::Variant<ustring>>(
                variant).get();