Remove more classbase

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11905 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/ctables.h b/include/ctables.h
index 0cf4c50d2c65d27a93e96f1ce2708ae5c1308e91..cc80053d85de35e9c304fb5992cdabf631253368 100644 (file)
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -85,7 +85,7 @@ struct RouteDescriptor
 /** A structure that defines a command. Every command available
  * in InspIRCd must be defined as derived from Command.
  */
-class CoreExport Command : public Extensible
+class CoreExport Command : public classbase
 {
  public:
        /** Command name

diff --git a/include/inspircd.h b/include/inspircd.h
index 93ba8bfa618972925ef358d0885ea0c844912fa3..9f7d07f5d1bec200d3b0c9410291d90960302371 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -208,7 +208,7 @@ template<typename T, typename V, typename R> inline char* itoa(const T &in, V *r
  * It is used by the InspIRCd class, which internally
  * has an instance of it.
  */
-class serverstats : public classbase
+class serverstats
 {
   public:
        /** Number of accepted connections
@@ -298,14 +298,12 @@ class CoreExport ConfigReaderThread : public Thread
 };
 
 /** The main class of the irc server.
- * This class contains instances of all the other classes
- * in this software, with the exception of the base class,
- * classbase. Amongst other things, it contains a ModeParser,
- * a DNS object, a CommandParser object, and a list of active
- * Module objects, and facilities for Module objects to
- * interact with the core system it implements.
+ * This class contains instances of all the other classes in this software.
+ * Amongst other things, it contains a ModeParser, a DNS object, a CommandParser
+ * object, and a list of active Module objects, and facilities for Module
+ * objects to interact with the core system it implements.
  */
-class CoreExport InspIRCd : public classbase
+class CoreExport InspIRCd
 {
  private:
        /** Holds the current UID. Used to generate the next one.

diff --git a/include/logger.h b/include/logger.h
index 709d00aed92bd28d1784995f58e45ba52b81d930..4914e86a2fe992acd3e90281bbf7609b72b52d3f 100644 (file)
--- a/include/logger.h
+++ b/include/logger.h
@@ -117,7 +117,7 @@ class CoreExport LogStream : public classbase
 
 typedef std::map<FileWriter*, int> FileLogMap;
 
-class CoreExport LogManager : public classbase
+class CoreExport LogManager
 {
  private:
        /** Lock variable, set to true when a log is in progress, which prevents further loggging from happening and creating a loop.

diff --git a/include/protocol.h b/include/protocol.h
index a3afe9fb37f37da3066ea1e2481afc352abba425..ed53c3cbbd2bca6efe1ab8b9e9b779f3dccfa6f3 100644 (file)
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -33,7 +33,7 @@ class ProtoServer
 
 typedef std::list<ProtoServer> ProtoServerList;
 
-class ProtocolInterface : public Extensible
+class ProtocolInterface
 {
  public:
        ProtocolInterface() { }

diff --git a/include/snomasks.h b/include/snomasks.h
index dddde1ff9095339ce74d46d0d7a6343d02b1fd67..591a8708cc1f7cf766ee6a99b5d748291f84ce7e 100644 (file)
--- a/include/snomasks.h
+++ b/include/snomasks.h
@@ -14,7 +14,7 @@
 #ifndef __SNOMASKS_H__
 #define __SNOMASKS_H__
 
-class Snomask : public Extensible
+class Snomask
 {
  public:
        char MySnomask;

diff --git a/include/testsuite.h b/include/testsuite.h
index 89318e32f82d22a51a793c4e51ce55e0e58f3cad..66a12ab39e80a674b3d0558916620cecc8dbc87d 100644 (file)
--- a/include/testsuite.h
+++ b/include/testsuite.h
@@ -14,7 +14,7 @@
 #ifndef __TESTSUITE_H__
 #define __TESTSUITE_H__
 
-class TestSuite : public Extensible
+class TestSuite
 {
  public:
        TestSuite();

diff --git a/include/usermanager.h b/include/usermanager.h
index 93f0476e3c8daccc9008f6e40807d1cccfcb254d..4c1f9424883688222fd2a07b6f43e9f057a8a714 100644 (file)
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -19,7 +19,7 @@
 /** A list of ip addresses cross referenced against clone counts */
 typedef std::map<irc::string, unsigned int> clonemap;
 
-class CoreExport UserManager : public Extensible
+class CoreExport UserManager
 {
  private:
        /** Map of local ip addresses for clone counting

diff --git a/src/modules/httpd.h b/src/modules/httpd.h
index 483009095572bcbd409106229bea9e1b0388a890..97148d413cab69ba2a51cf28a3fe748920cc5e18 100644 (file)
--- a/src/modules/httpd.h
+++ b/src/modules/httpd.h
@@ -22,7 +22,7 @@
 
 /** A modifyable list of HTTP header fields
  */
-class HTTPHeaders : public classbase
+class HTTPHeaders
 {
  protected:
        std::map<std::string,std::string> headers;

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index cf60c084a4725a21b44bbf79239abae19ec3ddd2..c356a2154cc88470b1d75a3838a01b6973e41a6f 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -18,7 +18,7 @@
 
 /* $ModDesc: Implementation of callerid (umode +g & /accept, ala hybrid etc) */
 
-class callerid_data : public classbase
+class callerid_data
 {
  public:
        time_t lastnotify;

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index df42d4608fd3cf690ab27e4c4bb38e03e8df03a1..4b960e18b6b6e8dddd94fefa7f0b88274997ec4c 100644 (file)
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -36,7 +36,7 @@ class CommandCheck : public Command
        void dumpExt(User* user, std::string checkstr, Extensible* ext)
        {
                std::stringstream dumpkeys;
-               for(ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); i++)
+               for(Extensible::ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); i++)
                {
                        ExtensionItem* item = i->first;
                        std::string value = item->serialize(FORMAT_USER, ext, i->second);

diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index 7f67b8d08f9ffc6a5cbc69bb62b39542782fa860..a267cd4043d448031046c3cd29db7e297bad9c91 100644 (file)
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -17,7 +17,7 @@
 
 /** Holds settings and state associated with channel mode +F
  */
-class nickfloodsettings : public classbase
+class nickfloodsettings
 {
  public:
        int secs;

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index b3b8045ae99875d72f2473a71b17fad62d8f070c..8e1a73354782fef65ec538d5718b6fc62707aea2 100644 (file)
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -23,7 +23,7 @@ enum SaslResult { SASL_OK, SASL_FAIL, SASL_ABORT };
 /**
  * Tracks SASL authentication state like charybdis does. --nenolod
  */
-class SaslAuthenticator : public classbase
+class SaslAuthenticator
 {
  private:
        InspIRCd *ServerInstance;