Commit a1f83f0c authored by Jonathan Marten's avatar Jonathan Marten
Browse files

Port deprecated QString::null -> QString()

parent ed714881
......@@ -610,7 +610,7 @@ QString Parser::Event::nsprefix(const QString &s) const
return (*it2);
++it2;
}
return QString::null;
return QString();
}
QString Parser::Event::namespaceURI() const
......
......@@ -45,7 +45,7 @@ namespace XMPP
int type() const;
// for document open
QString nsprefix(const QString &s=QString::null) const;
QString nsprefix(const QString &s=QString()) const;
// for document open / close
QString namespaceURI() const;
......
......@@ -48,8 +48,8 @@ namespace XMPP
inline FTThumbnail() : width(0), height(0) {}
// data - for outgoing it's actual image data. for incoming - cid
inline FTThumbnail(const QByteArray &data,
const QString &mimeType = QString::null,
quint32 width = 0, quint32 height = 0) :
const QString &mimeType = QString(),
quint32 width = 0, quint32 height = 0) :
data(data), mimeType(mimeType),
width(width), height(height) { }
inline bool isNull() const { return data.isNull(); }
......
......@@ -113,7 +113,7 @@ namespace XMPP
void setFeatures(const Features& f);
const Features& features() const;
DiscoItem makeDiscoResult(const QString &node = QString::null) const;
DiscoItem makeDiscoResult(const QString &node = QString()) const;
S5BManager *s5bManager() const;
IBBManager *ibbManager() const;
......
......@@ -41,7 +41,7 @@ namespace XMPP
// Allow retreive result from cache and update cache on finish with new data
void setAllowCache(bool allow = true);
void get(const Jid &, const QString &node = QString::null, const DiscoItem::Identity = DiscoItem::Identity());
void get(const Jid &, const QString &node = QString(), const DiscoItem::Identity = DiscoItem::Identity());
void get(const DiscoItem &);
const DiscoItem &item() const;
......
......@@ -338,8 +338,6 @@ QString DiscoItem::action2string(Action a)
s = "update";
else if ( a == Remove )
s = "remove";
else
s = QString::null;
return s;
}
......
......@@ -67,7 +67,7 @@ namespace XMPP {
inline Identity() {}
inline Identity(const QString &categoty, const QString &type,
const QString &lang = QString::null, const QString &name = QString::null) :
const QString &lang = QString(), const QString &name = QString()) :
category(categoty), type(type), lang(lang), name(name) {}
bool operator==(const Identity &other) const;
};
......
......@@ -40,7 +40,7 @@ namespace XMPP
static const QCryptographicHash::Algorithm invalidAlgo = (QCryptographicHash::Algorithm)255;
CapsSpec();
CapsSpec(const QString& node, QCryptographicHash::Algorithm hashAlgo, const QString& ver = QString::null);
CapsSpec(const QString& node, QCryptographicHash::Algorithm hashAlgo, const QString& ver = QString());
CapsSpec(const DiscoItem &disco, QCryptographicHash::Algorithm hashAlgo = QCryptographicHash::Sha1);
bool isValid() const;
......
......@@ -394,7 +394,7 @@ namespace XMPP
JT_DiscoItems(Task *);
~JT_DiscoItems();
void get(const Jid &, const QString &node = QString::null);
void get(const Jid &, const QString &node = QString());
void get(const DiscoItem &);
const DiscoList &items() const;
......
......@@ -205,7 +205,7 @@ void XData::Field::fromXml(const QDomElement &e)
_type = Field_TextSingle;
_required = false;
_desc = QString::null;
_desc.clear();
_options.clear();
_value.clear();
......
......@@ -328,7 +328,7 @@ QString subTagText(const QDomElement &e, const QString &name)
QDomElement i = e.firstChildElement(name);
if ( !i.isNull() )
return i.text();
return QString::null;
return QString();
}
QDomElement textTag(QDomDocument &doc, const QString &name, const QString &content)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment