[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs/khtml/dom
From: Kevin Ottens <ervin () kde ! org>
Date: 2010-11-04 8:42:32
Message-ID: 20101104084232.65A3CAC89E () svn ! kde ! org
[Download RAW message or body]
SVN commit 1192894 by ervin:
Remove deprecated symbols from the build (if KDE_NO_DEPRECATED is defined).
M +4 -0 dom_node.cpp
M +4 -0 dom_node.h
M +4 -0 html_form.cpp
M +4 -0 html_form.h
M +4 -0 html_image.cpp
M +4 -0 html_image.h
M +4 -0 html_misc.cpp
M +4 -0 html_misc.h
M +16 -0 html_object.cpp
M +16 -0 html_object.h
--- trunk/KDE/kdelibs/khtml/dom/dom_node.cpp #1192893:1192894
@@ -409,11 +409,13 @@
return impl->nodeIndex();
}
+#ifndef KDE_NO_DEPRECATED
QString Node::toHTML()
{
if (!impl) return QString();
return impl->toString().string();
}
+#endif
void Node::applyChanges()
{
@@ -421,12 +423,14 @@
impl->recalcStyle( NodeImpl::Inherit );
}
+#ifndef KDE_NO_DEPRECATED
void Node::getCursor(int offset, int &_x, int &_y, int &height)
{
if (!impl) throw DOMException(DOMException::NOT_FOUND_ERR);
int dummy;
impl->getCaret(offset, false, _x, _y, dummy, height);
}
+#endif
QRect Node::getRect()
{
--- trunk/KDE/kdelibs/khtml/dom/dom_node.h #1192893:1192894
@@ -928,12 +928,16 @@
* @internal returns the index of a node
*/
unsigned long index() const;
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED QString toHTML();
+#endif
void applyChanges();
/**
* @deprecated without substitution since 3.2
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED void getCursor(int offset, int &_x, int &_y, int &height);
+#endif
/**
* not part of the DOM.
* @returns the exact coordinates and size of this element.
--- trunk/KDE/kdelibs/khtml/dom/html_form.cpp #1192893:1192894
@@ -475,16 +475,20 @@
}
/* The next two are provided for backwards compatibility. */
+#ifndef KDE_NO_DEPRECATED
DOMString HTMLInputElement::size() const
{
if(!impl) return DOMString();
return static_cast<ElementImpl*>(impl)->getAttribute(ATTR_SIZE);
}
+#endif
+#ifndef KDE_NO_DEPRECATED
void HTMLInputElement::setSize( const DOMString &value )
{
if(impl) static_cast<ElementImpl*>(impl)->setAttribute(ATTR_SIZE, value);
}
+#endif
long HTMLInputElement::getSize() const
{
--- trunk/KDE/kdelibs/khtml/dom/html_form.h #1192893:1192894
@@ -534,12 +534,16 @@
/**
* @deprecated
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED DOMString size() const;
+#endif
/**
* @deprecated
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED void setSize( const DOMString & );
+#endif
/**
* Size information. The precise meaning is specific to each type
--- trunk/KDE/kdelibs/khtml/dom/html_image.cpp #1192893:1192894
@@ -220,17 +220,21 @@
if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_ALT, value);
}
+#ifndef KDE_NO_DEPRECATED
long HTMLImageElement::border() const
{
if(!impl) return 0;
// ### return value in pixels
return static_cast<HTMLImageElementImpl*>(impl)->getAttribute(ATTR_BORDER).toInt();
}
+#endif
+#ifndef KDE_NO_DEPRECATED
void HTMLImageElement::setBorder( long value )
{
if (impl) static_cast<HTMLImageElementImpl*>(impl)->setAttribute(ATTR_BORDER, \
QString::number(value)); }
+#endif
DOMString HTMLImageElement::getBorder() const
{
--- trunk/KDE/kdelibs/khtml/dom/html_image.h #1192893:1192894
@@ -256,12 +256,16 @@
/**
* @deprecated
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED long border() const;
+#endif
/**
* @deprecated
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED void setBorder( long );
+#endif
/**
* Override height. See the <a
--- trunk/KDE/kdelibs/khtml/dom/html_misc.cpp #1192893:1192894
@@ -76,16 +76,20 @@
if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_FACE, value);
}
+#ifndef KDE_NO_DEPRECATED
DOMString HTMLBaseFontElement::size() const
{
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_SIZE);
}
+#endif
+#ifndef KDE_NO_DEPRECATED
void HTMLBaseFontElement::setSize( const DOMString &value )
{
if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_SIZE, value);
}
+#endif
long HTMLBaseFontElement::getSize() const
{
--- trunk/KDE/kdelibs/khtml/dom/html_misc.h #1192893:1192894
@@ -105,12 +105,16 @@
/**
* @deprecated
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED DOMString size() const;
+#endif
/**
* @deprecated
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED void setSize( const DOMString & );
+#endif
};
// --------------------------------------------------------------------------
--- trunk/KDE/kdelibs/khtml/dom/html_object.cpp #1192893:1192894
@@ -123,16 +123,20 @@
if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_HEIGHT, value);
}
+#ifndef KDE_NO_DEPRECATED
DOMString HTMLAppletElement::hspace() const
{
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_HSPACE);
}
+#endif
+#ifndef KDE_NO_DEPRECATED
void HTMLAppletElement::setHspace( const DOMString &value )
{
if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_HSPACE, value);
}
+#endif
long HTMLAppletElement::getHspace() const
{
@@ -167,16 +171,20 @@
if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_OBJECT, value);
}
+#ifndef KDE_NO_DEPRECATED
DOMString HTMLAppletElement::vspace() const
{
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_VSPACE);
}
+#endif
+#ifndef KDE_NO_DEPRECATED
void HTMLAppletElement::setVspace( const DOMString &value )
{
if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_VSPACE, value);
}
+#endif
long HTMLAppletElement::getVspace() const
{
@@ -342,16 +350,20 @@
if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_HEIGHT, value);
}
+#ifndef KDE_NO_DEPRECATED
DOMString HTMLObjectElement::hspace() const
{
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_HSPACE);
}
+#endif
+#ifndef KDE_NO_DEPRECATED
void HTMLObjectElement::setHspace( const DOMString &value )
{
if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_HSPACE, value);
}
+#endif
long HTMLObjectElement::getHspace() const
{
@@ -422,16 +434,20 @@
if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_USEMAP, value);
}
+#ifndef KDE_NO_DEPRECATED
DOMString HTMLObjectElement::vspace() const
{
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_VSPACE);
}
+#endif
+#ifndef KDE_NO_DEPRECATED
void HTMLObjectElement::setVspace( const DOMString &value )
{
if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_VSPACE, value);
}
+#endif
long HTMLObjectElement::getVspace() const
{
--- trunk/KDE/kdelibs/khtml/dom/html_object.h #1192893:1192894
@@ -167,12 +167,16 @@
/**
* @deprecated
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED DOMString hspace() const;
+#endif
/**
* @deprecated
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED void setHspace( const DOMString &value );
+#endif
/**
* The name of the applet. See the <a
@@ -220,12 +224,16 @@
/**
* @deprecated
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED DOMString vspace() const;
+#endif
/**
* @deprecated
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED void setVspace( const DOMString & );
+#endif
/**
* Override width. See the <a
@@ -419,12 +427,16 @@
/**
* @deprecated
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED DOMString hspace() const;
+#endif
/**
* @deprecated
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED void setHspace( const DOMString & );
+#endif
/**
* Form control or object name when submitted with a form. See the
@@ -512,12 +524,16 @@
/**
* @deprecated
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED DOMString vspace() const;
+#endif
/**
* @deprecated
*/
+#ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED void setVspace( const DOMString & );
+#endif
/**
* Override width. See the <a
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic