Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
KDiff3
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
5
Issues
5
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
KDE
KDiff3
Commits
825ff750
Commit
825ff750
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
a6626420
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
src/gnudiff_diff.h
src/gnudiff_diff.h
+1
-1
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 @
825ff750
...
...
@@ -217,7 +217,7 @@ class GnuDiff
// 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 @
825ff750
...
...
@@ -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 @
825ff750
...
...
@@ -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