at 18.09-beta 1320 lines 56 kB view raw
1diff --git c/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp i/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp 2index c4d2ebe..707dbdb 100644 3--- c/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp 4+++ i/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp 5@@ -306,7 +306,7 @@ void MediaManagerDialog::avTransportStateChanged( 6 { 7 foreach(const HAvtLastChangeInfo& info, infos) 8 { 9- if (info.propertyName().compare("TransportState", Qt::CaseInsensitive) == 0) 10+ if (info.propertyName().compare(QString("TransportState"), Qt::CaseInsensitive) == 0) 11 { 12 HTransportState state(info.value().toString()); 13 if (state.isValid()) 14diff --git c/herqq/hupnp/src/dataelements/hproduct_tokens.cpp i/herqq/hupnp/src/dataelements/hproduct_tokens.cpp 15index 40f9fda..6739a58 100644 16--- c/herqq/hupnp/src/dataelements/hproduct_tokens.cpp 17+++ i/herqq/hupnp/src/dataelements/hproduct_tokens.cpp 18@@ -99,7 +99,7 @@ bool HProductToken::isValidUpnpToken() const 19 { 20 QString vrs = version(); 21 22- return (m_token.compare("upnp", Qt::CaseInsensitive) == 0) && 23+ return (m_token.compare(QString("upnp"), Qt::CaseInsensitive) == 0) && 24 (vrs.size() == 3 && 25 (vrs[0] == '1') && 26 vrs[1] == '.' && 27@@ -110,7 +110,7 @@ bool HProductToken::isValidDlnaDocToken() const 28 { 29 QString vrs = version(); 30 31- bool b = m_token.compare("DLNADOC", Qt::CaseInsensitive) == 0 && 32+ bool b = m_token.compare(QString("DLNADOC"), Qt::CaseInsensitive) == 0 && 33 vrs.size() >= 3 && 34 vrs[0] == '1' && 35 vrs[1] == '.'; 36diff --git c/herqq/hupnp/src/dataelements/hresourcetype.cpp i/herqq/hupnp/src/dataelements/hresourcetype.cpp 37index 8ed2492..94ab1e0 100644 38--- c/herqq/hupnp/src/dataelements/hresourcetype.cpp 39+++ i/herqq/hupnp/src/dataelements/hresourcetype.cpp 40@@ -56,7 +56,7 @@ HResourceType::HResourceType(const QString& resourceTypeAsStr) : 41 { 42 return; 43 } 44- if (tmp[1].compare("schemas-upnp-org") != 0) 45+ if (tmp[1].compare(QString("schemas-upnp-org")) != 0) 46 { 47 flags = 0x01; 48 tmp[1] = tmp[1].replace('.', '-'); 49@@ -67,11 +67,11 @@ HResourceType::HResourceType(const QString& resourceTypeAsStr) : 50 } 51 52 tmp[2] = tmp[2].simplified(); 53- if (tmp[2].compare("device") == 0) 54+ if (tmp[2].compare(QString("device")) == 0) 55 { 56 flags |= 0x04; 57 } 58- else if (tmp[2].compare("service") == 0) 59+ else if (tmp[2].compare(QString("service")) == 0) 60 { 61 flags |= 0x08; 62 } 63diff --git c/herqq/hupnp/src/dataelements/hserviceid.cpp i/herqq/hupnp/src/dataelements/hserviceid.cpp 64index 9b0fad6..11a8640 100644 65--- c/herqq/hupnp/src/dataelements/hserviceid.cpp 66+++ i/herqq/hupnp/src/dataelements/hserviceid.cpp 67@@ -64,7 +64,7 @@ public: 68 return; 69 } 70 71- if (tmp[0].compare("urn", Qt::CaseInsensitive) != 0) 72+ if (tmp[0].compare(QString("urn"), Qt::CaseInsensitive) != 0) 73 { 74 HLOG_WARN_NONSTD( 75 QString("Invalid service identifier [%1]").arg(arg)); 76@@ -72,7 +72,7 @@ public: 77 return; 78 } 79 80- if (tmp[1].compare("upnp-org", Qt::CaseInsensitive) != 0) 81+ if (tmp[1].compare(QString("upnp-org"), Qt::CaseInsensitive) != 0) 82 { 83 tmp[1] = tmp[1].replace('.', '-'); 84 if (tmp[1].isEmpty()) 85@@ -85,7 +85,7 @@ public: 86 } 87 88 bool warned = false; 89- if (tmp[2].compare("serviceId", Qt::CaseInsensitive) != 0) 90+ if (tmp[2].compare(QString("serviceId"), Qt::CaseInsensitive) != 0) 91 { 92 HLOG_WARN_NONSTD(QString("Invalid service identifier [%1]").arg(arg)); 93 warned = true; 94diff --git c/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp i/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp 95index b3a58fa..d1853e1 100644 96--- c/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp 97+++ i/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp 98@@ -195,7 +195,7 @@ bool HDocParser::parseActionArguments( 99 } 100 101 HActionArgument createdArg; 102- if (dirStr.compare("out", Qt::CaseInsensitive) == 0) 103+ if (dirStr.compare(QString("out"), Qt::CaseInsensitive) == 0) 104 { 105 if (retValWasDefined) 106 { 107@@ -228,7 +228,7 @@ bool HDocParser::parseActionArguments( 108 109 outArgs->push_back(createdArg); 110 } 111- else if (dirStr.compare("in", Qt::CaseInsensitive) == 0) 112+ else if (dirStr.compare(QString("in"), Qt::CaseInsensitive) == 0) 113 { 114 if (firstOutArgFound) 115 { 116@@ -677,11 +677,11 @@ bool HDocParser::parseStateVariable( 117 118 QString strSendEvents = stateVariableElement.attribute("sendEvents", "no"); 119 bool bSendEvents = false; 120- if (strSendEvents.compare("yes", Qt::CaseInsensitive) == 0) 121+ if (strSendEvents.compare(QString("yes"), Qt::CaseInsensitive) == 0) 122 { 123 bSendEvents = true; 124 } 125- else if (strSendEvents.compare("no", Qt::CaseInsensitive) != 0) 126+ else if (strSendEvents.compare(QString("no"), Qt::CaseInsensitive) != 0) 127 { 128 m_lastError = InvalidServiceDescriptionError; 129 m_lastErrorDescription = QString( 130@@ -694,11 +694,11 @@ bool HDocParser::parseStateVariable( 131 132 QString strMulticast = stateVariableElement.attribute("multicast", "no"); 133 bool bMulticast = false; 134- if (strMulticast.compare("yes", Qt::CaseInsensitive) == 0) 135+ if (strMulticast.compare(QString("yes"), Qt::CaseInsensitive) == 0) 136 { 137 bMulticast = true; 138 } 139- else if (strMulticast.compare("no", Qt::CaseInsensitive) != 0) 140+ else if (strMulticast.compare(QString("no"), Qt::CaseInsensitive) != 0) 141 { 142 m_lastError = InvalidServiceDescriptionError; 143 m_lastErrorDescription = QString( 144diff --git c/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp i/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp 145index 2e375a0..2d6a8cc 100644 146--- c/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp 147+++ i/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp 148@@ -197,7 +197,7 @@ HSubscribeRequest::RetVal HSubscribeRequest::setContents( 149 150 // this appears to be an initial subscription 151 152- if (nt.simplified().compare("upnp:event", Qt::CaseInsensitive) != 0) 153+ if (nt.simplified().compare(QString("upnp:event"), Qt::CaseInsensitive) != 0) 154 { 155 return PreConditionFailed; 156 } 157diff --git c/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp i/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp 158index aacdfcf..b618ba7 100644 159--- c/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp 160+++ i/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp 161@@ -37,7 +37,7 @@ HNt::HNt(const QString& type) : 162 m_typeValue(qMakePair(Type_Undefined, QString(""))), 163 m_subTypeValue(qMakePair(SubType_Undefined, QString(""))) 164 { 165- if (type.compare("upnp:event", Qt::CaseInsensitive) == 0) 166+ if (type.compare(QString("upnp:event"), Qt::CaseInsensitive) == 0) 167 { 168 m_typeValue.first = Type_UpnpEvent; 169 m_typeValue.second = "upnp:event"; 170@@ -48,13 +48,13 @@ HNt::HNt(const QString& type, const QString& subtype) : 171 m_typeValue(qMakePair(Type_Undefined, QString(""))), 172 m_subTypeValue(qMakePair(SubType_Undefined, QString(""))) 173 { 174- if (type.compare("upnp:event", Qt::CaseInsensitive) == 0) 175+ if (type.compare(QString("upnp:event"), Qt::CaseInsensitive) == 0) 176 { 177 m_typeValue.first = Type_UpnpEvent; 178 m_typeValue.second = "upnp:event"; 179 } 180 181- if (subtype.compare("upnp:propchange", Qt::CaseInsensitive) == 0) 182+ if (subtype.compare(QString("upnp:propchange"), Qt::CaseInsensitive) == 0) 183 { 184 m_subTypeValue.first = SubType_UpnpPropChange; 185 m_subTypeValue.second = "upnp:propchange"; 186diff --git c/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp i/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp 187index 0faf7f4..addbaaf 100644 188--- c/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp 189+++ i/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp 190@@ -43,7 +43,7 @@ HTimeout::HTimeout(const QString& timeout) : 191 m_value(-1) 192 { 193 QString tmp(timeout.simplified()); 194- if (tmp.compare("infinite", Qt::CaseInsensitive) != 0) 195+ if (tmp.compare(QString("infinite"), Qt::CaseInsensitive) != 0) 196 { 197 if (tmp.startsWith("Second-", Qt::CaseInsensitive)) 198 { 199diff --git c/herqq/hupnp/src/general/hupnp_datatypes.cpp i/herqq/hupnp/src/general/hupnp_datatypes.cpp 200index 9f2084f..ae8e9ae 100644 201--- c/herqq/hupnp/src/general/hupnp_datatypes.cpp 202+++ i/herqq/hupnp/src/general/hupnp_datatypes.cpp 203@@ -424,15 +424,15 @@ QVariant HUpnpDataTypes::convertToRightVariantType( 204 205 case HUpnpDataTypes::boolean: 206 { 207- if (value.compare("true", Qt::CaseInsensitive) == 0 || 208- value.compare("yes", Qt::CaseInsensitive) == 0 || 209- value.compare("1") == 0) 210+ if (value.compare(QString("true"), Qt::CaseInsensitive) == 0 || 211+ value.compare(QString("yes"), Qt::CaseInsensitive) == 0 || 212+ value.compare(QString("1")) == 0) 213 { 214 retVal = true; 215 } 216- else if (value.compare("false", Qt::CaseInsensitive) == 0 || 217- value.compare("no", Qt::CaseInsensitive) == 0 || 218- value.compare("0") == 0) 219+ else if (value.compare(QString("false"), Qt::CaseInsensitive) == 0 || 220+ value.compare(QString("no"), Qt::CaseInsensitive) == 0 || 221+ value.compare(QString("0")) == 0) 222 { 223 retVal = false; 224 } 225diff --git c/herqq/hupnp/src/http/hhttp_server_p.cpp i/herqq/hupnp/src/http/hhttp_server_p.cpp 226index eb1a56c..42e93ca 100644 227--- c/herqq/hupnp/src/http/hhttp_server_p.cpp 228+++ i/herqq/hupnp/src/http/hhttp_server_p.cpp 229@@ -121,27 +121,27 @@ void HHttpServer::processRequest(HHttpAsyncOperation* op) 230 mi->setKeepAlive(HHttpUtils::keepAlive(*hdr)); 231 232 QString method = hdr->method(); 233- if (method.compare("GET", Qt::CaseInsensitive) == 0) 234+ if (method.compare(QString("GET"), Qt::CaseInsensitive) == 0) 235 { 236 processGet(op->takeMessagingInfo(), *hdr); 237 } 238- else if (method.compare("HEAD"), Qt::CaseInsensitive) 239+ else if (method.compare(QString("HEAD")), Qt::CaseInsensitive) 240 { 241 processHead(op->takeMessagingInfo(), *hdr); 242 } 243- else if (method.compare("POST", Qt::CaseInsensitive) == 0) 244+ else if (method.compare(QString("POST"), Qt::CaseInsensitive) == 0) 245 { 246 processPost(op->takeMessagingInfo(), *hdr, op->dataRead()); 247 } 248- else if (method.compare("NOTIFY", Qt::CaseInsensitive) == 0) 249+ else if (method.compare(QString("NOTIFY"), Qt::CaseInsensitive) == 0) 250 { 251 processNotifyMessage(op->takeMessagingInfo(), *hdr, op->dataRead()); 252 } 253- else if (method.compare("SUBSCRIBE", Qt::CaseInsensitive) == 0) 254+ else if (method.compare(QString("SUBSCRIBE"), Qt::CaseInsensitive) == 0) 255 { 256 processSubscription(op->takeMessagingInfo(), *hdr); 257 } 258- else if (method.compare("UNSUBSCRIBE", Qt::CaseInsensitive) == 0) 259+ else if (method.compare(QString("UNSUBSCRIBE"), Qt::CaseInsensitive) == 0) 260 { 261 processUnsubscription(op->takeMessagingInfo(), *hdr); 262 } 263diff --git c/herqq/hupnp/src/http/hhttp_utils_p.h i/herqq/hupnp/src/http/hhttp_utils_p.h 264index 7285190..b3ee62e 100644 265--- c/herqq/hupnp/src/http/hhttp_utils_p.h 266+++ i/herqq/hupnp/src/http/hhttp_utils_p.h 267@@ -64,10 +64,10 @@ public: 268 QString connection = hdr.value("CONNECTION"); 269 if (hdr.minorVersion() == 1) 270 { 271- return connection.compare("close", Qt::CaseInsensitive) != 0; 272+ return connection.compare(QString("close"), Qt::CaseInsensitive) != 0; 273 } 274 275- return connection.compare("Keep-Alive", Qt::CaseInsensitive) == 0; 276+ return connection.compare(QString("Keep-Alive"), Qt::CaseInsensitive) == 0; 277 } 278 279 // returns the URLs as a string inside brackets. This is the format used in 280diff --git c/herqq/hupnp/src/utils/hmisc_utils_p.cpp i/herqq/hupnp/src/utils/hmisc_utils_p.cpp 281index 6641d14..7ea567a 100644 282--- c/herqq/hupnp/src/utils/hmisc_utils_p.cpp 283+++ i/herqq/hupnp/src/utils/hmisc_utils_p.cpp 284@@ -70,10 +70,10 @@ bool toBool(const QString& arg, bool* ok) 285 bool retVal = false, match = true; 286 if (arg == "1") { retVal = true; } 287 else if (arg == "0") { retVal = false; } 288- else if (arg.compare("true", Qt::CaseInsensitive) == 0) { retVal = true; } 289- else if (arg.compare("false", Qt::CaseInsensitive) == 0) { retVal = false; } 290- else if (arg.compare("yes", Qt::CaseInsensitive) == 0) { retVal = true; } 291- else if (arg.compare("no", Qt::CaseInsensitive) == 0) { retVal = false; } 292+ else if (arg.compare(QString("true"), Qt::CaseInsensitive) == 0) { retVal = true; } 293+ else if (arg.compare(QString("false"), Qt::CaseInsensitive) == 0) { retVal = false; } 294+ else if (arg.compare(QString("yes"), Qt::CaseInsensitive) == 0) { retVal = true; } 295+ else if (arg.compare(QString("no"), Qt::CaseInsensitive) == 0) { retVal = false; } 296 else { match = false; } 297 298 if (ok) { *ok = match; } 299diff --git c/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp i/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp 300index 6531929..8bd05c5 100644 301--- c/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp 302+++ i/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp 303@@ -680,15 +680,15 @@ QString HObject::writeStatusToString(WriteStatus status) 304 HObject::WriteStatus HObject::writeStatusFromString(const QString& status) 305 { 306 WriteStatus retVal = UnknownWriteStatus; 307- if (status.compare("writable", Qt::CaseInsensitive) == 0) 308+ if (status.compare(QString("writable"), Qt::CaseInsensitive) == 0) 309 { 310 retVal = WritableWriteStatus; 311 } 312- else if (status.compare("protected", Qt::CaseInsensitive) == 0) 313+ else if (status.compare(QString("protected"), Qt::CaseInsensitive) == 0) 314 { 315 retVal = ProtectedWriteStatus; 316 } 317- else if (status.compare("mixed", Qt::CaseInsensitive) == 0) 318+ else if (status.compare(QString("mixed"), Qt::CaseInsensitive) == 0) 319 { 320 retVal = MixedWriteStatus; 321 } 322diff --git c/herqq/hupnp_av/src/cds_model/hmatching_id.cpp i/herqq/hupnp_av/src/cds_model/hmatching_id.cpp 323index 25ee560..bea6ece 100644 324--- c/herqq/hupnp_av/src/cds_model/hmatching_id.cpp 325+++ i/herqq/hupnp_av/src/cds_model/hmatching_id.cpp 326@@ -77,11 +77,11 @@ QString HMatchingId::toString(Type type) 327 HMatchingId::Type HMatchingId::fromString(const QString& type) 328 { 329 Type retVal = Undefined; 330- if (type.compare("SI_SERIESID", Qt::CaseInsensitive) == 0) 331+ if (type.compare(QString("SI_SERIESID"), Qt::CaseInsensitive) == 0) 332 { 333 retVal = SeriesId; 334 } 335- else if (type.compare("SI_PROGRAMID", Qt::CaseInsensitive) == 0) 336+ else if (type.compare(QString("SI_PROGRAMID"), Qt::CaseInsensitive) == 0) 337 { 338 retVal = ProgramId; 339 } 340diff --git c/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp i/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp 341index 06ab6bf..e7cec20 100644 342--- c/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp 343+++ i/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp 344@@ -108,11 +108,11 @@ QString HScheduledTime::toString(Type type) 345 HScheduledTime::Type HScheduledTime::fromString(const QString& type) 346 { 347 Type retVal = Undefined; 348- if (type.compare("SCHEDULED_PROGRAM", Qt::CaseInsensitive) == 0) 349+ if (type.compare(QString("SCHEDULED_PROGRAM"), Qt::CaseInsensitive) == 0) 350 { 351 retVal = ScheduledProgram; 352 } 353- else if (type.compare("ON_DEMAND", Qt::CaseInsensitive) == 0) 354+ else if (type.compare(QString("ON_DEMAND"), Qt::CaseInsensitive) == 0) 355 { 356 retVal = OnDemand; 357 } 358diff --git c/herqq/hupnp_av/src/cds_model/hsortinfo.cpp i/herqq/hupnp_av/src/cds_model/hsortinfo.cpp 359index 078d719..31e1af0 100644 360--- c/herqq/hupnp_av/src/cds_model/hsortinfo.cpp 361+++ i/herqq/hupnp_av/src/cds_model/hsortinfo.cpp 362@@ -115,19 +115,19 @@ QString HSortModifier::toString(Type type) 363 HSortModifier::Type HSortModifier::fromString(const QString& type) 364 { 365 Type retVal = Undefined; 366- if (type.compare("+", Qt::CaseInsensitive) == 0) 367+ if (type.compare(QString("+"), Qt::CaseInsensitive) == 0) 368 { 369 retVal = AscendingByValue; 370 } 371- else if (type.compare("-", Qt::CaseInsensitive) == 0) 372+ else if (type.compare(QString("-"), Qt::CaseInsensitive) == 0) 373 { 374 retVal = DescendingByValue; 375 } 376- else if (type.compare("TIME+", Qt::CaseInsensitive) == 0) 377+ else if (type.compare(QString("TIME+"), Qt::CaseInsensitive) == 0) 378 { 379 retVal = AscendingByTime; 380 } 381- else if (type.compare("TIME-", Qt::CaseInsensitive) == 0) 382+ else if (type.compare(QString("TIME-"), Qt::CaseInsensitive) == 0) 383 { 384 retVal = DescendingByTime; 385 } 386diff --git c/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp i/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp 387index 65b67f8..f51e6b2 100644 388--- c/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp 389+++ i/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp 390@@ -198,11 +198,11 @@ HStateVariableCollection::RcsInstanceType HStateVariableCollection::fromString( 391 const QString& type) 392 { 393 RcsInstanceType retVal = Undefined; 394- if (type.compare("pre-mix", Qt::CaseInsensitive) == 0) 395+ if (type.compare(QString("pre-mix"), Qt::CaseInsensitive) == 0) 396 { 397 retVal = PreMix; 398 } 399- else if (type.compare("post-mix", Qt::CaseInsensitive) == 0) 400+ else if (type.compare(QString("post-mix"), Qt::CaseInsensitive) == 0) 401 { 402 retVal = PostMix; 403 } 404diff --git c/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp i/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp 405index 9f5712d..cd4dacb 100644 406--- c/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp 407+++ i/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp 408@@ -568,7 +568,7 @@ bool HCdsDidlLiteSerializer::serializeFromXml( 409 addNamespaces(reader); 410 if (reader.readNextStartElement()) 411 { 412- if (reader.name().compare("DIDL-Lite", Qt::CaseInsensitive) != 0) 413+ if (reader.name().compare(QString("DIDL-Lite"), Qt::CaseInsensitive) != 0) 414 { 415 h_ptr->m_lastErrorDescription = "Missing mandatory DIDL-Lite element"; 416 return false; 417diff --git c/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp i/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp 418index 30af243..af03c5c 100644 419--- c/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp 420+++ i/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp 421@@ -749,7 +749,7 @@ bool HCdsPropertyDbPrivate::serializeSvCollectionIn( 422 423 if (stateVariableReader.readNextStartElement()) 424 { 425- if (stateVariableReader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) 426+ if (stateVariableReader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) 427 { 428 return false; 429 } 430diff --git c/herqq/hupnp_av/src/common/hradioband.cpp i/herqq/hupnp_av/src/common/hradioband.cpp 431index d35a559..85b7e32 100644 432--- c/herqq/hupnp_av/src/common/hradioband.cpp 433+++ i/herqq/hupnp_av/src/common/hradioband.cpp 434@@ -83,23 +83,23 @@ QString HRadioBand::toString(Type type) 435 HRadioBand::Type HRadioBand::fromString(const QString& arg) 436 { 437 Type retVal = Undefined; 438- if (arg.compare("am", Qt::CaseInsensitive) == 0) 439+ if (arg.compare(QString("am"), Qt::CaseInsensitive) == 0) 440 { 441 retVal = AM; 442 } 443- else if (arg.compare("fm", Qt::CaseInsensitive) == 0) 444+ else if (arg.compare(QString("fm"), Qt::CaseInsensitive) == 0) 445 { 446 retVal = FM; 447 } 448- else if (arg.compare("shortwave", Qt::CaseInsensitive) == 0) 449+ else if (arg.compare(QString("shortwave"), Qt::CaseInsensitive) == 0) 450 { 451 retVal = ShortWave; 452 } 453- else if (arg.compare("internet", Qt::CaseInsensitive) == 0) 454+ else if (arg.compare(QString("internet"), Qt::CaseInsensitive) == 0) 455 { 456 retVal = Internet; 457 } 458- else if (arg.compare("satellite", Qt::CaseInsensitive) == 0) 459+ else if (arg.compare(QString("satellite"), Qt::CaseInsensitive) == 0) 460 { 461 retVal = Satellite; 462 } 463diff --git c/herqq/hupnp_av/src/common/hstoragemedium.cpp i/herqq/hupnp_av/src/common/hstoragemedium.cpp 464index 37ab7e0..c7f2109 100644 465--- c/herqq/hupnp_av/src/common/hstoragemedium.cpp 466+++ i/herqq/hupnp_av/src/common/hstoragemedium.cpp 467@@ -187,155 +187,155 @@ QString HStorageMedium::toString(Type type) 468 HStorageMedium::Type HStorageMedium::fromString(const QString& type) 469 { 470 Type retVal = Unknown; 471- if (type.compare("UNKNOWN", Qt::CaseInsensitive) == 0) 472+ if (type.compare(QString("UNKNOWN"), Qt::CaseInsensitive) == 0) 473 { 474 retVal = Unknown; 475 } 476- else if (type.compare("DV", Qt::CaseInsensitive) == 0) 477+ else if (type.compare(QString("DV"), Qt::CaseInsensitive) == 0) 478 { 479 retVal = DigitalVideo; 480 } 481- else if (type.compare("VHS", Qt::CaseInsensitive) == 0) 482+ else if (type.compare(QString("VHS"), Qt::CaseInsensitive) == 0) 483 { 484 retVal = VHS; 485 } 486- else if (type.compare("W-VHS", Qt::CaseInsensitive) == 0) 487+ else if (type.compare(QString("W-VHS"), Qt::CaseInsensitive) == 0) 488 { 489 retVal = W_VHS; 490 } 491- else if (type.compare("S-VHS", Qt::CaseInsensitive) == 0) 492+ else if (type.compare(QString("S-VHS"), Qt::CaseInsensitive) == 0) 493 { 494 retVal = S_VHS; 495 } 496- else if (type.compare("D_VHS", Qt::CaseInsensitive) == 0) 497+ else if (type.compare(QString("D_VHS"), Qt::CaseInsensitive) == 0) 498 { 499 retVal = D_VHS; 500 } 501- else if (type.compare("VHSC", Qt::CaseInsensitive) == 0) 502+ else if (type.compare(QString("VHSC"), Qt::CaseInsensitive) == 0) 503 { 504 retVal = VHSC; 505 } 506- else if (type.compare("VIDEO8", Qt::CaseInsensitive) == 0) 507+ else if (type.compare(QString("VIDEO8"), Qt::CaseInsensitive) == 0) 508 { 509 retVal = Video8; 510 } 511- else if (type.compare("HI8", Qt::CaseInsensitive) == 0) 512+ else if (type.compare(QString("HI8"), Qt::CaseInsensitive) == 0) 513 { 514 retVal = HI8; 515 } 516- else if (type.compare("CD-ROM", Qt::CaseInsensitive) == 0) 517+ else if (type.compare(QString("CD-ROM"), Qt::CaseInsensitive) == 0) 518 { 519 retVal = CD_ROM; 520 } 521- else if (type.compare("CD-DA", Qt::CaseInsensitive) == 0) 522+ else if (type.compare(QString("CD-DA"), Qt::CaseInsensitive) == 0) 523 { 524 retVal = CD_DA; 525 } 526- else if (type.compare("CD-R", Qt::CaseInsensitive) == 0) 527+ else if (type.compare(QString("CD-R"), Qt::CaseInsensitive) == 0) 528 { 529 retVal = CD_R; 530 } 531- else if (type.compare("CD-RW", Qt::CaseInsensitive) == 0) 532+ else if (type.compare(QString("CD-RW"), Qt::CaseInsensitive) == 0) 533 { 534 retVal = CD_RW; 535 } 536- else if (type.compare("VIDEO-CD", Qt::CaseInsensitive) == 0) 537+ else if (type.compare(QString("VIDEO-CD"), Qt::CaseInsensitive) == 0) 538 { 539 retVal = Video_CD; 540 } 541- else if (type.compare("SACD", Qt::CaseInsensitive) == 0) 542+ else if (type.compare(QString("SACD"), Qt::CaseInsensitive) == 0) 543 { 544 retVal = SACD; 545 } 546- else if (type.compare("MD-AUDIO", Qt::CaseInsensitive) == 0) 547+ else if (type.compare(QString("MD-AUDIO"), Qt::CaseInsensitive) == 0) 548 { 549 retVal = MiniDiscAudio; 550 } 551- else if (type.compare("MD-PICTURE", Qt::CaseInsensitive) == 0) 552+ else if (type.compare(QString("MD-PICTURE"), Qt::CaseInsensitive) == 0) 553 { 554 retVal = MiniDiscPicture; 555 } 556- else if (type.compare("DVD-ROM", Qt::CaseInsensitive) == 0) 557+ else if (type.compare(QString("DVD-ROM"), Qt::CaseInsensitive) == 0) 558 { 559 retVal = DVD_ROM; 560 } 561- else if (type.compare("DVD-VIDEO", Qt::CaseInsensitive) == 0) 562+ else if (type.compare(QString("DVD-VIDEO"), Qt::CaseInsensitive) == 0) 563 { 564 retVal = DVD_Video; 565 } 566- else if (type.compare("DVD+R", Qt::CaseInsensitive) == 0) 567+ else if (type.compare(QString("DVD+R"), Qt::CaseInsensitive) == 0) 568 { 569 retVal = DVD_PlusRecordable; 570 } 571- else if (type.compare("DVD-R", Qt::CaseInsensitive) == 0) 572+ else if (type.compare(QString("DVD-R"), Qt::CaseInsensitive) == 0) 573 { 574 retVal = DVD_MinusRecordable; 575 } 576- else if (type.compare("DVD+RW", Qt::CaseInsensitive) == 0) 577+ else if (type.compare(QString("DVD+RW"), Qt::CaseInsensitive) == 0) 578 { 579 retVal = DVD_PlusRewritable; 580 } 581- else if (type.compare("DVD-RW", Qt::CaseInsensitive) == 0) 582+ else if (type.compare(QString("DVD-RW"), Qt::CaseInsensitive) == 0) 583 { 584 retVal = DVD_MinusRewritable; 585 } 586- else if (type.compare("DVD-RAM", Qt::CaseInsensitive) == 0) 587+ else if (type.compare(QString("DVD-RAM"), Qt::CaseInsensitive) == 0) 588 { 589 retVal = DVD_RAM; 590 } 591- else if (type.compare("DAT", Qt::CaseInsensitive) == 0) 592+ else if (type.compare(QString("DAT"), Qt::CaseInsensitive) == 0) 593 { 594 retVal = DAT; 595 } 596- else if (type.compare("LD", Qt::CaseInsensitive) == 0) 597+ else if (type.compare(QString("LD"), Qt::CaseInsensitive) == 0) 598 { 599 retVal = LD; 600 } 601- else if (type.compare("HDD", Qt::CaseInsensitive) == 0) 602+ else if (type.compare(QString("HDD"), Qt::CaseInsensitive) == 0) 603 { 604 retVal = HDD; 605 } 606- else if (type.compare("MICRO-MV", Qt::CaseInsensitive) == 0) 607+ else if (type.compare(QString("MICRO-MV"), Qt::CaseInsensitive) == 0) 608 { 609 retVal = MicroMV; 610 } 611- else if (type.compare("NETWORK", Qt::CaseInsensitive) == 0) 612+ else if (type.compare(QString("NETWORK"), Qt::CaseInsensitive) == 0) 613 { 614 retVal = Network; 615 } 616- else if (type.compare("NONE", Qt::CaseInsensitive) == 0) 617+ else if (type.compare(QString("NONE"), Qt::CaseInsensitive) == 0) 618 { 619 retVal = None; 620 } 621- else if (type.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0) 622+ else if (type.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0) 623 { 624 retVal = NotImplemented; 625 } 626- else if (type.compare("SD", Qt::CaseInsensitive) == 0) 627+ else if (type.compare(QString("SD"), Qt::CaseInsensitive) == 0) 628 { 629 retVal = SecureDigital; 630 } 631- else if (type.compare("PC-CARD", Qt::CaseInsensitive) == 0) 632+ else if (type.compare(QString("PC-CARD"), Qt::CaseInsensitive) == 0) 633 { 634 retVal = PC_Card; 635 } 636- else if (type.compare("MMC", Qt::CaseInsensitive) == 0) 637+ else if (type.compare(QString("MMC"), Qt::CaseInsensitive) == 0) 638 { 639 retVal = MultimediaCard; 640 } 641- else if (type.compare("CF", Qt::CaseInsensitive) == 0) 642+ else if (type.compare(QString("CF"), Qt::CaseInsensitive) == 0) 643 { 644 retVal = CompactFlash; 645 } 646- else if (type.compare("BD", Qt::CaseInsensitive) == 0) 647+ else if (type.compare(QString("BD"), Qt::CaseInsensitive) == 0) 648 { 649 retVal = BluRay; 650 } 651- else if (type.compare("MS", Qt::CaseInsensitive) == 0) 652+ else if (type.compare(QString("MS"), Qt::CaseInsensitive) == 0) 653 { 654 retVal = MemoryStick; 655 } 656- else if (type.compare("HD_DVD", Qt::CaseInsensitive) == 0) 657+ else if (type.compare(QString("HD_DVD"), Qt::CaseInsensitive) == 0) 658 { 659 retVal = HD_DVD; 660 } 661diff --git c/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp i/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp 662index 89d44ae..bb364b5 100644 663--- c/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp 664+++ i/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp 665@@ -57,11 +57,11 @@ HConnectionManagerInfo::Direction 666 HConnectionManagerInfo::directionFromString(const QString& arg) 667 { 668 Direction retVal = DirectionUndefined; 669- if (arg.compare("Input", Qt::CaseInsensitive) == 0) 670+ if (arg.compare(QString("Input"), Qt::CaseInsensitive) == 0) 671 { 672 retVal = DirectionInput; 673 } 674- else if (arg.compare("Output", Qt::CaseInsensitive) == 0) 675+ else if (arg.compare(QString("Output"), Qt::CaseInsensitive) == 0) 676 { 677 retVal = DirectionOutput; 678 } 679@@ -92,23 +92,23 @@ HConnectionManagerInfo::ConnectionStatus 680 HConnectionManagerInfo::statusFromString(const QString& arg) 681 { 682 ConnectionStatus retVal = StatusUnknown; 683- if (arg.compare("Ok", Qt::CaseInsensitive) == 0) 684+ if (arg.compare(QString("Ok"), Qt::CaseInsensitive) == 0) 685 { 686 retVal = StatusOk; 687 } 688- else if (arg.compare("Unknown", Qt::CaseInsensitive) == 0) 689+ else if (arg.compare(QString("Unknown"), Qt::CaseInsensitive) == 0) 690 { 691 retVal = StatusUnknown; 692 } 693- else if (arg.compare("ContentFormatMismatch", Qt::CaseInsensitive) == 0) 694+ else if (arg.compare(QString("ContentFormatMismatch"), Qt::CaseInsensitive) == 0) 695 { 696 retVal = StatusContentFormatMismatch; 697 } 698- else if (arg.compare("InsufficientBandwidth", Qt::CaseInsensitive) == 0) 699+ else if (arg.compare(QString("InsufficientBandwidth"), Qt::CaseInsensitive) == 0) 700 { 701 retVal = StatusInsufficientBandwidth; 702 } 703- else if (arg.compare("UnreliableChannel", Qt::CaseInsensitive) == 0) 704+ else if (arg.compare(QString("UnreliableChannel"), Qt::CaseInsensitive) == 0) 705 { 706 retVal = StatusUnreliableChannel; 707 } 708diff --git c/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp i/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp 709index 5c0c0d0..743ed1e 100644 710--- c/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp 711+++ i/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp 712@@ -80,11 +80,11 @@ HContentDirectoryInfo::BrowseFlag 713 HContentDirectoryInfo::browseFlagFromString(const QString& arg) 714 { 715 BrowseFlag retVal = Undefined; 716- if (arg.compare("BrowseMetadata", Qt::CaseInsensitive) == 0) 717+ if (arg.compare(QString("BrowseMetadata"), Qt::CaseInsensitive) == 0) 718 { 719 retVal = BrowseMetadata; 720 } 721- else if (arg.compare("BrowseDirectChildren", Qt::CaseInsensitive) == 0) 722+ else if (arg.compare(QString("BrowseDirectChildren"), Qt::CaseInsensitive) == 0) 723 { 724 retVal = BrowseDirectChildren; 725 } 726diff --git c/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp i/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp 727index 0a663dc..1771b6f 100644 728--- c/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp 729+++ i/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp 730@@ -85,15 +85,15 @@ HTransferProgressInfo::~HTransferProgressInfo() 731 HTransferProgressInfo::Status HTransferProgressInfo::fromString(const QString& arg) 732 { 733 Status retVal = Error; 734- if (arg.compare("IN_PROGRESS", Qt::CaseInsensitive) == 0) 735+ if (arg.compare(QString("IN_PROGRESS"), Qt::CaseInsensitive) == 0) 736 { 737 retVal = InProgress; 738 } 739- else if (arg.compare("STOPPED", Qt::CaseInsensitive) == 0) 740+ else if (arg.compare(QString("STOPPED"), Qt::CaseInsensitive) == 0) 741 { 742 retVal = Stopped; 743 } 744- else if (arg.compare("COMPLETED", Qt::CaseInsensitive) == 0) 745+ else if (arg.compare(QString("COMPLETED"), Qt::CaseInsensitive) == 0) 746 { 747 retVal = Completed; 748 } 749diff --git c/herqq/hupnp_av/src/hav_global.cpp i/herqq/hupnp_av/src/hav_global.cpp 750index c3f93a9..27d98a0 100644 751--- c/herqq/hupnp_av/src/hav_global.cpp 752+++ i/herqq/hupnp_av/src/hav_global.cpp 753@@ -647,7 +647,7 @@ HStateVariableCollection parseStateVariableCollection(const QString& arg) 754 addNamespaces(reader); 755 756 if (!reader.readNextStartElement() || 757- reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) 758+ reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) 759 { 760 return retVal; 761 } 762diff --git c/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp i/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp 763index f9e2dc4..69b7648 100644 764--- c/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp 765+++ i/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp 766@@ -287,7 +287,7 @@ void HMediaBrowserPrivate::lastChangeReceived( 767 768 if (reader.readNextStartElement()) 769 { 770- if (reader.name().compare("StateEvent", Qt::CaseInsensitive) != 0) 771+ if (reader.name().compare(QString("StateEvent"), Qt::CaseInsensitive) != 0) 772 { 773 return; 774 } 775diff --git c/herqq/hupnp_av/src/mediarenderer/hconnection.cpp i/herqq/hupnp_av/src/mediarenderer/hconnection.cpp 776index 651e727..9fb4958 100644 777--- c/herqq/hupnp_av/src/mediarenderer/hconnection.cpp 778+++ i/herqq/hupnp_av/src/mediarenderer/hconnection.cpp 779@@ -144,7 +144,7 @@ void HConnection::lastChangeReceived( 780 781 if (reader.readNextStartElement()) 782 { 783- if (reader.name().compare("Event", Qt::CaseInsensitive) != 0) 784+ if (reader.name().compare(QString("Event"), Qt::CaseInsensitive) != 0) 785 { 786 return; 787 } 788@@ -159,7 +159,7 @@ void HConnection::lastChangeReceived( 789 { 790 QStringRef name = reader.name(); 791 792- if (name.compare("InstanceID", Qt::CaseInsensitive)) 793+ if (name.compare(QString("InstanceID"), Qt::CaseInsensitive)) 794 { 795 continue; 796 } 797@@ -205,7 +205,7 @@ void HConnection::lastChangeReceived(HAvTransportAdapter*, const QString& data) 798 799 if (reader.readNextStartElement()) 800 { 801- if (reader.name().compare("Event", Qt::CaseInsensitive) != 0) 802+ if (reader.name().compare(QString("Event"), Qt::CaseInsensitive) != 0) 803 { 804 return; 805 } 806@@ -220,7 +220,7 @@ void HConnection::lastChangeReceived(HAvTransportAdapter*, const QString& data) 807 { 808 QStringRef name = reader.name(); 809 810- if (name.compare("InstanceID", Qt::CaseInsensitive)) 811+ if (name.compare(QString("InstanceID"), Qt::CaseInsensitive)) 812 { 813 continue; 814 } 815diff --git c/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp i/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp 816index 174f423..bf7e9f2 100644 817--- c/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp 818+++ i/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp 819@@ -109,7 +109,7 @@ qint32 HConnectionManagerSinkService::prepareForConnection( 820 return HConnectionManagerInfo::IncompatibleDirections; 821 } 822 823- if (remoteProtocolInfo.protocol().compare("http-get", Qt::CaseInsensitive) && 824+ if (remoteProtocolInfo.protocol().compare(QString("http-get"), Qt::CaseInsensitive) && 825 remoteProtocolInfo.protocol() != "*") 826 { 827 return HConnectionManagerInfo::IncompatibleProtocolInfo; 828diff --git c/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp i/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp 829index 1ad337a..0f5e209 100644 830--- c/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp 831+++ i/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp 832@@ -1578,19 +1578,19 @@ bool HRendererConnectionInfo::hasChannelAssociated(const QString& svName) 833 { 834 bool retVal = false; 835 QString trimmed = svName.trimmed(); 836- if (trimmed.compare("Mute", Qt::CaseInsensitive) == 0) 837+ if (trimmed.compare(QString("Mute"), Qt::CaseInsensitive) == 0) 838 { 839 retVal = true; 840 } 841- else if (trimmed.compare("Volume", Qt::CaseInsensitive) == 0) 842+ else if (trimmed.compare(QString("Volume"), Qt::CaseInsensitive) == 0) 843 { 844 retVal = true; 845 } 846- else if (trimmed.compare("VolumeDB", Qt::CaseInsensitive) == 0) 847+ else if (trimmed.compare(QString("VolumeDB"), Qt::CaseInsensitive) == 0) 848 { 849 retVal = true; 850 } 851- else if (trimmed.compare("Loudness", Qt::CaseInsensitive) == 0) 852+ else if (trimmed.compare(QString("Loudness"), Qt::CaseInsensitive) == 0) 853 { 854 retVal = true; 855 } 856diff --git c/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp i/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp 857index a614e17..fbb3258 100644 858--- c/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp 859+++ i/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp 860@@ -449,7 +449,7 @@ qint32 HTransportSinkService::getStateVariables( 861 foreach(QString svName, stateVarNames) 862 { 863 svName = svName.trimmed(); 864- if (svName.compare("LastChange", Qt::CaseInsensitive) == 0 || 865+ if (svName.compare(QString("LastChange"), Qt::CaseInsensitive) == 0 || 866 svName.startsWith("A_ARG", Qt::CaseInsensitive)) 867 { 868 return HAvTransportInfo::InvalidStateVariableList; 869@@ -512,7 +512,7 @@ qint32 HTransportSinkService::setStateVariables( 870 871 if (reader.readNextStartElement()) 872 { 873- if (reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) 874+ if (reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) 875 { 876 return UpnpInvalidArgs; 877 } 878diff --git c/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp i/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp 879index 751a3d9..51c1ff4 100644 880--- c/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp 881+++ i/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp 882@@ -110,59 +110,59 @@ QString HChannel::toString(Type type) 883 HChannel::Type HChannel::fromString(const QString& type) 884 { 885 Type retVal = Undefined; 886- if (type.compare("MASTER", Qt::CaseInsensitive) == 0) 887+ if (type.compare(QString("MASTER"), Qt::CaseInsensitive) == 0) 888 { 889 retVal = Master; 890 } 891- else if (type.compare("LF", Qt::CaseInsensitive) == 0) 892+ else if (type.compare(QString("LF"), Qt::CaseInsensitive) == 0) 893 { 894 retVal = LeftFront; 895 } 896- else if (type.compare("RF", Qt::CaseInsensitive) == 0) 897+ else if (type.compare(QString("RF"), Qt::CaseInsensitive) == 0) 898 { 899 retVal = RightFront; 900 } 901- else if (type.compare("CF", Qt::CaseInsensitive) == 0) 902+ else if (type.compare(QString("CF"), Qt::CaseInsensitive) == 0) 903 { 904 retVal = CenterFront; 905 } 906- else if (type.compare("LFE", Qt::CaseInsensitive) == 0) 907+ else if (type.compare(QString("LFE"), Qt::CaseInsensitive) == 0) 908 { 909 retVal = LFE; 910 } 911- else if (type.compare("LS", Qt::CaseInsensitive) == 0) 912+ else if (type.compare(QString("LS"), Qt::CaseInsensitive) == 0) 913 { 914 retVal = LeftSurround; 915 } 916- else if (type.compare("RS", Qt::CaseInsensitive) == 0) 917+ else if (type.compare(QString("RS"), Qt::CaseInsensitive) == 0) 918 { 919 retVal = RightSurround; 920 } 921- else if (type.compare("LFC", Qt::CaseInsensitive) == 0) 922+ else if (type.compare(QString("LFC"), Qt::CaseInsensitive) == 0) 923 { 924 retVal = LeftOfCenter; 925 } 926- else if (type.compare("RFC", Qt::CaseInsensitive) == 0) 927+ else if (type.compare(QString("RFC"), Qt::CaseInsensitive) == 0) 928 { 929 retVal = RightOfCenter; 930 } 931- else if (type.compare("SD", Qt::CaseInsensitive) == 0) 932+ else if (type.compare(QString("SD"), Qt::CaseInsensitive) == 0) 933 { 934 retVal = Surround; 935 } 936- else if (type.compare("SL", Qt::CaseInsensitive) == 0) 937+ else if (type.compare(QString("SL"), Qt::CaseInsensitive) == 0) 938 { 939 retVal = SideLeft; 940 } 941- else if (type.compare("SR", Qt::CaseInsensitive) == 0) 942+ else if (type.compare(QString("SR"), Qt::CaseInsensitive) == 0) 943 { 944 retVal = SideRight; 945 } 946- else if (type.compare("T", Qt::CaseInsensitive) == 0) 947+ else if (type.compare(QString("T"), Qt::CaseInsensitive) == 0) 948 { 949 retVal = Top; 950 } 951- else if (type.compare("B", Qt::CaseInsensitive) == 0) 952+ else if (type.compare(QString("B"), Qt::CaseInsensitive) == 0) 953 { 954 retVal = Bottom; 955 } 956diff --git c/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp i/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp 957index fd52f9a..84f5579 100644 958--- c/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp 959+++ i/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp 960@@ -859,7 +859,7 @@ qint32 HRenderingControlService::setStateVariables( 961 962 if (reader.readNextStartElement()) 963 { 964- if (reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) 965+ if (reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) 966 { 967 return UpnpInvalidArgs; 968 } 969diff --git c/herqq/hupnp_av/src/transport/havtransport_info.cpp i/herqq/hupnp_av/src/transport/havtransport_info.cpp 970index cb18ce0..e3fcd64 100644 971--- c/herqq/hupnp_av/src/transport/havtransport_info.cpp 972+++ i/herqq/hupnp_av/src/transport/havtransport_info.cpp 973@@ -94,35 +94,35 @@ HAvTransportInfo::DrmState 974 HAvTransportInfo::drmStateFromString(const QString& state) 975 { 976 DrmState retVal = DrmState_Unknown; 977- if (state.compare("OK", Qt::CaseInsensitive) == 0) 978+ if (state.compare(QString("OK"), Qt::CaseInsensitive) == 0) 979 { 980 retVal = DrmState_Ok; 981 } 982- else if (state.compare("UNKNOWN", Qt::CaseInsensitive) == 0) 983+ else if (state.compare(QString("UNKNOWN"), Qt::CaseInsensitive) == 0) 984 { 985 retVal = DrmState_Unknown; 986 } 987- else if (state.compare("PROCESSING_CONTENT_KEY", Qt::CaseInsensitive) == 0) 988+ else if (state.compare(QString("PROCESSING_CONTENT_KEY"), Qt::CaseInsensitive) == 0) 989 { 990 retVal = DrmState_ProcessingContentKey; 991 } 992- else if (state.compare("CONTENT_KEY_FAILURE", Qt::CaseInsensitive) == 0) 993+ else if (state.compare(QString("CONTENT_KEY_FAILURE"), Qt::CaseInsensitive) == 0) 994 { 995 retVal = DrmState_ContentKeyFailure; 996 } 997- else if (state.compare("ATTEMPTING_AUTHENTICATION", Qt::CaseInsensitive) == 0) 998+ else if (state.compare(QString("ATTEMPTING_AUTHENTICATION"), Qt::CaseInsensitive) == 0) 999 { 1000 retVal = DrmState_AttemptingAuthentication; 1001 } 1002- else if (state.compare("FAILED_AUTHENTICATION", Qt::CaseInsensitive) == 0) 1003+ else if (state.compare(QString("FAILED_AUTHENTICATION"), Qt::CaseInsensitive) == 0) 1004 { 1005 retVal = DrmState_FailedAuthentication; 1006 } 1007- else if (state.compare("NOT_AUTHENTICATED", Qt::CaseInsensitive) == 0) 1008+ else if (state.compare(QString("NOT_AUTHENTICATED"), Qt::CaseInsensitive) == 0) 1009 { 1010 retVal = DrmState_NotAuthenticated; 1011 } 1012- else if (state.compare("DEVICE_REVOCATION", Qt::CaseInsensitive) == 0) 1013+ else if (state.compare(QString("DEVICE_REVOCATION"), Qt::CaseInsensitive) == 0) 1014 { 1015 retVal = DrmState_DeviceRevocation; 1016 } 1017diff --git c/herqq/hupnp_av/src/transport/hmediainfo.cpp i/herqq/hupnp_av/src/transport/hmediainfo.cpp 1018index 9e642c1..5f33847 100644 1019--- c/herqq/hupnp_av/src/transport/hmediainfo.cpp 1020+++ i/herqq/hupnp_av/src/transport/hmediainfo.cpp 1021@@ -180,15 +180,15 @@ HMediaInfo::MediaCategory HMediaInfo::mediaCategoryFromString( 1022 const QString& category) 1023 { 1024 MediaCategory retVal = Undefined; 1025- if (category.compare("NO_MEDIA", Qt::CaseInsensitive) == 0) 1026+ if (category.compare(QString("NO_MEDIA"), Qt::CaseInsensitive) == 0) 1027 { 1028 retVal = NoMedia; 1029 } 1030- else if (category.compare("TRACK_AWARE", Qt::CaseInsensitive) == 0) 1031+ else if (category.compare(QString("TRACK_AWARE"), Qt::CaseInsensitive) == 0) 1032 { 1033 retVal = TrackAware; 1034 } 1035- else if (category.compare("TRACK_UNAWARE", Qt::CaseInsensitive) == 0) 1036+ else if (category.compare(QString("TRACK_UNAWARE"), Qt::CaseInsensitive) == 0) 1037 { 1038 retVal = TrackUnaware; 1039 } 1040diff --git c/herqq/hupnp_av/src/transport/hplaymode.cpp i/herqq/hupnp_av/src/transport/hplaymode.cpp 1041index 8d3a20e..57605f0 100644 1042--- c/herqq/hupnp_av/src/transport/hplaymode.cpp 1043+++ i/herqq/hupnp_av/src/transport/hplaymode.cpp 1044@@ -87,31 +87,31 @@ QString HPlayMode::toString(HPlayMode::Type type) 1045 HPlayMode::Type HPlayMode::fromString(const QString& type) 1046 { 1047 Type retVal = Undefined; 1048- if (type.compare("NORMAL", Qt::CaseInsensitive) == 0) 1049+ if (type.compare(QString("NORMAL"), Qt::CaseInsensitive) == 0) 1050 { 1051 retVal = Normal; 1052 } 1053- else if (type.compare("SHUFFLE", Qt::CaseInsensitive) == 0) 1054+ else if (type.compare(QString("SHUFFLE"), Qt::CaseInsensitive) == 0) 1055 { 1056 retVal = Shuffle; 1057 } 1058- else if (type.compare("REPEAT_ONE", Qt::CaseInsensitive) == 0) 1059+ else if (type.compare(QString("REPEAT_ONE"), Qt::CaseInsensitive) == 0) 1060 { 1061 retVal = RepeatOne; 1062 } 1063- else if (type.compare("REPEAT_ALL", Qt::CaseInsensitive) == 0) 1064+ else if (type.compare(QString("REPEAT_ALL"), Qt::CaseInsensitive) == 0) 1065 { 1066 retVal = RepeatAll; 1067 } 1068- else if (type.compare("RANDOM", Qt::CaseInsensitive) == 0) 1069+ else if (type.compare(QString("RANDOM"), Qt::CaseInsensitive) == 0) 1070 { 1071 retVal = Random; 1072 } 1073- else if (type.compare("DIRECT_1", Qt::CaseInsensitive) == 0) 1074+ else if (type.compare(QString("DIRECT_1"), Qt::CaseInsensitive) == 0) 1075 { 1076 retVal = Direct_1; 1077 } 1078- else if (type.compare("INTRO", Qt::CaseInsensitive) == 0) 1079+ else if (type.compare(QString("INTRO"), Qt::CaseInsensitive) == 0) 1080 { 1081 retVal = Intro; 1082 } 1083diff --git c/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp i/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp 1084index ab29f09..a1a5de0 100644 1085--- c/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp 1086+++ i/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp 1087@@ -81,23 +81,23 @@ HRecordMediumWriteStatus::Type HRecordMediumWriteStatus::fromString( 1088 const QString& type) 1089 { 1090 Type retVal = Unknown; 1091- if (type.compare("WRITABLE", Qt::CaseInsensitive) == 0) 1092+ if (type.compare(QString("WRITABLE"), Qt::CaseInsensitive) == 0) 1093 { 1094 retVal = Writable; 1095 } 1096- else if (type.compare("PROTECTED", Qt::CaseInsensitive) == 0) 1097+ else if (type.compare(QString("PROTECTED"), Qt::CaseInsensitive) == 0) 1098 { 1099 retVal = Protected; 1100 } 1101- else if (type.compare("NOT_WRITABLE", Qt::CaseInsensitive) == 0) 1102+ else if (type.compare(QString("NOT_WRITABLE"), Qt::CaseInsensitive) == 0) 1103 { 1104 retVal = NotWritable; 1105 } 1106- else if (type.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0) 1107+ else if (type.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0) 1108 { 1109 retVal = NotImplemented; 1110 } 1111- else if (type.compare("UNKNOWN", Qt::CaseInsensitive) != 0 && !type.isEmpty()) 1112+ else if (type.compare(QString("UNKNOWN"), Qt::CaseInsensitive) != 0 && !type.isEmpty()) 1113 { 1114 retVal = VendorDefined; 1115 } 1116diff --git c/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp i/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp 1117index bf7dd90..b659fd7 100644 1118--- c/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp 1119+++ i/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp 1120@@ -88,31 +88,31 @@ QString HRecordQualityMode::toString(Type mode) 1121 HRecordQualityMode::Type HRecordQualityMode::fromString(const QString& mode) 1122 { 1123 Type retVal = Undefined; 1124- if (mode.compare("0:EP", Qt::CaseInsensitive) == 0) 1125+ if (mode.compare(QString("0:EP"), Qt::CaseInsensitive) == 0) 1126 { 1127 retVal = Ep; 1128 } 1129- else if (mode.compare("1:LP", Qt::CaseInsensitive) == 0) 1130+ else if (mode.compare(QString("1:LP"), Qt::CaseInsensitive) == 0) 1131 { 1132 retVal = Lp; 1133 } 1134- else if (mode.compare("2:SP", Qt::CaseInsensitive) == 0) 1135+ else if (mode.compare(QString("2:SP"), Qt::CaseInsensitive) == 0) 1136 { 1137 retVal = Sp; 1138 } 1139- else if (mode.compare("0:BASIC", Qt::CaseInsensitive) == 0) 1140+ else if (mode.compare(QString("0:BASIC"), Qt::CaseInsensitive) == 0) 1141 { 1142 retVal = Basic; 1143 } 1144- else if (mode.compare("1:MEDIUM", Qt::CaseInsensitive) == 0) 1145+ else if (mode.compare(QString("1:MEDIUM"), Qt::CaseInsensitive) == 0) 1146 { 1147 retVal = Medium; 1148 } 1149- else if (mode.compare("2:HIGH", Qt::CaseInsensitive) == 0) 1150+ else if (mode.compare(QString("2:HIGH"), Qt::CaseInsensitive) == 0) 1151 { 1152 retVal = High; 1153 } 1154- else if (mode.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0) 1155+ else if (mode.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0) 1156 { 1157 retVal = NotImplemented; 1158 } 1159diff --git c/herqq/hupnp_av/src/transport/hseekinfo.cpp i/herqq/hupnp_av/src/transport/hseekinfo.cpp 1160index c2ac69a..d3eee2b 100644 1161--- c/herqq/hupnp_av/src/transport/hseekinfo.cpp 1162+++ i/herqq/hupnp_av/src/transport/hseekinfo.cpp 1163@@ -102,43 +102,43 @@ QString HSeekMode::toString(Type type) 1164 HSeekMode::Type HSeekMode::fromString(const QString& type) 1165 { 1166 Type retVal = Unknown; 1167- if (type.compare("TRACK_NR", Qt::CaseInsensitive) == 0) 1168+ if (type.compare(QString("TRACK_NR"), Qt::CaseInsensitive) == 0) 1169 { 1170 retVal = TrackNr; 1171 } 1172- else if (type.compare("ABS_TIME", Qt::CaseInsensitive) == 0) 1173+ else if (type.compare(QString("ABS_TIME"), Qt::CaseInsensitive) == 0) 1174 { 1175 retVal = AbsTime; 1176 } 1177- else if (type.compare("REL_TIME", Qt::CaseInsensitive) == 0) 1178+ else if (type.compare(QString("REL_TIME"), Qt::CaseInsensitive) == 0) 1179 { 1180 retVal = RelTime; 1181 } 1182- else if (type.compare("ABS_COUNT", Qt::CaseInsensitive) == 0) 1183+ else if (type.compare(QString("ABS_COUNT"), Qt::CaseInsensitive) == 0) 1184 { 1185 retVal = AbsCount; 1186 } 1187- else if (type.compare("REL_COUNT", Qt::CaseInsensitive) == 0) 1188+ else if (type.compare(QString("REL_COUNT"), Qt::CaseInsensitive) == 0) 1189 { 1190 retVal = RelCount; 1191 } 1192- else if (type.compare("CHANNEL_FREQ", Qt::CaseInsensitive) == 0) 1193+ else if (type.compare(QString("CHANNEL_FREQ"), Qt::CaseInsensitive) == 0) 1194 { 1195 retVal = ChannelFreq; 1196 } 1197- else if (type.compare("TAPE-INDEX", Qt::CaseInsensitive) == 0) 1198+ else if (type.compare(QString("TAPE-INDEX"), Qt::CaseInsensitive) == 0) 1199 { 1200 retVal = TapeIndex; 1201 } 1202- else if (type.compare("REL_TAPE-INDEX", Qt::CaseInsensitive) == 0) 1203+ else if (type.compare(QString("REL_TAPE-INDEX"), Qt::CaseInsensitive) == 0) 1204 { 1205 retVal = RelTapeIndex; 1206 } 1207- else if (type.compare("FRAME", Qt::CaseInsensitive) == 0) 1208+ else if (type.compare(QString("FRAME"), Qt::CaseInsensitive) == 0) 1209 { 1210 retVal = Frame; 1211 } 1212- else if (type.compare("REL_FRAME", Qt::CaseInsensitive) == 0) 1213+ else if (type.compare(QString("REL_FRAME"), Qt::CaseInsensitive) == 0) 1214 { 1215 retVal = RelFrame; 1216 } 1217diff --git c/herqq/hupnp_av/src/transport/htransportaction.cpp i/herqq/hupnp_av/src/transport/htransportaction.cpp 1218index d64b1bc..4a34b8d 100644 1219--- c/herqq/hupnp_av/src/transport/htransportaction.cpp 1220+++ i/herqq/hupnp_av/src/transport/htransportaction.cpp 1221@@ -91,31 +91,31 @@ QString HTransportAction::toString(Type type) 1222 HTransportAction::Type HTransportAction::fromString(const QString& type) 1223 { 1224 Type retVal = Undefined; 1225- if (type.compare("PLAY", Qt::CaseInsensitive) == 0) 1226+ if (type.compare(QString("PLAY"), Qt::CaseInsensitive) == 0) 1227 { 1228 retVal = Play; 1229 } 1230- else if (type.compare("STOP", Qt::CaseInsensitive) == 0) 1231+ else if (type.compare(QString("STOP"), Qt::CaseInsensitive) == 0) 1232 { 1233 retVal = Stop; 1234 } 1235- else if (type.compare("PAUSE", Qt::CaseInsensitive) == 0) 1236+ else if (type.compare(QString("PAUSE"), Qt::CaseInsensitive) == 0) 1237 { 1238 retVal = Pause; 1239 } 1240- else if (type.compare("SEEK", Qt::CaseInsensitive) == 0) 1241+ else if (type.compare(QString("SEEK"), Qt::CaseInsensitive) == 0) 1242 { 1243 retVal = Seek; 1244 } 1245- else if (type.compare("NEXT", Qt::CaseInsensitive) == 0) 1246+ else if (type.compare(QString("NEXT"), Qt::CaseInsensitive) == 0) 1247 { 1248 retVal = Next; 1249 } 1250- else if (type.compare("PREVIOUS", Qt::CaseInsensitive) == 0) 1251+ else if (type.compare(QString("PREVIOUS"), Qt::CaseInsensitive) == 0) 1252 { 1253 retVal = Previous; 1254 } 1255- else if (type.compare("RECORD", Qt::CaseInsensitive) == 0) 1256+ else if (type.compare(QString("RECORD"), Qt::CaseInsensitive) == 0) 1257 { 1258 retVal = Record; 1259 } 1260diff --git c/herqq/hupnp_av/src/transport/htransportinfo.cpp i/herqq/hupnp_av/src/transport/htransportinfo.cpp 1261index ecfaf0b..8ca9b1c 100644 1262--- c/herqq/hupnp_av/src/transport/htransportinfo.cpp 1263+++ i/herqq/hupnp_av/src/transport/htransportinfo.cpp 1264@@ -71,11 +71,11 @@ QString HTransportStatus::toString(HTransportStatus::Type type) 1265 HTransportStatus::Type HTransportStatus::fromString(const QString& type) 1266 { 1267 Type retVal = Undefined; 1268- if (type.compare("OK", Qt::CaseInsensitive) == 0) 1269+ if (type.compare(QString("OK"), Qt::CaseInsensitive) == 0) 1270 { 1271 retVal = OK; 1272 } 1273- else if (type.compare("ERROR_OCCURRED", Qt::CaseInsensitive) == 0) 1274+ else if (type.compare(QString("ERROR_OCCURRED"), Qt::CaseInsensitive) == 0) 1275 { 1276 retVal = ErrorOccurred; 1277 } 1278diff --git c/herqq/hupnp_av/src/transport/htransportstate.cpp i/herqq/hupnp_av/src/transport/htransportstate.cpp 1279index b460065..f2a1ac3 100644 1280--- c/herqq/hupnp_av/src/transport/htransportstate.cpp 1281+++ i/herqq/hupnp_av/src/transport/htransportstate.cpp 1282@@ -89,31 +89,31 @@ QString HTransportState::toString(HTransportState::Type type) 1283 HTransportState::Type HTransportState::fromString(const QString& type) 1284 { 1285 Type retVal = Undefined; 1286- if (type.compare("NO_MEDIA_PRESENT", Qt::CaseInsensitive) == 0) 1287+ if (type.compare(QString("NO_MEDIA_PRESENT"), Qt::CaseInsensitive) == 0) 1288 { 1289 retVal = NoMediaPresent; 1290 } 1291- else if (type.compare("STOPPED", Qt::CaseInsensitive) == 0) 1292+ else if (type.compare(QString("STOPPED"), Qt::CaseInsensitive) == 0) 1293 { 1294 retVal = Stopped; 1295 } 1296- else if (type.compare("PLAYING", Qt::CaseInsensitive) == 0) 1297+ else if (type.compare(QString("PLAYING"), Qt::CaseInsensitive) == 0) 1298 { 1299 retVal = Playing; 1300 } 1301- else if (type.compare("TRANSITIONING", Qt::CaseInsensitive) == 0) 1302+ else if (type.compare(QString("TRANSITIONING"), Qt::CaseInsensitive) == 0) 1303 { 1304 retVal = Transitioning; 1305 } 1306- else if (type.compare("PAUSED_PLAYBACK", Qt::CaseInsensitive) == 0) 1307+ else if (type.compare(QString("PAUSED_PLAYBACK"), Qt::CaseInsensitive) == 0) 1308 { 1309 retVal = PausedPlayback; 1310 } 1311- else if (type.compare("PAUSED_RECORDING", Qt::CaseInsensitive) == 0) 1312+ else if (type.compare(QString("PAUSED_RECORDING"), Qt::CaseInsensitive) == 0) 1313 { 1314 retVal = PausedRecording; 1315 } 1316- else if (type.compare("RECORDING", Qt::CaseInsensitive) == 0) 1317+ else if (type.compare(QString("RECORDING"), Qt::CaseInsensitive) == 0) 1318 { 1319 retVal = Recording; 1320 }