svnno****@sourc*****
svnno****@sourc*****
2009年 8月 5日 (水) 21:15:42 JST
ForkRevision: 2516
http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2516
Author: nogu
Date: 2009-08-05 21:15:42 +0900 (Wed, 05 Aug 2009)
Log Message:
-----------
use QString::number()
Modified Paths:
--------------
kita/branches/KITA-KDE4/kita/src/domtree.cpp
kita/branches/KITA-KDE4/kita/src/htmlpart.cpp
kita/branches/KITA-KDE4/kita/src/libkita/access.cpp
kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.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-08-05 11:58:14 UTC (rev 2515)
+++ kita/branches/KITA-KDE4/kita/src/domtree.cpp 2009-08-05 12:15:42 UTC (rev 2516)
@@ -83,12 +83,12 @@
m_titleElm[ num ] = m_hdoc.createElement("DIV");
m_titleElm[ num ].setAttribute("class", "res_title");
- m_titleElm[ num ].setAttribute("id", QString().setNum(num));
+ m_titleElm[ num ].setAttribute("id", QString::number(num));
m_titleElm[ num ].setInnerHTML(titleHTML);
m_bodyElm[ num ] = m_hdoc.createElement("DIV");
m_bodyElm[ num ].setAttribute("class", "res_body");
- m_bodyElm[ num ].setAttribute("id", QString().setNum(num));
+ m_bodyElm[ num ].setAttribute("id", QString::number(num));
m_bodyElm[ num ].setInnerHTML(bodyHTML);
return true;
Modified: kita/branches/KITA-KDE4/kita/src/htmlpart.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/htmlpart.cpp 2009-08-05 11:58:14 UTC (rev 2515)
+++ kita/branches/KITA-KDE4/kita/src/htmlpart.cpp 2009-08-05 12:15:42 UTC (rev 2516)
@@ -336,7 +336,7 @@
int endNum = DatManager::getReadNum(m_datURL);
showResponses(1, endNum);
updateScreen(true , false);
- gotoAnchor(QString().setNum(m_centerNum), false);
+ gotoAnchor(QString::number(m_centerNum), false);
view() ->setFocus();
return true;
@@ -394,7 +394,7 @@
}
if (m_firstReceive && m_centerNum < readNum) {
- gotoAnchor(QString().setNum(m_centerNum), false);
+ gotoAnchor(QString::number(m_centerNum), false);
m_firstReceive = false;
}
@@ -419,7 +419,8 @@
// m_domtree->parseAllRes();
m_centerNum = 0;
- if (m_jumpNumAfterLoading) gotoAnchor(QString().setNum(m_jumpNumAfterLoading), false);
+ if (m_jumpNumAfterLoading)
+ gotoAnchor(QString::number(m_jumpNumAfterLoading), false);
m_jumpNumAfterLoading = 0;
emit finishReload();
@@ -450,7 +451,7 @@
/* is target valid ? */
if (!DatManager::isResValid(m_datURL, res)) return false;
- ancstr = QString().setNum(res);
+ ancstr = QString::number(res);
}
if (res == 1) ancstr = "header";
@@ -474,7 +475,7 @@
if (m_mode != HTMLPART_MODE_MAINPART) return ;
int kokoyon = DatManager::getViewPos(m_datURL);
- gotoAnchor(QString().setNum(kokoyon), false);
+ gotoAnchor(QString::number(kokoyon), false);
}
@@ -726,7 +727,8 @@
popupMenu.addMenu(markSubMenu);
popupMenu.addSeparator();
}
- str = QString().setNum(i) + " " + DatManager::getPlainBody(m_datURL, i).left(10);
+ str = QString::number(i) + " "
+ + DatManager::getPlainBody(m_datURL, i).left(10);
KAction *gotoMarkAct = new KAction(str, this);
markSubMenu->addAction(gotoMarkAct);
}
@@ -829,7 +831,8 @@
return;
}
if (menu == markSubMenu) {
- gotoAnchor(QString().setNum(menu->actions().indexOf(action)), false);
+ gotoAnchor(QString::number(menu->actions().indexOf(action)),
+ false);
} else if (menu == backSubMenu) {
for (int i = 0; i < menu->actions().indexOf(action); i++)
m_anchorStack.pop_back();
@@ -1011,7 +1014,7 @@
if (m_mode == HTMLPART_MODE_POPUP) {
ViewMediator::getInstance()->openURL(urlin);
} else {
- gotoAnchor(QString().setNum(refNum), true);
+ gotoAnchor(QString::number(refNum), true);
}
}
@@ -1115,10 +1118,10 @@
return;
}
if (action == resAct) {
- resstr = ">>" + QString().setNum(resNum) + '\n';
+ resstr = ">>" + QString::number(resNum) + '\n';
ViewMediator::getInstance()->showWriteView(m_datURL, resstr);
} else if (action == quoteAct) {
- resstr = ">>" + QString().setNum(resNum) + '\n'
+ resstr = ">>" + QString::number(resNum) + '\n'
+ "> " + DatManager::getPlainTitle(m_datURL, resNum) + '\n'
+ "> " + DatManager::getPlainBody(m_datURL, resNum).replace('\n', "\n> ") + '\n';
ViewMediator::getInstance()->showWriteView(m_datURL, resstr);
@@ -1134,7 +1137,8 @@
// url
if (!str.isEmpty()) str += '\n';
- str += DatManager::threadURL(m_datURL) + '/' + QString().setNum(resNum) + '\n';
+ str += DatManager::threadURL(m_datURL) + '/' + QString::number(resNum)
+ + '\n';
// body
if (action == copyAct) {
@@ -1152,10 +1156,10 @@
ViewMediator::getInstance()->updateBoardView(m_datURL);
m_updatedKokoyon = true;
updateScreen(true, true);
- gotoAnchor(QString().setNum(resNum), false);
+ gotoAnchor(QString::number(resNum), false);
} else if (action == showBrowserAct) {
- str = DatManager::threadURL(m_datURL) + '/' + QString().setNum(resNum);
+ str = DatManager::threadURL(m_datURL) + '/' + QString::number(resNum);
KRun::runUrl(str, "text/html", view());
} else if (action == aboneNameAct) {
Modified: kita/branches/KITA-KDE4/kita/src/libkita/access.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/access.cpp 2009-08-05 11:58:14 UTC (rev 2515)
+++ kita/branches/KITA-KDE4/kita/src/libkita/access.cpp 2009-08-05 12:15:42 UTC (rev 2516)
@@ -129,14 +129,14 @@
case Board_MachiBBS:
getURL = getThreadURL(m_datURL);
- if (m_readNum > 0) getURL += "&START=" + QString().setNum(m_readNum + 1);
+ if (m_readNum > 0) getURL += "&START=" + QString::number(m_readNum + 1);
InitParseMachiBBS();
break;
case Board_JBBS:
getURL = getThreadURL(m_datURL);
getURL.replace("read.cgi", "rawmode.cgi"); /* adhoc... */
- if (m_readNum > 0) getURL += '/' + QString().setNum(m_readNum + 1) + '-';
+ if (m_readNum > 0) getURL += '/' + QString::number(m_readNum + 1) + '-';
break;
default:
Modified: kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp 2009-08-05 11:58:14 UTC (rev 2515)
+++ kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp 2009-08-05 12:15:42 UTC (rev 2516)
@@ -934,7 +934,8 @@
if (qdir.exists (newCachePath)) {
QString bkupPath = newCachePath;
bkupPath.truncate(bkupPath.length() - 1); /* remove '/' */
- bkupPath += '.' + QString().setNum(QDateTime::currentDateTime().toTime_t());
+ bkupPath +=
+ '.' + QString::number(QDateTime::currentDateTime().toTime_t());
qdir.rename(newCachePath, bkupPath);
}
Modified: kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-08-05 11:58:14 UTC (rev 2515)
+++ kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-08-05 12:15:42 UTC (rev 2516)
@@ -438,13 +438,13 @@
RESDAT& resdat = m_resDatVec[ num ];
if (abone) {
- titleHTML = QString().setNum(num) + ' ' + i18n("Abone");
- bodyHTML = "<a href=\"#abone" + QString().setNum(num) + "\">";
+ titleHTML = QString::number(num) + ' ' + i18n("Abone");
+ bodyHTML = "<a href=\"#abone" + QString::number(num) + "\">";
bodyHTML += i18n("Abone") + "</a>";
return HTML_ABONE;
} else if (resdat.broken) {
- titleHTML = QString().setNum(num) + ' ' + i18n("Broken");
+ titleHTML = QString::number(num) + ' ' + i18n("Broken");
bodyHTML = i18n("Broken");
return HTML_BROKEN;
@@ -559,7 +559,7 @@
int& count)
{
- QString tmp = QString().setNum(rootnum);
+ QString tmp = QString::number(rootnum);
QString retstr = "<a href=\"#" + tmp + "\">>>" + tmp + "</a><br>";
retstr += getTreeByResCore(rootnum, reverse, count, "");
@@ -587,7 +587,7 @@
if (checkAbonePrivate(i)) continue;
if (checkRes(i, rootnum)) {
count ++;
- strlists += QString().setNum(i);
+ strlists += QString::number(i);
}
}
@@ -598,7 +598,7 @@
for (int i = (*it).from; i <= qMin(rootnum - 1, (*it).to) ; i++) {
if (checkAbonePrivate(i)) continue;
count ++;
- strlists += QString().setNum(i);
+ strlists += QString::number(i);
}
}
}
Modified: kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp 2009-08-05 11:58:14 UTC (rev 2515)
+++ kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp 2009-08-05 12:15:42 UTC (rev 2516)
@@ -1263,8 +1263,8 @@
/* res number */
if (useTableTag) titleHTML += "<td class=\"res_title_number\">";
- titleHTML += "<a href=\"#write" + QString().setNum(resdat.num) + "\">";
- titleHTML += QString().setNum(resdat.num);
+ titleHTML += "<a href=\"#write" + QString::number(resdat.num) + "\">";
+ titleHTML += QString::number(resdat.num);
titleHTML += "</a> ";
Modified: kita/branches/KITA-KDE4/kita/src/threadview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadview.cpp 2009-08-05 11:58:14 UTC (rev 2515)
+++ kita/branches/KITA-KDE4/kita/src/threadview.cpp 2009-08-05 12:15:42 UTC (rev 2516)
@@ -434,7 +434,7 @@
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(QString::number(i) + '-');
}
gotoCombo->addItem(QString::fromUtf8(KITAUTF8_SAIGO));
gotoCombo->adjustSize();
Modified: kita/branches/KITA-KDE4/kita/src/writeview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/writeview.cpp 2009-08-05 11:58:14 UTC (rev 2515)
+++ kita/branches/KITA-KDE4/kita/src/writeview.cpp 2009-08-05 12:15:42 UTC (rev 2516)
@@ -356,8 +356,8 @@
);
QString str;
- str = QString().setNum(lines);
- str += " | " + QString().setNum(length);
+ str = QString::number(lines);
+ str += " | " + QString::number(length);
lengthLabel->setText(str);
return true;