Merge branch '4.6-api-review' into 4.6

9 files changed, 30 insertions, 19 deletions

diff --git a/tools/assistant/lib/qhelpsearchengine.cpp b/tools/assistant/lib/qhelpsearchengine.cpp
index cb18142725..893495d35f 100644
--- a/tools/assistant/lib/qhelpsearchengine.cpp
+++ b/tools/assistant/lib/qhelpsearchengine.cpp
@@ -95,12 +95,11 @@ private:
         delete indexWriter;
     }
 
-
-    int hitsCount() const
+    int hitCount() const
     {
         int count = 0;
         if (indexReader)
-            count = indexReader->hitsCount();
+            count = indexReader->hitCount();
 
         return count;
     }
@@ -366,11 +365,22 @@ QHelpSearchResultWidget* QHelpSearchEngine::resultWidget()
 }
 
 /*!
+    \obsolete
     Returns the amount of hits the search engine found.
+    \sa hitCount()
 */
 int QHelpSearchEngine::hitsCount() const
 {
-    return d->hitsCount();
+    return d->hitCount();
+}
+
+/*!
+    \since 4.6
+    Returns the amount of hits the search engine found.
+*/
+int QHelpSearchEngine::hitCount() const
+{
+    return d->hitCount();
 }
 
 /*!
diff --git a/tools/assistant/lib/qhelpsearchengine.h b/tools/assistant/lib/qhelpsearchengine.h
index 1d53411ab6..21f04c5420 100644
--- a/tools/assistant/lib/qhelpsearchengine.h
+++ b/tools/assistant/lib/qhelpsearchengine.h
@@ -86,7 +86,8 @@ public:
     QHelpSearchQueryWidget* queryWidget();
     QHelpSearchResultWidget* resultWidget();
 
-    int hitsCount() const;
+    QT_DEPRECATED int hitsCount() const;
+    int hitCount() const;
 
     typedef QPair<QString, QString> SearchHit;
     QList<SearchHit> hits(int start, int end) const;
diff --git a/tools/assistant/lib/qhelpsearchindexreader.cpp b/tools/assistant/lib/qhelpsearchindexreader.cpp
index 20d181bbe4..b13460536d 100644
--- a/tools/assistant/lib/qhelpsearchindexreader.cpp
+++ b/tools/assistant/lib/qhelpsearchindexreader.cpp
@@ -83,7 +83,7 @@ void QHelpSearchIndexReader::search(const QString &collectionFile, const QString
     start(QThread::NormalPriority);
 }
 
-int QHelpSearchIndexReader::hitsCount() const
+int QHelpSearchIndexReader::hitCount() const
 {
     QMutexLocker lock(&mutex);
     return hitList.count();
diff --git a/tools/assistant/lib/qhelpsearchindexreader_p.h b/tools/assistant/lib/qhelpsearchindexreader_p.h
index 31c392f7d9..adbcdc246c 100644
--- a/tools/assistant/lib/qhelpsearchindexreader_p.h
+++ b/tools/assistant/lib/qhelpsearchindexreader_p.h
@@ -81,7 +81,7 @@ public:
     void search(const QString &collectionFile,
         const QString &indexFilesFolder,
         const QList<QHelpSearchQuery> &queryList);
-    int hitsCount() const;
+    int hitCount() const;
     QList<QHelpSearchEngine::SearchHit> hits(int start, int end) const;
 
 signals:
diff --git a/tools/assistant/lib/qhelpsearchresultwidget.cpp b/tools/assistant/lib/qhelpsearchresultwidget.cpp
index a2f0021588..c0d17dd9a8 100644
--- a/tools/assistant/lib/qhelpsearchresultwidget.cpp
+++ b/tools/assistant/lib/qhelpsearchresultwidget.cpp
@@ -169,13 +169,13 @@ private slots:
     void showNextResultPage()
     {
         if (!searchEngine.isNull()
-            && resultLastToShow < searchEngine->hitsCount()) {
+            && resultLastToShow < searchEngine->hitCount()) {
             resultLastToShow += 20;
             resultFirstToShow += 20;
 
             resultTextBrowser->showResultPage(searchEngine->hits(resultFirstToShow,
                 resultLastToShow), isIndexing);
-            if (resultLastToShow >= searchEngine->hitsCount())
+            if (resultLastToShow >= searchEngine->hitCount())
                 updateNextButtonState(false);
         }
         updateHitRange();
@@ -184,7 +184,7 @@ private slots:
     void showLastResultPage()
     {
         if (!searchEngine.isNull()) {
-            resultLastToShow = searchEngine->hitsCount();
+            resultLastToShow = searchEngine->hitCount();
             resultFirstToShow = resultLastToShow - (resultLastToShow % 20);
 
             if (resultFirstToShow == resultLastToShow)
@@ -214,7 +214,7 @@ private slots:
     {
         if (!searchEngine.isNull()) {
             int count = resultLastToShow % 20;
-            if (count == 0 || resultLastToShow != searchEngine->hitsCount())
+            if (count == 0 || resultLastToShow != searchEngine->hitCount())
                 count = 20;
 
             resultLastToShow -= count;
@@ -298,7 +298,7 @@ private:
         int count = 0;
 
         if (!searchEngine.isNull()) {
-            count = searchEngine->hitsCount();
+            count = searchEngine->hitCount();
             if (count > 0) {
                 first = resultFirstToShow +1;
                 last = resultLastToShow > count ? count : resultLastToShow;
diff --git a/tools/designer/src/designer/qdesigner_formwindow.cpp b/tools/designer/src/designer/qdesigner_formwindow.cpp
index b2af25743f..05937cd78f 100644
--- a/tools/designer/src/designer/qdesigner_formwindow.cpp
+++ b/tools/designer/src/designer/qdesigner_formwindow.cpp
@@ -182,7 +182,7 @@ int QDesignerFormWindow::getNumberOfUntitledWindows() const
             if (rx.indexIn(title) != -1) {
                 if (maxUntitled == 0)
                     ++maxUntitled;
-                if (rx.numCaptures() > 1) {
+                if (rx.captureCount() > 1) {
                     const QString numberCapture = rx.cap(2);
                     if (!numberCapture.isEmpty())
                         maxUntitled = qMax(numberCapture.toInt(), maxUntitled);
diff --git a/tools/makeqpf/mainwindow.cpp b/tools/makeqpf/mainwindow.cpp
index 8fa372b166..45ea0a3274 100644
--- a/tools/makeqpf/mainwindow.cpp
+++ b/tools/makeqpf/mainwindow.cpp
@@ -269,7 +269,7 @@ void MainWindow::populateCharacterRanges()
         if (line.isEmpty() || line.startsWith(QLatin1Char('#')))
             continue;
 
-        if (!rangeExpr.exactMatch(line) || rangeExpr.numCaptures() != 3)
+        if (!rangeExpr.exactMatch(line) || rangeExpr.captureCount() != 3)
             continue;
 
         QPF::CharacterRange range;
diff --git a/tools/makeqpf/qpf2.cpp b/tools/makeqpf/qpf2.cpp
index 23006f0e31..a0af1a01f3 100644
--- a/tools/makeqpf/qpf2.cpp
+++ b/tools/makeqpf/qpf2.cpp
@@ -519,7 +519,7 @@ void QPF::addGlyphs(QFontEngine *fe, const QList<CharacterRange> &ranges)
                 glyph_metrics_t metrics = fe->boundingBox(glyphIndex);
 
                 const quint32 oldSize = glyphs.size();
-                glyphs.resize(glyphs.size() + sizeof(QFontEngineQPF::Glyph) + img.numBytes());
+                glyphs.resize(glyphs.size() + sizeof(QFontEngineQPF::Glyph) + img.byteCount());
                 uchar *data = reinterpret_cast<uchar *>(glyphs.data() + oldSize);
 
                 uchar *gmapPtr = reinterpret_cast<uchar *>(gmap.data() + glyphIndex * sizeof(quint32));
@@ -543,7 +543,7 @@ void QPF::addGlyphs(QFontEngine *fe, const QList<CharacterRange> &ranges)
                         ;
                 }
 
-                qMemCopy(data, img.bits(), img.numBytes());
+                qMemCopy(data, img.bits(), img.byteCount());
             }
         }
     }
diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp
index 8cab641e0b..69817bdb8e 100644
--- a/tools/qvfb/qvfbview.cpp
+++ b/tools/qvfb/qvfbview.cpp
@@ -596,7 +596,7 @@ QImage QVFbView::getBuffer(const QRect &r, int &leading) const
                    r.width(), r.height(), mView->linestep(),
                    QImage::Format_Indexed8);
         img.setColorTable(mView->clut());
-        if (img.numColors() <= 0)
+        if (img.colorCount() <= 0)
             img = QImage();
         break;
     }
@@ -613,10 +613,10 @@ QImage QVFbView::getBuffer(const QRect &r, int &leading) const
             if ( img.format() != QImage::Format_ARGB32_Premultiplied )
                 img = img.convertToFormat(QImage::Format_RGB32);
 
-            // NOTE: calling bits() may change numBytes(), so do not
+            // NOTE: calling bits() may change byteCount(), so do not
             // pass them as parameters (which are evaluated right-to-left).
             QRgb *b = (QRgb*)img.bits();
-            int n = img.numBytes()/4;
+            int n = img.byteCount()/4;
             dim(b,n,brightness);
         }
     }