1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove references to QUrlOperator (Qt3) class

Browse Source 
Change-Id: I2bb9fa77a8e260d5ba75541f66597a1c8904895f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Gatis Paeglis 2017-02-03 15:11:05 +01:00 committed by Tony Sarajärvi
parent 4cde33b70b
commit 6ecfab30d0
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/dialogs/qprogressdialog.cpp
View File

@ -244,7 +244,7 @@ void QProgressDialogPrivate::_q_disconnectOnClose()
A modeless progress dialog is suitable for operations that take A modeless progress dialog is suitable for operations that take
place in the background, where the user is able to interact with the place in the background, where the user is able to interact with the
application. Such operations are typically based on QTimer (or application. Such operations are typically based on QTimer (or
QObject::timerEvent()), QSocketNotifier, or QUrlOperator; or performed QObject::timerEvent()) or QSocketNotifier; or performed
in a separate thread. A QProgressBar in the status bar of your main window in a separate thread. A QProgressBar in the status bar of your main window
is often an alternative to a modeless progress dialog. is often an alternative to a modeless progress dialog.

17
tests/auto/corelib/io/qurl/tst_qurl.cpp
View File

@ -1376,18 +1376,6 @@ void tst_QUrl::compat_constructor_01_data()
void tst_QUrl::compat_constructor_01() void tst_QUrl::compat_constructor_01()
{ {
/* The following should work as expected:
*
* QUrlOperator op;
* op.copy( QString( "Makefile" ),
* QString("ftp://rms:grmpf12@nibbler/home/rms/tmp"),
* false );
*
* as well as the following:
*
* QUrlOperator op;
* op.copy(QString("ftp://ftp.qt-project.org/qt/INSTALL"), ".");
*/
QFETCH( QString, urlStr ); QFETCH( QString, urlStr );
{ {
@ -1417,11 +1405,6 @@ void tst_QUrl::compat_constructor_02_data()
void tst_QUrl::compat_constructor_02() void tst_QUrl::compat_constructor_02()
{ {
/* The following should work as expected:
*
* QUrlOperator op( "ftp://ftp.qt-project.org/qt" );
* op.copy(QString("INSTALL"), ".");
*/
QFETCH( QString, urlStr ); QFETCH( QString, urlStr );
QFETCH( QString, fileName ); QFETCH( QString, fileName );