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
Utilities
Kate
Commits
378d3a8f
Commit
378d3a8f
authored
Apr 03, 2021
by
Waqar Ahmed
Browse files
Fix file name and memory leak in comparebranchview
parent
f9653015
Changes
4
Show whitespace changes
Inline
Side-by-side
addons/project/CMakeLists.txt
View file @
378d3a8f
...
...
@@ -68,7 +68,7 @@ target_sources(
filehistorywidget.cpp
quickdialog.cpp
pushpulldialog.cpp
comarebranchesview.cpp
com
p
arebranchesview.cpp
tools/kateprojectcodeanalysistoolcppcheck.cpp
tools/kateprojectcodeanalysistoolflake8.cpp
...
...
addons/project/comarebranchesview.cpp
→
addons/project/com
p
arebranchesview.cpp
View file @
378d3a8f
...
...
@@ -3,7 +3,7 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include
"comarebranchesview.h"
#include
"com
p
arebranchesview.h"
#include
"kateprojectpluginview.h"
#include
"kateprojectworker.h"
...
...
@@ -129,11 +129,11 @@ CompareBranchesView::CompareBranchesView(QWidget *parent, const QString &gitPath
{
setLayout
(
new
QVBoxLayout
);
QStandardItem
*
root
=
new
QStandardItem
;
createFileTree
(
root
,
m_gitDir
,
items
);
QStandardItem
root
;
createFileTree
(
&
root
,
m_gitDir
,
items
);
m_model
.
clear
();
m_model
.
invisibleRootItem
()
->
appendColumn
(
root
->
takeColumn
(
0
));
m_model
.
invisibleRootItem
()
->
appendColumn
(
root
.
takeColumn
(
0
));
m_backBtn
.
setText
(
i18n
(
"Back"
));
m_backBtn
.
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"go-previous"
)));
...
...
addons/project/comarebranchesview.h
→
addons/project/com
p
arebranchesview.h
View file @
378d3a8f
File moved
addons/project/gitwidget.cpp
View file @
378d3a8f
...
...
@@ -6,7 +6,7 @@
#include
"gitwidget.h"
#include
"branchcheckoutdialog.h"
#include
"branchesdialog.h"
#include
"comarebranchesview.h"
#include
"com
p
arebranchesview.h"
#include
"git/gitdiff.h"
#include
"gitcommitdialog.h"
#include
"gitstatusmodel.h"
...
...
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