-Wshadow fixes

[user/henk/code/inspircd.git] / src / modules / extra / m_sqlutils.h

diff --git a/src/modules/extra/m_sqlutils.h b/src/modules/extra/m_sqlutils.h
index 255e92122cded830b3722b45b5c4cd405004cabc..485f0915847e4e0fc78629c729707610b1b71d37 100644 (file)
--- a/src/modules/extra/m_sqlutils.h
+++ b/src/modules/extra/m_sqlutils.h
@@ -1,3 +1,16 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #ifndef INSPIRCD_SQLUTILS
 #define INSPIRCD_SQLUTILS
 
@@ -20,9 +33,9 @@ public:
        unsigned long id;
        /** User
         */
-       userrec* user;
+       User* user;
        
-       AssociateUser(Module* s, Module* d, unsigned long i, userrec* u)
+       AssociateUser(Module* s, Module* d, unsigned long i, User* u)
        : Request(s, d, SQLUTILAU), id(i), user(u)
        {
        }
@@ -44,9 +57,9 @@ public:
        unsigned long id;
        /** Channel
         */
-       chanrec* chan;
+       Channel* chan;
        
-       AssociateChan(Module* s, Module* d, unsigned long i, chanrec* u)
+       AssociateChan(Module* s, Module* d, unsigned long i, Channel* u)
        : Request(s, d, SQLUTILAC), id(i), chan(u)
        {
        }
@@ -89,7 +102,7 @@ public:
        unsigned long id;
        /** The user
         */
-       userrec* user;
+       User* user;
 
        GetAssocUser(Module* s, Module* d, unsigned long i)
        : Request(s, d, SQLUTILGU), id(i), user(NULL)
@@ -113,7 +126,7 @@ public:
        unsigned long id;
        /** The channel
         */
-       chanrec* chan;
+       Channel* chan;
 
        GetAssocChan(Module* s, Module* d, unsigned long i)
        : Request(s, d, SQLUTILGC), id(i), chan(NULL)