ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use deprecated QString::sprintf and qVariantFromValue

pull/345/head
Michael Zanetti 2020-10-26 15:59:38 +01:00
parent a0add78af0
commit 166b16689f
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libnymea/coap/coapobserveresource.cpp
View File

@ -55,13 +55,6 @@ CoapObserveResource::CoapObserveResource(const QUrl &url, const QByteArray &toke
{
}
/*! Constructs a copy of the given \a other \l{CoapObserveResource}. */
CoapObserveResource::CoapObserveResource(const CoapObserveResource &other)
{
m_url = other.url();
m_token = other.token();
}
/*! Returns the url of this \l{CoapObserveResource}. */
QUrl CoapObserveResource::url() const
{

1
libnymea/coap/coapobserveresource.h
View File

@ -42,7 +42,6 @@ class LIBNYMEA_EXPORT CoapObserveResource
public:
CoapObserveResource();
CoapObserveResource(const QUrl &url, const QByteArray &token);
CoapObserveResource(const CoapObserveResource &other);
QUrl url() const;
QByteArray token() const;

6
server/nymeaapplication.cpp
View File

@ -76,7 +76,7 @@ static void printBacktrace()
size_t funktionNameSize = 256;
char* functionName = (char*)malloc(funktionNameSize);
for (int i = 1; i < traceLength; i++) {
QString address = QString().sprintf("%p", trace[i]);
QString address = QString::asprintf("%p", trace[i]);
QString fileName = QString(symbolList[i]);
int fileIndex = fileName.indexOf("(");
QString lineCommand = QString("addr2line %1 -e %2").arg(address).arg(fileName.left(fileIndex));
@ -110,9 +110,9 @@ static void printBacktrace()
char* ret = abi::__cxa_demangle(begin_name, functionName, &funktionNameSize, &status);
if (status == 0) {
functionName = ret;
functionString = QString(" %1").arg(QString().sprintf("%s+%s", functionName, begin_offset));
functionString = QString(" %1").arg(QString::asprintf("%s+%s", functionName, begin_offset));
} else {
functionString = QString(" %1").arg(QString().sprintf("%s()+%s", begin_name, begin_offset));
functionString = QString(" %1").arg(QString::asprintf("%s()+%s", begin_name, begin_offset));
}
}

2
tests/utils/pushbuttonagent.cpp
View File

@ -42,7 +42,7 @@ bool PushButtonAgent::init(QDBusConnection::BusType busType)
}
QDBusMessage message = QDBusMessage::createMethodCall("io.guh.nymead", "/io/guh/nymead/UserManager", "io.guh.nymead", "RegisterButtonAgent");
message << qVariantFromValue(QDBusObjectPath("/nymea/pushbuttonhandler"));
message << QVariant::fromValue(QDBusObjectPath("/nymea/pushbuttonhandler"));
QDBusMessage reply = bus.call(message);
if (!reply.errorName().isEmpty()) {
qCWarning(dcPushButtonAgent()) << "Error registering PushButton agent:" << reply.errorMessage();