Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit df4bd88

Browse filesBrowse files
Skycoder42Skycoder42
committed
Refactoring: Convert enum to enum class
1 parent 02e1e63 commit df4bd88
Copy full SHA for df4bd88
Expand file treeCollapse file tree

33 files changed

+317
-294
lines changed

‎examples/service/EchoControl/controlwidget.cpp

Copy file name to clipboardExpand all lines: examples/service/EchoControl/controlwidget.cpp
+14-14Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,35 +53,35 @@ void ControlWidget::on_loadButton_clicked()
5353
ui->backendComboBox->setEnabled(false);
5454
ui->nameLineEdit->setEnabled(false);
5555

56-
if(_control->supportFlags().testFlag(ServiceControl::SupportsSetBlocking)) {
56+
if(_control->supportFlags().testFlag(ServiceControl::SupportFlag::SetBlocking)) {
5757
ui->bLockingCheckBox->setEnabled(true);
58-
ui->bLockingCheckBox->setChecked(_control->blocking() == ServiceControl::Blocking);
59-
} else if(_control->blocking() == ServiceControl::Blocking)
58+
ui->bLockingCheckBox->setChecked(_control->blocking() == ServiceControl::BlockMode::Blocking);
59+
} else if(_control->blocking() == ServiceControl::BlockMode::Blocking)
6060
ui->bLockingCheckBox->setChecked(true);
61-
else if(_control->blocking() == ServiceControl::NonBlocking)
61+
else if(_control->blocking() == ServiceControl::BlockMode::NonBlocking)
6262
ui->bLockingCheckBox->setChecked(false);
6363
else
6464
ui->bLockingCheckBox->setCheckState(Qt::PartiallyChecked);
6565

66-
if(_control->supportFlags().testFlag(ServiceControl::SupportsGetAutostart))
66+
if(_control->supportFlags().testFlag(ServiceControl::SupportFlag::GetAutostart))
6767
ui->enabledCheckBox->setChecked(_control->isAutostartEnabled());
68-
if(_control->supportFlags().testFlag(ServiceControl::SupportsSetAutostart))
68+
if(_control->supportFlags().testFlag(ServiceControl::SupportFlag::SetAutostart))
6969
ui->enabledCheckBox->setEnabled(true);
7070

71-
if(_control->supportFlags().testFlag(ServiceControl::SupportsStatus)) {
71+
if(_control->supportFlags().testFlag(ServiceControl::SupportFlag::Status)) {
7272
ui->actionReload->setEnabled(true);
7373
setStatus();
7474
}
7575

76-
if(_control->supportFlags().testFlag(ServiceControl::SupportsStart))
76+
if(_control->supportFlags().testFlag(ServiceControl::SupportFlag::Start))
7777
ui->startButton->setEnabled(true);
78-
if(_control->supportFlags().testFlag(ServiceControl::SupportsStop))
78+
if(_control->supportFlags().testFlag(ServiceControl::SupportFlag::Stop))
7979
ui->stopButton->setEnabled(true);
80-
if(_control->supportFlags().testFlag(ServiceControl::SupportsPause))
80+
if(_control->supportFlags().testFlag(ServiceControl::SupportFlag::Pause))
8181
ui->pauseButton->setEnabled(true);
82-
if(_control->supportFlags().testFlag(ServiceControl::SupportsResume))
82+
if(_control->supportFlags().testFlag(ServiceControl::SupportFlag::Resume))
8383
ui->resumeButton->setEnabled(true);
84-
if(_control->supportFlags().testFlag(ServiceControl::SupportsReload))
84+
if(_control->supportFlags().testFlag(ServiceControl::SupportFlag::Reload))
8585
ui->reloadButton->setEnabled(true);
8686
}
8787

@@ -117,9 +117,9 @@ void ControlWidget::setStatus()
117117
{
118118
if(!_control)
119119
return;
120-
auto metaEnum = QMetaEnum::fromType<ServiceControl::ServiceStatus>();
120+
auto metaEnum = QMetaEnum::fromType<ServiceControl::Status>();
121121
ui->statusLineEdit->setText(QString::fromUtf8(metaEnum.valueToKey(static_cast<int>(_control->status()))));
122-
if(_control->supportFlags().testFlag(ServiceControl::SupportsGetAutostart))
122+
if(_control->supportFlags().testFlag(ServiceControl::SupportFlag::GetAutostart))
123123
ui->enabledCheckBox->setChecked(_control->isAutostartEnabled());
124124
}
125125

‎examples/service/EchoService/echoservice.cpp

Copy file name to clipboardExpand all lines: examples/service/EchoService/echoservice.cpp
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ QtService::Service::CommandResult EchoService::onStart()
4646
qApp->exit(EXIT_FAILURE);
4747
}
4848

49-
return OperationCompleted;
49+
return CommandResult::Completed;
5050
}
5151

5252
QtService::Service::CommandResult EchoService::onStop(int &exitCode)
5353
{
5454
Q_UNUSED(exitCode)
5555
qDebug() << Q_FUNC_INFO;
5656
_server->close();
57-
return OperationCompleted;
57+
return CommandResult::Completed;
5858
}
5959

6060
QtService::Service::CommandResult EchoService::onReload()
@@ -68,21 +68,21 @@ QtService::Service::CommandResult EchoService::onReload()
6868
qApp->exit(EXIT_FAILURE);
6969
}
7070

71-
return OperationCompleted;
71+
return CommandResult::Completed;
7272
}
7373

7474
QtService::Service::CommandResult EchoService::onPause()
7575
{
7676
qDebug() << Q_FUNC_INFO;
7777
_server->pauseAccepting();
78-
return OperationCompleted;
78+
return CommandResult::Completed;
7979
}
8080

8181
QtService::Service::CommandResult EchoService::onResume()
8282
{
8383
qDebug() << Q_FUNC_INFO;
8484
_server->resumeAccepting();
85-
return OperationCompleted;
85+
return CommandResult::Completed;
8686
}
8787

8888
void EchoService::newConnection()

‎examples/service/TerminalService/terminalservice.cpp

Copy file name to clipboardExpand all lines: examples/service/TerminalService/terminalservice.cpp
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ TerminalService::TerminalService(int &argc, char **argv) :
1414
Service::CommandResult TerminalService::onStart()
1515
{
1616
qDebug() << "Service started with terminal mode:" << terminalMode();
17-
return OperationCompleted;
17+
return CommandResult::Completed;
1818
}
1919

2020
Service::CommandResult TerminalService::onStop(int &exitCode)
2121
{
2222
qDebug() << "Closing down service...";
2323
Q_UNUSED(exitCode)
24-
return OperationCompleted;
24+
return CommandResult::Completed;
2525
}
2626

2727
bool TerminalService::verifyCommand(const QStringList &arguments)
@@ -35,7 +35,7 @@ bool TerminalService::verifyCommand(const QStringList &arguments)
3535
parser.showVersion();
3636

3737
if(parser.isSet(QStringLiteral("passive")))
38-
setTerminalMode(Service::ReadWritePassive);
38+
setTerminalMode(Service::TerminalMode::ReadWritePassive);
3939
return true;
4040
} else
4141
return false;
@@ -57,7 +57,7 @@ void TerminalService::terminalConnected(Terminal *terminal)
5757

5858
if(parser.positionalArguments().startsWith(QStringLiteral("stop")))
5959
quit();
60-
else if(terminal->terminalMode() == Service::ReadWriteActive) {
60+
else if(terminal->terminalMode() == Service::TerminalMode::ReadWriteActive) {
6161
connect(terminal, &Terminal::readyRead,
6262
terminal, [terminal](){
6363
qDebug() << "terminals name is:" << terminal->readAll();

‎src/imports/service/plugins.qmltypes

Copy file name to clipboardExpand all lines: src/imports/service/plugins.qmltypes
+30-30Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ Module {
8787
Enum {
8888
name: "CommandResult"
8989
values: {
90-
"OperationCompleted": 0,
91-
"OperationPending": 1,
92-
"OperationFailed": 2,
93-
"OperationExit": 3
90+
"Completed": 0,
91+
"Pending": 1,
92+
"Failed": 2,
93+
"Exit": 3
9494
}
9595
}
9696
Enum {
@@ -179,35 +179,35 @@ Module {
179179
Enum {
180180
name: "SupportFlags"
181181
values: {
182-
"SupportsStart": 1,
183-
"SupportsStop": 2,
184-
"SupportsPause": 4,
185-
"SupportsResume": 8,
186-
"SupportsReload": 16,
187-
"SupportsGetAutostart": 32,
188-
"SupportsSetAutostart": 64,
189-
"SupportsSetBlocking": 128,
190-
"SupportsSetEnabled": 256,
191-
"SupportsStatus": 512,
192-
"SupportsCustomCommands": 1024,
193-
"SupportsStartStop": 3,
194-
"SupportsPauseResume": 12,
195-
"SupportsAutostart": 96
182+
"Start": 1,
183+
"Stop": 2,
184+
"Pause": 4,
185+
"Resume": 8,
186+
"Reload": 16,
187+
"GetAutostart": 32,
188+
"SetAutostart": 64,
189+
"SetBlocking": 128,
190+
"SetEnabled": 256,
191+
"Status": 512,
192+
"CustomCommands": 1024,
193+
"StartStop": 3,
194+
"PauseResume": 12,
195+
"Autostart": 96
196196
}
197197
}
198198
Enum {
199-
name: "ServiceStatus"
199+
name: "Status"
200200
values: {
201-
"ServiceStatusUnknown": 0,
202-
"ServiceStopped": 1,
203-
"ServiceStarting": 2,
204-
"ServiceRunning": 3,
205-
"ServicePausing": 4,
206-
"ServicePaused": 5,
207-
"ServiceResuming": 6,
208-
"ServiceReloading": 7,
209-
"ServiceStopping": 8,
210-
"ServiceErrored": 9
201+
"Unknown": 0,
202+
"Stopped": 1,
203+
"Starting": 2,
204+
"Running": 3,
205+
"Pausing": 4,
206+
"Paused": 5,
207+
"Resuming": 6,
208+
"Reloading": 7,
209+
"Stopping": 8,
210+
"Errored": 9
211211
}
212212
}
213213
Enum {
@@ -267,7 +267,7 @@ Module {
267267
Parameter { name: "kind"; type: "QByteArray" }
268268
}
269269
Method { name: "serviceExists"; type: "bool" }
270-
Method { name: "status"; type: "QtService::ServiceControl::ServiceStatus" }
270+
Method { name: "status"; type: "QtService::ServiceControl::Status" }
271271
Method { name: "isAutostartEnabled"; type: "bool" }
272272
Method { name: "runtimeDir"; type: "QDir" }
273273
}

‎src/plugins/servicebackends/android/androidservicebackend.cpp

Copy file name to clipboardExpand all lines: src/plugins/servicebackends/android/androidservicebackend.cpp
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ int AndroidServiceBackend::runService(int &argc, char **argv, int flags)
4141

4242
// start the eventloop
4343
QMetaObject::invokeMethod(this, "processServiceCommand", Qt::QueuedConnection,
44-
Q_ARG(QtService::ServiceBackend::ServiceCommand, StartCommand));
44+
Q_ARG(QtService::ServiceBackend::ServiceCommand, ServiceCommand::Start));
4545
return app.exec();
4646
}
4747

@@ -53,7 +53,7 @@ void AndroidServiceBackend::quitService()
5353

5454
void AndroidServiceBackend::reloadService()
5555
{
56-
processServiceCommand(ReloadCommand);
56+
processServiceCommand(ServiceCommand::Reload);
5757
}
5858

5959
jint AndroidServiceBackend::callStartCommand(JNIEnv *, jobject, jobject intent, jint flags, jint startId, jint oldId)
@@ -97,7 +97,7 @@ void AndroidServiceBackend::onExit()
9797
connect(service(), &Service::stopped,
9898
this, &AndroidServiceBackend::onStopped,
9999
Qt::UniqueConnection);
100-
processServiceCommand(StopCommand);
100+
processServiceCommand(ServiceCommand::Stop);
101101
}
102102
}
103103

‎src/plugins/servicebackends/android/androidservicecontrol.cpp

Copy file name to clipboardExpand all lines: src/plugins/servicebackends/android/androidservicecontrol.cpp
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ QString AndroidServiceControl::backend() const
1515

1616
ServiceControl::SupportFlags AndroidServiceControl::supportFlags() const
1717
{
18-
return SupportsStartStop |
19-
SupportsCustomCommands |
20-
SupportsSetEnabled;
18+
return SupportFlag::StartStop |
19+
SupportFlag::CustomCommands |
20+
SupportFlag::SetEnabled;
2121
}
2222

2323
bool AndroidServiceControl::serviceExists() const
@@ -106,7 +106,7 @@ QVariant AndroidServiceControl::callGenericCommand(const QByteArray &kind, const
106106

107107
ServiceControl::BlockMode AndroidServiceControl::blocking() const
108108
{
109-
return NonBlocking;
109+
return BlockMode::NonBlocking;
110110
}
111111

112112
bool AndroidServiceControl::start()

‎src/plugins/servicebackends/launchd/launchdservicebackend.cpp

Copy file name to clipboardExpand all lines: src/plugins/servicebackends/launchd/launchdservicebackend.cpp
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ int LaunchdServiceBackend::runService(int &argc, char **argv, int flags)
2727

2828
// start the eventloop
2929
QMetaObject::invokeMethod(this, "processServiceCommand", Qt::QueuedConnection,
30-
Q_ARG(QtService::ServiceBackend::ServiceCommand, StartCommand));
30+
Q_ARG(QtService::ServiceBackend::ServiceCommand, ServiceCommand::Start));
3131
return app.exec();
3232
}
3333

@@ -36,12 +36,12 @@ void LaunchdServiceBackend::quitService()
3636
connect(service(), &Service::stopped,
3737
qApp, &QCoreApplication::exit,
3838
Qt::UniqueConnection);
39-
processServiceCommand(StopCommand);
39+
processServiceCommand(ServiceCommand::Stop);
4040
}
4141

4242
void LaunchdServiceBackend::reloadService()
4343
{
44-
processServiceCommand(ReloadCommand);
44+
processServiceCommand(ServiceCommand::Reload);
4545
}
4646

4747
QList<int> LaunchdServiceBackend::getActivatedSockets(const QByteArray &name)
@@ -77,10 +77,10 @@ void LaunchdServiceBackend::signalTriggered(int signal)
7777
reloadService();
7878
break;
7979
case SIGTSTP:
80-
processServiceCommand(PauseCommand);
80+
processServiceCommand(ServiceCommand::Pause);
8181
break;
8282
case SIGCONT:
83-
processServiceCommand(ResumeCommand);
83+
processServiceCommand(ServiceCommand::Resume);
8484
break;
8585
case SIGUSR1:
8686
processServiceCallback("SIGUSR1");

‎src/plugins/servicebackends/launchd/launchdservicecontrol.cpp

Copy file name to clipboardExpand all lines: src/plugins/servicebackends/launchd/launchdservicecontrol.cpp
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ QString LaunchdServiceControl::backend() const
2020

2121
ServiceControl::SupportFlags LaunchdServiceControl::supportFlags() const
2222
{
23-
return SupportsStartStop |
24-
SupportsCustomCommands |
25-
SupportsSetEnabled;
23+
return SupportFlag::StartStop |
24+
SupportFlag::CustomCommands |
25+
SupportFlag::SetEnabled;
2626
}
2727

2828
bool LaunchdServiceControl::serviceExists() const
@@ -106,7 +106,7 @@ int LaunchdServiceControl::runLaunchctl(const QByteArray &command, const QString
106106
process.setProcessChannelMode(QProcess::ForwardedErrorChannel);
107107

108108
process.start(QProcess::ReadOnly);
109-
if(process.waitForFinished(isBlocking() ? -1 : 2500)) {//non-blocking calls should finish within two seconds
109+
if(process.waitForFinished(2500)) { // non-blocking calls should finish within two seconds
110110
if(outData)
111111
*outData = process.readAllStandardOutput();
112112
if(process.exitStatus() == QProcess::NormalExit)

‎src/plugins/servicebackends/standard/standardservicebackend.cpp

Copy file name to clipboardExpand all lines: src/plugins/servicebackends/standard/standardservicebackend.cpp
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ int StandardServiceBackend::runService(int &argc, char **argv, int flags)
8282

8383
// start the eventloop
8484
QMetaObject::invokeMethod(this, "processServiceCommand", Qt::QueuedConnection,
85-
Q_ARG(QtService::ServiceBackend::ServiceCommand, StartCommand));
85+
Q_ARG(QtService::ServiceBackend::ServiceCommand, ServiceCommand::Start));
8686
return app.exec();
8787
}
8888

@@ -91,12 +91,12 @@ void StandardServiceBackend::quitService()
9191
connect(service(), &Service::stopped,
9292
qApp, &QCoreApplication::exit,
9393
Qt::UniqueConnection);
94-
processServiceCommand(StopCommand);
94+
processServiceCommand(ServiceCommand::Stop);
9595
}
9696

9797
void StandardServiceBackend::reloadService()
9898
{
99-
processServiceCommand(ReloadCommand);
99+
processServiceCommand(ServiceCommand::Reload);
100100
}
101101

102102
void StandardServiceBackend::signalTriggered(int signal)
@@ -117,10 +117,10 @@ void StandardServiceBackend::signalTriggered(int signal)
117117
reloadService();
118118
break;
119119
case SIGTSTP:
120-
processServiceCommand(PauseCommand);
120+
processServiceCommand(ServiceCommand::Pause);
121121
break;
122122
case SIGCONT:
123-
processServiceCommand(ResumeCommand);
123+
processServiceCommand(ServiceCommand::Resume);
124124
break;
125125
case SIGUSR1:
126126
processServiceCallback("SIGUSR1");

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.