commit 2633298900c02507350c452119c230ec66ec1775 Author: Gary Cramblitt Date: Sat Jun 19 04:34:13 2004 +0000 Add LocaleString operator and initialize KShared object. svn path=/trunk/kdeextragear-2/konversation/; revision=321856 diff --git a/konversation/nickinfo.cpp b/konversation/nickinfo.cpp index b068741..4da8d6c 100644 --- a/konversation/nickinfo.cpp +++ b/konversation/nickinfo.cpp @@ -25,7 +25,7 @@ let Server know that the object has been modified. */ -NickInfo::NickInfo(const QString& nick, Server* server) +NickInfo::NickInfo(const QString& nick, Server* server): KShared() { nickname = nick; owningServer = server; diff --git a/konversation/server.cpp b/konversation/server.cpp index 9582b8f..2868f09 100644 --- a/konversation/server.cpp +++ b/konversation/server.cpp @@ -1047,9 +1047,11 @@ QString Server::getNumericalIp() // Given a nickname, returns NickInfo object. 0 if not found. NickInfoPtr Server::getNickInfo(const QString& nickname) { - LocaleString lcNickname = nickname.lower(); + LocaleString lcNickname(nickname.lower()); if (allNicks.contains(lcNickname)) + { return allNicks[lcNickname]; + } else return 0; } diff --git a/konversation/server.h b/konversation/server.h index 4143e24..6f64576 100644 --- a/konversation/server.h +++ b/konversation/server.h @@ -17,6 +17,9 @@ #include #include + +#include + #include #include "inputfilter.h" @@ -56,6 +59,7 @@ class LocaleString : public QString LocaleString& operator=(const LocaleString& s) { QString::operator=(s); return *this; } + inline bool operator<( const LocaleString &s1) { return (localeAwareCompare(s1) < 0); } inline bool operator<( const QString &s1) { return (localeAwareCompare(s1) < 0); } inline bool operator<( const char *s1) { return (localeAwareCompare(s1) < 0); } inline bool operator<( QChar c) { return (localeAwareCompare(c) < 0); } @@ -70,8 +74,8 @@ typedef QMap NickInfoMap; class ChannelNick : public KShared { public: - ChannelNick() : mode(0), nickInfo(0) {} - ChannelNick(unsigned int m, NickInfoPtr ni) : mode(m), nickInfo(ni) {} + ChannelNick() : KShared(), mode(0), nickInfo(0) {} + ChannelNick(unsigned int m, NickInfoPtr ni) : KShared(), mode(m), nickInfo(ni) {} unsigned int mode; NickInfoPtr nickInfo; };