[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/khtml
From:       Harri Porten <porten () kde ! org>
Date:       2007-11-01 22:50:25
Message-ID: 1193957425.192795.30760.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 731820 by porten:

Guard almost dead code thus saving a pointer's space.


 M  +0 -1      khtml_part.cpp  
 M  +6 -0      khtmlpart_p.h  


--- trunk/KDE/kdelibs/khtml/khtml_part.cpp #731819:731820
@@ -1006,7 +1006,6 @@
   frame->m_kjs_lib = lib;
 #else
   frame->m_jscript = kjs_html_init(frame);
-  // frame->m_kjs_lib remains 0L.
 #endif
   return true;
 }
--- trunk/KDE/kdelibs/khtml/khtmlpart_p.h #731819:731820
@@ -80,7 +80,9 @@
       ChildFrame() : QObject (0) {
           setObjectName( "khtml_child_frame" );
           m_jscript = 0L;
+#ifndef DIRECT_LINKAGE_TO_ECMA
           m_kjs_lib = 0;
+#endif
           m_bCompleted = false; m_bPreloaded = false; m_type = Frame; m_bNotify = false;
           m_bPendingRedirection = false;
       }
@@ -88,8 +90,10 @@
       ~ChildFrame() {
           if (m_run) m_run->abort();
           delete m_jscript;
+#ifndef DIRECT_LINKAGE_TO_ECMA
           if ( m_kjs_lib)
               m_kjs_lib->unload();
+#endif
       }
 
     QPointer<khtml::RenderPart> m_frame;
@@ -99,7 +103,9 @@
     QString m_serviceName;
     QString m_serviceType;
     KJSProxy *m_jscript;
+#ifndef DIRECT_LINKAGE_TO_ECMA
     KLibrary *m_kjs_lib;
+#endif
     bool m_bCompleted;
     QString m_name;
     KParts::OpenUrlArguments m_args;
[prev in list] [next in list] [prev in thread] [next in thread]