Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SDK
Dolphin Plugins
Commits
ac988af1
Commit
ac988af1
authored
Nov 10, 2021
by
Elvis Angelaccio
Browse files
Add missing this receiver
parent
f2253180
Changes
2
Hide whitespace changes
Inline
Side-by-side
svn/svncommitdialog.cpp
View file @
ac988af1
...
...
@@ -116,26 +116,26 @@ SvnCommitDialog::SvnCommitDialog(const QHash<QString, KVersionControlPlugin::Ite
*/
m_actRevertFile
=
new
QAction
(
i18nc
(
"@item:inmenu"
,
"Revert"
),
this
);
m_actRevertFile
->
setIcon
(
QIcon
::
fromTheme
(
"document-revert"
));
connect
(
m_actRevertFile
,
&
QAction
::
triggered
,
[
this
]
()
{
connect
(
m_actRevertFile
,
&
QAction
::
triggered
,
this
,
[
this
]
()
{
const
QString
filePath
=
m_actRevertFile
->
data
().
value
<
svnCommitEntryInfo_t
>
().
localPath
;
Q_EMIT
revertFiles
(
QStringList
()
<<
filePath
);
}
);
m_actDiffFile
=
new
QAction
(
i18nc
(
"@item:inmenu"
,
"Show changes"
),
this
);
m_actDiffFile
->
setIcon
(
QIcon
::
fromTheme
(
"view-split-left-right"
));
connect
(
m_actDiffFile
,
&
QAction
::
triggered
,
[
this
]
()
{
connect
(
m_actDiffFile
,
&
QAction
::
triggered
,
this
,
[
this
]
()
{
const
QString
filePath
=
m_actDiffFile
->
data
().
value
<
svnCommitEntryInfo_t
>
().
localPath
;
Q_EMIT
diffFile
(
filePath
);
}
);
m_actAddFile
=
new
QAction
(
i18nc
(
"@item:inmenu"
,
"Add file"
),
this
);
m_actAddFile
->
setIcon
(
QIcon
::
fromTheme
(
"list-add"
));
connect
(
m_actAddFile
,
&
QAction
::
triggered
,
[
this
]
()
{
connect
(
m_actAddFile
,
&
QAction
::
triggered
,
this
,
[
this
]
()
{
const
QString
filePath
=
m_actAddFile
->
data
().
value
<
svnCommitEntryInfo_t
>
().
localPath
;
Q_EMIT
addFiles
(
QStringList
()
<<
filePath
);
}
);
connect
(
buttonBox
,
&
QDialogButtonBox
::
accepted
,
[
this
]
()
{
connect
(
buttonBox
,
&
QDialogButtonBox
::
accepted
,
this
,
[
this
]
()
{
// Form a new context list from an existing one and a possibly modified m_versionInfoHash (some
// files from original context might no longer be in m_versionInfoHash).
QStringList
context
=
makeContext
(
m_context
,
m_versionInfoHash
);
...
...
svn/svnprogressdialog.cpp
View file @
ac988af1
...
...
@@ -43,20 +43,20 @@ void SvnProgressDialog::connectToProcess(QProcess *process)
m_svnTerminated
=
false
;
m_conCancel
=
connect
(
m_ui
.
buttonCancel
,
&
QPushButton
::
clicked
,
[
this
,
process
]
()
{
m_conCancel
=
connect
(
m_ui
.
buttonCancel
,
&
QPushButton
::
clicked
,
this
,
[
this
,
process
]
()
{
process
->
terminate
();
m_svnTerminated
=
true
;
}
);
m_conCompeted
=
connect
(
process
,
QOverload
<
int
,
QProcess
::
ExitStatus
>::
of
(
&
QProcess
::
finished
),
this
,
&
SvnProgressDialog
::
operationCompeleted
);
m_conProcessError
=
connect
(
process
,
&
QProcess
::
errorOccurred
,
[
this
,
process
]
(
QProcess
::
ProcessError
)
{
m_conProcessError
=
connect
(
process
,
&
QProcess
::
errorOccurred
,
this
,
[
this
,
process
]
(
QProcess
::
ProcessError
)
{
const
QString
commandLine
=
process
->
program
()
+
process
->
arguments
().
join
(
' '
);
appendErrorText
(
i18nc
(
"@info:status"
,
"Error starting: %1"
,
commandLine
));
operationCompeleted
();
}
);
m_conStdOut
=
connect
(
process
,
&
QProcess
::
readyReadStandardOutput
,
[
this
,
process
]
()
{
m_conStdOut
=
connect
(
process
,
&
QProcess
::
readyReadStandardOutput
,
this
,
[
this
,
process
]
()
{
appendInfoText
(
process
->
readAllStandardOutput
()
);
}
);
m_conStrErr
=
connect
(
process
,
&
QProcess
::
readyReadStandardError
,
[
this
,
process
]
()
{
m_conStrErr
=
connect
(
process
,
&
QProcess
::
readyReadStandardError
,
this
,
[
this
,
process
]
()
{
appendErrorText
(
process
->
readAllStandardError
()
);
}
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment