Menu
▾
▴
[Libirc-commits] SF.net SVN: libirc: [239] trunk/libirc
|
From: <mm...@us...> - 2007-10-05 10:12:58
|
Revision: 239
http://libirc.svn.sourceforge.net/libirc/?rev=239&view=rev
Author: mm_202
Date: 2007-10-05 03:12:56 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
Some minor clean and typo fixes.
Modified Paths:
--------------
trunk/libirc/include/IRCClient.h
trunk/libirc/include/IRCUserManager.h
trunk/libirc/src/IRCClient.cpp
trunk/libirc/src/IRCUserManager.cpp
Modified: trunk/libirc/include/IRCClient.h
===================================================================
--- trunk/libirc/include/IRCClient.h 2007-10-05 05:37:09 UTC (rev 238)
+++ trunk/libirc/include/IRCClient.h 2007-10-05 10:12:56 UTC (rev 239)
@@ -131,7 +131,7 @@
// IRC info operations
virtual string_list listUsers ( std::string channel );
- virtual string_list listChanels ( void );
+ virtual string_list listChannels ( void ); // NOTE: was this listChanels for a reason?? mm_202.
virtual string_list listChanOps ( std::string channel );
virtual trIRCChannelPermisions getChanPerms ( std::string channel );
@@ -209,13 +209,13 @@
// networking
TCPClientConnection *tcpClient;
- TCPConnection &tcpConnection;
+ TCPConnection &tcpConnection;
// irc data
- std::string ircServerName;
- std::string reportedServerHost;
- unsigned short ircServerPort;
- std::string lastRecevedData;
+ std::string ircServerName;
+ std::string reportedServerHost;
+ unsigned short ircServerPort;
+ std::string lastRecevedData;
// IRC "constants"
std::string ircMessageTerminator;
@@ -233,7 +233,7 @@
teIRCConnectionState ircConnectionState;
- bool registered;
+ bool registered;
virtual teIRCConnectionState getConnectionState ( void ){return ircConnectionState;}
virtual void setConnectionState ( teIRCConnectionState state ){ircConnectionState = state;}
@@ -253,8 +253,8 @@
void registerDefaultCommandhandlers ( void );
// event handlers
- tmIRCEventMap defaultEventHandlers;
- tmIRCEventListMap userEventHandlers;
+ tmIRCEventMap defaultEventHandlers;
+ tmIRCEventListMap userEventHandlers;
void addDefaultEventHandlers ( teIRCEventType eventType, IRCBasicEventCallback* handler );
void clearDefaultEventHandlers ( void );
@@ -262,17 +262,17 @@
// loging
IRCClientLogHandler *logHandler;
- std::string logfile;
- int debugLogLevel;
+ std::string logfile;
+ int debugLogLevel;
// info from the connection
- std::string MOTD;
- std::string requestedNick;
- std::string nickname;
+ std::string MOTD;
+ std::string requestedNick;
+ std::string nickname;
- IRCUserManager userManager;
+ IRCUserManager userManager;
// flood protection
- float minCycleTime;
+ float minCycleTime;
};
#endif //_IRC_CLIENT_H_
Modified: trunk/libirc/include/IRCUserManager.h
===================================================================
--- trunk/libirc/include/IRCUserManager.h 2007-10-05 05:37:09 UTC (rev 238)
+++ trunk/libirc/include/IRCUserManager.h 2007-10-05 10:12:56 UTC (rev 239)
@@ -52,44 +52,44 @@
typedef struct
{
std::string mode;
- bool allowColors;
- bool forwarded;
- bool inviteOnly;
- bool anyInvite;
- bool juped;
- int userLimit;
- bool moderated;
- bool externalMessages;
- bool permanent;
- bool regForVoice;
- bool regOnly;
- bool secret;
- bool reducedModeraton;
+ bool allowColors;
+ bool forwarded;
+ bool inviteOnly;
+ bool anyInvite;
+ bool juped;
+ int userLimit;
+ bool moderated;
+ bool externalMessages;
+ bool permanent;
+ bool regForVoice;
+ bool regOnly;
+ bool secret;
+ bool reducedModeraton;
}trIRCChannelPermisions;
typedef struct
{
- int id;
- std::string name;
- trIRCChannelPermisions perms;
+ int id;
+ std::string name;
+ trIRCChannelPermisions perms;
std::map<int,trIRCChannelUserPermisions>userPerms;
- std::string lastMessage;
- int lastMessageUser;
- std::string topic;
- std::vector<trIRCBanListItem> banList;
+ std::string lastMessage;
+ int lastMessageUser;
+ std::string topic;
+ std::vector<trIRCBanListItem> banList;
}trIRCChannelRecord;
typedef struct
{
- int id;
- std::string nick;
- std::string host;
+ int id;
+ std::string nick;
+ std::string host;
- int lastMessageChannel;
- std::string lastMessage;
+ int lastMessageChannel;
+ std::string lastMessage;
- trIRCUserPermisions perms;
- std::vector<int> channels;
+ trIRCUserPermisions perms;
+ std::vector<int> channels;
}trIRCUserRecord;
class IRCUserManager
@@ -179,8 +179,8 @@
std::vector<trIRCBanListItem> getChannelBanList ( std::string &channel );
std::vector<int> listChannelUsers ( int id );
- std::vector<int> listChannelsUser ( std::string &name );
- std::vector<std::string> listChanneUserlNames ( int id );
+ std::vector<int> listChannelUsers ( std::string &name );
+ std::vector<std::string> listChannelUserNames ( int id );
std::vector<std::string> listChannelUserNames ( std::string &name );
std::vector<int> listChannels ( void );
@@ -252,9 +252,9 @@
std::map<std::string,int> userNameLookup;
std::map<std::string,int> channelNameLookup;
- bool autoPurgeOnLastPart;
- int lastUserID;
- int lastChannelID;
+ bool autoPurgeOnLastPart;
+ int lastUserID;
+ int lastChannelID;
};
#endif//_IRC_USER_MANAGER_
\ No newline at end of file
Modified: trunk/libirc/src/IRCClient.cpp
===================================================================
--- trunk/libirc/src/IRCClient.cpp 2007-10-05 05:37:09 UTC (rev 238)
+++ trunk/libirc/src/IRCClient.cpp 2007-10-05 10:12:56 UTC (rev 239)
@@ -665,7 +665,7 @@
return userNames;
}
-string_list IRCClient::listChanels ( void )
+string_list IRCClient::listChannels ( void )
{
return userManager.listChannelNames();
}
Modified: trunk/libirc/src/IRCUserManager.cpp
===================================================================
--- trunk/libirc/src/IRCUserManager.cpp 2007-10-05 05:37:09 UTC (rev 238)
+++ trunk/libirc/src/IRCUserManager.cpp 2007-10-05 10:12:56 UTC (rev 239)
@@ -457,7 +457,7 @@
return userList;
}
-std::vector<int> IRCUserManager::listChannelsUser ( std::string &name )
+std::vector<int> IRCUserManager::listChannelUsers ( std::string &name )
{
trIRCChannelRecord &channel = getChannelInfo(name);
@@ -469,7 +469,7 @@
return userList;
}
-std::vector<std::string> IRCUserManager::listChanneUserlNames ( int id )
+std::vector<std::string> IRCUserManager::listChannelUserNames ( int id )
{
trIRCChannelRecord &channel = getChannelInfo(id);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
