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
da2f01e1
Commit
da2f01e1
authored
Dec 09, 2018
by
Yuri Chornoivan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix various EBN issues, compilation issues and typos
Differential Revision:
https://phabricator.kde.org/D17429
parent
7c5fd342
Changes
30
Hide whitespace changes
Inline
Side-by-side
Showing
30 changed files
with
51 additions
and
41 deletions
+51
-41
COPYING
COPYING
+1
-1
README
README
+8
-8
src/DirectoryInfo.h
src/DirectoryInfo.h
+1
-1
src/MergeFileInfos.h
src/MergeFileInfos.h
+1
-1
src/ProgressProxyExtender.h
src/ProgressProxyExtender.h
+3
-3
src/Utils.cpp
src/Utils.cpp
+1
-1
src/Utils.h
src/Utils.h
+1
-1
src/common.cpp
src/common.cpp
+2
-2
src/cvsignorelist.h
src/cvsignorelist.h
+5
-1
src/directorymergewindow.cpp
src/directorymergewindow.cpp
+1
-1
src/gnudiff_analyze.cpp
src/gnudiff_analyze.cpp
+1
-1
src/gnudiff_diff.h
src/gnudiff_diff.h
+1
-1
src/gnudiff_io.cpp
src/gnudiff_io.cpp
+1
-1
src/gnudiff_system.h
src/gnudiff_system.h
+1
-1
src/gnudiff_xmalloc.cpp
src/gnudiff_xmalloc.cpp
+1
-1
src/guiutils.h
src/guiutils.h
+4
-0
src/kdiff3.cpp
src/kdiff3.cpp
+1
-1
src/kdiff3.h
src/kdiff3.h
+1
-1
src/kdiff3_part.cpp
src/kdiff3_part.cpp
+1
-1
src/kdiff3_part.h
src/kdiff3_part.h
+1
-1
src/kdiff3_shell.cpp
src/kdiff3_shell.cpp
+2
-2
src/kdiff3_shell.h
src/kdiff3_shell.h
+1
-1
src/mergeresultwindow.cpp
src/mergeresultwindow.cpp
+1
-1
src/optiondialog.cpp
src/optiondialog.cpp
+1
-1
src/optiondialog.h
src/optiondialog.h
+1
-1
src/options.h
src/options.h
+1
-1
src/pdiff.cpp
src/pdiff.cpp
+1
-3
src/selection.h
src/selection.h
+4
-0
src/smalldialogs.cpp
src/smalldialogs.cpp
+1
-1
src/smalldialogs.h
src/smalldialogs.h
+1
-1
No files found.
COPYING
View file @
da2f01e1
...
...
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
51 Franklin St
r
eet, Fifth Floor, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
...
...
README
View file @
da2f01e1
...
...
@@ -6,16 +6,16 @@ Port to KF5/Qt5 by Michael Reeves (reeves.87@gmail.com)
KDiff3-Version: 1.7.90
Now requires Qt 5.6 or later and KF5 5.14+. Legacy 0.9.98 and earlier builds are not supported.
MacOSX build is untested since port. The Konqueror specific plugin is not ported and no longer mantained.
MacOSX build is untested since port. The Konqueror specific plugin is not ported and no longer ma
i
ntained.
This plugin would only apply to KDE before 4.6. Support as been removed from main CMakeLists.txt.
As of 1/13/17 cmake 3.1+ is the targeted cmake version.
cmake is now the only build system supported. KF5/Q
T
5 was big jump. A lot changed besides just the API.
I am not against a Qt5-only build variant but see no reason to ma
ntain two spe
rate build systems.
cmake is now the only build system supported. KF5/Q
t
5 was big jump. A lot changed besides just the API.
I am not against a Qt5-only build variant but see no reason to ma
intain two sepa
rate build systems.
At present KF5 is my focus.
The original pre KF5/Qt5 Readme f
allows old build intrus
tions have been removed to avoid confusion:
The original pre KF5/Qt5 Readme f
ollows old build instruc
tions have been removed to avoid confusion:
Copyright: (C) 2002-2014 by Joachim Eibl
...
...
@@ -25,7 +25,7 @@ These are available for Un*x, Windows, Mac.
Thus there are many setup possibilities to consider.
Supported Qt-versions: 4.8, 5.2 or higher.
Supported KDE-version: 4
Supported KDE-version: 4
, 5
(For KDE3/Qt3 use KDiff3-0.9.92 or older.)
Contents
...
...
@@ -46,11 +46,11 @@ KDiff3 is a program that
- an integrated editor for comfortable solving of merge-conflicts
- has support for KDE-KIO (ftp, sftp, http, fish, smb),
- has an intuitive graphical user interface,
- provides a context menu for KDE-
Konqueror
and Windows-Explorer,
- provides a context menu for KDE-
Dolphin
and Windows-Explorer,
- supports 64 bit systems. (Some build issues are discussed in here.)
- Support for many encodings and Unicode.
Do you want help translating? Read the
README in the po-subdirectory
!
Do you want help translating? Read the
instructions on https://l10n.kde.org/
!
License
...
...
@@ -69,7 +69,7 @@ License
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307
Foundation, Inc., 51 Franklin St
r
eet, Fifth Floor, Boston, MA 02111-1307
USA
For details see file "COPYING".
...
...
src/DirectoryInfo.h
View file @
da2f01e1
...
...
@@ -52,4 +52,4 @@ class DirectoryInfo
FileAccess
m_dirDest
;
};
#endif
\ No newline at end of file
#endif
src/MergeFileInfos.h
View file @
da2f01e1
...
...
@@ -157,4 +157,4 @@ class MfiCompare
}
};
#endif // !MERGEFILEINFO_H
\ No newline at end of file
#endif // !MERGEFILEINFO_H
src/ProgressProxyExtender.h
View file @
da2f01e1
...
...
@@ -20,8 +20,8 @@
*
*/
#ifndef PROGREESPROXYEXENDER_H
#define PROGREESPROXYEXENDER_H
#ifndef PROGREESPROXYEX
T
ENDER_H
#define PROGREESPROXYEX
T
ENDER_H
#include "progress.h"
#include <QString>
...
...
@@ -37,4 +37,4 @@ public Q_SLOTS:
void
slotListDirInfoMessage
(
KJob
*
,
const
QString
&
msg
);
void
slotPercent
(
KJob
*
,
qint64
percent
);
};
#endif
\ No newline at end of file
#endif
src/Utils.cpp
View file @
da2f01e1
...
...
@@ -122,4 +122,4 @@ bool Utils::wildcardMultiMatch(const QString& wildcard, const QString& testStrin
}
return
false
;
}
\ No newline at end of file
}
src/Utils.h
View file @
da2f01e1
...
...
@@ -30,4 +30,4 @@ class Utils{
static
QString
getArguments
(
QString
cmd
,
QString
&
program
,
QStringList
&
args
);
};
#endif
\ No newline at end of file
#endif
src/common.cpp
View file @
da2f01e1
...
...
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin St
eet, Fifth Floor, Boston, MA 02110-1301, USA.
*
* 51 Franklin St
reet, Fifth Floor, Boston, MA 02110-1301, USA.
*
***************************************************************************/
#include "common.h"
...
...
@@ -187,7 +187,7 @@ static QString subSection(const QString& s, int idx, char sep)
return
s
.
mid
(
pos
);
}
return
""
;
return
QString
()
;
}
static
int
num
(
QString
&
s
,
int
idx
)
...
...
src/cvsignorelist.h
View file @
da2f01e1
...
...
@@ -11,6 +11,8 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
#ifndef CVSIGNORELIST_H
#define CVSIGNORELIST_H
#include "fileaccess.h"
...
...
@@ -32,4 +34,6 @@ class CvsIgnoreList
QStringList
m_startPatterns
;
QStringList
m_endPatterns
;
QStringList
m_generalPatterns
;
};
\ No newline at end of file
};
#endif
src/directorymergewindow.cpp
View file @
da2f01e1
...
...
@@ -2142,7 +2142,7 @@ QString DirectoryMergeWindow::DirectoryMergeWindowPrivate::getFileName(const QMo
{
return
mi
.
column
()
==
s_ACol
?
pMFI
->
getFileInfoA
()
->
absoluteFilePath
()
:
mi
.
column
()
==
s_BCol
?
pMFI
->
getFileInfoB
()
->
absoluteFilePath
()
:
mi
.
column
()
==
s_CCol
?
pMFI
->
getFileInfoC
()
->
absoluteFilePath
()
:
QString
(
""
);
}
return
""
;
return
QString
()
;
}
bool
DirectoryMergeWindow
::
DirectoryMergeWindowPrivate
::
isDir
(
const
QModelIndex
&
mi
)
...
...
src/gnudiff_analyze.cpp
View file @
da2f01e1
...
...
@@ -19,7 +19,7 @@
You should have received a copy of the GNU General Public License
along with this program; see the file COPYING.
If not, write to the Free Software Foundation,
51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. */
51 Franklin St
r
eet, Fifth Floor, Boston, MA 02110-1301, USA. */
/* The basic algorithm is described in:
"An O(ND) Difference Algorithm and its Variations", Eugene Myers,
...
...
src/gnudiff_diff.h
View file @
da2f01e1
...
...
@@ -19,7 +19,7 @@
You should have received a copy of the GNU General Public License
along with this program; see the file COPYING.
If not, write to the Free Software Foundation,
51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. */
51 Franklin St
r
eet, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef GNUDIFF_DIFF_H
#define GNUDIFF_DIFF_H
...
...
src/gnudiff_io.cpp
View file @
da2f01e1
...
...
@@ -19,7 +19,7 @@
You should have received a copy of the GNU General Public License
along with this program; see the file COPYING.
If not, write to the Free Software Foundation,
51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. */
51 Franklin St
r
eet, Fifth Floor, Boston, MA 02110-1301, USA. */
#include "gnudiff_diff.h"
#include <stdlib.h>
...
...
src/gnudiff_system.h
View file @
da2f01e1
...
...
@@ -19,7 +19,7 @@
You should have received a copy of the GNU General Public License
along with this program; see the file COPYING.
If not, write to the Free Software Foundation,
51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. */
51 Franklin St
r
eet, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef GNUDIFF_SYSTEM_H
#define GNUDIFF_SYSTEM_H
...
...
src/gnudiff_xmalloc.cpp
View file @
da2f01e1
...
...
@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. */
Inc., 51 Franklin St
r
eet, Fifth Floor, Boston, MA 02110-1301, USA. */
#include <sys/types.h>
...
...
src/guiutils.h
View file @
da2f01e1
...
...
@@ -14,6 +14,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef GUIUTILS_H
#define GUIUTILS_H
#include <QObject>
#include <kactioncollection.h>
...
...
@@ -128,3 +130,5 @@ namespace KDiff3 {
return
theAction
;
}
}
#endif
src/kdiff3.cpp
View file @
da2f01e1
...
...
@@ -351,7 +351,7 @@ KDiff3App::KDiff3App(QWidget* pParent, const QString /*name*/, KDiff3Part* pKDif
delete
KDiff3Shell
::
getParser
();
if
(
m_pKDiff3Shell
==
nullptr
)
{
completeInit
();
completeInit
(
QString
()
);
}
}
...
...
src/kdiff3.h
View file @
da2f01e1
...
...
@@ -120,7 +120,7 @@ class KDiff3App : public QSplitter
void
readOptions
(
KSharedConfigPtr
);
// Finish initialisation (virtual, so that it can be called from the shell too.)
virtual
void
completeInit
(
const
QString
&
fn1
=
""
,
const
QString
&
fn2
=
""
,
const
QString
&
fn3
=
""
);
virtual
void
completeInit
(
const
QString
&
fn1
=
QString
(),
const
QString
&
fn2
=
QString
(),
const
QString
&
fn3
=
QString
()
);
/** queryClose is called by KMainWindow on each closeEvent of a window. Against the
* default implementation (only returns true), this calles saveModified() on the document object to ask if the document shall
...
...
src/kdiff3_part.cpp
View file @
da2f01e1
...
...
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin St
eet, Fifth Floor, Boston, MA 02110-1301, USA.
*
* 51 Franklin St
reet, Fifth Floor, Boston, MA 02110-1301, USA.
*
***************************************************************************/
#include "kdiff3_part.h"
...
...
src/kdiff3_part.h
View file @
da2f01e1
...
...
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin St
eet, Fifth Floor, Boston, MA 02110-1301, USA.
*
* 51 Franklin St
reet, Fifth Floor, Boston, MA 02110-1301, USA.
*
***************************************************************************/
#ifndef _KDIFF3PART_H_
...
...
src/kdiff3_shell.cpp
View file @
da2f01e1
...
...
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin St
eet, Fifth Floor, Boston, MA 02110-1301, USA.
*
* 51 Franklin St
reet, Fifth Floor, Boston, MA 02110-1301, USA.
*
***************************************************************************/
#include "kdiff3_shell.h"
...
...
@@ -69,7 +69,7 @@ KDiff3Shell::KDiff3Shell(bool bCompleteInit)
setCentralWidget
(
m_widget
);
if
(
bCompleteInit
)
m_widget
->
completeInit
();
m_widget
->
completeInit
(
QString
()
);
connect
(
m_widget
,
SIGNAL
(
createNewInstance
(
const
QString
&
,
const
QString
&
,
const
QString
&
)),
this
,
SLOT
(
slotNewInstance
(
const
QString
&
,
const
QString
&
,
const
QString
&
)));
}
else
...
...
src/kdiff3_shell.h
View file @
da2f01e1
...
...
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin St
eet, Fifth Floor, Boston, MA 02110-1301, USA.
*
* 51 Franklin St
reet, Fifth Floor, Boston, MA 02110-1301, USA.
*
***************************************************************************/
#ifndef _KDIFF3SHELL_H_
...
...
src/mergeresultwindow.cpp
View file @
da2f01e1
...
...
@@ -1099,7 +1099,7 @@ static QString calcHistoryLead(const QString& s)
return
s
;
// Very unlikely
}
}
return
""
;
// Must be an empty string, not a null string.
return
QString
()
;
// Must be an empty string, not a null string.
}
static
void
findHistoryRange
(
const
QRegExp
&
historyStart
,
bool
bThreeFiles
,
const
Diff3LineList
*
pD3LList
,
...
...
src/optiondialog.cpp
View file @
da2f01e1
...
...
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
* Foundation, Inc., 51 Franklin St
r
eet, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
...
...
src/optiondialog.h
View file @
da2f01e1
...
...
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
* Foundation, Inc., 51 Franklin St
r
eet, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
...
...
src/options.h
View file @
da2f01e1
...
...
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
* Foundation, Inc., 51 Franklin St
r
eet, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
...
...
src/pdiff.cpp
View file @
da2f01e1
...
...
@@ -13,22 +13,20 @@
#include <cstdio>
#include <ctype.h>
#include <QtCore>
#include <QCheckBox>
#include <QClipboard>
#include <QComboBox>
#include <QDir>
#include <QDropEvent>
#include <QFile>
#include <QtGui>
#include <QLayout>
#include <QLineEdit>
#include <QMimeData>
#include <QProcess>
#include <QScrollBar>
#include <QSplitter>
#include <QStatusBar>
#include <QUrl>
#include <QtWidgets/QtWidgets>
#include <KLocalizedString>
#include <KShortcutsDialog>
...
...
src/selection.h
View file @
da2f01e1
...
...
@@ -7,6 +7,8 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
#ifndef SELECTION_H
#define SELECTION_H
#include "gnudiff_diff.h"
#include "common.h"
...
...
@@ -76,3 +78,5 @@ public:
int
endPos
()
{
return
firstLine
==
lastLine
?
std
::
max
(
firstPos
,
lastPos
)
:
firstLine
<
lastLine
?
lastPos
:
firstPos
;
}
};
#endif
src/smalldialogs.cpp
View file @
da2f01e1
...
...
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. *
* 51 Franklin St
r
eet, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "smalldialogs.h"
...
...
src/smalldialogs.h
View file @
da2f01e1
...
...
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin St
eet, Fifth Floor, Boston, MA 02110-1301, USA.
*
* 51 Franklin St
reet, Fifth Floor, Boston, MA 02110-1301, USA.
*
***************************************************************************/
#ifndef SMALLDIALOGS_H
...
...
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