From 432a75604819d9ed4143036c7cafa72106c768e0 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Tue, 18 Oct 2011 16:44:54 +0200 Subject: replace 'const QChar &' with 'QChar ' where appropriate as QChar is actually an ushort and there is no point in taking its address. Merge-request: 69 Change-Id: Idcc9d621e5627514ade006aa12a789a88929d48b Reviewed-by: Olivier Goffart --- src/gui/text/qrawfont.cpp | 2 +- src/gui/text/qrawfont.h | 2 +- src/gui/text/qtextdocument_p.cpp | 4 ++-- src/gui/text/qtextdocument_p.h | 2 +- src/gui/text/qtextobject.cpp | 4 ++-- src/gui/text/qtextobject_p.h | 4 ++-- src/gui/text/qtexttable.cpp | 4 ++-- src/gui/text/qtexttable_p.h | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/gui') diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp index a5879e3407..79793d5845 100644 --- a/src/gui/text/qrawfont.cpp +++ b/src/gui/text/qrawfont.cpp @@ -614,7 +614,7 @@ QList QRawFont::supportedWritingSystems() const \sa supportedWritingSystems() */ -bool QRawFont::supportsCharacter(const QChar &character) const +bool QRawFont::supportsCharacter(QChar character) const { return d->isValid() && d->fontEngine->canRender(&character, 1); } diff --git a/src/gui/text/qrawfont.h b/src/gui/text/qrawfont.h index 453f01ff11..5cd996e705 100644 --- a/src/gui/text/qrawfont.h +++ b/src/gui/text/qrawfont.h @@ -127,7 +127,7 @@ public: QFont::HintingPreference hintingPreference); bool supportsCharacter(quint32 ucs4) const; - bool supportsCharacter(const QChar &character) const; + bool supportsCharacter(QChar character) const; QList supportedWritingSystems() const; QByteArray fontTable(const char *tagName) const; diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp index 8ce3ae4ac3..2869f75355 100644 --- a/src/gui/text/qtextdocument_p.cpp +++ b/src/gui/text/qtextdocument_p.cpp @@ -126,7 +126,7 @@ void QTextBlockData::invalidate() const layout->engine()->invalidate(); } -static bool isValidBlockSeparator(const QChar &ch) +static bool isValidBlockSeparator(QChar ch) { return ch == QChar::ParagraphSeparator || ch == QTextBeginningOfFrame @@ -393,7 +393,7 @@ int QTextDocumentPrivate::insert_block(int pos, uint strPos, int format, int blo return x; } -int QTextDocumentPrivate::insertBlock(const QChar &blockSeparator, +int QTextDocumentPrivate::insertBlock(QChar blockSeparator, int pos, int blockFormat, int charFormat, QTextUndoCommand::Operation op) { Q_ASSERT(formats.format(blockFormat).isBlockFormat()); diff --git a/src/gui/text/qtextdocument_p.h b/src/gui/text/qtextdocument_p.h index 5f2f0f0096..54eefd32db 100644 --- a/src/gui/text/qtextdocument_p.h +++ b/src/gui/text/qtextdocument_p.h @@ -179,7 +179,7 @@ public: void insert(int pos, const QString &text, int format); void insert(int pos, int strPos, int strLength, int format); int insertBlock(int pos, int blockFormat, int charFormat, QTextUndoCommand::Operation = QTextUndoCommand::MoveCursor); - int insertBlock(const QChar &blockSeparator, int pos, int blockFormat, int charFormat, + int insertBlock(QChar blockSeparator, int pos, int blockFormat, int charFormat, QTextUndoCommand::Operation op = QTextUndoCommand::MoveCursor); void move(int from, int to, int length, QTextUndoCommand::Operation = QTextUndoCommand::MoveCursor); diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index bffc2c3a65..a9daf6ba56 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -525,7 +525,7 @@ void QTextFrame::setLayoutData(QTextFrameLayoutData *data) -void QTextFramePrivate::fragmentAdded(const QChar &type, uint fragment) +void QTextFramePrivate::fragmentAdded(QChar type, uint fragment) { if (type == QTextBeginningOfFrame) { Q_ASSERT(!fragment_start); @@ -543,7 +543,7 @@ void QTextFramePrivate::fragmentAdded(const QChar &type, uint fragment) } } -void QTextFramePrivate::fragmentRemoved(const QChar &type, uint fragment) +void QTextFramePrivate::fragmentRemoved(QChar type, uint fragment) { Q_UNUSED(fragment); // --release warning if (type == QTextBeginningOfFrame) { diff --git a/src/gui/text/qtextobject_p.h b/src/gui/text/qtextobject_p.h index 960e4e81f2..3f63024051 100644 --- a/src/gui/text/qtextobject_p.h +++ b/src/gui/text/qtextobject_p.h @@ -97,8 +97,8 @@ public: : QTextObjectPrivate(doc), fragment_start(0), fragment_end(0), parentFrame(0), layoutData(0) { } - virtual void fragmentAdded(const QChar &type, uint fragment); - virtual void fragmentRemoved(const QChar &type, uint fragment); + virtual void fragmentAdded(QChar type, uint fragment); + virtual void fragmentRemoved(QChar type, uint fragment); void remove_me(); uint fragment_start; diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp index 35adfd16b2..12af933fd0 100644 --- a/src/gui/text/qtexttable.cpp +++ b/src/gui/text/qtexttable.cpp @@ -397,7 +397,7 @@ int QTextTablePrivate::findCellIndex(int fragment) const return it - cells.begin(); } -void QTextTablePrivate::fragmentAdded(const QChar &type, uint fragment) +void QTextTablePrivate::fragmentAdded(QChar type, uint fragment) { dirty = true; if (blockFragmentUpdates) @@ -415,7 +415,7 @@ void QTextTablePrivate::fragmentAdded(const QChar &type, uint fragment) QTextFramePrivate::fragmentAdded(type, fragment); } -void QTextTablePrivate::fragmentRemoved(const QChar &type, uint fragment) +void QTextTablePrivate::fragmentRemoved(QChar type, uint fragment) { dirty = true; if (blockFragmentUpdates) diff --git a/src/gui/text/qtexttable_p.h b/src/gui/text/qtexttable_p.h index 273caa110f..7b278f9742 100644 --- a/src/gui/text/qtexttable_p.h +++ b/src/gui/text/qtexttable_p.h @@ -66,8 +66,8 @@ public: ~QTextTablePrivate(); static QTextTable *createTable(QTextDocumentPrivate *, int pos, int rows, int cols, const QTextTableFormat &tableFormat); - void fragmentAdded(const QChar &type, uint fragment); - void fragmentRemoved(const QChar &type, uint fragment); + void fragmentAdded(QChar type, uint fragment); + void fragmentRemoved(QChar type, uint fragment); void update() const; -- cgit v1.2.3