Revert partially (auto) "reformat code! now the code is only ugly on the *inside*"

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

diff --git a/plugins/image/image.cpp b/plugins/image/image.cpp
index 2a4afb2369c9ca04c561209eb471ecdc9938c1bc..7d767f228426db79a3fb0db5a9b68c819af87433 100644 (file)
--- a/plugins/image/image.cpp
+++ b/plugins/image/image.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 "image.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 "ifilesystem.h"
 #include "iimage.h"
@@ -29,6 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "bmp.h"
 #include "pcx.h"
 #include "dds.h"
+#include "ktx.h"
 
 
 #include "modulesystem/singletonmodule.h"
@@ -39,19 +38,17 @@ class ImageDependencies : public GlobalFileSystemModuleRef
 
 class ImageTGAAPI
 {
-  _QERPlugImageTable m_imagetga;
+_QERPlugImageTable m_imagetga;
 public:
-  typedef _QERPlugImageTable Type;
-  STRING_CONSTANT(Name, "tga");
-
-  ImageTGAAPI()
-  {
-    m_imagetga.loadImage = LoadTGA;
-  }
-  _QERPlugImageTable* getTable()
-  {
-    return &m_imagetga;
-  }
+typedef _QERPlugImageTable Type;
+STRING_CONSTANT( Name, "tga" );
+
+ImageTGAAPI(){
+       m_imagetga.loadImage = LoadTGA;
+}
+_QERPlugImageTable* getTable(){
+       return &m_imagetga;
+}
 };
 
 typedef SingletonModule<ImageTGAAPI> ImageTGAModule;
@@ -61,19 +58,17 @@ ImageTGAModule g_ImageTGAModule;
 
 class ImageJPGAPI
 {
-  _QERPlugImageTable m_imagejpg;
+_QERPlugImageTable m_imagejpg;
 public:
-  typedef _QERPlugImageTable Type;
-  STRING_CONSTANT(Name, "jpg");
-
-  ImageJPGAPI()
-  {
-    m_imagejpg.loadImage = LoadJPG;
-  }
-  _QERPlugImageTable* getTable()
-  {
-    return &m_imagejpg;
-  }
+typedef _QERPlugImageTable Type;
+STRING_CONSTANT( Name, "jpg" );
+
+ImageJPGAPI(){
+       m_imagejpg.loadImage = LoadJPG;
+}
+_QERPlugImageTable* getTable(){
+       return &m_imagejpg;
+}
 };
 
 typedef SingletonModule<ImageJPGAPI, ImageDependencies> ImageJPGModule;
@@ -83,19 +78,17 @@ ImageJPGModule g_ImageJPGModule;
 
 class ImageBMPAPI
 {
-  _QERPlugImageTable m_imagebmp;
+_QERPlugImageTable m_imagebmp;
 public:
-  typedef _QERPlugImageTable Type;
-  STRING_CONSTANT(Name, "bmp");
-
-  ImageBMPAPI()
-  {
-    m_imagebmp.loadImage = LoadBMP;
-  }
-  _QERPlugImageTable* getTable()
-  {
-    return &m_imagebmp;
-  }
+typedef _QERPlugImageTable Type;
+STRING_CONSTANT( Name, "bmp" );
+
+ImageBMPAPI(){
+       m_imagebmp.loadImage = LoadBMP;
+}
+_QERPlugImageTable* getTable(){
+       return &m_imagebmp;
+}
 };
 
 typedef SingletonModule<ImageBMPAPI, ImageDependencies> ImageBMPModule;
@@ -105,19 +98,17 @@ ImageBMPModule g_ImageBMPModule;
 
 class ImagePCXAPI
 {
-  _QERPlugImageTable m_imagepcx;
+_QERPlugImageTable m_imagepcx;
 public:
-  typedef _QERPlugImageTable Type;
-  STRING_CONSTANT(Name, "pcx");
-
-  ImagePCXAPI()
-  {
-    m_imagepcx.loadImage = LoadPCX32;
-  }
-  _QERPlugImageTable* getTable()
-  {
-    return &m_imagepcx;
-  }
+typedef _QERPlugImageTable Type;
+STRING_CONSTANT( Name, "pcx" );
+
+ImagePCXAPI(){
+       m_imagepcx.loadImage = LoadPCX32;
+}
+_QERPlugImageTable* getTable(){
+       return &m_imagepcx;
+}
 };
 
 typedef SingletonModule<ImagePCXAPI, ImageDependencies> ImagePCXModule;
@@ -127,19 +118,17 @@ ImagePCXModule g_ImagePCXModule;
 
 class ImageDDSAPI
 {
-  _QERPlugImageTable m_imagedds;
+_QERPlugImageTable m_imagedds;
 public:
-  typedef _QERPlugImageTable Type;
-  STRING_CONSTANT(Name, "dds");
-
-  ImageDDSAPI()
-  {
-    m_imagedds.loadImage = LoadDDS;
-  }
-  _QERPlugImageTable* getTable()
-  {
-    return &m_imagedds;
-  }
+typedef _QERPlugImageTable Type;
+STRING_CONSTANT( Name, "dds" );
+
+ImageDDSAPI(){
+       m_imagedds.loadImage = LoadDDS;
+}
+_QERPlugImageTable* getTable(){
+       return &m_imagedds;
+}
 };
 
 typedef SingletonModule<ImageDDSAPI, ImageDependencies> ImageDDSModule;
@@ -147,16 +136,33 @@ typedef SingletonModule<ImageDDSAPI, ImageDependencies> ImageDDSModule;
 ImageDDSModule g_ImageDDSModule;
 
 
-extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules(ModuleServer& server)
+class ImageKTXAPI
 {
-  GlobalErrorStream::instance().setOutputStream(server.getErrorStream());
-  GlobalOutputStream::instance().setOutputStream(server.getOutputStream());
-  GlobalDebugMessageHandler::instance().setHandler(server.getDebugMessageHandler());
-  GlobalModuleServer::instance().set(server);
-
-  g_ImageTGAModule.selfRegister();
-  g_ImageJPGModule.selfRegister();
-  g_ImageBMPModule.selfRegister();
-  g_ImagePCXModule.selfRegister();
-  g_ImageDDSModule.selfRegister();
+_QERPlugImageTable m_imagektx;
+public:
+typedef _QERPlugImageTable Type;
+STRING_CONSTANT( Name, "ktx" );
+
+ImageKTXAPI(){
+       m_imagektx.loadImage = LoadKTX;
+}
+_QERPlugImageTable* getTable(){
+       return &m_imagektx;
+}
+};
+
+typedef SingletonModule<ImageKTXAPI, ImageDependencies> ImageKTXModule;
+
+ImageKTXModule g_ImageKTXModule;
+
+
+extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules( ModuleServer& server ){
+       initialiseModule( server );
+
+       g_ImageTGAModule.selfRegister();
+       g_ImageJPGModule.selfRegister();
+       g_ImageBMPModule.selfRegister();
+       g_ImagePCXModule.selfRegister();
+       g_ImageDDSModule.selfRegister();
+       g_ImageKTXModule.selfRegister();
 }