d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-22 20:44:15 +00:00
Code Issues Projects Releases Wiki Activity

Clean up coding style

Browse Source
This commit is contained in:
Chocobo1 2023-07-17 23:18:26 +08:00
parent 38d773ca46
commit 79afa0b84d
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
3 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/powermanagement/powermanagement.h
View File

@ -61,6 +61,6 @@ private:
PowerManagementInhibitor *m_inhibitor = nullptr; PowerManagementInhibitor *m_inhibitor = nullptr;
#endif #endif
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
IOPMAssertionID m_assertionID; IOPMAssertionID m_assertionID {};
#endif #endif
}; };

54
src/gui/powermanagement/powermanagement_x11.cpp
View File

@ -38,17 +38,15 @@
PowerManagementInhibitor::PowerManagementInhibitor(QObject *parent) PowerManagementInhibitor::PowerManagementInhibitor(QObject *parent)
: QObject(parent) : QObject(parent)
{ {
if (!QDBusConnection::sessionBus().isConnected()) { if (!QDBusConnection::sessionBus().isConnected())
{
qDebug("D-Bus: Could not connect to session bus"); qDebug("D-Bus: Could not connect to session bus");
m_state = Error; m_state = Error;
} }
else { else
{
m_state = Idle; m_state = Idle;
} }
m_intendedState = Idle;
m_cookie = 0;
m_useGSM = true;
} }
void PowerManagementInhibitor::requestIdle() void PowerManagementInhibitor::requestIdle()
@ -73,12 +71,11 @@ void PowerManagementInhibitor::requestIdle()
u"UnInhibit"_s); u"UnInhibit"_s);
call.setArguments({m_cookie}); call.setArguments({m_cookie});
QDBusPendingCall pcall = QDBusConnection::sessionBus().asyncCall(call, 1000); const QDBusPendingCall pcall = QDBusConnection::sessionBus().asyncCall(call, 1000);
auto *watcher = new QDBusPendingCallWatcher(pcall, this); const auto *watcher = new QDBusPendingCallWatcher(pcall, this);
connect(watcher, &QDBusPendingCallWatcher::finished, this, &PowerManagementInhibitor::onAsyncReply); connect(watcher, &QDBusPendingCallWatcher::finished, this, &PowerManagementInhibitor::onAsyncReply);
} }
void PowerManagementInhibitor::requestBusy() void PowerManagementInhibitor::requestBusy()
{ {
m_intendedState = Busy; m_intendedState = Busy;
@ -108,45 +105,55 @@ void PowerManagementInhibitor::requestBusy()
args << 4u; args << 4u;
call.setArguments(args); call.setArguments(args);
QDBusPendingCall pcall = QDBusConnection::sessionBus().asyncCall(call, 1000); const QDBusPendingCall pcall = QDBusConnection::sessionBus().asyncCall(call, 1000);
auto *watcher = new QDBusPendingCallWatcher(pcall, this); const auto *watcher = new QDBusPendingCallWatcher(pcall, this);
connect(watcher, &QDBusPendingCallWatcher::finished, this, &PowerManagementInhibitor::onAsyncReply); connect(watcher, &QDBusPendingCallWatcher::finished, this, &PowerManagementInhibitor::onAsyncReply);
} }
void PowerManagementInhibitor::onAsyncReply(QDBusPendingCallWatcher *call) void PowerManagementInhibitor::onAsyncReply(QDBusPendingCallWatcher *call)
{ {
if (m_state == RequestIdle) { call->deleteLater();
QDBusPendingReply<> reply = *call;
if (reply.isError()) { if (m_state == RequestIdle)
{
const QDBusPendingReply reply = *call;
if (reply.isError())
{
qDebug("D-Bus: Reply: Error: %s", qUtf8Printable(reply.error().message())); qDebug("D-Bus: Reply: Error: %s", qUtf8Printable(reply.error().message()));
m_state = Error; m_state = Error;
} }
else { else
{
m_state = Idle; m_state = Idle;
qDebug("D-Bus: PowerManagementInhibitor: Request successful"); qDebug("D-Bus: PowerManagementInhibitor: Request successful");
if (m_intendedState == Busy) if (m_intendedState == Busy)
requestBusy(); requestBusy();
} }
} }
else if (m_state == RequestBusy) { else if (m_state == RequestBusy)
QDBusPendingReply<uint> reply = *call; {
const QDBusPendingReply<quint32> reply = *call;
if (reply.isError()) { if (reply.isError())
{
qDebug("D-Bus: Reply: Error: %s", qUtf8Printable(reply.error().message())); qDebug("D-Bus: Reply: Error: %s", qUtf8Printable(reply.error().message()));
if (m_useGSM) { if (m_useGSM)
{
qDebug("D-Bus: Falling back to org.freedesktop.PowerManagement"); qDebug("D-Bus: Falling back to org.freedesktop.PowerManagement");
m_useGSM = false; m_useGSM = false;
m_state = Idle; m_state = Idle;
if (m_intendedState == Busy) if (m_intendedState == Busy)
requestBusy(); requestBusy();
} }
else { else
{
m_state = Error; m_state = Error;
} }
} }
else { else
{
m_state = Busy; m_state = Busy;
m_cookie = reply.value(); m_cookie = reply.value();
qDebug("D-Bus: PowerManagementInhibitor: Request successful, cookie is %d", m_cookie); qDebug("D-Bus: PowerManagementInhibitor: Request successful, cookie is %d", m_cookie);
@ -154,10 +161,9 @@ void PowerManagementInhibitor::onAsyncReply(QDBusPendingCallWatcher *call)
requestIdle(); requestIdle();
} }
} }
else { else
{
qDebug("D-Bus: Unexpected reply in state %d", m_state); qDebug("D-Bus: Unexpected reply in state %d", m_state);
m_state = Error; m_state = Error;
} }
call->deleteLater();
} }

10
src/gui/powermanagement/powermanagement_x11.h
View File

@ -32,7 +32,7 @@
class QDBusPendingCallWatcher; class QDBusPendingCallWatcher;
class PowerManagementInhibitor : public QObject class PowerManagementInhibitor final : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY_MOVE(PowerManagementInhibitor) Q_DISABLE_COPY_MOVE(PowerManagementInhibitor)
@ -57,9 +57,9 @@ private:
RequestIdle RequestIdle
}; };
enum State m_state; enum State m_state = Error;
enum State m_intendedState; enum State m_intendedState = Idle;
unsigned int m_cookie; quint32 m_cookie = 0;
bool m_useGSM; bool m_useGSM = true;
}; };