Commit da2f01e1 authored by Yuri Chornoivan's avatar Yuri Chornoivan

Fix various EBN issues, compilation issues and typos

Differential Revision: https://phabricator.kde.org/D17429
parent 7c5fd342
......@@ -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 Street, 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.
......
......@@ -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 maintained.
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/QT5 was big jump. A lot changed besides just the API.
I am not against a Qt5-only build variant but see no reason to mantain two sperate build systems.
cmake is now the only build system supported. KF5/Qt5 was big jump. A lot changed besides just the API.
I am not against a Qt5-only build variant but see no reason to maintain two separate build systems.
At present KF5 is my focus.
The original pre KF5/Qt5 Readme fallows old build intrustions have been removed to avoid confusion:
The original pre KF5/Qt5 Readme follows old build instructions 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 Street, Fifth Floor, Boston, MA 02111-1307
USA
For details see file "COPYING".
......
......@@ -52,4 +52,4 @@ class DirectoryInfo
FileAccess m_dirDest;
};
#endif
\ No newline at end of file
#endif
......@@ -157,4 +157,4 @@ class MfiCompare
}
};
#endif // !MERGEFILEINFO_H
\ No newline at end of file
#endif // !MERGEFILEINFO_H
......@@ -20,8 +20,8 @@
*
*/
#ifndef PROGREESPROXYEXENDER_H
#define PROGREESPROXYEXENDER_H
#ifndef PROGREESPROXYEXTENDER_H
#define PROGREESPROXYEXTENDER_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
......@@ -122,4 +122,4 @@ bool Utils::wildcardMultiMatch(const QString& wildcard, const QString& testStrin
}
return false;
}
\ No newline at end of file
}
......@@ -30,4 +30,4 @@ class Utils{
static QString getArguments(QString cmd, QString& program, QStringList& args);
};
#endif
\ No newline at end of file
#endif
......@@ -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 Street, 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)
......
......@@ -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
......@@ -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)
......
......@@ -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 Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* The basic algorithm is described in:
"An O(ND) Difference Algorithm and its Variations", Eugene Myers,
......
......@@ -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 Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef GNUDIFF_DIFF_H
#define GNUDIFF_DIFF_H
......
......@@ -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 Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#include "gnudiff_diff.h"
#include <stdlib.h>
......
......@@ -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 Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef GNUDIFF_SYSTEM_H
#define GNUDIFF_SYSTEM_H
......
......@@ -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 Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#include <sys/types.h>
......
......@@ -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
......@@ -351,7 +351,7 @@ KDiff3App::KDiff3App(QWidget* pParent, const QString /*name*/, KDiff3Part* pKDif
delete KDiff3Shell::getParser();
if(m_pKDiff3Shell == nullptr) {
completeInit();
completeInit(QString());
}
}
......
......@@ -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
......
......@@ -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. *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "kdiff3_part.h"
......
......@@ -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 Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#ifndef _KDIFF3PART_H_
......
......@@ -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 Street, 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
......
......@@ -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 Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#ifndef _KDIFF3SHELL_H_
......
......@@ -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,
......
......@@ -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 Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
......
......@@ -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 Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
......
......@@ -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 Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
......
......@@ -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>
......
......@@ -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
......@@ -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 Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "smalldialogs.h"
......
......@@ -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 Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#ifndef SMALLDIALOGS_H
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment