diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-11-10 10:35:10 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-11-10 10:35:10 (GMT) |
| commit | 294ca3b59dc02e1c89e2cac8007a74c61a2828fe (patch) | |
| tree | 77aaa7a83107953f9e5591d09917ecb0b5400268 /src/gui/dialogs | |
| parent | f42dd78db71c29d288b4a76a2fcfe720335afe1a (diff) | |
| parent | 451e7fcad72366cf40bcb00931b86aafba1b983f (diff) | |
| download | Qt-294ca3b59dc02e1c89e2cac8007a74c61a2828fe.zip Qt-294ca3b59dc02e1c89e2cac8007a74c61a2828fe.tar.gz Qt-294ca3b59dc02e1c89e2cac8007a74c61a2828fe.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qprintpreviewdialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/dialogs/qprintpreviewdialog.cpp b/src/gui/dialogs/qprintpreviewdialog.cpp index 4cb0c93..1f0b51d 100644 --- a/src/gui/dialogs/qprintpreviewdialog.cpp +++ b/src/gui/dialogs/qprintpreviewdialog.cpp @@ -446,7 +446,7 @@ void QPrintPreviewDialogPrivate::setFitting(bool on) void QPrintPreviewDialogPrivate::updateNavActions() { int curPage = preview->currentPage(); - int numPages = preview->numPages(); + int numPages = preview->pageCount(); nextPageAction->setEnabled(curPage < numPages); prevPageAction->setEnabled(curPage > 1); firstPageAction->setEnabled(curPage > 1); @@ -458,7 +458,7 @@ void QPrintPreviewDialogPrivate::updatePageNumLabel() { Q_Q(QPrintPreviewDialog); - int numPages = preview->numPages(); + int numPages = preview->pageCount(); int maxChars = QString::number(numPages).length(); pageNumLabel->setText(QString::fromLatin1("/ %1").arg(numPages)); int cyphersWidth = q->fontMetrics().width(QString().fill(QLatin1Char('8'), maxChars)); @@ -515,7 +515,7 @@ void QPrintPreviewDialogPrivate::_q_navigate(QAction* action) else if (action == firstPageAction) preview->setCurrentPage(1); else if (action == lastPageAction) - preview->setCurrentPage(preview->numPages()); + preview->setCurrentPage(preview->pageCount()); updateNavActions(); } |