summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@nokia.com>2011-07-08 01:22:39 -0700
committerQt by Nokia <qt-info@nokia.com>2011-08-18 20:12:15 +0200
commit2c91710679556f1abc00a728d71137a33e0c6c52 (patch)
tree5e468b82714178e16224ddea2fa39cd8116d40ef /src
parentb5dbd1373beddb9eb4d761230c4b8d8d5ff4f6dc (diff)
Rename textBeforeOffsetFromString to start with q.
Exported functions should start with q. Reviewed-by: TrustMe (cherry picked from commit 4fcb7c233c3c8d748d66bf698df059ad7546ae88) Change-Id: Idc53d3ec49f73227a9fd12b6b88aade35c7cdf25 Reviewed-on: http://codereview.qt.nokia.com/3026 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/gui/accessible/qaccessible2.cpp6
-rw-r--r--src/plugins/accessible/widgets/simplewidgets.cpp12
2 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/accessible/qaccessible2.cpp b/src/gui/accessible/qaccessible2.cpp
index b62a7a4235..078ff13e2c 100644
--- a/src/gui/accessible/qaccessible2.cpp
+++ b/src/gui/accessible/qaccessible2.cpp
@@ -137,7 +137,7 @@ QT_BEGIN_NAMESPACE
/*!
\internal
*/
-QString Q_GUI_EXPORT textBeforeOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType,
+QString Q_GUI_EXPORT qTextBeforeOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType,
int *startOffset, int *endOffset, const QString& text)
{
QTextBoundaryFinder::BoundaryType type;
@@ -175,7 +175,7 @@ QString Q_GUI_EXPORT textBeforeOffsetFromString(int offset, QAccessible2::Bounda
/*!
\internal
*/
-QString Q_GUI_EXPORT textAfterOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType,
+QString Q_GUI_EXPORT qTextAfterOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType,
int *startOffset, int *endOffset, const QString& text)
{
QTextBoundaryFinder::BoundaryType type;
@@ -210,7 +210,7 @@ QString Q_GUI_EXPORT textAfterOffsetFromString(int offset, QAccessible2::Boundar
/*!
\internal
*/
-QString Q_GUI_EXPORT textAtOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType,
+QString Q_GUI_EXPORT qTextAtOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType,
int *startOffset, int *endOffset, const QString& text)
{
QTextBoundaryFinder::BoundaryType type;
diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp
index 179ec76299..5730b4d896 100644
--- a/src/plugins/accessible/widgets/simplewidgets.cpp
+++ b/src/plugins/accessible/widgets/simplewidgets.cpp
@@ -68,11 +68,11 @@ extern QList<QWidget*> childWidgets(const QWidget *widget, bool includeTopLevel
QString Q_GUI_EXPORT qt_accStripAmp(const QString &text);
QString Q_GUI_EXPORT qt_accHotKey(const QString &text);
-QString Q_GUI_EXPORT textBeforeOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType,
+QString Q_GUI_EXPORT qTextBeforeOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType,
int *startOffset, int *endOffset, const QString& text);
-QString Q_GUI_EXPORT textAtOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType,
+QString Q_GUI_EXPORT qTextAtOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType,
int *startOffset, int *endOffset, const QString& text);
-QString Q_GUI_EXPORT textAfterOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType,
+QString Q_GUI_EXPORT qTextAfterOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType,
int *startOffset, int *endOffset, const QString& text);
/*!
@@ -818,7 +818,7 @@ QString QAccessibleLineEdit::textBeforeOffset(int offset, BoundaryType boundaryT
*startOffset = *endOffset = -1;
return QString();
}
- return textBeforeOffsetFromString(offset, boundaryType, startOffset, endOffset, lineEdit()->text());
+ return qTextBeforeOffsetFromString(offset, boundaryType, startOffset, endOffset, lineEdit()->text());
}
QString QAccessibleLineEdit::textAfterOffset(int offset, BoundaryType boundaryType,
@@ -828,7 +828,7 @@ QString QAccessibleLineEdit::textAfterOffset(int offset, BoundaryType boundaryTy
*startOffset = *endOffset = -1;
return QString();
}
- return textAfterOffsetFromString(offset, boundaryType, startOffset, endOffset, lineEdit()->text());
+ return qTextAfterOffsetFromString(offset, boundaryType, startOffset, endOffset, lineEdit()->text());
}
QString QAccessibleLineEdit::textAtOffset(int offset, BoundaryType boundaryType,
@@ -838,7 +838,7 @@ QString QAccessibleLineEdit::textAtOffset(int offset, BoundaryType boundaryType,
*startOffset = *endOffset = -1;
return QString();
}
- return textAtOffsetFromString(offset, boundaryType, startOffset, endOffset, lineEdit()->text());
+ return qTextAtOffsetFromString(offset, boundaryType, startOffset, endOffset, lineEdit()->text());
}
void QAccessibleLineEdit::removeSelection(int selectionIndex)