Skip to content

Commit 7348e56

Browse files
eteraneteran
committed
converting more auto-connects to manual
formatting
1 parent 5449395 commit 7348e56

13 files changed

+89
-87
lines changed

‎src/DialogDrawingStyles.cpp‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,15 @@ DialogDrawingStyles::DialogDrawingStyles(DialogSyntaxPatterns *dialogSyntaxPatte
5656
* @brief DialogDrawingStyles::connectSlots
5757
*/
5858
void DialogDrawingStyles::connectSlots() {
59-
connect(ui.buttonNew , &QPushButton::clicked, this, &DialogDrawingStyles::buttonNew_clicked);
60-
connect(ui.buttonCopy , &QPushButton::clicked, this, &DialogDrawingStyles::buttonCopy_clicked);
61-
connect(ui.buttonDelete , &QPushButton::clicked, this, &DialogDrawingStyles::buttonDelete_clicked);
62-
connect(ui.buttonUp , &QPushButton::clicked, this, &DialogDrawingStyles::buttonUp_clicked);
63-
connect(ui.buttonDown , &QPushButton::clicked, this, &DialogDrawingStyles::buttonDown_clicked);
64-
connect(ui.buttonForeground, &QPushButton::clicked, this, &DialogDrawingStyles::buttonForeground_clicked);
65-
connect(ui.buttonBackground, &QPushButton::clicked, this, &DialogDrawingStyles::buttonBackground_clicked);
59+
connect(ui.buttonNew, &QPushButton::clicked, this, &DialogDrawingStyles::buttonNew_clicked);
60+
connect(ui.buttonCopy, &QPushButton::clicked, this, &DialogDrawingStyles::buttonCopy_clicked);
61+
connect(ui.buttonDelete, &QPushButton::clicked, this, &DialogDrawingStyles::buttonDelete_clicked);
62+
connect(ui.buttonUp, &QPushButton::clicked, this, &DialogDrawingStyles::buttonUp_clicked);
63+
connect(ui.buttonDown, &QPushButton::clicked, this, &DialogDrawingStyles::buttonDown_clicked);
64+
connect(ui.buttonForeground, &QPushButton::clicked, this, &DialogDrawingStyles::buttonForeground_clicked);
65+
connect(ui.buttonBackground, &QPushButton::clicked, this, &DialogDrawingStyles::buttonBackground_clicked);
66+
connect(ui.buttonBox, &QDialogButtonBox::accepted, this, &DialogDrawingStyles::buttonBox_accepted);
67+
connect(ui.buttonBox, &QDialogButtonBox::clicked, this, &DialogDrawingStyles::buttonBox_clicked);
6668
}
6769

6870

@@ -279,9 +281,9 @@ void DialogDrawingStyles::currentChanged(const QModelIndex &current, const QMode
279281
}
280282

281283
/**
282-
* @brief DialogDrawingStyles::on_buttonBox_accepted
284+
* @brief DialogDrawingStyles::buttonBox_accepted
283285
*/
284-
void DialogDrawingStyles::on_buttonBox_accepted() {
286+
void DialogDrawingStyles::buttonBox_accepted() {
285287

286288
if (!applyDialogChanges()) {
287289
return;
@@ -292,10 +294,10 @@ void DialogDrawingStyles::on_buttonBox_accepted() {
292294

293295

294296
/**
295-
* @brief DialogDrawingStyles::on_buttonBox_clicked
297+
* @brief DialogDrawingStyles::buttonBox_clicked
296298
* @param button
297299
*/
298-
void DialogDrawingStyles::on_buttonBox_clicked(QAbstractButton *button) {
300+
void DialogDrawingStyles::buttonBox_clicked(QAbstractButton *button) {
299301
if(ui.buttonBox->standardButton(button) == QDialogButtonBox::Apply) {
300302
applyDialogChanges();
301303
}

‎src/DialogDrawingStyles.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,9 @@ class DialogDrawingStyles final : public Dialog {
2828
private Q_SLOTS:
2929
void currentChanged(const QModelIndex &current, const QModelIndex &previous);
3030

31-
private Q_SLOTS:
32-
void on_buttonBox_clicked(QAbstractButton *button);
33-
void on_buttonBox_accepted();
34-
3531
private:
32+
void buttonBox_clicked(QAbstractButton *button);
33+
void buttonBox_accepted();
3634
void buttonNew_clicked();
3735
void buttonCopy_clicked();
3836
void buttonDelete_clicked();

‎src/DialogLanguageModes.cpp‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,13 @@ DialogLanguageModes::DialogLanguageModes(DialogSyntaxPatterns *dialogSyntaxPatte
6262
* @brief DialogLanguageModes::connectSlots
6363
*/
6464
void DialogLanguageModes::connectSlots() {
65-
connect(ui.buttonUp , &QPushButton::clicked, this, &DialogLanguageModes::buttonUp_clicked);
66-
connect(ui.buttonDown , &QPushButton::clicked, this, &DialogLanguageModes::buttonDown_clicked);
65+
connect(ui.buttonUp, &QPushButton::clicked, this, &DialogLanguageModes::buttonUp_clicked);
66+
connect(ui.buttonDown, &QPushButton::clicked, this, &DialogLanguageModes::buttonDown_clicked);
6767
connect(ui.buttonDelete, &QPushButton::clicked, this, &DialogLanguageModes::buttonDelete_clicked);
68-
connect(ui.buttonCopy , &QPushButton::clicked, this, &DialogLanguageModes::buttonCopy_clicked);
69-
connect(ui.buttonNew , &QPushButton::clicked, this, &DialogLanguageModes::buttonNew_clicked);
68+
connect(ui.buttonCopy, &QPushButton::clicked, this, &DialogLanguageModes::buttonCopy_clicked);
69+
connect(ui.buttonNew, &QPushButton::clicked, this, &DialogLanguageModes::buttonNew_clicked);
70+
connect(ui.buttonBox, &QDialogButtonBox::accepted, this, &DialogLanguageModes::buttonBox_accepted);
71+
connect(ui.buttonBox, &QDialogButtonBox::clicked, this, &DialogLanguageModes::buttonBox_clicked);
7072
}
7173

7274

@@ -226,9 +228,9 @@ void DialogLanguageModes::currentChanged(const QModelIndex &current, const QMode
226228
}
227229

228230
/**
229-
* @brief DialogLanguageModes::on_buttonBox_accepted
231+
* @brief DialogLanguageModes::buttonBox_accepted
230232
*/
231-
void DialogLanguageModes::on_buttonBox_accepted() {
233+
void DialogLanguageModes::buttonBox_accepted() {
232234
if (!updateLMList(Verbosity::Verbose)) {
233235
return;
234236
}
@@ -237,10 +239,10 @@ void DialogLanguageModes::on_buttonBox_accepted() {
237239
}
238240

239241
/**
240-
* @brief DialogLanguageModes::on_buttonBox_clicked
242+
* @brief DialogLanguageModes::buttonBox_clicked
241243
* @param button
242244
*/
243-
void DialogLanguageModes::on_buttonBox_clicked(QAbstractButton *button) {
245+
void DialogLanguageModes::buttonBox_clicked(QAbstractButton *button) {
244246
if(ui.buttonBox->standardButton(button) == QDialogButtonBox::Apply) {
245247
updateLMList(Verbosity::Verbose);
246248
}

‎src/DialogLanguageModes.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ class DialogLanguageModes final : public Dialog {
2626
private Q_SLOTS:
2727
void currentChanged(const QModelIndex &current, const QModelIndex &previous);
2828

29-
private Q_SLOTS:
30-
void on_buttonBox_accepted();
31-
void on_buttonBox_clicked(QAbstractButton *button);
32-
3329
private:
30+
void buttonBox_clicked(QAbstractButton *button);
31+
void buttonBox_accepted();
3432
void buttonUp_clicked();
3533
void buttonDown_clicked();
3634
void buttonDelete_clicked();

‎src/DialogMacros.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ DialogMacros::DialogMacros(QWidget *parent, Qt::WindowFlags f) : Dialog(parent,
5454
* @brief DialogMacros::connectSlots
5555
*/
5656
void DialogMacros::connectSlots() {
57-
connect(ui.buttonNew , &QPushButton::clicked, this, &DialogMacros::buttonNew_clicked);
58-
connect(ui.buttonCopy , &QPushButton::clicked, this, &DialogMacros::buttonCopy_clicked);
59-
connect(ui.buttonDelete , &QPushButton::clicked, this, &DialogMacros::buttonDelete_clicked);
60-
connect(ui.buttonUp , &QPushButton::clicked, this, &DialogMacros::buttonUp_clicked);
61-
connect(ui.buttonDown , &QPushButton::clicked, this, &DialogMacros::buttonDown_clicked);
62-
connect(ui.buttonPasteLRMacro , &QPushButton::clicked, this, &DialogMacros::buttonPasteLRMacro_clicked);
63-
connect(ui.buttonCheck , &QPushButton::clicked, this, &DialogMacros::buttonCheck_clicked);
64-
connect(ui.buttonApply , &QPushButton::clicked, this, &DialogMacros::buttonApply_clicked);
65-
connect(ui.buttonOK , &QPushButton::clicked, this, &DialogMacros::buttonOK_clicked);
57+
connect(ui.buttonNew, &QPushButton::clicked, this, &DialogMacros::buttonNew_clicked);
58+
connect(ui.buttonCopy, &QPushButton::clicked, this, &DialogMacros::buttonCopy_clicked);
59+
connect(ui.buttonDelete, &QPushButton::clicked, this, &DialogMacros::buttonDelete_clicked);
60+
connect(ui.buttonUp, &QPushButton::clicked, this, &DialogMacros::buttonUp_clicked);
61+
connect(ui.buttonDown, &QPushButton::clicked, this, &DialogMacros::buttonDown_clicked);
62+
connect(ui.buttonPasteLRMacro, &QPushButton::clicked, this, &DialogMacros::buttonPasteLRMacro_clicked);
63+
connect(ui.buttonCheck, &QPushButton::clicked, this, &DialogMacros::buttonCheck_clicked);
64+
connect(ui.buttonApply, &QPushButton::clicked, this, &DialogMacros::buttonApply_clicked);
65+
connect(ui.buttonOK, &QPushButton::clicked, this, &DialogMacros::buttonOK_clicked);
6666
}
6767

6868

‎src/DialogMultiReplace.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ DialogMultiReplace::DialogMultiReplace(DialogReplace *replace, Qt::WindowFlags f
2626
*/
2727
void DialogMultiReplace::connectSlots() {
2828
connect(ui.buttonDeselectAll, &QPushButton::clicked, this, &DialogMultiReplace::buttonDeselectAll_clicked);
29-
connect(ui.buttonSelectAll , &QPushButton::clicked, this, &DialogMultiReplace::buttonSelectAll_clicked);
30-
connect(ui.buttonReplace , &QPushButton::clicked, this, &DialogMultiReplace::buttonReplace_clicked);
29+
connect(ui.buttonSelectAll, &QPushButton::clicked, this, &DialogMultiReplace::buttonSelectAll_clicked);
30+
connect(ui.buttonReplace, &QPushButton::clicked, this, &DialogMultiReplace::buttonReplace_clicked);
3131
}
3232

3333
/**

‎src/DialogReplace.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ DialogReplace::DialogReplace(MainWindow *window, DocumentWidget *document, Qt::W
9595
* @brief DialogReplace::connectSlots
9696
*/
9797
void DialogReplace::connectSlots() {
98-
connect(ui.buttonFind , &QPushButton::clicked, this, &DialogReplace::buttonFind_clicked);
99-
connect(ui.buttonReplace , &QPushButton::clicked, this, &DialogReplace::buttonReplace_clicked);
98+
connect(ui.buttonFind, &QPushButton::clicked, this, &DialogReplace::buttonFind_clicked);
99+
connect(ui.buttonReplace, &QPushButton::clicked, this, &DialogReplace::buttonReplace_clicked);
100100
connect(ui.buttonReplaceFind, &QPushButton::clicked, this, &DialogReplace::buttonReplaceFind_clicked);
101-
connect(ui.buttonWindow , &QPushButton::clicked, this, &DialogReplace::buttonWindow_clicked);
102-
connect(ui.buttonSelection , &QPushButton::clicked, this, &DialogReplace::buttonSelection_clicked);
103-
connect(ui.buttonMulti , &QPushButton::clicked, this, &DialogReplace::buttonMulti_clicked);
101+
connect(ui.buttonWindow, &QPushButton::clicked, this, &DialogReplace::buttonWindow_clicked);
102+
connect(ui.buttonSelection, &QPushButton::clicked, this, &DialogReplace::buttonSelection_clicked);
103+
connect(ui.buttonMulti, &QPushButton::clicked, this, &DialogReplace::buttonMulti_clicked);
104104
}
105105

106106

‎src/DialogShellMenu.cpp‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@ DialogShellMenu::DialogShellMenu(QWidget *parent, Qt::WindowFlags f) : Dialog(pa
4848
* @brief DialogShellMenu::connectSlots
4949
*/
5050
void DialogShellMenu::connectSlots() {
51-
connect(ui.buttonNew , &QPushButton::clicked, this, &DialogShellMenu::buttonNew_clicked);
52-
connect(ui.buttonCopy , &QPushButton::clicked, this, &DialogShellMenu::buttonCopy_clicked);
53-
connect(ui.buttonDelete, &QPushButton::clicked, this, &DialogShellMenu::buttonDelete_clicked);
54-
connect(ui.buttonUp , &QPushButton::clicked, this, &DialogShellMenu::buttonUp_clicked);
55-
connect(ui.buttonDown , &QPushButton::clicked, this, &DialogShellMenu::buttonDown_clicked);
51+
connect(ui.buttonNew, &QPushButton::clicked, this, &DialogShellMenu::buttonNew_clicked);
52+
connect(ui.buttonCopy, &QPushButton::clicked, this, &DialogShellMenu::buttonCopy_clicked);
53+
connect(ui.buttonDelete, &QPushButton::clicked, this, &DialogShellMenu::buttonDelete_clicked);
54+
connect(ui.buttonUp, &QPushButton::clicked, this, &DialogShellMenu::buttonUp_clicked);
55+
connect(ui.buttonDown, &QPushButton::clicked, this, &DialogShellMenu::buttonDown_clicked);
56+
connect(ui.buttonBox, &QDialogButtonBox::accepted, this, &DialogShellMenu::buttonBox_accepted);
57+
connect(ui.buttonBox, &QDialogButtonBox::clicked, this, &DialogShellMenu::buttonBox_clicked);
5658
}
5759

5860

@@ -283,19 +285,19 @@ void DialogShellMenu::currentChanged(const QModelIndex &current, const QModelInd
283285
}
284286

285287
/**
286-
* @brief DialogShellMenu::on_buttonBox_clicked
288+
* @brief DialogShellMenu::buttonBox_clicked
287289
* @param button
288290
*/
289-
void DialogShellMenu::on_buttonBox_clicked(QAbstractButton *button) {
291+
void DialogShellMenu::buttonBox_clicked(QAbstractButton *button) {
290292
if(ui.buttonBox->standardButton(button) == QDialogButtonBox::Apply) {
291293
applyDialogChanges();
292294
}
293295
}
294296

295297
/**
296-
* @brief DialogShellMenu::on_buttonBox_accepted
298+
* @brief DialogShellMenu::buttonBox_accepted
297299
*/
298-
void DialogShellMenu::on_buttonBox_accepted() {
300+
void DialogShellMenu::buttonBox_accepted() {
299301
// Read the dialog fields, and update the menus
300302
if (!applyDialogChanges()) {
301303
return;

‎src/DialogShellMenu.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ private Q_SLOTS:
2525
void currentChanged(const QModelIndex &current, const QModelIndex &previous);
2626

2727
private Q_SLOTS:
28-
void on_buttonBox_clicked(QAbstractButton *button);
29-
void on_buttonBox_accepted();
3028
void on_radioToSameDocument_toggled(bool checked);
3129

3230
private:
31+
void buttonBox_clicked(QAbstractButton *button);
32+
void buttonBox_accepted();
3333
void buttonNew_clicked();
3434
void buttonCopy_clicked();
3535
void buttonDelete_clicked();

‎src/DialogSmartIndent.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ DialogSmartIndent::DialogSmartIndent(DocumentWidget *document, QWidget *parent,
3838
* @brief DialogSmartIndent::connectSlots
3939
*/
4040
void DialogSmartIndent::connectSlots() {
41-
connect(ui.buttonCommon , &QPushButton::clicked, this, &DialogSmartIndent::buttonCommon_clicked);
42-
connect(ui.buttonLanguageMode, &QPushButton::clicked, this, &DialogSmartIndent::buttonLanguageMode_clicked);
43-
connect(ui.buttonOK , &QPushButton::clicked, this, &DialogSmartIndent::buttonOK_clicked);
44-
connect(ui.buttonApply , &QPushButton::clicked, this, &DialogSmartIndent::buttonApply_clicked);
45-
connect(ui.buttonCheck , &QPushButton::clicked, this, &DialogSmartIndent::buttonCheck_clicked);
46-
connect(ui.buttonDelete , &QPushButton::clicked, this, &DialogSmartIndent::buttonDelete_clicked);
47-
connect(ui.buttonRestore , &QPushButton::clicked, this, &DialogSmartIndent::buttonRestore_clicked);
48-
connect(ui.buttonHelp , &QPushButton::clicked, this, &DialogSmartIndent::buttonHelp_clicked);
41+
connect(ui.buttonCommon, &QPushButton::clicked, this, &DialogSmartIndent::buttonCommon_clicked);
42+
connect(ui.buttonLanguageMode, &QPushButton::clicked, this, &DialogSmartIndent::buttonLanguageMode_clicked);
43+
connect(ui.buttonOK, &QPushButton::clicked, this, &DialogSmartIndent::buttonOK_clicked);
44+
connect(ui.buttonApply, &QPushButton::clicked, this, &DialogSmartIndent::buttonApply_clicked);
45+
connect(ui.buttonCheck, &QPushButton::clicked, this, &DialogSmartIndent::buttonCheck_clicked);
46+
connect(ui.buttonDelete, &QPushButton::clicked, this, &DialogSmartIndent::buttonDelete_clicked);
47+
connect(ui.buttonRestore, &QPushButton::clicked, this, &DialogSmartIndent::buttonRestore_clicked);
48+
connect(ui.buttonHelp, &QPushButton::clicked, this, &DialogSmartIndent::buttonHelp_clicked);
4949
}
5050

5151

0 commit comments

Comments
 (0)