Cleanup

skyjake · Jun 11, 2016 · 3960276 · 3960276
1 parent e0cf8cf
commit 3960276
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/doomsday/apps/server/src/serversystem.cpp b/doomsday/apps/server/src/serversystem.cpp
@@ -68,7 +68,7 @@ DENG2_PIMPL(ServerSystem)
 
     ListenSocket *serverSock = nullptr;
 
-    QMap<Id, RemoteUser *> users;
+    QHash<Id, RemoteUser *> users;
     ShellUsers shellUsers;
 
     Instance(Public *i) : Base(i) {}

diff --git a/doomsday/sdk/libcore/src/data/reader.cpp b/doomsday/sdk/libcore/src/data/reader.cpp
@@ -332,9 +332,9 @@ Reader &Reader::operator >> (IByteArray &byteArray)
      * because the destination byte array is not guaranteed to be
      * a memory buffer where you can copy the contents directly.
      */
-    QScopedPointer<IByteArray::Byte> data(new IByteArray::Byte[size]);
+    Block data(size);
     d->readBytes(data.data(), size);
-    byteArray.set(0, data.data(), size);
+    byteArray.set(0, data.dataConst(), size);
     return *this;
 }
 
@@ -346,9 +346,9 @@ Reader &Reader::operator >> (FixedByteArray &fixedByteArray)
      * a memory buffer where you can copy the contents directly.
      */
     dsize const size = fixedByteArray.size();
-    QScopedPointer<IByteArray::Byte> data(new IByteArray::Byte[size]);
+    Block data(size);
     d->readBytes(data.data(), size);
-    fixedByteArray.set(0, data.data(), size);
+    fixedByteArray.set(0, data.dataConst(), size);
     return *this;
 }
 

diff --git a/doomsday/sdk/libcore/src/scriptsys/scriptsystem.cpp b/doomsday/sdk/libcore/src/scriptsys/scriptsystem.cpp
@@ -156,13 +156,15 @@ DENG2_PIMPL(ScriptSystem)
         std::unique_ptr<ArrayValue> defaultImportPath(new ArrayValue);
         defaultImportPath->add("");
         //defaultImportPath->add("*"); // Newest module with a matching name.
-        ArrayValue const *importPath = defaultImportPath.get();
+        ArrayValue const *importPath;
         try
         {
             importPath = &App::config().geta("importPath");
         }
         catch (Record::NotFoundError const &)
-        {}
+        {
+            importPath = defaultImportPath.get();
+        }
 
         // Compile a list of all possible import locations.
         importPaths.clear();