[Kita-svn] [2371] - remove reduntant NULL checks

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2009年 7月 6日 (月) 22:54:56 JST


Revision: 2371
          http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2371
Author:   nogu
Date:     2009-07-06 22:54:56 +0900 (Mon, 06 Jul 2009)

Log Message:
-----------
- remove reduntant NULL checks
- use isEmpty()

Modified Paths:
--------------
    kita/branches/KITA-KDE4/kita/src/htmlpart.cpp
    kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp
    kita/branches/KITA-KDE4/kita/src/libkita/access.cpp
    kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp
    kita/branches/KITA-KDE4/kita/src/respopup.cpp

Modified: kita/branches/KITA-KDE4/kita/src/htmlpart.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/htmlpart.cpp	2009-07-05 21:49:31 UTC (rev 2370)
+++ kita/branches/KITA-KDE4/kita/src/htmlpart.cpp	2009-07-06 13:54:56 UTC (rev 2371)
@@ -70,7 +70,7 @@
     slotDeletePopup();
 
     /* delete KitaDomTree */
-    if ( m_domtree ) delete m_domtree;
+    delete m_domtree;
     m_domtree = NULL;
 
     /* update ViewPos */
@@ -1270,7 +1270,7 @@
 /* public slot */
 void KitaHTMLPart::slotDeletePopup()
 {
-    if ( m_popup ) delete m_popup;
+    delete m_popup;
     m_popup = NULL;
     m_multiPopup = false;
 }

Modified: kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp	2009-07-05 21:49:31 UTC (rev 2370)
+++ kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp	2009-07-06 13:54:56 UTC (rev 2371)
@@ -68,7 +68,7 @@
             delete part;
         }
     }
-    if ( m_manager ) delete m_manager;
+    delete m_manager;
     m_manager = NULL;
 
     /* remove widgets which don't belong to parts */

Modified: kita/branches/KITA-KDE4/kita/src/libkita/access.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/access.cpp	2009-07-05 21:49:31 UTC (rev 2370)
+++ kita/branches/KITA-KDE4/kita/src/libkita/access.cpp	2009-07-06 13:54:56 UTC (rev 2371)
@@ -62,7 +62,7 @@
     }
 
     // set data size.
-    if ( orgData.size() == 0 ) return ;
+    if ( orgData.isEmpty() ) return ;
     m_dataSize = orgData.length();
 
     switch ( m_bbstype ) {

Modified: kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp	2009-07-05 21:49:31 UTC (rev 2370)
+++ kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp	2009-07-06 13:54:56 UTC (rev 2371)
@@ -157,7 +157,6 @@
     DatInfoList::Iterator it;
     for ( it = m_datInfoList.begin(); it != m_datInfoList.end(); ++it ) {
 
-        if ( ( *it ) == NULL ) continue;
         delete ( *it );
     }
 }

Modified: kita/branches/KITA-KDE4/kita/src/respopup.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/respopup.cpp	2009-07-05 21:49:31 UTC (rev 2370)
+++ kita/branches/KITA-KDE4/kita/src/respopup.cpp	2009-07-06 13:54:56 UTC (rev 2371)
@@ -42,7 +42,7 @@
 
     ResPopup::~ResPopup()
     {
-        if ( m_htmlPart ) delete m_htmlPart;
+        delete m_htmlPart;
     }
 
 




Kita-svn メーリングリストの案内
Back to archive index