feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

add ProString::prepend()

Browse Source 
Change-Id: I2dc905470c90eeba15f0f00412405a9a1a2ddcc7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-08-22 12:00:56 +02:00
parent 43ff20d728
commit 9f8b9eaf16
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/shared/proparser/proitems.cpp
View File

@@ -156,14 +156,14 @@ QString &ProString::toQString(QString &tmp) const
return tmp.setRawData(m_string.constData() + m_offset, m_length); return tmp.setRawData(m_string.constData() + m_offset, m_length);
} }
QChar *ProString::prepareAppend(int extraLen) QChar *ProString::prepareExtend(int extraLen, int thisTarget, int extraTarget)
{ {
if (m_string.isDetached() && m_length + extraLen <= m_string.capacity()) { if (m_string.isDetached() && m_length + extraLen <= m_string.capacity()) {
m_string.reserve(0); // Prevent the resize() below from reallocating m_string.reserve(0); // Prevent the resize() below from reallocating
QChar *ptr = (QChar *)m_string.constData(); QChar *ptr = (QChar *)m_string.constData();
if (m_offset) if (m_offset != thisTarget)
memmove(ptr, ptr + m_offset, m_length * 2); memmove(ptr + thisTarget, ptr + m_offset, m_length * 2);
ptr += m_length; ptr += extraTarget;
m_offset = 0; m_offset = 0;
m_length += extraLen; m_length += extraLen;
m_string.resize(m_length); m_string.resize(m_length);
@@ -172,13 +172,28 @@ QChar *ProString::prepareAppend(int extraLen)
} else { } else {
QString neu(m_length + extraLen, Qt::Uninitialized); QString neu(m_length + extraLen, Qt::Uninitialized);
QChar *ptr = (QChar *)neu.constData(); QChar *ptr = (QChar *)neu.constData();
memcpy(ptr, m_string.constData() + m_offset, m_length * 2); memcpy(ptr + thisTarget, m_string.constData() + m_offset, m_length * 2);
ptr += m_length; ptr += extraTarget;
*this = ProString(neu); *this = ProString(neu);
return ptr; return ptr;
} }
} }
ProString &ProString::prepend(const ProString &other)
{
if (other.m_length) {
if (!m_length) {
*this = other;
} else {
QChar *ptr = prepareExtend(other.m_length, other.m_length, 0);
memcpy(ptr, other.constData(), other.m_length * 2);
if (!m_file)
m_file = other.m_file;
}
}
return *this;
}
// If pending != 0, prefix with space if appending to non-empty non-pending // If pending != 0, prefix with space if appending to non-empty non-pending
ProString &ProString::append(const ProString &other, bool *pending) ProString &ProString::append(const ProString &other, bool *pending)
{ {
@@ -188,10 +203,10 @@ ProString &ProString::append(const ProString &other, bool *pending)
} else { } else {
QChar *ptr; QChar *ptr;
if (pending && !*pending) { if (pending && !*pending) {
ptr = prepareAppend(1 + other.m_length); ptr = prepareExtend(1 + other.m_length, 0, m_length);
*ptr++ = 32; *ptr++ = 32;
} else { } else {
ptr = prepareAppend(other.m_length); ptr = prepareExtend(other.m_length, 0, m_length);
} }
memcpy(ptr, other.m_string.constData() + other.m_offset, other.m_length * 2); memcpy(ptr, other.m_string.constData() + other.m_offset, other.m_length * 2);
if (other.m_file) if (other.m_file)
@@ -224,7 +239,7 @@ ProString &ProString::append(const ProStringList &other, bool *pending, bool ski
else else
totalLength--; totalLength--;
QChar *ptr = prepareAppend(totalLength); QChar *ptr = prepareExtend(totalLength, 0, m_length);
for (int i = startIdx; i < sz; ++i) { for (int i = startIdx; i < sz; ++i) {
if (putSpace) if (putSpace)
*ptr++ = 32; *ptr++ = 32;

3
src/shared/proparser/proitems.h
View File

@@ -78,6 +78,7 @@ public:
ProString &setSource(const ProFile *pro) { m_file = pro; return *this; } ProString &setSource(const ProFile *pro) { m_file = pro; return *this; }
const ProFile *sourceFile() const { return m_file; } const ProFile *sourceFile() const { return m_file; }
ProString &prepend(const ProString &other);
ProString &operator+=(const ProString &other); ProString &operator+=(const ProString &other);
ProString &append(const ProString &other, bool *pending = 0); ProString &append(const ProString &other, bool *pending = 0);
ProString &append(const ProStringList &other, bool *pending = 0, bool skipEmpty1st = false); ProString &append(const ProStringList &other, bool *pending = 0, bool skipEmpty1st = false);
@@ -155,7 +156,7 @@ private:
int m_offset, m_length; int m_offset, m_length;
const ProFile *m_file; const ProFile *m_file;
mutable uint m_hash; mutable uint m_hash;
QChar *prepareAppend(int extraLen); QChar *prepareExtend(int extraLen, int thisTarget, int extraTarget);
uint updatedHash() const; uint updatedHash() const;
friend uint qHash(const ProString &str); friend uint qHash(const ProString &str);
friend QString operator+(const ProString &one, const ProString &two); friend QString operator+(const ProString &one, const ProString &two);