Merge branch 'optional_q3map2_type' into 'master'

[xonotic/netradiant.git] / plugins / imageq2 / imageq2.cpp

diff --git a/plugins/imageq2/imageq2.cpp b/plugins/imageq2/imageq2.cpp
index dfd64467d42147c2c06f4b980558f1faf5ef54de..282589323503e11ff5ec1ed303d2683886c46d50 100644 (file)
--- a/plugins/imageq2/imageq2.cpp
+++ b/plugins/imageq2/imageq2.cpp
@@ -1,25 +1,23 @@
 /*
-Copyright (C) 2001-2006, William Joseph.
-All Rights Reserved.
+   Copyright (C) 2001-2006, William Joseph.
+   All Rights Reserved.
 
-This file is part of GtkRadiant.
+   This file is part of GtkRadiant.
 
-GtkRadiant is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   GtkRadiant is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-GtkRadiant is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   GtkRadiant is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty 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 GtkRadiant; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#include "imageq2.h"
+   You should have received a copy of the GNU General Public License
+   along with GtkRadiant; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 #include "debugging/debugging.h"
 #include "ifilesystem.h"
@@ -31,25 +29,25 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "modulesystem/singletonmodule.h"
 
 
-class ImageDependencies : public GlobalFileSystemModuleRef
-{
+class ImageDependencies : public GlobalFileSystemModuleRef {
 };
 
-class ImageWalAPI
-{
-  _QERPlugImageTable m_imagewal;
+class ImageWalAPI {
+    _QERPlugImageTable m_imagewal;
 public:
-  typedef _QERPlugImageTable Type;
-  STRING_CONSTANT(Name, "wal");
-
-  ImageWalAPI()
-  {
-    m_imagewal.loadImage = LoadWal;
-  }
-  _QERPlugImageTable* getTable()
-  {
-    return &m_imagewal;
-  }
+    typedef _QERPlugImageTable Type;
+
+    STRING_CONSTANT(Name, "wal");
+
+    ImageWalAPI()
+    {
+        m_imagewal.loadImage = LoadWal;
+    }
+
+    _QERPlugImageTable *getTable()
+    {
+        return &m_imagewal;
+    }
 };
 
 typedef SingletonModule<ImageWalAPI, ImageDependencies> ImageWalModule;
@@ -58,21 +56,22 @@ ImageWalModule g_ImageWalModule;
 
 ////////////////////////////////////////////////////
 
-class ImageM8API
-{
-  _QERPlugImageTable m_imagem8;
+class ImageM8API {
+    _QERPlugImageTable m_imagem8;
 public:
-  typedef _QERPlugImageTable Type;
-  STRING_CONSTANT(Name, "m8");
-
-  ImageM8API()
-  {
-    m_imagem8.loadImage = LoadM8;
-  }
-  _QERPlugImageTable* getTable()
-  {
-    return &m_imagem8;
-  }
+    typedef _QERPlugImageTable Type;
+
+    STRING_CONSTANT(Name, "m8");
+
+    ImageM8API()
+    {
+        m_imagem8.loadImage = LoadM8;
+    }
+
+    _QERPlugImageTable *getTable()
+    {
+        return &m_imagem8;
+    }
 };
 
 typedef SingletonModule<ImageM8API, ImageDependencies> ImageM8Module;
@@ -81,21 +80,22 @@ ImageM8Module g_ImageM8Module;
 
 ////////////////////////////////////////////////////////
 
-class ImageM32API
-{
-  _QERPlugImageTable m_imagem32;
+class ImageM32API {
+    _QERPlugImageTable m_imagem32;
 public:
-  typedef _QERPlugImageTable Type;
-  STRING_CONSTANT(Name, "m32");
-
-  ImageM32API()
-  {
-    m_imagem32.loadImage = LoadM32;
-  }
-  _QERPlugImageTable* getTable()
-  {
-    return &m_imagem32;
-  }
+    typedef _QERPlugImageTable Type;
+
+    STRING_CONSTANT(Name, "m32");
+
+    ImageM32API()
+    {
+        m_imagem32.loadImage = LoadM32;
+    }
+
+    _QERPlugImageTable *getTable()
+    {
+        return &m_imagem32;
+    }
 };
 
 typedef SingletonModule<ImageM32API, ImageDependencies> ImageM32Module;
@@ -104,11 +104,11 @@ ImageM32Module g_ImageM32Module;
 
 ////////////////////////////////////////////////////////
 
-extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules(ModuleServer& server)
+extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules(ModuleServer &server)
 {
-  initialiseModule(server);
+    initialiseModule(server);
 
-  g_ImageWalModule.selfRegister();
-  g_ImageM8Module.selfRegister();
-  g_ImageM32Module.selfRegister();
+    g_ImageWalModule.selfRegister();
+    g_ImageM8Module.selfRegister();
+    g_ImageM32Module.selfRegister();
 }