Cleanup

skyjake · Nov 17, 2016 · da4c289 · da4c289
1 parent 4ec93a5
commit da4c289
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/doomsday/apps/client/src/network/base/masterserver.cpp b/doomsday/apps/client/src/network/base/masterserver.cpp
@@ -183,7 +183,7 @@ void MasterWorker::requestFinished(QNetworkReply* reply)
         }
         else
         {
-            String replyText = String::fromUtf8(Block(reply->readAll())).strip();
+            String replyText = String::fromUtf8(reply->readAll()).strip();
             if (!replyText.isEmpty())
             {
                 LOGDEV_NET_VERBOSE("Reply contents:\n") << replyText;
@@ -214,7 +214,7 @@ bool MasterWorker::parseResponse(QByteArray const &response)
         d->servers.clear();
 
         // The syntax of the response is a JSON array containing server objects.
-        foreach (QVariant entry, parseJSON(String::fromUtf8(Block(response))).toList())
+        foreach (QVariant entry, parseJSON(String::fromUtf8(response)).toList())
         {
             try
             {

diff --git a/doomsday/apps/client/src/network/serverlink.cpp b/doomsday/apps/client/src/network/serverlink.cpp
@@ -94,7 +94,7 @@ DENG2_PIMPL(ServerLink)
         {
             try
             {
-                QVariant const response = parseJSON(String::fromUtf8(Block(reply.mid(5))));
+                QVariant const response = parseJSON(String::fromUtf8(reply.mid(5)));
                 std::unique_ptr<Value> rec(Value::constructFrom(response.toMap()));
                 if (!rec->is<RecordValue>())
                 {

diff --git a/doomsday/apps/libdoomsday/src/resource/databundle.cpp b/doomsday/apps/libdoomsday/src/resource/databundle.cpp
@@ -900,9 +900,9 @@ File *DataBundle::Interpreter::interpretFile(File *sourceData) const
     {
         if (!fmt.str.compareWithoutCase(ext))
         {
-            LOG_RES_VERBOSE("Interpreted ") << sourceData->description()
-                                            << " as "
-                                            << ::internal::formatDescriptions[fmt.format];
+            LOG_RES_XVERBOSE("Interpreted %s as %s")
+                    << sourceData->description()
+                    << ::internal::formatDescriptions[fmt.format];
 
             switch (fmt.format)
             {

diff --git a/doomsday/apps/libdoomsday/src/savedsession.cpp b/doomsday/apps/libdoomsday/src/savedsession.cpp
@@ -425,7 +425,7 @@ File *SavedSession::Interpreter::interpretFile(File *sourceData) const
             if (sourceData->extension() == ".save")
             {
                 /// @todo fixme: Don't assume this is a save package.
-                LOG_RES_VERBOSE("Interpreted %s as a SavedSession") << sourceData->description();
+                LOG_RES_XVERBOSE("Interpreted %s as a SavedSession") << sourceData->description();
                 std::unique_ptr<ArchiveFolder> package;
                 package.reset(new SavedSession(*sourceData, sourceData->name()));
 

diff --git a/doomsday/apps/server/src/remoteuser.cpp b/doomsday/apps/server/src/remoteuser.cpp
@@ -178,7 +178,7 @@ DENG2_PIMPL(RemoteUser)
             // Read the client's name and convert the network node into an actual
             // client. Here we also decide if the client's protocol is compatible
             // with ours.
-            name = String::fromUtf8(Block(command.mid(10)));
+            name = String::fromUtf8(command.mid(10));
 
             if (App_ServerSystem().isUserAllowedToJoin(self))
             {

diff --git a/doomsday/sdk/libgui/src/graphics/imagefile.cpp b/doomsday/sdk/libgui/src/graphics/imagefile.cpp
@@ -195,8 +195,8 @@ File *ImageFile::Interpreter::interpretFile(File *sourceData) const
 {
     if (Image::recognize(*sourceData))
     {
-        LOG_RES_VERBOSE("Interpreted ") << sourceData->description()
-                                        << " as an image";
+        LOG_RES_XVERBOSE("Interpreted ") << sourceData->description()
+                                         << " as an image";
         return new ImageFile(sourceData);
     }
     return nullptr;