svnno****@sourc*****
svnno****@sourc*****
2009年 7月 22日 (水) 22:45:50 JST
Revision: 2463 http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2463 Author: nogu Date: 2009-07-22 22:45:50 +0900 (Wed, 22 Jul 2009) Log Message: ----------- empty() -> isEmpty() Modified Paths: -------------- kita/branches/KITA-KDE4/kita/src/htmlpart.cpp kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp kita/branches/KITA-KDE4/kita/src/mainwindow.cpp Modified: kita/branches/KITA-KDE4/kita/src/htmlpart.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/htmlpart.cpp 2009-07-22 13:41:41 UTC (rev 2462) +++ kita/branches/KITA-KDE4/kita/src/htmlpart.cpp 2009-07-22 13:45:50 UTC (rev 2463) @@ -480,7 +480,7 @@ /* public slot */ void HTMLPart::slotGobackAnchor() { - if (m_anchorStack.empty()) return ; + if (m_anchorStack.isEmpty()) return ; QString anc = m_anchorStack.last(); m_anchorStack.pop_back(); @@ -698,7 +698,7 @@ showppm = true; // back - if (!m_anchorStack.empty()) { + if (!m_anchorStack.isEmpty()) { backSubMenu = new KMenu(view()); int i = m_anchorStack.size(); Modified: kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-07-22 13:41:41 UTC (rev 2462) +++ kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-07-22 13:45:50 UTC (rev 2463) @@ -797,10 +797,11 @@ { for (int i = 1; i < (int) m_resDatVec.size(); i++) m_resDatVec[ i ].checkAbone = false; - m_aboneByID = (!AboneConfig::aboneIDList().empty()); - m_aboneByName = (!AboneConfig::aboneNameList().empty()); - m_aboneByBody = (!AboneConfig::aboneWordList().empty()); - m_aboneChain = (m_aboneByID | m_aboneByName | m_aboneByBody) & Config::aboneChain() ; + m_aboneByID = (!AboneConfig::aboneIDList().isEmpty()); + m_aboneByName = (!AboneConfig::aboneNameList().isEmpty()); + m_aboneByBody = (!AboneConfig::aboneWordList().isEmpty()); + m_aboneChain = (m_aboneByID | m_aboneByName | m_aboneByBody) + & Config::aboneChain() ; } Modified: kita/branches/KITA-KDE4/kita/src/mainwindow.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/mainwindow.cpp 2009-07-22 13:41:41 UTC (rev 2462) +++ kita/branches/KITA-KDE4/kita/src/mainwindow.cpp 2009-07-22 13:45:50 UTC (rev 2463) @@ -70,21 +70,21 @@ // load ascii art AsciiArtConfig::self()->readConfig(); - if (AsciiArtConfig::self()->asciiArtList().empty()) { + if (AsciiArtConfig::self()->asciiArtList().isEmpty()) { loadAsciiArt(); } // load abone lists AboneConfig::self()->readConfig(); - if (AboneConfig::self()->aboneIDList().empty()) { + if (AboneConfig::self()->aboneIDList().isEmpty()) { loadAboneIDList(); } - if (AboneConfig::self()->aboneNameList().empty()) { + if (AboneConfig::self()->aboneNameList().isEmpty()) { loadAboneNameList(); } - if (AboneConfig::self()->aboneWordList().empty()) { + if (AboneConfig::self()->aboneWordList().isEmpty()) { loadAboneWordList(); }