Merge remote-tracking branch 'github/master'

[xonotic/netradiant.git] / plugins / archivezip / plugin.cpp

diff --git a/plugins/archivezip/plugin.cpp b/plugins/archivezip/plugin.cpp
index 59e2511ebaeb9720c0fa6125b8bdf007af0b3727..8375eafa2114eaf5592c2e2a88dd04921472c165 100644 (file)
--- a/plugins/archivezip/plugin.cpp
+++ b/plugins/archivezip/plugin.cpp
@@ -1,23 +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
-*/
+   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 "plugin.h"
 
@@ -31,19 +31,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 class ArchiveZipAPI
 {
-  _QERArchiveTable m_archivezip;
+_QERArchiveTable m_archivezip;
 public:
-  typedef _QERArchiveTable Type;
-  STRING_CONSTANT(Name, "pk3");
-
-  ArchiveZipAPI()
-  {
-    m_archivezip.m_pfnOpenArchive = &OpenArchive;
-  }
-  _QERArchiveTable* getTable()
-  {
-    return &m_archivezip;
-  }
+typedef _QERArchiveTable Type;
+STRING_CONSTANT( Name, "pk3" );
+
+ArchiveZipAPI(){
+       m_archivezip.m_pfnOpenArchive = &OpenArchive;
+}
+_QERArchiveTable* getTable(){
+       return &m_archivezip;
+}
 };
 
 typedef SingletonModule<ArchiveZipAPI> ArchiveZipModule;
@@ -53,19 +51,17 @@ ArchiveZipModule g_ArchiveZipModule;
 
 class ArchivePK4API
 {
-  _QERArchiveTable m_archivepk4;
+_QERArchiveTable m_archivepk4;
 public:
-  typedef _QERArchiveTable Type;
-  STRING_CONSTANT(Name, "pk4");
-
-  ArchivePK4API()
-  {
-    m_archivepk4.m_pfnOpenArchive = &OpenArchive;
-  }
-  _QERArchiveTable* getTable()
-  {
-    return &m_archivepk4;
-  }
+typedef _QERArchiveTable Type;
+STRING_CONSTANT( Name, "pk4" );
+
+ArchivePK4API(){
+       m_archivepk4.m_pfnOpenArchive = &OpenArchive;
+}
+_QERArchiveTable* getTable(){
+       return &m_archivepk4;
+}
 };
 
 typedef SingletonModule<ArchivePK4API> ArchivePK4Module;
@@ -73,13 +69,9 @@ typedef SingletonModule<ArchivePK4API> ArchivePK4Module;
 ArchivePK4Module g_ArchivePK4Module;
 
 
-extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules(ModuleServer& server)
-{
-  GlobalErrorStream::instance().setOutputStream(server.getErrorStream());
-  GlobalOutputStream::instance().setOutputStream(server.getOutputStream());
-  GlobalDebugMessageHandler::instance().setHandler(server.getDebugMessageHandler());
-  GlobalModuleServer::instance().set(server);
+extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules( ModuleServer& server ){
+       initialiseModule( server );
 
-  g_ArchiveZipModule.selfRegister();
-  g_ArchivePK4Module.selfRegister();
+       g_ArchiveZipModule.selfRegister();
+       g_ArchivePK4Module.selfRegister();
 }