Add some const correctness to Network

diff --git a/src/common/network.cpp b/src/common/network.cpp
index ed8b35a..ed14be8 100644 (file)
--- a/src/common/network.cpp
+++ b/src/common/network.cpp
@@ -122,14 +122,14 @@ void Network::setNetworkInfo(const NetworkInfo &info) {
   if(info.rejoinChannels != rejoinChannels()) setRejoinChannels(info.rejoinChannels);
 }
 
   if(info.rejoinChannels != rejoinChannels()) setRejoinChannels(info.rejoinChannels);
 }
 

-QString Network::prefixToMode(const QString &prefix) {
+QString Network::prefixToMode(const QString &prefix) const {

   if(prefixes().contains(prefix))
     return QString(prefixModes()[prefixes().indexOf(prefix)]);
   else
     return QString();
 }
 
   if(prefixes().contains(prefix))
     return QString(prefixModes()[prefixes().indexOf(prefix)]);
   else
     return QString();
 }
 

-QString Network::modeToPrefix(const QString &mode) {
+QString Network::modeToPrefix(const QString &mode) const {

   if(prefixModes().contains(mode))
     return QString(prefixes()[prefixModes().indexOf(mode)]);
   else
   if(prefixModes().contains(mode))
     return QString(prefixes()[prefixModes().indexOf(mode)]);
   else


@@ -146,14 +146,14 @@ QStringList Network::nicks() const {
   return nicks;
 }
 
   return nicks;
 }
 

-QString Network::prefixes() {
+QString Network::prefixes() const {

   if(_prefixes.isNull())
     determinePrefixes();
 
   return _prefixes;
 }
 
   if(_prefixes.isNull())
     determinePrefixes();
 
   return _prefixes;
 }
 

-QString Network::prefixModes() {
+QString Network::prefixModes() const {

   if(_prefixModes.isNull())
     determinePrefixes();
 
   if(_prefixModes.isNull())
     determinePrefixes();
 


@@ -732,7 +732,7 @@ void Network::emitConnectionError(const QString &errorMsg) {
 // ====================
 //  Private:
 // ====================
 // ====================
 //  Private:
 // ====================

-void Network::determinePrefixes() {
+void Network::determinePrefixes() const {

   // seems like we have to construct them first
   QString prefix = support("PREFIX");
 
   // seems like we have to construct them first
   QString prefix = support("PREFIX");
 

diff --git a/src/common/network.h b/src/common/network.h
index 236269a..21bf5d5 100644 (file)
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -135,10 +135,10 @@ public:
   //Network::ConnectionState connectionState() const;
   inline int connectionState() const { return _connectionState; }
 
   //Network::ConnectionState connectionState() const;
   inline int connectionState() const { return _connectionState; }
 

-  QString prefixToMode(const QString &prefix);
-  inline QString prefixToMode(const QCharRef &prefix) { return prefixToMode(QString(prefix)); }
-  QString modeToPrefix(const QString &mode);
-  inline QString modeToPrefix(const QCharRef &mode) { return modeToPrefix(QString(mode)); }
+  QString prefixToMode(const QString &prefix) const;
+  inline QString prefixToMode(const QCharRef &prefix) const { return prefixToMode(QString(prefix)); }
+  QString modeToPrefix(const QString &mode) const;
+  inline QString modeToPrefix(const QCharRef &mode) const { return modeToPrefix(QString(mode)); }

 
   ChannelModeType channelModeType(const QString &mode);
   inline ChannelModeType channelModeType(const QCharRef &mode) { return channelModeType(QString(mode)); }
 
   ChannelModeType channelModeType(const QString &mode);
   inline ChannelModeType channelModeType(const QCharRef &mode) { return channelModeType(QString(mode)); }


@@ -169,9 +169,9 @@ public:
   NetworkInfo networkInfo() const;
   void setNetworkInfo(const NetworkInfo &);
 
   NetworkInfo networkInfo() const;
   void setNetworkInfo(const NetworkInfo &);
 

-  QString prefixes();
-  QString prefixModes();
-  void determinePrefixes();
+  QString prefixes() const;
+  QString prefixModes() const;
+  void determinePrefixes() const;

 
   bool supports(const QString &param) const { return _supports.contains(param); }
   QString support(const QString &param) const;
 
   bool supports(const QString &param) const { return _supports.contains(param); }
   QString support(const QString &param) const;


@@ -336,8 +336,8 @@ private:
   bool _connected;
   ConnectionState _connectionState;
 
   bool _connected;
   ConnectionState _connectionState;
 

-  QString _prefixes;
-  QString _prefixModes;
+  mutable QString _prefixes;
+  mutable QString _prefixModes;

 
   QHash<QString, IrcUser *> _ircUsers;  // stores all known nicks for the server
   QHash<QString, IrcChannel *> _ircChannels; // stores all known channels
 
   QHash<QString, IrcUser *> _ircUsers;  // stores all known nicks for the server
   QHash<QString, IrcChannel *> _ircChannels; // stores all known channels