cmake: Autogenerate most of the .qrc resource files

[quassel.git] / src / client / networkmodel.cpp

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 6df98c3..5daec85 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -22,9 +22,6 @@
 
 #include <QAbstractItemView>
 #include <QMimeData>
-#if QT_VERSION < 0x050000
-#include <QTextDocument>        // for Qt::escape()
-#endif
 
 #include "buffermodel.h"
 #include "buffersettings.h"
@@ -86,11 +83,7 @@ QString NetworkItem::escapeHTML(const QString &string, bool useNonbreakingSpaces
 {
     // QString.replace() doesn't guarantee the source string will remain constant.
     // Use a local variable to avoid compiler errors.
-#if QT_VERSION < 0x050000
-    QString formattedString = Qt::escape(string);
-#else
     QString formattedString = string.toHtmlEscaped();
-#endif
     return (useNonbreakingSpaces ? formattedString.replace(" ", "&nbsp;") : formattedString);
 }
 
@@ -655,8 +648,8 @@ QString QueryBufferItem::toolTip(int column) const
                    NetworkItem::escapeHTML(tr("Identified for this nick")),
                    !accountAdded);
             // Don't add the account row again if information's already added via account-notify
-            // Mark the row as added
-            accountAdded = true;
+            // Not used further down...
+            // accountAdded = true;
         } else {
             addRow(NetworkItem::escapeHTML(tr("Service Reply"), true),
                    NetworkItem::escapeHTML(_ircUser->whoisServiceReply()),
@@ -1236,8 +1229,8 @@ QString IrcUserItem::toolTip(int column) const
                NetworkItem::escapeHTML(tr("Identified for this nick")),
                !accountAdded);
         // Don't add the account row again if information's already added via account-notify
-        // Mark the row as added
-        accountAdded = true;
+        // Not used further down...
+        // accountAdded = true;
     } else {
         addRow(NetworkItem::escapeHTML(tr("Service Reply"), true),
                NetworkItem::escapeHTML(_ircUser->whoisServiceReply()),