SVN commit 501601 by mlaurent: Fix compile error M +6 -6 kimportdialog.cpp M +2 -2 maillistdrag.cpp M +1 -0 statusbarprogresswidget.cpp --- trunk/KDE/kdepim/libkdepim/kimportdialog.cpp #501600:501601 @@ -318,18 +318,18 @@ QTextStream inputStream(&mFile, QIODevice::ReadOnly); inputStream.setCodec("ISO 8859-1"); - KProgressDialog pDialog(this, 0, i18n("Loading Progress"), + KProgressDialog pDialog(this, i18n("Loading Progress"), i18n("Please wait while the file is loaded."), true); pDialog.setAllowCancel(true); pDialog.showCancelButton(true); pDialog.setAutoClose(true); - KProgress *progress = pDialog.progressBar(); - progress->setTotalSteps( mFile.count(mSeparator, Qt::CaseSensitive) ); + KProgressBar *progress = pDialog.progressBar(); + progress->setMaximum( mFile.count(mSeparator, Qt::CaseSensitive) ); progress->setValue(0); int progressValue = 0; - if (progress->totalSteps() > 0) // We have data + if (progress->maximum() > 0) // We have data pDialog.show(); while (!inputStream.atEnd() && !pDialog.wasCancelled()) { @@ -651,14 +651,14 @@ { kdDebug(5300) << "KImportDialog::applyConverter" << endl; - KProgressDialog pDialog(this, 0, i18n("Importing Progress"), + KProgressDialog pDialog(this, i18n("Importing Progress"), i18n("Please wait while the data is imported."), true); pDialog.setAllowCancel(true); pDialog.showCancelButton(true); pDialog.setAutoClose(true); KProgressBar *progress = pDialog.progressBar(); - progress->setTotalSteps( mTable->numRows()-1 ); + progress->setMaximum( mTable->numRows()-1 ); progress->setValue(0); readFile( 0 ); --- trunk/KDE/kdepim/libkdepim/maillistdrag.cpp #501600:501601 @@ -256,9 +256,9 @@ QByteArray rc; if (_src) { - KProgressDialog *dlg = new KProgressDialog(0, 0, QString(), i18n("Retrieving and storing messages..."), true); + KProgressDialog *dlg = new KProgressDialog( 0, QString(), i18n("Retrieving and storing messages..."), true); dlg->setAllowCancel(true); - dlg->progressBar()->setTotalSteps(mMailList.count()); + dlg->progressBar()->setMaximum(mMailList.count()); int i = 0; dlg->progressBar()->setValue(i); dlg->show(); --- trunk/KDE/kdepim/libkdepim/statusbarprogresswidget.cpp #501600:501601 @@ -57,6 +57,7 @@ #include #include "progressdialog.h" +#include #include "statusbarprogresswidget.h" using namespace KPIM;