Cleanup

skyjake · Aug 24, 2015 · 80fceaa · 80fceaa
1 parent 168d846
commit 80fceaa
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 23 deletions.
diff --git a/doomsday/apps/client/include/ui/widgets/busywidget.h b/doomsday/apps/client/include/ui/widgets/busywidget.h
@@ -13,7 +13,7 @@
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
  * Public License for more details. You should have received a copy of the GNU
  * General Public License along with this program; if not, see:
- * http://www.gnu.org/licenses</small> 
+ * http://www.gnu.org/licenses</small>
  */
 
 #ifndef CLIENT_BUSYWIDGET_H

diff --git a/doomsday/apps/client/src/render/modelrenderer.cpp b/doomsday/apps/client/src/render/modelrenderer.cpp
@@ -106,16 +106,6 @@ DENG2_PIMPL(ModelRenderer)
         defaultSpecular = atlas->alloc(img);
 
         uTex = *atlas;
-
-        /*
-        // All loaded items should use this atlas.
-        bank.iterate([this] (DotPath const &path)
-        {
-            if(bank.isLoaded(path))
-            {
-                setupModel(bank.model(path));
-            }
-        });*/
     }
 
     void deinit()
@@ -129,7 +119,10 @@ DENG2_PIMPL(ModelRenderer)
 
     void assetAvailabilityChanged(String const &identifier, filesys::AssetObserver::Event event)
     {
-        //qDebug() << "loading model:" << identifier << event;
+        LOG_RES_MSG("Model asset \"%s\" is now %s")
+                << identifier
+                << (event == filesys::AssetObserver::Added? "available" :
+                                                            "unavailable");
 
         if(event == filesys::AssetObserver::Added)
         {

diff --git a/doomsday/sdk/libappfw/src/widgets/popupwidget.cpp b/doomsday/sdk/libappfw/src/widgets/popupwidget.cpp
@@ -157,7 +157,7 @@ DENG_GUI_PIMPL(PopupWidget)
         if(&widget == realParent)
         {
             // We don't know who the real parent is any more.
-            realParent = 0;
+            realParent = nullptr;
         }
     }
 };

diff --git a/doomsday/sdk/libcore/include/de/data/observers.h b/doomsday/sdk/libcore/include/de/data/observers.h
@@ -14,7 +14,7 @@
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
  * General Public License for more details. You should have received a copy of
  * the GNU Lesser General Public License along with this program; if not, see:
- * http://www.gnu.org/licenses</small> 
+ * http://www.gnu.org/licenses</small>
  */
 
 #ifndef LIBDENG2_OBSERVERS_H
@@ -82,9 +82,9 @@
 /**
  * Macro for defining an observer interface containing a single method.
  *
- * @param Name    Name of the audience. E.g., "Deletion" produces @c DeletionAudience 
+ * @param Name    Name of the audience. E.g., "Deletion" produces @c DeletionAudience
  *                and @c audienceForDeletion.
- * @param Method  The pure virtual method that the observer has to implement. 
+ * @param Method  The pure virtual method that the observer has to implement.
  *                The @c virtual keyword and <code>=0</code> are automatically included.
  */
 #define DENG2_DEFINE_AUDIENCE(Name, Method) \

diff --git a/doomsday/sdk/libcore/src/core/app.cpp b/doomsday/sdk/libcore/src/core/app.cpp
@@ -14,7 +14,7 @@
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
  * General Public License for more details. You should have received a copy of
  * the GNU Lesser General Public License along with this program; if not, see:
- * http://www.gnu.org/licenses</small> 
+ * http://www.gnu.org/licenses</small>
  */
 
 #include "de/Animation"
@@ -278,7 +278,7 @@ DENG2_PIMPL(App)
                 level = LogEntry::XVerbose;
             }
 
-            logFilter.setMinLevel(LogEntry::AllDomains, level);            
+            logFilter.setMinLevel(LogEntry::AllDomains, level);
         }
 
         // Enable developer messages across the board?
@@ -485,7 +485,7 @@ NativePath App::nativePluginBinaryPath()
         d->cmdLine.makeAbsolutePath(opt.pos + 1);
         return (d->cachedPluginBinaryPath = d->cmdLine.at(opt.pos + 1));
     }
-    
+
     NativePath path;
 #ifdef WIN32
     path = d->appPath.fileNamePath() / "plugins";
@@ -538,7 +538,7 @@ Archive const &App::persistentData()
     }
     return *persist;
 }
-    
+
 Archive &App::mutablePersistentData()
 {
     Archive *persist = DENG2_APP->d->persistentData;
@@ -592,7 +592,7 @@ NativePath App::nativeBasePath()
     if(!path.exists())
     {
         // Fall back to using the application binary path, which always exists.
-        // We use this instead of the working directory because the basedir is 
+        // We use this instead of the working directory because the basedir is
         // meant for storing read-only data files that may be deployed with
         // the application binary.
         path = d->appPath.fileNamePath();
@@ -696,7 +696,7 @@ void App::initSubsystems(SubsystemInitFlags flags)
     d->clock.setTime(Time::currentHighPerformanceTime());
 
     // Now we can start observing progress of time.
-    d->clock.audienceForTimeChange() += this;    
+    d->clock.audienceForTimeChange() += this;
 
     if(allowPlugins)
     {

diff --git a/doomsday/sdk/libcore/src/core/asset.cpp b/doomsday/sdk/libcore/src/core/asset.cpp
@@ -13,7 +13,7 @@
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
  * General Public License for more details. You should have received a copy of
  * the GNU Lesser General Public License along with this program; if not, see:
- * http://www.gnu.org/licenses</small> 
+ * http://www.gnu.org/licenses</small>
  */
 
 #include "de/Asset"