Changeset e249438 in confclerk_git for src/gui

Timestamp:

09/10/13 23:41:58 (9 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

d942dc3

Parents:

0584e12

Message:

Escaped the strings that are shown in the dialog and preserve some layout.

File:

• src/gui/eventdialog.cpp (modified) (2 diffs)

src/gui/eventdialog.cpp

@@ -39 +39 @@
     QString info;
     // title
-    info.append(QString("<h1>%1</h1>\n").arg(event.title()));
+    info.append(QString("<h1>%1</h1>\n").arg(Qt::escape(event.title())));
 
     // persons
     info += QString("<h2>%1</h2>\n").arg(tr("Persons"));
-    info += QString("<p>%1</p>\n").arg(event.persons().join(", "));
+    QStringList persons = event.persons();
+    for (int i = 0; i != persons.size(); ++i) persons[i] = Qt::escape(persons[i]);
+    info += QString("<p>%1</p>\n").arg(persons.join(", "));
 
     // abstract
     info += QString("<h2>%1</h2>\n").arg(tr("Abstract"));
-    info += QString("<p>%1</p>\n").arg(event.abstract());
+    info += Qt::convertFromPlainText(event.abstract(), Qt::WhiteSpaceNormal);
 
     // description
     info += QString("<h2>%1</h2>\n").arg(tr("Description"));
-    info += QString("<p>%1</p>\n").arg(event.description());
+    info += Qt::convertFromPlainText(event.description(), Qt::WhiteSpaceNormal);
 
     // links
@@ -62 +64 @@
         if (url.isEmpty() || url == "http://") continue;
         if (name.isEmpty()) name = url;
-        info += QString("<li><a href=\"%1\">%2</a></li>\n").arg(url, name);
+        info += QString("<li><a href=\"%1\">%2</a></li>\n").arg(Qt::escape(url), Qt::escape(name));
     }
     info += QString("</ul>\n");