← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/kde4libs/jaunty

« back to all changes in this revision

Viewing changes to khtml/html/html_imageimpl.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Wenning, Jonathan Thomas, Andreas Wenning
  • Date: 2009-04-01 05:55:52 UTC
  • mfrom: (1.1.29 upstream)
  • Revision ID: james.westby@ubuntu.com-20090401055552-uel5di5f3xiftax3
Tags: 4:4.2.2-0ubuntu1
https://launchpad.net/bugs/344709
https://launchpad.net/bugs/348823
[ Jonathan Thomas ]
* New upstream release (LP: #344709, #348823):
  - Bump upstreamversion and runtimedeps in debian/rules
  - Remove kubuntu_65_kcmdlineargs_decoding_svn934640.diff, applied upstream

[ Andreas Wenning ]
* Remove patch kubuntu_69_do_not_show_plasma_popups_over_screensaver.diff,
  applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
khtml/html/html_imageimpl.cpp
177
177
        break;
178
178
    case ATTR_NAME:
179
179
        if (inDocument() && m_name != attr->value()) {
180
 
            document()->underDocNamedCache().remove(m_name.string(),        this);
181
 
            document()->underDocNamedCache().add   (attr->value().string(), this);
 
180
            document()->underDocNamedCache().remove(m_name,        this);
 
181
            document()->underDocNamedCache().add   (attr->value(), this);
182
182
        }
183
183
        m_name = attr->value();
184
184
        //fallthrough
252
252
 
253
253
void HTMLImageElementImpl::removedFromDocument()
254
254
{
255
 
    document()->underDocNamedCache().remove(m_name.string(), this);
 
255
    document()->underDocNamedCache().remove(m_name, this);
256
256
    HTMLElementImpl::removedFromDocument();
257
257
}
258
258
 
259
259
void HTMLImageElementImpl::insertedIntoDocument()
260
260
{
261
 
    document()->underDocNamedCache().add(m_name.string(), this);
 
261
    document()->underDocNamedCache().add(m_name, this);
262
262
    HTMLElementImpl::insertedIntoDocument();
263
263
}
264
264
 
265
 
void HTMLImageElementImpl::removeId(const QString& id)
 
265
void HTMLImageElementImpl::removeId(const DOMString& id)
266
266
{
267
267
    document()->underDocNamedCache().remove(id, this);
268
268
    HTMLElementImpl::removeId(id);
269
269
}
270
270
 
271
 
void HTMLImageElementImpl::addId   (const QString& id)
 
271
void HTMLImageElementImpl::addId   (const DOMString& id)
272
272
{
273
273
    document()->underDocNamedCache().add(id, this);
274
274
    HTMLElementImpl::addId(id);