summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread/qfuturewatcher.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/thread/qfuturewatcher.h')
-rw-r--r--src/corelib/thread/qfuturewatcher.h39
1 files changed, 35 insertions, 4 deletions
diff --git a/src/corelib/thread/qfuturewatcher.h b/src/corelib/thread/qfuturewatcher.h
index 0c8c1ec247..d2b8eeace1 100644
--- a/src/corelib/thread/qfuturewatcher.h
+++ b/src/corelib/thread/qfuturewatcher.h
@@ -69,7 +69,11 @@ public:
bool isFinished() const;
bool isRunning() const;
bool isCanceled() const;
+#if QT_DEPRECATED_SINCE(6, 0)
+ QT_DEPRECATED_VERSION_X_6_0("Use isSuspending() or isSuspended() instead.")
bool isPaused() const;
+#endif
+ bool isSuspending() const;
bool isSuspended() const;
void waitForFinished();
@@ -82,7 +86,11 @@ Q_SIGNALS:
void started();
void finished();
void canceled();
+#if QT_DEPRECATED_SINCE(6, 0)
+ QT_DEPRECATED_VERSION_X_6_0("Use suspending() instead.")
void paused();
+#endif
+ void suspending();
void suspended();
void resumed();
void resultReadyAt(int resultIndex);
@@ -93,10 +101,21 @@ Q_SIGNALS:
public Q_SLOTS:
void cancel();
+ void setSuspended(bool suspend);
+ void suspend();
+ void resume();
+ void toggleSuspended();
+
+#if QT_DEPRECATED_SINCE(6, 0)
+ QT_DEPRECATED_VERSION_X_6_0("Use setSuspended() instead.")
void setPaused(bool paused);
+
+ QT_DEPRECATED_VERSION_X_6_0("Use suspended() instead.")
void pause();
- void resume();
+
+ QT_DEPRECATED_VERSION_X_6_0("Use toggleSuspended() instead.")
void togglePaused();
+#endif
protected:
void connectNotify (const QMetaMethod &signal) override;
@@ -148,8 +167,11 @@ public:
bool isFinished() const;
bool isRunning() const;
bool isCanceled() const;
+#if QT_DEPRECATED_SINCE(6, 0)
bool isPaused() const;
- bool isSuspended() const
+#endif
+ bool isSuspending() const;
+ bool isSuspended() const;
void waitForFinished();
@@ -159,7 +181,10 @@ Q_SIGNALS:
void started();
void finished();
void canceled();
+#if QT_DEPRECATED_SINCE(6, 0)
void paused();
+#endif
+ void suspending();
void suspended();
void resumed();
void resultReadyAt(int resultIndex);
@@ -170,11 +195,17 @@ Q_SIGNALS:
public Q_SLOTS:
void cancel();
+ void setSuspended(bool suspend);
+ void suspend();
+ void resume();
+ void toggleSuspended();
+#if QT_DEPRECATED_SINCE(6, 0)
void setPaused(bool paused);
void pause();
- void resume();
void togglePaused();
-#endif
+#endif // QT_DEPRECATED_SINCE(6, 0)
+
+#endif // Q_QDOC
private:
QFuture<T> m_future;