Kita - 2ch client for KDE

Fork

[Kita-svn] [2500] use QString::fromUtf8

svnno****@sourc***** svnno****@sourc*****
2009年 7月 30日 (木) 06:34:58 JST

• 前の記事 [Kita-svn] [2499] - remove functions related to text codecs in kita_misc.h
• 次の記事 [Kita-svn] [2501] KIO::Job -> KJob
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 2500
          http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2500
Author:   nogu
Date:     2009-07-30 06:34:58 +0900 (Thu, 30 Jul 2009)

Log Message:
-----------
use QString::fromUtf8

Modified Paths:
--------------
    kita/branches/KITA-KDE4/kita/src/domtree.cpp
    kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp
    kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp
    kita/branches/KITA-KDE4/kita/src/threadview.cpp
    kita/branches/KITA-KDE4/kita/src/writeview.cpp

Modified: kita/branches/KITA-KDE4/kita/src/domtree.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/domtree.cpp	2009-07-29 21:19:56 UTC (rev 2499)
+++ kita/branches/KITA-KDE4/kita/src/domtree.cpp	2009-07-29 21:34:58 UTC (rev 2500)
@@ -12,8 +12,6 @@
 
 #include "domtree.h"
 
-#include <QtCore/QTextCodec>
-
 #include <kurl.h>
 #include <dom/dom_text.h>
 
@@ -311,12 +309,11 @@
         rootnode.setAttribute("kita_type", "header");
         rootnode.setAttribute("id", "header");
 
-        QTextCodec* codec = QTextCodec::codecForName("UTF-8");
-        str = codec->toUnicode(KITAUTF8_KOKOYON);
+        str = QString::fromUtf8(KITAUTF8_KOKOYON);
         appendAnchorNode(rootnode, "#kokomade_yonda", str);
         rootnode.appendChild(m_hdoc.createTextNode(" "));
 
-        str = codec->toUnicode(KITAUTF8_SAIGO);
+        str = QString::fromUtf8(KITAUTF8_SAIGO);
         appendAnchorNode(rootnode, "#tosaigo", str);
 
         rootnode.appendChild(m_hdoc.createElement("BR"));
@@ -340,12 +337,11 @@
         rootnode.setAttribute("kita_type", "footer");
         rootnode.setAttribute("id", "footer");
 
-        QTextCodec* codec = QTextCodec::codecForName("UTF-8");
-        str = codec->toUnicode(KITAUTF8_KOKOYON);
+        str = QString::fromUtf8(KITAUTF8_KOKOYON);
         appendAnchorNode(rootnode, "#kokomade_yonda", str);
         rootnode.appendChild(m_hdoc.createTextNode(" "));
 
-        str = codec->toUnicode(KITAUTF8_SAIGO);
+        str = QString::fromUtf8(KITAUTF8_SAIGO);
         appendAnchorNode(rootnode, "#tosaigo", str);
     }
 
@@ -360,8 +356,7 @@
     QString str, style;
     DOM::Element rootnode;
 
-    QTextCodec* codec = QTextCodec::codecForName("UTF-8");
-    str = codec->toUnicode(KITAUTF8_KOKOYON2);
+    str = QString::fromUtf8(KITAUTF8_KOKOYON2);
 
     rootnode = m_hdoc.createElement("DIV");
     {

Modified: kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp	2009-07-29 21:19:56 UTC (rev 2499)
+++ kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp	2009-07-29 21:34:58 UTC (rev 2500)
@@ -12,7 +12,6 @@
 
 #include <QtCore/QRegExp>
 #include <QtCore/QStringList>
-#include <QtCore/QTextCodec>
 
 #include <klocale.h>
 
@@ -56,11 +55,10 @@
     m_thread = Thread::getByURL(m_datURL);
 
     /* japanese strings */
-    QTextCodec* codec = QTextCodec::codecForName("UTF-8");
-    m_spacestr = codec->toUnicode(KITAUTF8_ZENSPACE);
-    m_framestr1 = codec->toUnicode(KITAUTF8_FRAME1); /* |  */
-    m_framestr2 = codec->toUnicode(KITAUTF8_FRAME2); /* |- */
-    m_framestr3 = codec->toUnicode(KITAUTF8_FRAME3); /* L  */
+    m_spacestr = QString::fromUtf8(KITAUTF8_ZENSPACE);
+    m_framestr1 = QString::fromUtf8(KITAUTF8_FRAME1); /* |  */
+    m_framestr2 = QString::fromUtf8(KITAUTF8_FRAME2); /* |- */
+    m_framestr3 = QString::fromUtf8(KITAUTF8_FRAME3); /* L  */
 
     /* make directory */
     Cache cache(m_datURL);

Modified: kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp	2009-07-29 21:19:56 UTC (rev 2499)
+++ kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp	2009-07-29 21:34:58 UTC (rev 2500)
@@ -12,7 +12,6 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QRegExp>
-#include <QtCore/QTextCodec>
 
 #include <kurl.h>
 
@@ -151,7 +150,6 @@
     /* output */
     unsigned int& pos)
 {
-    QTextCodec* codec = QTextCodec::codecForName("UTF-8");
     QString retstr;
 
     if ((pos = isEqual(cdat , "&gt;"))) retstr = '>';
@@ -161,16 +159,16 @@
     else if ((pos = isEqual(cdat , "&quot;"))) retstr = '"';
 
     else if ((pos = isEqual(cdat , "&hearts;")))
-        retstr = codec->toUnicode(KITAUTF8_HEART);
+        retstr = QString::fromUtf8(KITAUTF8_HEART);
 
     else if ((pos = isEqual(cdat , "&diams;")))
-        retstr = codec->toUnicode(KITAUTF8_DIA);
+        retstr = QString::fromUtf8(KITAUTF8_DIA);
 
     else if ((pos = isEqual(cdat , "&clubs;")))
-        retstr = codec->toUnicode(KITAUTF8_CLUB);
+        retstr = QString::fromUtf8(KITAUTF8_CLUB);
 
     else if ((pos = isEqual(cdat , "&spades;")))
-        retstr = codec->toUnicode(KITAUTF8_SPADE);
+        retstr = QString::fromUtf8(KITAUTF8_SPADE);
 
     return retstr;
 }
@@ -1257,9 +1255,8 @@
     bool useTableTag = GlobalConfig::useStyleSheet();
 
     if (m_colonstr.isEmpty()) {
-        QTextCodec* codec = QTextCodec::codecForName("UTF-8");
-        m_colonstr = codec->toUnicode(KITAUTF8_COLON);
-        m_colonnamestr = codec->toUnicode(KITAUTF8_NAME);
+        m_colonstr = QString::fromUtf8(KITAUTF8_COLON);
+        m_colonnamestr = QString::fromUtf8(KITAUTF8_NAME);
     }
 
     if (useTableTag) titleHTML += "<table class=\"res_title\"><tr>";

Modified: kita/branches/KITA-KDE4/kita/src/threadview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadview.cpp	2009-07-29 21:19:56 UTC (rev 2499)
+++ kita/branches/KITA-KDE4/kita/src/threadview.cpp	2009-07-29 21:34:58 UTC (rev 2500)
@@ -11,7 +11,6 @@
 
 #include "threadview.h"
 
-#include <QtCore/QTextCodec>
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QToolButton>
 #include <QtGui/QVBoxLayout>
@@ -340,8 +339,7 @@
     activateWindow();
 
     if (m_threadPart->reload(jumpNum)) {
-        QTextCodec* codec = QTextCodec::codecForName("UTF-8");
-        showStatusBar(codec->toUnicode(KITAUTF8_NOWRENEW));
+        showStatusBar(QString::fromUtf8(KITAUTF8_NOWRENEW));
     }
 }
 
@@ -428,14 +426,13 @@
                      BoardManager::boardURL(m_datURL));
     updateButton();
 
-    QTextCodec* codec = QTextCodec::codecForName("UTF-8");
     gotoCombo->clear();
-    gotoCombo->addItem(codec->toUnicode(KITAUTF8_GOTO));
-    gotoCombo->addItem(codec->toUnicode(KITAUTF8_KOKOYON));
+    gotoCombo->addItem(QString::fromUtf8(KITAUTF8_GOTO));
+    gotoCombo->addItem(QString::fromUtf8(KITAUTF8_KOKOYON));
     for (int i = 1; i < DatManager::getReadNum(m_datURL); i += 100) {
         gotoCombo->addItem(QString().setNum(i) + '-');
     }
-    gotoCombo->addItem(codec->toUnicode(KITAUTF8_SAIGO));
+    gotoCombo->addItem(QString::fromUtf8(KITAUTF8_SAIGO));
     gotoCombo->adjustSize();
 
     ViewMediator::getInstance()->updateBoardView(m_datURL);

Modified: kita/branches/KITA-KDE4/kita/src/writeview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/writeview.cpp	2009-07-29 21:19:56 UTC (rev 2499)
+++ kita/branches/KITA-KDE4/kita/src/writeview.cpp	2009-07-29 21:34:58 UTC (rev 2500)
@@ -277,13 +277,13 @@
 void WriteView::processPostFinished()
 {
     QString response;
-    QString ckstr = QTextCodec::codecForName("utf8") ->toUnicode(KITAUTF8_WRITECOOKIE);
+    QString ckstr = QString::fromUtf8(KITAUTF8_WRITECOOKIE);
 
     // x-euc-jp & euc-jp
     if (m_array.contains("euc-jp")) {
-        response = QTextCodec::codecForName("eucJP") ->toUnicode(m_array);
+        response = QTextCodec::codecForName("eucJP")->toUnicode(m_array);
     } else {
-        response = QTextCodec::codecForName("sjis") ->toUnicode(m_array);
+        response = QTextCodec::codecForName("sjis")->toUnicode(m_array);
     }
 
     int retcode = resultCode(response);
@@ -317,8 +317,7 @@
     case K2ch_Cookie:
 
         if (KMessageBox::questionYesNo(0,
-                                         QTextCodec::codecForName("utf8") ->toUnicode(KITAUTF8_WRITECOOKIEMSG),
-                                         resultTitle(response))
+            QString::fromUtf8(KITAUTF8_WRITECOOKIEMSG), resultTitle(response))
                 == KMessageBox::Yes) {
             slotPostMessage();
         }
@@ -395,9 +394,9 @@
 int WriteView::resultCode(const QString& response) const
 {
     /* see also libkita/kita-utf8.h */
-    QString errstr = QTextCodec::codecForName("utf8") ->toUnicode(KITAUTF8_WRITEERROR);
-    QString truestr = QTextCodec::codecForName("utf8") ->toUnicode(KITAUTF8_WRITETRUE);
-    QString ckstr = QTextCodec::codecForName("utf8") ->toUnicode(KITAUTF8_WRITECOOKIE);
+    QString errstr = QString::fromUtf8(KITAUTF8_WRITEERROR);
+    QString truestr = QString::fromUtf8(KITAUTF8_WRITETRUE);
+    QString ckstr = QString::fromUtf8(KITAUTF8_WRITECOOKIE);
 
     QRegExp regexp("<!-- 2ch_X:(.*) -->");
     int pos = regexp.indexIn(response);

• 前の記事 [Kita-svn] [2499] - remove functions related to text codecs in kita_misc.h
• 次の記事 [Kita-svn] [2501] KIO::Job -> KJob
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]