Add SslInfoDlg as a nice way to show information about an SSL connection

[quassel.git] / src / common / util.cpp

diff --git a/src/common/util.cpp b/src/common/util.cpp
index 4698b30..8b9231e 100644 (file)
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -23,9 +23,7 @@
 #include <QCoreApplication>
 #include <QDebug>
 #include <QFile>
-#include <QLibraryInfo>
 #include <QTextCodec>
-#include <QTranslator>
 
 #include "quassel.h"
 
@@ -110,14 +108,14 @@ uint editingDistance(const QString &s1, const QString &s2) {
       uint insertChar = matrix[i][j-1] + 1;
 
       if(deleteChar < insertChar)
-       min = deleteChar;
+        min = deleteChar;
       else
-       min = insertChar;
+        min = insertChar;
 
       if(s1[i-1] == s2[j-1]) {
-       uint inheritChar = matrix[i-1][j-1];
-       if(inheritChar < min)
-         min = inheritChar;
+        uint inheritChar = matrix[i-1][j-1];
+        if(inheritChar < min)
+          min = inheritChar;
       }
 
       matrix[i][j] = min;
@@ -126,32 +124,6 @@ uint editingDistance(const QString &s1, const QString &s2) {
   return matrix[n-1][m-1];
 }
 
-void loadTranslation(const QLocale &locale) {
-  QTranslator *qtTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QtTr");
-  QTranslator *quasselTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QuasselTr");
-
-  if(!qtTranslator) {
-    qtTranslator = new QTranslator(qApp);
-    qtTranslator->setObjectName("QtTr");
-    qApp->installTranslator(qtTranslator);
-  }
-  if(!quasselTranslator) {
-    quasselTranslator = new QTranslator(qApp);
-    quasselTranslator->setObjectName("QuasselTr");
-    qApp->installTranslator(quasselTranslator);
-  }
-
-  QLocale::setDefault(locale);
-
-  if(locale.language() == QLocale::C)
-    return;
-
-  bool success = qtTranslator->load(QString(":i18n/qt_%1").arg(locale.name()));
-  if(!success)
-    qtTranslator->load(QString("%2/qt_%1").arg(locale.name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)));
-  quasselTranslator->load(QString(":i18n/quassel_%1").arg(locale.name()));
-}
-
 QString secondsToString(int timeInSeconds) {
     QList< QPair<int, QString> > timeUnit;
     timeUnit.append(qMakePair(365*24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "year")));
@@ -170,3 +142,14 @@ QString secondsToString(int timeInSeconds) {
     }
     return returnString.join(", ");
 }
+
+QByteArray prettyDigest(const QByteArray &digest) {
+  QByteArray hexDigest = digest.toHex().toUpper();
+  QByteArray prettyDigest;
+  prettyDigest.fill(':', hexDigest.count() + (hexDigest.count() / 2) - 1);
+
+  for(int i = 0; i * 2 < hexDigest.count(); i++) {
+    prettyDigest.replace(i * 3, 2, hexDigest.mid(i * 2, 2));
+  }
+  return prettyDigest;
+}