make copies of the string in QTextBoundaryFinder, use const in args where possible

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/tools/qtextboundaryfinder.cpp b/src/core/tools/qtextboundaryfinder.cpp
index 05bce0a..4a4e49b 100644 (file)
--- a/src/core/tools/qtextboundaryfinder.cpp
+++ b/src/core/tools/qtextboundaryfinder.cpp
@@ -160,14 +160,14 @@ QTextBoundaryFinder::QTextBoundaryFinder(BoundaryType type, const QString &strin
 {
     d->pos = 0;
     d->length = string.size();
-    d->string = string;
+    d->string = QString(string);
 }
 
 /*!
   Creates a QTextBoundaryFinder object of \a type operating on \a chars
   with \a length.
 */
-QTextBoundaryFinder::QTextBoundaryFinder(BoundaryType type, const QChar *chars, int length)
+QTextBoundaryFinder::QTextBoundaryFinder(BoundaryType type, const QChar *chars, const int length)
     : d(new QTextBoundaryFinderPrivate)
     , t(type)
 {
@@ -218,7 +218,7 @@ int QTextBoundaryFinder::position() const
 
   \sa position()
 */
-void QTextBoundaryFinder::setPosition(int position)
+void QTextBoundaryFinder::setPosition(const int position)
 {
     d->pos = qBound(0, position, d->length);
 }
@@ -235,11 +235,11 @@ void QTextBoundaryFinder::setPosition(int position)
 */
 
 /*!
-  Returns the string  the QTextBoundaryFinder object operates on.
+  Returns the string the QTextBoundaryFinder object operates on.
 */
 QString QTextBoundaryFinder::string() const
 {
-    return d->string;
+    return QString(d->string);
 }
 
 
@@ -355,9 +355,7 @@ bool QTextBoundaryFinder::isAtBoundary() const
 */
 QTextBoundaryFinder::BoundaryReasons QTextBoundaryFinder::boundaryReasons() const
 {
-    if (!d)
-        return QTextBoundaryFinder::NotAtBoundary;
-    if (!isAtBoundary())
+    if (!d || !isAtBoundary())
         return QTextBoundaryFinder::NotAtBoundary;
     if (d->pos == 0) {
         if (d->string[d->pos].isSpace())

diff --git a/src/core/tools/qtextboundaryfinder.h b/src/core/tools/qtextboundaryfinder.h
index a4bab50..5520d15 100644 (file)
--- a/src/core/tools/qtextboundaryfinder.h
+++ b/src/core/tools/qtextboundaryfinder.h
@@ -76,7 +76,7 @@ public:
     Q_DECLARE_FLAGS(BoundaryReasons, BoundaryReason)
 
     QTextBoundaryFinder(BoundaryType type, const QString &string);
-    QTextBoundaryFinder(BoundaryType type, const QChar *chars, int length);
+    QTextBoundaryFinder(BoundaryType type, const QChar *chars, const int length);
 
     inline bool isValid() const { return d; }
 
@@ -86,7 +86,7 @@ public:
     void toStart();
     void toEnd();
     int position() const;
-    void setPosition(int position);
+    void setPosition(const int position);
 
     int toNextBoundary();
     int toPreviousBoundary();