Skip to content

Commit a721f7d

Browse files
committed
i3/ipc: fix formatting
1 parent ab9eda9 commit a721f7d

File tree

2 files changed

+29
-13
lines changed

2 files changed

+29
-13
lines changed

src/x11/i3/ipc/connection.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ I3Ipc::I3Ipc(const QList<QString>& events): mEvents(events) {
8484
this->mSocketPath = sock;
8585

8686
// clang-format off
87-
QObject::connect(&this->liveEventSocket, &QLocalSocket::errorOccurred, this, &I3Ipc::eventSocketError);
88-
QObject::connect(&this->liveEventSocket, &QLocalSocket::stateChanged, this, &I3Ipc::eventSocketStateChanged);
89-
QObject::connect(&this->liveEventSocket, &QLocalSocket::readyRead, this, &I3Ipc::eventSocketReady);
90-
QObject::connect(&this->liveEventSocket, &QLocalSocket::connected, this, &I3Ipc::subscribe);
87+
QObject::connect(&this->liveEventSocket, &QLocalSocket::errorOccurred, this, &I3Ipc::eventSocketError);
88+
QObject::connect(&this->liveEventSocket, &QLocalSocket::stateChanged, this, &I3Ipc::eventSocketStateChanged);
89+
QObject::connect(&this->liveEventSocket, &QLocalSocket::readyRead, this, &I3Ipc::eventSocketReady);
90+
QObject::connect(&this->liveEventSocket, &QLocalSocket::connected, this, &I3Ipc::subscribe);
9191
// clang-format on
9292

9393
this->liveEventSocketDs.setDevice(&this->liveEventSocket);
@@ -120,7 +120,7 @@ QByteArray I3Ipc::buildRequestMessage(EventCode cmd, const QByteArray& payload)
120120

121121
void I3Ipc::subscribe() {
122122
auto jsonArray = QJsonArray::fromStringList(this->mEvents);
123-
const QJsonDocument jsonDoc(jsonArray);
123+
auto jsonDoc = QJsonDocument(jsonArray);
124124
auto payload = jsonDoc.toJson(QJsonDocument::Compact);
125125
auto message = I3Ipc::buildRequestMessage(EventCode::Subscribe, payload);
126126

src/x11/i3/ipc/controller.cpp

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ void I3IpcController::setFocusedMonitor(I3Monitor* monitor) {
5555
auto* oldMonitor = this->bFocusedMonitor.value();
5656
if (monitor == oldMonitor) return;
5757

58-
if (oldMonitor != nullptr) { QObject::disconnect(oldMonitor, nullptr, this, nullptr); }
58+
if (oldMonitor != nullptr) {
59+
QObject::disconnect(oldMonitor, nullptr, this, nullptr);
60+
}
5961

6062
if (monitor != nullptr) {
6163
QObject::connect(
@@ -106,7 +108,9 @@ void I3IpcController::handleGetWorkspacesEvent(I3IpcEvent* event) {
106108
auto* workspace = workspaceIter == mList.end() ? nullptr : *workspaceIter;
107109
auto existed = workspace != nullptr;
108110

109-
if (workspace == nullptr) { workspace = new I3Workspace(this); }
111+
if (workspace == nullptr) {
112+
workspace = new I3Workspace(this);
113+
}
110114

111115
workspace->updateFromObject(object);
112116

@@ -161,21 +165,29 @@ void I3IpcController::handleGetOutputsEvent(I3IpcEvent* event) {
161165
auto* monitor = monitorIter == mList.end() ? nullptr : *monitorIter;
162166
auto existed = monitor != nullptr;
163167

164-
if (monitor == nullptr) { monitor = new I3Monitor(this); }
168+
if (monitor == nullptr) {
169+
monitor = new I3Monitor(this);
170+
}
165171

166172
monitor->updateFromObject(object);
167173

168-
if (monitor->bindableFocused().value()) { this->setFocusedMonitor(monitor); }
174+
if (monitor->bindableFocused().value()) {
175+
this->setFocusedMonitor(monitor);
176+
}
169177

170-
if (!existed) { this->mMonitors.insertObject(monitor); }
178+
if (!existed) {
179+
this->mMonitors.insertObject(monitor);
180+
}
171181

172182
names.push_back(name);
173183
}
174184

175185
auto removedMonitors = QVector<I3Monitor*>();
176186

177187
for (auto* monitor: mList) {
178-
if (!names.contains(monitor->bindableName().value())) { removedMonitors.push_back(monitor); }
188+
if (!names.contains(monitor->bindableName().value())) {
189+
removedMonitors.push_back(monitor);
190+
}
179191
}
180192

181193
qCDebug(logI3Ipc) << "Removing" << removedMonitors.length() << "disconnected monitors.";
@@ -230,7 +242,9 @@ void I3IpcController::handleWorkspaceEvent(I3IpcEvent* event) {
230242
auto* workspace = this->findWorkspaceByID(workspaceData["id"].toInt(-1));
231243
auto existed = workspace != nullptr;
232244

233-
if (!existed) { workspace = new I3Workspace(this); }
245+
if (!existed) {
246+
workspace = new I3Workspace(this);
247+
}
234248

235249
if (workspaceData.isObject()) {
236250
workspace->updateFromObject(workspaceData.toObject().toVariantMap());
@@ -254,7 +268,9 @@ void I3IpcController::handleWorkspaceEvent(I3IpcEvent* event) {
254268

255269
auto* newWorkspace = this->findWorkspaceByName(newName);
256270

257-
if (newWorkspace == nullptr) { newWorkspace = new I3Workspace(this); }
271+
if (newWorkspace == nullptr) {
272+
newWorkspace = new I3Workspace(this);
273+
}
258274

259275
newWorkspace->updateFromObject(newData.toObject().toVariantMap());
260276

0 commit comments

Comments
 (0)