[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [Konversation] 85b2d8c: Remove LocaleString. It was causing crashes.
From: Gary Cramblitt <garycramblitt () comcast ! net>
Date: 2010-07-01 13:27:52
Message-ID: 20100701132752.360E2BB5709 () projects ! kde ! org
[Download RAW message or body]
commit 85b2d8c478f5635408034f5215370e0c156fe78c
Author: Gary Cramblitt <garycramblitt@comcast.net>
Date: Sat Aug 14 18:34:52 2004 +0000
Remove LocaleString. It was causing crashes. Each component that displays a \
list of nicks will need to implement localeAware sorting.
svn path=/trunk/kdeextragear-2/konversation/; revision=337970
diff --git a/konversation/channelnick.h b/konversation/channelnick.h
index 46c3db5..d8e55e0 100644
--- a/konversation/channelnick.h
+++ b/konversation/channelnick.h
@@ -65,7 +65,7 @@ typedef KSharedPtr<ChannelNick> ChannelNickPtr;
/** A ChannelNickMap is a list of ChannelNick pointers, indexed and sorted by
* lowercase nickname.
*/
-typedef QMap<LocaleString,ChannelNickPtr> ChannelNickMap;
+typedef QMap<QString,ChannelNickPtr> ChannelNickMap;
typedef QValueList<ChannelNickPtr> ChannelNickList;
@@ -73,7 +73,7 @@ typedef QValueList<ChannelNickPtr> ChannelNickList;
/** A ChannelMembershipMap is a list of ChannelNickMap pointers, indexed and
* sorted by lowercase channel name.
*/
-typedef QMap<LocaleString,ChannelNickMap *> ChannelMembershipMap;
+typedef QMap<QString,ChannelNickMap *> ChannelMembershipMap;
#endif /* CHANNEL_NICK_H */
diff --git a/konversation/localestring.h b/konversation/localestring.h
deleted file mode 100644
index 73fcb22..0000000
--- a/konversation/localestring.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- This program 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.
-*/
-
-/*
- localestring.h - Class that sorts in localeAware order.
- begin: Wed Aug 04 2004
- copyright: (C) 2002,2003,2004 by Dario Abatianni
- email: eisfuchs@tigress.com
-*/
-
-
-#ifndef LOCALE_STRING_H
-#define LOCALE_STRING_H
-
-/** A LocaleString is used as a key to a QMap. Unlike QString, it sorts the QMap
- * in localeAware order.
- */
-class LocaleString : public QString
-{
- public:
- LocaleString() : QString() {};
- LocaleString(const QString& s) : QString(s) {}
- LocaleString(const LocaleString& s) : QString(s) {}
- LocaleString& operator=(const QString& s) {
- QString::operator=(s);
- return *this; }
- 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); }
- inline bool operator<( char ch) { return (localeAwareCompare(&ch) < 0); }
-};
-
-#endif
diff --git a/konversation/nickinfo.h b/konversation/nickinfo.h
index 3af3ba9..058a01b 100644
--- a/konversation/nickinfo.h
+++ b/konversation/nickinfo.h
@@ -25,7 +25,6 @@
#include <kabc/addressbook.h>
#include "addressbook.h"
-#include "localestring.h"
class Server;
@@ -102,7 +101,7 @@ class NickInfo : public QObject, public KShared
typedef KSharedPtr<NickInfo> NickInfoPtr;
/** A NickInfoMap is a list of NickInfo objects, indexed and sorted by lowercase \
nickname.
*/
-typedef QMap<LocaleString,NickInfoPtr> NickInfoMap;
+typedef QMap<QString,NickInfoPtr> NickInfoMap;
#endif
diff --git a/konversation/nicksonline.cpp b/konversation/nicksonline.cpp
index e117ecc..308a9b8 100644
--- a/konversation/nicksonline.cpp
+++ b/konversation/nicksonline.cpp
@@ -205,7 +205,7 @@ void NicksOnline::updateServerOnlineList(Server* server, bool)
while (child)
{
nextChild = child->nextSibling();
- if (!nickInfoList->contains(LocaleString(child->text(0).lower()))) delete \
child; + if (!nickInfoList->contains(child->text(0).lower())) delete child;
child = nextChild;
}
// List offline nicknames.
@@ -227,7 +227,7 @@ void NicksOnline::updateServerOnlineList(Server* server, bool)
while (child)
{
nextChild = child->nextSibling();
- if (!nickInfoList->contains(LocaleString(child->text(0).lower()))) delete \
child; + if (!nickInfoList->contains(child->text(0).lower())) delete child;
child = nextChild;
}
// Expand server if newly added to list.
diff --git a/konversation/server.cpp b/konversation/server.cpp
index 176eaca..46c647e 100644
--- a/konversation/server.cpp
+++ b/konversation/server.cpp
@@ -1068,7 +1068,7 @@ QString Server::getNumericalIp()
// Given a nickname, returns NickInfo object. 0 if not found.
NickInfoPtr Server::getNickInfo(const QString& nickname)
{
- LocaleString lcNickname(nickname.lower());
+ QString lcNickname(nickname.lower());
if (allNicks.contains(lcNickname))
{
NickInfoPtr nickinfo = allNicks[lcNickname];
@@ -1087,7 +1087,7 @@ NickInfoPtr Server::obtainNickInfo(const QString& nickname)
if (!nickInfoPtr)
{
nickInfoPtr = new NickInfo(nickname, this);
- allNicks.insert(LocaleString(nickname.lower()), nickInfoPtr);
+ allNicks.insert(QString(nickname.lower()), nickInfoPtr);
}
return nickInfoPtr;
}
@@ -1097,7 +1097,7 @@ NickInfoPtr Server::obtainNickInfo(const QString& nickname)
// Using code must not alter the list.
const ChannelNickMap *Server::getJoinedChannelMembers(const QString& channelName) \
const {
- LocaleString lcChannelName = channelName.lower();
+ QString lcChannelName = channelName.lower();
if (joinedChannels.contains(lcChannelName))
return joinedChannels[lcChannelName];
else
@@ -1109,7 +1109,7 @@ const ChannelNickMap *Server::getJoinedChannelMembers(const \
QString& channelName // Using code must not alter the list.
const ChannelNickMap *Server::getUnjoinedChannelMembers(const QString& channelName) \
const {
- LocaleString lcChannelName = channelName.lower();
+ QString lcChannelName = channelName.lower();
if (unjoinedChannels.contains(lcChannelName))
return unjoinedChannels[lcChannelName];
else
@@ -1133,7 +1133,7 @@ const ChannelNickMap *Server::getChannelMembers(const QString& \
channelName) cons ChannelNickPtr Server::getChannelNick(const QString& channelName, \
const QString& nickname) {
QString lcChannelName = channelName.lower();
- LocaleString lcNickname = nickname.lower();
+ QString lcNickname = nickname.lower();
const ChannelNickMap *channelNickMap = getChannelMembers(lcChannelName);
if (channelNickMap)
{
@@ -1179,7 +1179,7 @@ ChannelNickPtr Server::setChannelNick(const QString& \
channelName, const QString& // Returns a list of all the channels (joined or \
unjoined) that a nick is in. QStringList Server::getNickChannels(QString& nickname)
{
- LocaleString lcNickname = nickname.lower();
+ QString lcNickname = nickname.lower();
QStringList channellist;
ChannelMembershipMap::Iterator channel;
for( channel = joinedChannels.begin(); channel != joinedChannels.end(); ++channel \
) @@ -1252,7 +1252,7 @@ void Server::addQuery(const QString& nickname,const QString& \
hostmask, bool wein
#ifdef USE_NICKINFO
// Update NickInfo.
- LocaleString lcNickname = nickname.lower();
+ QString lcNickname = nickname.lower();
NickInfoPtr nickInfo = obtainNickInfo(nickname);
if ((nickInfo->getHostmask() != hostmask) && !hostmask.isEmpty())
{
@@ -1276,7 +1276,7 @@ void Server::closeQuery(const QString &name)
#ifdef USE_NICKINFO
// Update NickInfo.
- queryNicks.remove(LocaleString(name.lower()));
+ queryNicks.remove(QString(name.lower()));
#endif
}
@@ -1838,11 +1838,11 @@ ChannelNickPtr Server::addNickToJoinedChannelsList(const \
QString& channelName, c bool doChannelJoinedSignal = false;
bool doWatchedNickChangedSignal = false;
bool doChannelMembersChangedSignal = false;
- LocaleString lcNickname = nickname.lower();
+ QString lcNickname = nickname.lower();
// Create NickInfo if not already created.
NickInfoPtr nickInfo = obtainNickInfo(nickname);
// Move the channel from unjoined list (if present) to joined list.
- LocaleString lcChannelName = channelName.lower();
+ QString lcChannelName = channelName.lower();
ChannelNickMap *channel;
if (unjoinedChannels.contains(lcChannelName))
{
@@ -1923,11 +1923,11 @@ ChannelNickPtr Server::addNickToUnjoinedChannelsList(const \
QString& channelName, bool doChannelUnjoinedSignal = false;
bool doWatchedNickChangedSignal = false;
bool doChannelMembersChangedSignal = false;
- LocaleString lcNickname = nickname.lower();
+ QString lcNickname = nickname.lower();
// Create NickInfo if not already created.
NickInfoPtr nickInfo = obtainNickInfo(nickname);
// Move the channel from joined list (if present) to unjoined list.
- LocaleString lcChannelName = channelName.lower();
+ QString lcChannelName = channelName.lower();
ChannelNickMap *channel;
if (joinedChannels.contains(lcChannelName))
{
@@ -1982,7 +1982,7 @@ ChannelNickPtr Server::addNickToUnjoinedChannelsList(const \
QString&, const QStri NickInfoPtr Server::addNickToOnlineList(const QString& \
nickname) {
bool doSignal = false;
- LocaleString lcNickname = nickname.lower();
+ QString lcNickname = nickname.lower();
nicknamesOffline.remove(lcNickname);
NickInfoPtr nickInfo = obtainNickInfo(nickname);
if (!nicknamesOnline.contains(lcNickname))
@@ -2006,7 +2006,7 @@ NickInfoPtr Server::addNickToOnlineList(const QString&) { \
return 0; } NickInfoPtr Server::addNickToOfflineList(const QString& nickname, const \
QStringList& watchList) {
bool doSignal = false;
- LocaleString lcNickname = nickname.lower();
+ QString lcNickname = nickname.lower();
nicknamesOnline.remove(lcNickname);
NickInfoPtr nickInfo;
if (watchList.find(lcNickname) != watchList.end())
@@ -2044,8 +2044,8 @@ void Server::removeChannelNick(const QString& channelName, \
const QString& nickna {
bool doSignal = false;
bool joined = false;
- LocaleString lcChannelName = channelName.lower();
- LocaleString lcNickname = nickname.lower();
+ QString lcChannelName = channelName.lower();
+ QString lcNickname = nickname.lower();
ChannelNickMap *channel;
if (joinedChannels.contains(lcChannelName))
{
@@ -2095,7 +2095,7 @@ void Server::removeJoinedChannel(const QString& channelName)
bool doSignal = false;
QString watchList = KonversationApplication::preferences.getNotifyString();
QStringList watchListLower = QStringList::split(' ', watchList.lower());
- LocaleString lcChannelName = channelName.lower();
+ QString lcChannelName = channelName.lower();
// Move the channel nick list from the joined to unjoined lists.
ChannelNickMap *channel;
ChannelNickMap::Iterator member;
@@ -2108,7 +2108,7 @@ void Server::removeJoinedChannel(const QString& channelName)
bool allDeleted = true;
for ( member = channel->begin(); member != channel->end() ;++member )
{
- LocaleString lcNickname = member.key();
+ QString lcNickname = member.key();
if (watchListLower.find(lcNickname) == watchListLower.end())
{
// Remove the nickname from the unjoined channel. If nickname is no longer
@@ -2143,9 +2143,9 @@ void Server::renameNickInfo(NickInfoPtr nickInfo, const \
QString& newname) if (nickInfo)
{
// Get existing lowercase nickname and rename nickname in the NickInfo object.
- LocaleString lcNickname = nickInfo->getNickname().lower();
+ QString lcNickname = nickInfo->getNickname().lower();
nickInfo->setNickname(newname);
- LocaleString lcNewname = newname.lower();
+ QString lcNewname = newname.lower();
// Rename the key in allNicks list.
allNicks.remove(lcNickname);
allNicks.insert(lcNewname, nickInfo);
diff --git a/konversation/server.h b/konversation/server.h
index 68b16d2..c678108 100644
--- a/konversation/server.h
+++ b/konversation/server.h
@@ -44,7 +44,6 @@ class KonversationMainWindow;
class RawLog;
class ChannelListPanel;
class ScriptLauncher;
-class LocaleString;
class Server : public QObject
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic