summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2019-07-03 14:06:09 +0200
committerAlbert Astals Cid <aacid@kde.org>2019-07-03 14:06:09 +0200
commitcf629d6f829d1371b86fc654891ca83533b0542e (patch)
treeb8e4043aea62de75fa834fd303be48dbd6ae0581
parent4ed864b2c412a3f887973c2873104169909bec1b (diff)
QString::null is deprecated, use QString()
-rw-r--r--qt5/src/poppler-page.cc2
-rw-r--r--qt5/src/poppler-qt5.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
index 4676dcd8..bf1f8889 100644
--- a/qt5/src/poppler-page.cc
+++ b/qt5/src/poppler-page.cc
@@ -211,7 +211,7 @@ Link* PageData::convertLinkActionToLink(::LinkAction * a, DocumentData *parentDo
LinkGoTo * g = (LinkGoTo *) a;
const LinkDestinationData ldd( g->getDest(), g->getNamedDest(), parentDoc, false );
// create link: no ext file, namedDest, object pointer
- popplerLink = new LinkGoto( linkArea, QString::null, LinkDestination( ldd ) );
+ popplerLink = new LinkGoto( linkArea, QString(), LinkDestination( ldd ) );
}
break;
diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h
index c03fec15..ebbc456a 100644
--- a/qt5/src/poppler-qt5.h
+++ b/qt5/src/poppler-qt5.h
@@ -1,7 +1,7 @@
/* poppler-qt.h: qt interface to poppler
* Copyright (C) 2005, Net Integration Technologies, Inc.
* Copyright (C) 2005, 2007, Brad Hards <bradh@frogmouth.net>
- * Copyright (C) 2005-2015, 2017, 2018, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2005-2015, 2017-2019, Albert Astals Cid <aacid@kde.org>
* Copyright (C) 2005, Stefan Kebekus <stefan.kebekus@math.uni-koeln.de>
* Copyright (C) 2006-2011, Pino Toscano <pino@kde.org>
* Copyright (C) 2009 Shawn Rutledge <shawn.t.rutledge@gmail.com>
@@ -205,7 +205,7 @@ namespace Poppler {
~FontInfo();
/**
- The name of the font. Can be QString::null if the font has no name
+ The name of the font. Can be a null QString if the font has no name
*/
QString name() const;