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

List:       kde-commits
Subject:    KDE/kdelibs/khtml (silent)
From:       Alex Merry <huntedhacker () tiscali ! co ! uk>
Date:       2007-05-04 15:44:00
Message-ID: 1178293440.251769.16280.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 661103 by alexmerry:

SVN_SILENT:

Includes fixes



 M  +1 -1      css/css_ruleimpl.cpp  
 M  +2 -1      html/html_tableimpl.cpp  
 M  +0 -5      rendering/font.cpp  
 M  +14 -13    rendering/render_flow.cpp  
 M  +2 -8      rendering/render_text.cpp  


--- trunk/KDE/kdelibs/khtml/css/css_ruleimpl.cpp #661102:661103
@@ -21,10 +21,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "css_ruleimpl.h"
 #include "css_stylesheetimpl.h"
 #include "css_valueimpl.h"
 #include "cssparser.h"
-#include "css_ruleimpl.h"
 
 #include <dom/css_rule.h>
 #include <dom/css_stylesheet.h>
--- trunk/KDE/kdelibs/khtml/html/html_tableimpl.cpp #661102:661103
@@ -25,9 +25,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "html_documentimpl.h"
 #include "html_tableimpl.h"
 
+#include "html_documentimpl.h"
+
 #include <dom/dom_exception.h>
 #include <dom/dom_node.h>
 
--- trunk/KDE/kdelibs/khtml/rendering/font.cpp #661102:661103
@@ -29,11 +29,6 @@
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
-#if 0
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-#endif
 
 #include <khtml_factory.h>
 #include <khtml_settings.h>
--- trunk/KDE/kdelibs/khtml/rendering/render_flow.cpp #661102:661103
@@ -23,25 +23,26 @@
  */
 // -------------------------------------------------------------------------
 
+#include "render_flow.h"
+
 #include <kdebug.h>
 #include <assert.h>
 #include <QtGui/QPainter>
 #include <kglobal.h>
 
-#include "rendering/render_flow.h"
-#include "rendering/render_text.h"
-#include "rendering/render_table.h"
-#include "rendering/render_canvas.h"
-#include "rendering/render_inline.h"
-#include "rendering/render_block.h"
-#include "rendering/render_arena.h"
-#include "rendering/render_line.h"
-#include "xml/dom_nodeimpl.h"
-#include "xml/dom_docimpl.h"
-#include "misc/htmltags.h"
-#include "html/html_formimpl.h"
+#include "render_text.h"
+#include "render_table.h"
+#include "render_canvas.h"
+#include "render_inline.h"
+#include "render_block.h"
+#include "render_arena.h"
+#include "render_line.h"
+#include <xml/dom_nodeimpl.h>
+#include <xml/dom_docimpl.h>
+#include <misc/htmltags.h>
+#include <html/html_formimpl.h>
 
-#include "khtmlview.h"
+#include <khtmlview.h>
 
 using namespace DOM;
 using namespace khtml;
--- trunk/KDE/kdelibs/khtml/rendering/render_text.cpp #661102:661103
@@ -26,14 +26,6 @@
 //#define DEBUG_LAYOUT
 //#define BIDI_DEBUG
 
-#include <config.h>
-
-#if 0
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-#endif
-
 #include "render_text.h"
 #include "render_canvas.h"
 #include "break_lines.h"
@@ -52,6 +44,8 @@
 #include <limits.h>
 #include <math.h>
 
+#include <config.h>
+
 #ifdef HAVE_ALLOCA_H
 // explicitly included for systems that don't provide it in stdlib.h
 #include <alloca.h>
[prev in list] [next in list] [prev in thread] [next in thread]