← Back to branch summary

~ubuntu-branches/ubuntu/vivid/kdesdk/vivid

« back to all changes in this revision

Viewing changes to lokalize/src/catalog/xliff/xliffstorage.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-06-06 11:49:54 UTC
  • mfrom: (0.4.21)
  • Revision ID: package-import@ubuntu.com-20120606114954-rdls73fzlpzxglbx
Tags: 4:4.8.80-0ubuntu1
* New uptream beta release
* Update dont_export_private_classes.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
lokalize/src/catalog/xliff/xliffstorage.cpp
40
40
#include <kdatetime.h>
41
41
#include <QXmlSimpleReader>
42
42
 
43
 
static const char* const noyes[]={"no","yes"};
44
 
static const char* const bintargettarget[]={"bin-target","target"};
45
 
static const char* const binsourcesource[]={"bin-source","source"};
 
43
static const QString noyes[]={"no","yes"};
 
44
static const QString bintargettarget[]={"bin-target","target"};
 
45
static const QString binsourcesource[]={"bin-source","source"};
46
46
 
47
47
XliffStorage::XliffStorage()
48
48
 : CatalogStorage()
375
375
 
376
376
                        }
377
377
                        if (!newNode.lastChild().isCharacterData())
378
 
                            newNode.appendChild( elem.ownerDocument().createTextNode(""));
 
378
                            newNode.appendChild( elem.ownerDocument().createTextNode(QString()));
379
379
                    }
380
380
                    if (!mid.isEmpty())
381
381
                        elem.insertAfter( elem.ownerDocument().createTextNode(mid),newNode);
382
382
                    else if (!newNode.nextSibling().isCharacterData()) //keep our DOM in a nice state
383
 
                        elem.insertAfter( elem.ownerDocument().createTextNode(""),newNode);
 
383
                        elem.insertAfter( elem.ownerDocument().createTextNode(QString()),newNode);
384
384
 
385
385
                    data->actionType=ContentEditingData::CheckLength;
386
386
                    return QString('a');//we're done here
436
436
            //END DELETE TAG
437
437
 
438
438
            if (!seenCharacterDataAfterElement)  //add empty charData child so that user could add some text
439
 
                elem.insertBefore( elem.ownerDocument().createTextNode(""),n);
 
439
                elem.insertBefore( elem.ownerDocument().createTextNode(QString()),n);
440
440
            seenCharacterDataAfterElement=false;
441
441
 
442
442
            if (data)
472
472
    if (!seenCharacterDataAfterElement)
473
473
    {
474
474
        //add empty charData child so that user could add some text
475
 
        elem.appendChild( elem.ownerDocument().createTextNode(""));
 
475
        elem.appendChild( elem.ownerDocument().createTextNode(QString()));
476
476
    }
477
477
 
478
478
    return result;
484
484
 
485
485
CatalogString XliffStorage::catalogString(QDomElement unit,  DocPosition::Part part) const
486
486
{
487
 
    static const char* names[]={"source","target"};
 
487
    static const QString names[]={"source","target"};
488
488
    CatalogString catalogString;
489
489
    ContentEditingData data(ContentEditingData::Get);
490
490
    catalogString.string=content(unit.firstChildElement( names[part==DocPosition::Target]), &data );
530
530
    else
531
531
    {
532
532
        //only bulk delete requests are generated
533
 
        targetForPos(pos.entry).firstChildElement("external-file").setAttribute("href","");
 
533
        targetForPos(pos.entry).firstChildElement("external-file").setAttribute("href",QString());
534
534
    }
535
535
}
536
536
 
807
807
    {
808
808
        QDomElement ref=unit.lastChildElement("note");
809
809
        elem=unit.insertAfter( m_doc.createElement("note"),ref).toElement();
810
 
        elem.appendChild(m_doc.createTextNode(""));
 
810
        elem.appendChild(m_doc.createTextNode(QString()));
811
811
    }
812
812
    else
813
813
    {