refactoring.

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

diff --git a/kita/src/libkita/datinfo.cpp b/kita/src/libkita/datinfo.cpp
index ebf5c37..0fe3385 100644 (file)
--- a/kita/src/libkita/datinfo.cpp
+++ b/kita/src/libkita/datinfo.cpp
@@ -497,34 +497,25 @@ int DatInfo::getHTMLPrivate( int num, bool checkAbone, QString& titleHTML, QStri
     bool abone = checkAbone & checkAbonePrivate( num );
     RESDAT& resdat = m_resDatVec[ num ];
 
-    if ( !resdat.broken && !abone ) {
+    if ( abone ) {
+        titleHTML = QString().setNum( num ) + " " + i18n( "Abone" );
+        bodyHTML = "<a href=\"#abone" + QString().setNum( num ) + "\">";
+        bodyHTML += i18n( "Abone" ) + "</a>";
 
+        return KITA_HTML_ABONE;
+    } else if ( resdat.broken ) {
+        titleHTML = QString().setNum( num ) + " " + i18n( "Broken" );
+        bodyHTML = i18n( "Broken" );
+
+        return KITA_HTML_BROKEN;
+    } else {
         createTitleHTML( resdat, titleHTML );
         bodyHTML = resdat.bodyHTML;
-    } else {
-
-        /* "abone" */
-        if ( abone ) {
-            titleHTML = QString().setNum( num ) + " " + i18n( "Abone" );
-            bodyHTML = "<a href=\"#abone" + QString().setNum( num ) + "\">";
-            bodyHTML += i18n( "Abone" ) + "</a>";
-
-            return KITA_HTML_ABONE;
-        }
-
-        /* "broken" */
-        else {
-            titleHTML = QString().setNum( num ) + " " + i18n( "Broken" );
-            bodyHTML = i18n( "Broken" );
-
-            return KITA_HTML_BROKEN;
-        }
+        
+        return KITA_HTML_NORMAL;
     }
-
-    return KITA_HTML_NORMAL;
 }
 
-
 /* get HTML strings from startnum to endnum.
  
    return value is HTML strings               */  /* public */