Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
KDiff3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
6
Issues
6
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SDK
KDiff3
Commits
1db0dc42
Commit
1db0dc42
authored
Aug 11, 2019
by
Michael Reeves
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Strip c-style void in function defs
This was never needed for c++.
parent
0ec3e8c3
Pipeline
#6482
passed with stage
in 8 minutes and 38 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
src/gnudiff_diff.h
src/gnudiff_diff.h
+3
-3
src/gnudiff_xmalloc.cpp
src/gnudiff_xmalloc.cpp
+2
-2
src/optiondialog.h
src/optiondialog.h
+4
-4
No files found.
src/gnudiff_diff.h
View file @
1db0dc42
...
...
@@ -318,9 +318,9 @@ struct change *find_change (struct change *);
struct
change
*
find_reverse_change
(
struct
change
*
);
void
*
zalloc
(
size_t
);
enum
changes
analyze_hunk
(
struct
change
*
,
LineRef
*
,
LineRef
*
,
LineRef
*
,
LineRef
*
);
void
begin_output
(
void
);
void
begin_output
();
void
debug_script
(
struct
change
*
);
void
finish_output
(
void
);
void
finish_output
();
void
message
(
const
QChar
*
,
const
QChar
*
,
const
QChar
*
);
void
message5
(
const
QChar
*
,
const
QChar
*
,
const
QChar
*
,
const
QChar
*
,
const
QChar
*
);
void
output_1_line
(
const
QChar
*
,
const
QChar
*
,
const
QChar
*
,
const
QChar
*
);
...
...
@@ -348,7 +348,7 @@ private:
// gnudiff_xmalloc.cpp
void
*
xmalloc
(
size_t
n
);
void
*
xrealloc
(
void
*
p
,
size_t
n
);
void
xalloc_die
(
void
);
void
xalloc_die
();
inline
bool
isWhite
(
QChar
c
)
{
...
...
src/gnudiff_xmalloc.cpp
View file @
1db0dc42
...
...
@@ -30,9 +30,9 @@
#include "gnudiff_diff.h"
/* If non NULL, call this function when memory is exhausted. */
void
(
*
xalloc_fail_func
)(
void
)
=
nullptr
;
void
(
*
xalloc_fail_func
)()
=
nullptr
;
void
GnuDiff
::
xalloc_die
(
void
)
void
GnuDiff
::
xalloc_die
()
{
if
(
xalloc_fail_func
)
(
*
xalloc_fail_func
)();
...
...
src/optiondialog.h
View file @
1db0dc42
...
...
@@ -47,7 +47,7 @@ class OptionDialog : public KPageDialog
public:
explicit
OptionDialog
(
bool
bShowDirMergeSettings
,
QWidget
*
parent
=
nullptr
);
~
OptionDialog
(
void
)
override
;
~
OptionDialog
()
override
;
QString
parseOptions
(
const
QStringList
&
optionList
);
QString
calcOptionHelp
();
...
...
@@ -61,9 +61,9 @@ public:
void
addOptionItem
(
OptionItemBase
*
);
KKeyDialog
*
m_pKeyDialog
;
protected
Q_SLOTS
:
virtual
void
slotDefault
(
void
);
virtual
void
slotOk
(
void
);
virtual
void
slotApply
(
void
);
virtual
void
slotDefault
();
virtual
void
slotOk
();
virtual
void
slotApply
();
//virtual void buttonClicked( QAbstractButton* );
virtual
void
helpRequested
();
...
...
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