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

Replace the PMF to certain QString members with a regular function

Browse Source 
Qt 5.4 is adding ref-qualified overloads to toUpper, toLower, trimmed
and some others, so the cast becomes ambiguous or just plain wrong.

Change-Id: Idff0b3e100f075b9b995aeb84d88575afecb2d6f
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Thiago Macieira
2014-07-29 22:02:56 -07:00
parent 22fe880628
commit 5da75dba06
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qtsupport/exampleslistmodel.cpp
View File

@@ -264,7 +264,7 @@ static QString fixStringForTags(const QString &string)
static QStringList trimStringList(const QStringList &stringlist) static QStringList trimStringList(const QStringList &stringlist)
{ {
return Utils::transform(stringlist, &QString::trimmed); return Utils::transform(stringlist, [](const QString &str) { return str.trimmed(); });
} }
static QString relativeOrInstallPath(const QString &path, const QString &manifestPath, static QString relativeOrInstallPath(const QString &path, const QString &manifestPath,

20
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -133,7 +133,17 @@ using namespace Utils;
namespace TextEditor { namespace TextEditor {
namespace Internal { namespace Internal {
typedef QString (QString::*TransformationMethod)() const; typedef QString (TransformationMethod)(const QString &);
static QString QString_toUpper(const QString &str)
{
return str.toUpper();
}
static QString QString_toLower(const QString &str)
{
return str.toLower();
}
class BaseTextEditorAnimator : public QObject class BaseTextEditorAnimator : public QObject
{ {
@@ -1252,12 +1262,12 @@ void BaseTextEditorWidget::moveLineDown()
void BaseTextEditorWidget::uppercaseSelection() void BaseTextEditorWidget::uppercaseSelection()
{ {
d->transformSelection(&QString::toUpper); d->transformSelection(&QString_toUpper);
} }
void BaseTextEditorWidget::lowercaseSelection() void BaseTextEditorWidget::lowercaseSelection()
{ {
d->transformSelection(&QString::toLower); d->transformSelection(&QString_toLower);
} }
void BaseTextEditorWidget::indent() void BaseTextEditorWidget::indent()
@@ -6833,7 +6843,7 @@ void BaseTextEditorWidgetPrivate::transformSelection(TransformationMethod method
} }
QString text = cursor.selectedText(); QString text = cursor.selectedText();
QString transformedText = (text.*method)(); QString transformedText = method(text);
if (transformedText == text) { if (transformedText == text) {
// if the transformation does not do anything to the selection, do no create an undo step // if the transformation does not do anything to the selection, do no create an undo step
@@ -6878,7 +6888,7 @@ void BaseTextEditorWidgetPrivate::transformBlockSelection(TransformationMethod m
if (startPos < endPos) { if (startPos < endPos) {
cursor.setPosition(startPos); cursor.setPosition(startPos);
cursor.setPosition(endPos, QTextCursor::KeepAnchor); cursor.setPosition(endPos, QTextCursor::KeepAnchor);
const QString &transformedText = (m_document->textAt(startPos, endPos - startPos).*method)(); const QString &transformedText = method(m_document->textAt(startPos, endPos - startPos));
if (transformedText != cursor.selectedText()) if (transformedText != cursor.selectedText())
cursor.insertText(transformedText); cursor.insertText(transformedText);
} }