AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce code duplication

Browse Source 
Change-Id: I077963fcb910fa705b087e35e99cd07436c034b1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Konstantin Ritt 2014-01-15 22:57:34 +02:00 committed by The Qt Project
parent e52dca3655
commit 31a40e5ca2
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/text/qtextformat.cpp
View File

@ -3385,19 +3385,6 @@ bool QTextFormatCollection::hasFormatCached(const QTextFormat &format) const
return false; return false;
} }
QTextFormat QTextFormatCollection::objectFormat(int objectIndex) const
{
if (objectIndex == -1)
return QTextFormat();
return format(objFormats.at(objectIndex));
}
void QTextFormatCollection::setObjectFormat(int objectIndex, const QTextFormat &f)
{
const int formatIndex = indexForFormat(f);
objFormats[objectIndex] = formatIndex;
}
int QTextFormatCollection::objectFormatIndex(int objectIndex) const int QTextFormatCollection::objectFormatIndex(int objectIndex) const
{ {
if (objectIndex == -1) if (objectIndex == -1)

6
src/gui/text/qtextformat_p.h
View File

@ -68,8 +68,10 @@ public:
QTextFormatCollection(const QTextFormatCollection &rhs); QTextFormatCollection(const QTextFormatCollection &rhs);
QTextFormatCollection &operator=(const QTextFormatCollection &rhs); QTextFormatCollection &operator=(const QTextFormatCollection &rhs);
QTextFormat objectFormat(int objectIndex) const; inline QTextFormat objectFormat(int objectIndex) const
void setObjectFormat(int objectIndex, const QTextFormat &format); { return format(objectFormatIndex(objectIndex)); }
inline void setObjectFormat(int objectIndex, const QTextFormat &format)
{ setObjectFormatIndex(objectIndex, indexForFormat(format)); }
int objectFormatIndex(int objectIndex) const; int objectFormatIndex(int objectIndex) const;
void setObjectFormatIndex(int objectIndex, int formatIndex); void setObjectFormatIndex(int objectIndex, int formatIndex);