Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Utilities
Kate
Commits
a4f40085
Commit
a4f40085
authored
May 13, 2021
by
Méven Car
Committed by
Christoph Cullmann
May 13, 2021
Browse files
Fix typo
parent
3c0b2e30
Changes
3
Hide whitespace changes
Inline
Side-by-side
kate/katemainwindow.cpp
View file @
a4f40085
...
...
@@ -1176,7 +1176,7 @@ void KateMainWindow::queueModifiedOnDisc(KTextEditor::Document *doc)
s_modOnHdDialog
=
new
KateMwModOnHdDialog
(
list
,
this
);
m_modignore
=
true
;
KWindowSystem
::
setOnAllDesktops
(
s_modOnHdDialog
->
winId
(),
true
);
connect
(
s_modOnHdDialog
,
&
KateMwModOnHdDialog
::
requesOpenDiffDocum
m
ent
,
this
,
[
this
](
const
QUrl
&
url
)
{
connect
(
s_modOnHdDialog
,
&
KateMwModOnHdDialog
::
reques
t
OpenDiffDocument
,
this
,
[
this
](
const
QUrl
&
url
)
{
viewManager
()
->
openUrl
(
url
,
QString
(),
true
,
true
);
});
s_modOnHdDialog
->
exec
();
...
...
kate/katemwmodonhddialog.cpp
View file @
a4f40085
...
...
@@ -341,11 +341,11 @@ void KateMwModOnHdDialog::slotPDone()
}
m_diffFile
->
setAutoRemove
(
false
);
QUrl
url
=
QUrl
::
fromLocalFile
(
QDir
::
tempPath
()
+
"/"
+
m_diffFile
->
fileName
());
QUrl
url
=
QUrl
::
fromLocalFile
(
QDir
::
tempPath
()
+
QLatin1Char
(
'/'
)
+
m_diffFile
->
fileName
());
delete
m_diffFile
;
m_diffFile
=
nullptr
;
Q_EMIT
requesOpenDiffDocum
m
ent
(
url
);
Q_EMIT
reques
t
OpenDiffDocument
(
url
);
}
void
KateMwModOnHdDialog
::
addDocument
(
KTextEditor
::
Document
*
doc
)
...
...
kate/katemwmodonhddialog.h
View file @
a4f40085
...
...
@@ -33,7 +33,7 @@ public:
void
addDocument
(
KTextEditor
::
Document
*
doc
);
Q_SIGNALS:
void
requesOpenDiffDocum
m
ent
(
const
QUrl
&
documentUrl
);
void
reques
t
OpenDiffDocument
(
const
QUrl
&
documentUrl
);
private
Q_SLOTS
:
void
slotIgnore
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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