[Turqstat-commits] [SCM] Turquoise SuperStat - http://www.softwolves.pp.se/sw/software/turquoise branch, xturqstat-win32, updated. release-3.0-2-8-g9d9d340

[Peter Karlsson]

The following commit has been merged in the xturqstat-win32 branch:
commit 9d9d3405a3df35644bd719154735ff01eb13ee3f
Author: Peter Karlsson <peter at softwolves.pp.se>
Date:   Sun Mar 23 00:51:42 2008 +0100

    QString can now be set directly from std::wstring.

diff --git a/qtlist.cpp b/qtlist.cpp
index 7ac4e81..3693a1d 100644
--- a/qtlist.cpp
+++ b/qtlist.cpp
@@ -173,7 +173,7 @@ void TopListWindow::addQuoters(StatEngine *engine)
         if (data.bytesquoted && data.byteswritten)
         {
             QString tmp;
-            QString name = charConvert(data.name);
+			QString name = QString::fromStdWString(data.name);
             if (name != QString(data.address.c_str()))
                 tmp = name + " <" + data.address.c_str() + ">";
             else
@@ -205,7 +205,7 @@ void TopListWindow::addSenders(StatEngine *engine)
         if (!data.messageswritten) break;
 
         QString tmp;
-        QString name = charConvert(data.name);
+		QString name = QString::fromStdWString(data.name);
         if (name != QString(data.address.c_str()))
             tmp = name + " <" + data.address.c_str() + ">";
         else
@@ -245,7 +245,7 @@ void TopListWindow::addOriginalContent(StatEngine *engine)
         }
 
         QString tmp;
-        QString name = charConvert(data.name);
+		QString name = QString::fromStdWString(data.name);
         if (name != QString(data.address.c_str()))
             tmp = name + " <" + data.address.c_str() + ">";
         else
@@ -324,7 +324,7 @@ void TopListWindow::addReceivers(StatEngine *engine)
 
         QString tmp;
         if (data.name.length())
-            tmp = charConvert(data.name);
+			tmp = QString::fromStdWString(data.name);
         else
             tmp = tr("(none)");
 
@@ -356,7 +356,7 @@ void TopListWindow::addSubjects(StatEngine *engine)
     {
         QString tmp;
         if (data.subject.length())
-            tmp = charConvert(data.subject);
+			tmp = QString::fromStdWString(data.subject);
         else
             tmp = tr("(none)");
 
@@ -384,7 +384,7 @@ void TopListWindow::addSoftware(StatEngine *engine)
     {
         QString tmp;
         if (data.program.length())
-            tmp = charConvert(data.program);
+			tmp = QString::fromStdWString(data.program);
         else
             tmp = tr("(none)");
 
@@ -400,21 +400,6 @@ void TopListWindow::addSoftware(StatEngine *engine)
     engine->DoneTopPrograms();
 }
 
-QString TopListWindow::charConvert(wstring &inputstring)
-{
-    int length = inputstring.length();
-    QChar *tmp = new QChar[length];
-    for (int i = 0; i < length; i ++)
-    {
-        tmp[i] = inputstring[i];
-    }
-
-    QString rc = QString(tmp, length);
-    delete[] tmp;
-
-    return rc;
-}
-
 QString TopListWindow::percentString(int numerator, int denumerator)
 {
     float percent =
diff --git a/qtlist.h b/qtlist.h
index 5b6a16e..c4809be 100644
--- a/qtlist.h
+++ b/qtlist.h
@@ -92,12 +92,6 @@ protected:
     /** Internal method used for creating a software toplist. */
     void addSoftware(StatEngine *);
 
-    /**
-     * Convert a wide character string into a QString.
-     * @param inputstring String to copy.
-     * @return A QString representation of the string.
-     */
-    static QString charConvert(wstring &);
     /** Create a percent string to display in a toplist. */
     QString percentString(int, int);
 

-- 
Turquoise SuperStat - http://www.softwolves.pp.se/sw/software/turquoise