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

List:       kde-commits
Subject:    kdenonbeta/khtml2/impl
From:       John Tapsell <john.tapsell () kdemail ! net>
Date:       2005-06-02 22:09:37
Message-ID: 1117750177.665971.13791.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 421372 by johnflux:

HTMLAreaElementImpl now compiles.  Added to the makefile.
Only 4 lines were commented out - the renderer ones


 M  +11 -6     HTMLAreaElementImpl.cc  
 M  +5 -3      HTMLAreaElementImpl.h  
 M  +1 -1      Makefile.am  


--- trunk/kdenonbeta/khtml2/impl/HTMLAreaElementImpl.cc #421371:421372
@@ -28,6 +28,7 @@
 
 #include <kdom/impl/DocumentImpl.h>
 #include <kdom/impl/AttrImpl.h>
+#include <kdom/Helper.h>
 
 #include <kglobal.h>
 #include <kdebug.h>
@@ -63,7 +64,7 @@
 	return ID_AREA;
 }
 
-void HTMLAreaElementImpl::parseAttribute(AttributeImpl *attr)
+void HTMLAreaElementImpl::parseAttribute(KDOM::AttributeImpl *attr)
 {
 	switch (attr->id())
 	{
@@ -79,7 +80,7 @@
 		break;
 	case ATTR_COORDS:
 		delete [] m_coords;
-		m_coords = attr->val()->toLengthArray(m_coordsLen);
+		m_coords = KDOM::Helper::stringToLengthArray(attr->value(),m_coordsLen);
 		break;
 	case ATTR_NOHREF:
 		nohref = attr->val() != 0;
@@ -96,7 +97,8 @@
 	}
 }
 
-bool HTMLAreaElementImpl::mapMouseEvent(int x_, int y_, int width_, int height_,
+//FIXME Commented out because we don't have a renderobject yet
+/*bool HTMLAreaElementImpl::mapMouseEvent(int x_, int y_, int width_, int height_,
 								   RenderObject::NodeInfo& info)
 {
 	bool inside = false;
@@ -114,17 +116,20 @@
 
 	return inside;
 }
-
+*/
 QRect HTMLAreaElementImpl::getRect() const
 {
 	if (parentNode()->renderer()==0)
 		return QRect();
 	int dx, dy;
-	if (!parentNode()->renderer()->absolutePosition(dx, dy))
+	//Commented out the below, and added last line
+	//FIXME we don't have a renderer object yet
+/*	if (!parentNode()->renderer()->absolutePosition(dx, dy))
 		return QRect();
 	QRegion region = getRegion(lastw,lasth);
 	region.translate(dx, dy);
-	return region.boundingRect();
+	return region.boundingRect(); */
+	return QRect();
 }
 
 QRegion HTMLAreaElementImpl::getRegion(int width_, int height_) const
--- trunk/kdenonbeta/khtml2/impl/HTMLAreaElementImpl.h #421371:421372
@@ -24,6 +24,7 @@
 #define HTML_HTMLIMAGEIMPL_H
 
 #include "HTMLAnchorElementImpl.h"
+#include <kdom/css/impl/RenderStyleDefs.h>
 
 #include <qregion.h>
 
@@ -52,8 +53,9 @@
 
 	bool isDefault() const { return shape==Default; }
 
-	bool mapMouseEvent(int x_, int y_, int width_, int height_,
-					   khtml::RenderObject::NodeInfo& info);
+	//FIXME commented out because we don't have a render object yet
+//	bool mapMouseEvent(int x_, int y_, int width_, int height_,
+//					   khtml::RenderObject::NodeInfo& info);
 
 	virtual QRect getRect() const;
 
@@ -62,7 +64,7 @@
 protected:
 	QRegion getRegion(int width_, int height) const;
 	QRegion region;
-	khtml::Length* m_coords;
+	KDOM::Length* m_coords;
 	int m_coordsLen;
 	int lastw, lasth;
 	Shape shape  : 3;
--- trunk/kdenonbeta/khtml2/impl/Makefile.am #421371:421372
@@ -12,4 +12,4 @@
 HTMLTableElementImpl.cc HTMLTableCellElementImpl.cc HTMLTableColElementImpl.cc \
 HTMLTableRowElementImpl.cc HTMLDListElementImpl.cc HTMLMenuElementImpl.cc \
 HTMLLIElementImpl.cc HTMLUListElementImpl.cc HTMLDirectoryElementImpl.cc \
-HTMLOListElementImpl.cc CDFInterface.cc
+HTMLOListElementImpl.cc HTMLAnchorElementImpl.cc HTMLAreaElementImpl.cc CDFInterface.cc
[prev in list] [next in list] [prev in thread] [next in thread]