refactoring.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@1979 56b19765-1e22-0410-a548-a0f45d66c51a

diff --git a/kita/src/thread/htmlpart.cpp b/kita/src/thread/htmlpart.cpp
index 586cb4a..7ba8a67 100644 (file)
--- a/kita/src/thread/htmlpart.cpp
+++ b/kita/src/thread/htmlpart.cpp
@@ -46,7 +46,7 @@
 KitaHTMLPart::KitaHTMLPart( QWidget* parent, const char* name )
         : KHTMLPart( new KitaHTMLView( this, parent, name ) )
 {
-    m_mode = HTMLPART_MODE_KHTML;
+    m_mode = HTMLPART_MODE_MAINPART;
     m_popup = NULL;
     m_domtree = NULL;
     m_datURL = QString::null;
@@ -107,7 +107,7 @@ void KitaHTMLPart::clearPart()
         }
     }
     m_datURL = QString::null;
-    m_mode = HTMLPART_MODE_KHTML;
+    m_mode = HTMLPART_MODE_MAINPART;
 }
 
 
@@ -115,7 +115,7 @@ void KitaHTMLPart::clearPart()
 /* public */
 bool KitaHTMLPart::setup( int mode, const KURL& url )
 {
-    if ( url.isEmpty() ) return FALSE;
+    Q_ASSERT( !url.isEmpty() );
 
     clearPart();
 
@@ -516,7 +516,7 @@ void KitaHTMLPart::slotFinishLoad()
 bool KitaHTMLPart::gotoAnchor( const QString& anc, bool pushPosition )
 {
     if ( anc == QString::null ) return FALSE;
-    if ( !m_domtree || m_mode == HTMLPART_MODE_KHTML || m_mode == HTMLPART_MODE_POPUP )
+    if ( !m_domtree || m_mode == HTMLPART_MODE_POPUP )
         return KHTMLPart::gotoAnchor( anc );
 
     hidePopup();
@@ -1106,7 +1106,7 @@ void KitaHTMLPart::clickAnchor( const KURL& urlin )
 
     if ( !refNum ) return ;
 
-    if ( m_mode == HTMLPART_MODE_KHTML || m_mode == HTMLPART_MODE_POPUP ) {
+    if ( m_mode == HTMLPART_MODE_POPUP ) {
         emit openURLRequestExt( urlin );
     } else gotoAnchor( QString().setNum( refNum ), TRUE );
 }

diff --git a/kita/src/thread/htmlpart.h b/kita/src/thread/htmlpart.h
index 7c826f1..458d195 100644 (file)
--- a/kita/src/thread/htmlpart.h
+++ b/kita/src/thread/htmlpart.h
@@ -17,9 +17,6 @@
 
 /* mode */
 enum {
-    /* This part is not initialized. This part works as just KHTMLPart */
-    HTMLPART_MODE_KHTML,
-
     /* on main window */
     HTMLPART_MODE_MAINPART,