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

List:       kde-commits
Subject:    kdelibs/khtml
From:       George Staikos <staikos () kde ! org>
Date:       2003-10-01 7:18:46
[Download RAW message or body]

CVS commit by staikos: 

Fix all compile problems with xlC and AIX except for a compiler issue where
the compiler cannot deal with mutable bitfields.  Not sure what the solution
will be with this one yet. (probably external patch for now)


  M +5 -4      Makefile.am   1.151
  M +6 -1      khtml_part.cpp   1.913
  M +0 -1      khtmlpart_p.h   1.47
  M +2 -2      css/cssparser.h   1.74
  M +5 -0      misc/loader_jpeg.cpp   1.14
  M +2 -2      rendering/font.h   1.14
  M +2 -2      rendering/render_replaced.h   1.59


--- kdelibs/khtml/Makefile.am  #1.150:1.151
@@ -32,8 +32,9 @@
 kde_module_LTLIBRARIES = libkhtmlpart.la khtmlimagepart.la
 
-libkhtml_la_SOURCES = khtmlview.cpp khtml_part.cpp khtml_run.cpp khtml_factory.cpp \
                khtml_settings.cc \
-                      khtml_events.cpp khtml_ext.cpp khtml_pagecache.cpp \
                khtml_iface.skel khtml_iface.cc \
-                      khtml_printsettings.cpp htmlpageinfo.ui khtmlimage.cpp \
-                        kjserrordlg.ui
+libkhtml_la_SOURCES = kjserrordlg.ui khtmlview.cpp khtml_part.cpp khtml_run.cpp\
+                        khtml_factory.cpp khtml_settings.cc khtml_events.cpp \
+                        khtml_ext.cpp khtml_pagecache.cpp khtml_iface.skel \
+                        khtml_iface.cc khtml_printsettings.cpp htmlpageinfo.ui \
+                        khtmlimage.cpp 
 
 libkhtml_la_METASOURCES = AUTO

--- kdelibs/khtml/khtml_part.cpp  #1.912:1.913
@@ -436,4 +436,9 @@ KHTMLPart::~KHTMLPart()
   }
 
+  // Have to delete this here since we forward declare it in khtmlpart_p and
+  // at least some compilers won't call the destructor in this case.
+  delete d->m_jsedlg;
+  d->m_jsedlg = 0;
+
   delete d; d = 0;
   KHTMLFactory::deregisterPart( this );
@@ -5212,5 +5217,5 @@ bool isBeforeNode(DOM::Node start_sp, DO
   // Now we iterator through the parent's children until we find start_sp or end_sp
   // ### parentNode is sometimes 0?? (LS)
-  n = start_sp.parentNode().isNull() ? 0 : start_sp.parentNode().firstChild();
+  n = start_sp.parentNode().isNull() ? DOM::Node(0) : \
start_sp.parentNode().firstChild();  while( !n.isNull() ){
     if( n == start_sp ){

--- kdelibs/khtml/khtmlpart_p.h  #1.46:1.47
@@ -207,5 +207,4 @@ public:
   ~KHTMLPartPrivate()
   {
-    delete m_jsedlg;
     delete m_dcopobject;
     delete m_statusBarExtension;

--- kdelibs/khtml/css/cssparser.h  #1.73:1.74
@@ -60,5 +60,5 @@ namespace DOM {
             int iValue;
             ParseString string;
-            Function *function;
+            struct Function *function;
         };
         enum {

--- kdelibs/khtml/misc/loader_jpeg.cpp  #1.13:1.14
@@ -28,4 +28,9 @@
 
 #ifdef HAVE_LIBJPEG
+// on some systems, libjpeg installs its config.h file which causes a conflict
+// and makes the compiler barf with "XXX already defined".
+#ifdef HAVE_STDLIB_H
+#undef HAVE_STDLIB_H
+#endif
 #include "loader_jpeg.h"
 

--- kdelibs/khtml/rendering/font.h  #1.13:1.14
@@ -112,5 +112,5 @@ public:
 
 private:
-    FontDef fontDef;
+    mutable FontDef fontDef;
     mutable QFont f;
     mutable QFontMetrics fm;

--- kdelibs/khtml/rendering/render_replaced.h  #1.58:1.59
@@ -113,5 +113,5 @@ public:
     void deref(RenderArena *arena);
 
-    static void paintWidget(QPainter *p, QWidget *w, int x, int y, int w, int h, int \
tx, int ty); +    static void paintWidget(QPainter *p, QWidget *widget, int x, int y, \
int w, int h, int tx, int ty);  virtual bool handleEvent(const DOM::EventImpl& ev);
 


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