Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Commit 8a2f382

Browse files
Skycoder42Skycoder42
committed
renamed "delay" to "interval"
1 parent da8be0a commit 8a2f382

File tree

8 files changed

+53
-53
lines changed

8 files changed

+53
-53
lines changed

‎src/datasyncandroid/androidsynccontrol.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ QString AndroidSyncControl::serviceId() const
3030
return d->serviceId;
3131
}
3232

33-
qint64 AndroidSyncControl::delay() const
33+
qint64 AndroidSyncControl::interval() const
3434
{
35-
return d->delay.count();
35+
return d->interval.count();
3636
}
3737

38-
std::chrono::minutes AndroidSyncControl::delayMinutes() const
38+
std::chrono::minutes AndroidSyncControl::intervalMinutes() const
3939
{
40-
return d->delay;
40+
return d->interval;
4141
}
4242

4343
bool AndroidSyncControl::isEnabled() const
@@ -54,18 +54,18 @@ void AndroidSyncControl::setServiceId(QString serviceId)
5454
emit serviceIdChanged(d->serviceId, {});
5555
}
5656

57-
void AndroidSyncControl::setDelay(qint64 delay)
57+
void AndroidSyncControl::setInterval(qint64 interval)
5858
{
59-
setDelay(minutes{delay});
59+
setInterval(minutes{interval});
6060
}
6161

62-
void AndroidSyncControl::setDelay(std::chrono::minutes delay)
62+
void AndroidSyncControl::setInterval(std::chrono::minutes interval)
6363
{
64-
if(d->delay == delay)
64+
if(d->interval == interval)
6565
return;
6666

67-
d->delay = delay;
68-
emit delayChanged(d->delay.count(), {});
67+
d->interval = interval;
68+
emit intervalChanged(d->interval.count(), {});
6969
}
7070

7171
void AndroidSyncControl::setEnabled(bool enabled)
@@ -89,7 +89,7 @@ void AndroidSyncControl::setEnabled(bool enabled)
8989
ALARM_SERVICE.object());
9090
if(alarmManager.isValid()) {
9191
if(enabled) {
92-
auto delta = duration_cast<milliseconds>(d->delay).count();
92+
auto delta = duration_cast<milliseconds>(d->interval).count();
9393
alarmManager.callMethod<void>("setInexactRepeating", "(IJJLandroid/app/PendingIntent;)V",
9494
RTC_WAKEUP,
9595
static_cast<jlong>(QDateTime::currentDateTime().addMSecs(delta).toMSecsSinceEpoch()),
@@ -100,7 +100,7 @@ void AndroidSyncControl::setEnabled(bool enabled)
100100
"(Landroid/content/Context;Ljava/lang/String;J)V",
101101
QtAndroid::androidContext().object(),
102102
QAndroidJniObject::fromString(d->serviceId).object(),
103-
static_cast<jlong>(d->delay.count()));
103+
static_cast<jlong>(d->interval.count()));
104104
} else {
105105
alarmManager.callMethod<void>("cancel", "(Landroid/app/PendingIntent;)V",
106106
pendingIntent.object());

‎src/datasyncandroid/androidsynccontrol.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ class AndroidSyncControlPrivate;
1414
class Q_DATASYNCANDROID_EXPORT AndroidSyncControl : public QObject
1515
{
1616
Q_OBJECT
17-
17+
1818
Q_PROPERTY(bool valid READ isValid CONSTANT)
1919

2020
Q_PROPERTY(QString serviceId READ serviceId WRITE setServiceId NOTIFY serviceIdChanged)
21-
Q_PROPERTY(qint64 delay READ delay WRITE setDelay NOTIFY delayChanged)
21+
Q_PROPERTY(qint64 interval READ interval WRITE setInterval NOTIFY intervalChanged)
2222

2323
Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)
2424

@@ -30,33 +30,33 @@ class Q_DATASYNCANDROID_EXPORT AndroidSyncControl : public QObject
3030
bool isValid() const;
3131

3232
QString serviceId() const;
33-
qint64 delay() const;
34-
std::chrono::minutes delayMinutes() const;
33+
qint64 interval() const;
34+
std::chrono::minutes intervalMinutes() const;
3535
bool isEnabled() const;
3636

3737
template <typename TRep, typename TPeriod>
38-
void setDelay(const std::chrono::duration<TRep, TPeriod> &delay);
39-
void setDelay(std::chrono::minutes delay);
38+
void setInterval(const std::chrono::duration<TRep, TPeriod> &interval);
39+
void setInterval(std::chrono::minutes interval);
4040

4141
public Q_SLOTS:
4242
void setServiceId(QString serviceId);
43-
void setDelay(qint64 delay);
43+
void setInterval(qint64 interval);
4444
void setEnabled(bool enabled);
4545

4646
bool triggerSyncNow();
4747

4848
Q_SIGNALS:
4949
void serviceIdChanged(const QString &serviceId, QPrivateSignal);
50-
void delayChanged(qint64 delay, QPrivateSignal);
50+
void intervalChanged(qint64 interval, QPrivateSignal);
5151

5252
private:
5353
QScopedPointer<AndroidSyncControlPrivate> d;
5454
};
5555

5656
template<typename TRep, typename TPeriod>
57-
void AndroidSyncControl::setDelay(const std::chrono::duration<TRep, TPeriod> &delay)
57+
void AndroidSyncControl::setInterval(const std::chrono::duration<TRep, TPeriod> &interval)
5858
{
59-
setDelay(std::chrono::duration_cast<std::chrono::minutes>(delay));
59+
setInterval(std::chrono::duration_cast<std::chrono::minutes>(interval));
6060
}
6161

6262
}

‎src/datasyncandroid/androidsynccontrol_p.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class AndroidSyncControlPrivate
1212
{
1313
public:
1414
QString serviceId {QStringLiteral("de.skycoder42.qtservice.AndroidService")};
15-
std::chrono::minutes delay{60};
15+
std::chrono::minutes interval{60};
1616

1717
QAndroidIntent createIntent() const;
1818
QAndroidJniObject createPendingIntent(bool allowCreate) const;

‎src/datasyncios/QIOSApplicationDelegate+QtDatasyncAppDelegate.mm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ void QtDatasyncAppDelegateInitialize()
3939
Q_ASSERT_X(appDelegate, Q_FUNC_INFO, "Failed to initialize QIOSApplicationDelegate (QtDatasyncAppDelegate)");
4040
}
4141

42-
void setSyncInterval(double delaySeconds)
42+
void setSyncInterval(double intervalSeconds)
4343
{
44-
if(delaySeconds == -1.0)
44+
if(intervalSeconds == -1.0)
4545
[[UIApplication sharedApplication] setMinimumBackgroundFetchInterval:UIApplicationBackgroundFetchIntervalNever];
4646
else
47-
[[UIApplication sharedApplication] setMinimumBackgroundFetchInterval:delaySeconds];
47+
[[UIApplication sharedApplication] setMinimumBackgroundFetchInterval:intervalSeconds];
4848
}
4949

5050
@end

‎src/datasyncios/iossyncdelegate.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ void IosSyncDelegate::init(IosSyncDelegate *delegate)
2626
// if persisted, load the state
2727
auto settings = delegate->d->settings;
2828
settings->beginGroup(IosSyncDelegatePrivate::SyncStateGroup);
29-
delegate->setDelay(settings->value(IosSyncDelegatePrivate::SyncDelayKey,
30-
delegate->delay())
29+
delegate->setInterval(settings->value(IosSyncDelegatePrivate::SyncIntervalKey,
30+
delegate->interval())
3131
.toLongLong());
3232
delegate->setEnabled(settings->value(IosSyncDelegatePrivate::SyncEnabledKey,
3333
delegate->isEnabled())
@@ -63,14 +63,14 @@ IosSyncDelegate::IosSyncDelegate(QSettings *settings, QObject *parent) :
6363

6464
IosSyncDelegate::~IosSyncDelegate() = default;
6565

66-
qint64 IosSyncDelegate::delay() const
66+
qint64 IosSyncDelegate::interval() const
6767
{
68-
return d->delay.count();
68+
return d->interval.count();
6969
}
7070

71-
std::chrono::minutes IosSyncDelegate::delayMinutes() const
71+
std::chrono::minutes IosSyncDelegate::intervalMinutes() const
7272
{
73-
return d->delay;
73+
return d->interval;
7474
}
7575

7676
bool IosSyncDelegate::isEnabled() const
@@ -88,19 +88,19 @@ bool IosSyncDelegate::persistState() const
8888
return true;
8989
}
9090

91-
void IosSyncDelegate::setDelay(std::chrono::minutes delay)
91+
void IosSyncDelegate::setInterval(std::chrono::minutes interval)
9292
{
93-
if(d->delay == delay)
93+
if(d->interval == interval)
9494
return;
9595

96-
d->delay = delay;
97-
emit delayChanged(d->delay.count(), {});
96+
d->interval = interval;
97+
emit intervalChanged(d->interval.count(), {});
9898
d->updateSyncInterval();
9999
}
100100

101-
void IosSyncDelegate::setDelay(qint64 delay)
101+
void IosSyncDelegate::setInterval(qint64 interval)
102102
{
103-
setDelay(minutes{delay});
103+
setInterval(minutes{interval});
104104
}
105105

106106
void IosSyncDelegate::setEnabled(bool enabled)
@@ -195,7 +195,7 @@ void IosSyncDelegate::backendReady()
195195
// ------------- PRIVATE IMPLEMENTATION -------------
196196

197197
const QString IosSyncDelegatePrivate::SyncStateGroup = QStringLiteral("qtdatasync::iossyncdelegate");
198-
const QString IosSyncDelegatePrivate::SyncDelayKey = QStringLiteral("delay");
198+
const QString IosSyncDelegatePrivate::SyncIntervalKey = QStringLiteral("interval");
199199
const QString IosSyncDelegatePrivate::SyncEnabledKey = QStringLiteral("enabled");
200200
const QString IosSyncDelegatePrivate::SyncWaitKey = QStringLiteral("wait");
201201
QPointer<IosSyncDelegate> IosSyncDelegatePrivate::delegateInstance;
@@ -221,7 +221,7 @@ void IosSyncDelegatePrivate::updateSyncInterval()
221221
return;
222222

223223
if(enabled)
224-
::setSyncInterval(duration_cast<milliseconds>(delay).count() / 1000.0);
224+
::setSyncInterval(duration_cast<milliseconds>(interval).count() / 1000.0);
225225
else
226226
::setSyncInterval(-1.0);
227227

@@ -232,7 +232,7 @@ void IosSyncDelegatePrivate::storeState()
232232
{
233233
if(q->persistState()) {
234234
settings->beginGroup(SyncStateGroup);
235-
settings->setValue(SyncDelayKey, QVariant::fromValue<qint64>(delay.count()));
235+
settings->setValue(SyncIntervalKey, QVariant::fromValue<qint64>(interval.count()));
236236
settings->setValue(SyncEnabledKey, enabled);
237237
settings->setValue(SyncWaitKey, waitFullSync);
238238
settings->endGroup();

‎src/datasyncios/iossyncdelegate.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Q_DATASYNCIOS_EXPORT IosSyncDelegate : public QObject
2020
{
2121
Q_OBJECT
2222

23-
Q_PROPERTY(qint64 delay READ delay WRITE setDelay NOTIFY delayChanged)
23+
Q_PROPERTY(qint64 interval READ interval WRITE setInterval NOTIFY intervalChanged)
2424
Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged)
2525

2626
Q_PROPERTY(bool waitFullSync READ waitFullSync WRITE setWaitFullSync NOTIFY waitFullSyncChanged)
@@ -41,23 +41,23 @@ class Q_DATASYNCIOS_EXPORT IosSyncDelegate : public QObject
4141
explicit IosSyncDelegate(QSettings *settings, QObject *parent = nullptr);
4242
~IosSyncDelegate() override;
4343

44-
qint64 delay() const;
45-
std::chrono::minutes delayMinutes() const;
44+
qint64 interval() const;
45+
std::chrono::minutes intervalMinutes() const;
4646
bool isEnabled() const;
4747
bool waitFullSync() const;
4848
virtual bool persistState() const;
4949

5050
template <typename TRep, typename TPeriod>
51-
void setDelay(const std::chrono::duration<TRep, TPeriod> &delay);
52-
void setDelay(std::chrono::minutes delay);
51+
void setInterval(const std::chrono::duration<TRep, TPeriod> &interval);
52+
void setInterval(std::chrono::minutes interval);
5353

5454
public Q_SLOTS:
55-
void setDelay(qint64 delay);
55+
void setInterval(qint64 interval);
5656
void setEnabled(bool enabled);
5757
void setWaitFullSync(bool waitFullSync);
5858

5959
Q_SIGNALS:
60-
void delayChanged(qint64 delay, QPrivateSignal);
60+
void intervalChanged(qint64 interval, QPrivateSignal);
6161
void enabledChanged(bool enabled, QPrivateSignal);
6262
void waitFullSyncChanged(bool waitFullSync, QPrivateSignal);
6363

@@ -77,9 +77,9 @@ private Q_SLOTS:
7777
};
7878

7979
template<typename TRep, typename TPeriod>
80-
void IosSyncDelegate::setDelay(const std::chrono::duration<TRep, TPeriod> &delay)
80+
void IosSyncDelegate::setInterval(const std::chrono::duration<TRep, TPeriod> &interval)
8181
{
82-
setDelay(std::chrono::duration_cast<std::chrono::minutes>(delay));
82+
setInterval(std::chrono::duration_cast<std::chrono::minutes>(interval));
8383
}
8484

8585
}

‎src/datasyncios/iossyncdelegate_p.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class IosSyncDelegatePrivate
1717

1818
private:
1919
static const QString SyncStateGroup;
20-
static const QString SyncDelayKey;
20+
static const QString SyncIntervalKey;
2121
static const QString SyncEnabledKey;
2222
static const QString SyncWaitKey;
2323

@@ -27,7 +27,7 @@ class IosSyncDelegatePrivate
2727

2828
IosSyncDelegate *q;
2929
bool enabled = true;
30-
std::chrono::minutes delay{60};
30+
std::chrono::minutes interval{60};
3131
bool waitFullSync = false;
3232

3333
QSettings *settings;

‎src/datasyncios/qtdatasyncappdelegate_capi_p.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88

99
// c -> mm
1010
void QtDatasyncAppDelegateInitialize();
11-
void setSyncInterval(double delaySeconds);
11+
void setSyncInterval(double intervalSeconds);
1212

1313
#endif // DATASYNCAPPDELEGATE_CAPI_P_H

0 commit comments

Comments
 (0)