svnno****@sourc*****
svnno****@sourc*****
2009年 7月 18日 (土) 18:52:03 JST
ForkRevision: 2428
http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2428
Author: nogu
Date: 2009-07-18 18:52:03 +0900 (Sat, 18 Jul 2009)
Log Message:
-----------
QTableWidgetItem* item -> int row
Modified Paths:
--------------
kita/branches/KITA-KDE4/kita/src/boardview.cpp
kita/branches/KITA-KDE4/kita/src/boardview.h
Modified: kita/branches/KITA-KDE4/kita/src/boardview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/boardview.cpp 2009-07-18 09:20:47 UTC (rev 2427)
+++ kita/branches/KITA-KDE4/kita/src/boardview.cpp 2009-07-18 09:52:03 UTC (rev 2428)
@@ -64,7 +64,7 @@
void BoardView::reloadSubject()
{
- if (! m_boardURL.isEmpty()) {
+ if (!m_boardURL.isEmpty()) {
loadBoard(m_boardURL);
}
}
@@ -90,7 +90,7 @@
void BoardView::loadThread(QTableWidgetItem* item)
{
- if (! item) return ;
+ if (!item) return ;
KUrl datURL = item->text();
@@ -149,7 +149,7 @@
}
int id = (i < countNew ? i + 1 : 0);
int order = i + 1;
- updateListViewItem(subjectList->item(i, 0), datURL, current, id, order);
+ updateListViewItem(i, datURL, current, id, order);
}
if (HideButton->isChecked()) {
@@ -196,11 +196,7 @@
/* public slot */
void BoardView::slotFocusSearchCombo()
{
- if (! SearchCombo->hasFocus()) {
- SearchCombo->setFocus();
- } else {
- setFocus();
- }
+ SearchCombo->hasFocus() ? setFocus() : SearchCombo->setFocus();
}
void BoardView::updateKindLabel()
@@ -227,34 +223,37 @@
if (subjectList->item(i, ColumnDatUrl)->text() == datURL.prettyUrl()) {
switch (subjectList->item(i, ColumnMarkOrder)->text().toInt()) {
- case Thread_Readed :
- case Thread_Read : m_readNum--; break;
- case Thread_New : m_newNum--; break;
- case Thread_HasUnread : m_unreadNum--; break;
+ case Thread_Readed:
+ case Thread_Read:
+ m_readNum--;
+ break;
+ case Thread_New:
+ m_newNum--;
+ break;
+ case Thread_HasUnread:
+ m_unreadNum--;
+ break;
}
Thread* thread = Thread::getByURLNew(datURL);
- if (thread == 0) return ;
+ if (thread == 0)
+ return;
int id = subjectList->item(i, ColumnId)->text().toInt();
int order = subjectList->item(i, ColumnIdOrder)->text().toInt();
- updateListViewItem(subjectList->item(i, 0),
- datURL, current, id, order);
+ updateListViewItem(i, datURL, current, id, order);
updateKindLabel();
- return ;
+ return;
}
}
}
-
-
/* if id == 0, this thread is old thread. */
/* private */
-void BoardView::updateListViewItem(QTableWidgetItem* item,
- const KUrl& datURL, const QDateTime& current, int id, int order)
+void BoardView::updateListViewItem(int row, const KUrl& datURL,
+ const QDateTime& current, int id, int order)
{
- int row = item->row();
QDateTime since;
since.setTime_t(datToSince(datURL));
QString threadName = DatManager::threadName(datURL);
@@ -328,7 +327,7 @@
void BoardView::slotSizeChange(int section, int oldSize, int newSize)
{
- if (! m_enableSizeChange) return ;
+ if (!m_enableSizeChange) return ;
if (autoResize()) return ;
QString configPath
@@ -354,11 +353,8 @@
KConfigGroup group = config.group("Column");
for (int i = ColumnBegin; i <= ColumnEnd; i++) {
- if (subjectList->columnWidth(i) != 0) {
- group.writeEntry(s_colAttr[ i ].keyName, true);
- } else {
- group.writeEntry(s_colAttr[ i ].keyName, false);
- }
+ group.writeEntry(s_colAttr[i].keyName,
+ subjectList->columnWidth(i) != 0);
}
}
@@ -371,12 +367,8 @@
KConfigGroup group = config.group("Column");
for (int i = ColumnBegin; i <= ColumnEnd; i++) {
bool isShown = group.readEntry(
- s_colAttr[ i ].keyName, s_colAttr[ i ].showDefault);
- if (isShown) {
- showColumn(i);
- } else {
- hideColumn(i);
- }
+ s_colAttr[i].keyName, s_colAttr[i].showDefault);
+ isShown ? showColumn(i) : hideColumn(i);
}
}
Modified: kita/branches/KITA-KDE4/kita/src/boardview.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/boardview.h 2009-07-18 09:20:47 UTC (rev 2427)
+++ kita/branches/KITA-KDE4/kita/src/boardview.h 2009-07-18 09:52:03 UTC (rev 2428)
@@ -55,7 +55,7 @@
void updateKindLabel();
void deleteLog(const KUrl& url);
void loadLayout();
- void updateListViewItem(QTableWidgetItem* item, const KUrl& datURL,
+ void updateListViewItem(int row, const KUrl& datURL,
const QDateTime& current, int id, int order);
void saveHeaderOnOff();
void loadHeaderOnOff();