Commit 53cf963e authored by Michael Reeves's avatar Michael Reeves

MISC ebn fixes

parent be33b6d0
/**
* Copyright (C) 2018 Michael Reeves
* Copyright (C) 2018 Michael Reeves reeves.87@gmail.com
*
* This file is part of KDiff3.
*
......
/**
* Copyright (C) 2003-2007 by Joachim Eibl
* joachim.eibl at gmx.de
* Copyright (C) 2018 Michael Reeves
* Copyright (C) 2018 Michael Reeves reeves.87@gmail.com
*
* This file is part of KDiff3.
*
......
/**
* Copyright (C) 2003-2007 by Joachim Eibl
* joachim.eibl at gmx.de
* Copyright (C) 2018 Michael Reeves
* Copyright (C) 2018 Michael Reeves reeves.87@gmail.com
*
* This file is part of KDiff3.
*
......
/**
* Copyright (C) 2003-2007 by Joachim Eibl <joachim.eibl at gmx.de>
* Copyright (C) 2018 Michael Reeves
* Copyright (C) 2018 Michael Reeves reeves.87@gmail.com
*
* This file is part of KDiff3.
*
......
/**
* Copyright (C) 2018 Michael Reeves
* Copyright (C) 2018 Michael Reeves reeves.87@gmail.com
*
* This file is part of KDiff3.
*
......
......@@ -15,8 +15,8 @@
* *
***************************************************************************/
#ifndef _COMMON_H
#define _COMMON_H
#ifndef COMMON_H
#define COMMON_H
#include <QAtomicInt>
#include <QString>
......
......@@ -15,8 +15,9 @@
* *
***************************************************************************/
#include "diff.h"
#include <qglobal.h>
#include "Utils.h"
#ifdef Q_OS_WIN
#include <qt_windows.h>
......@@ -26,7 +27,7 @@
#include <cstdlib>
#include "diff.h"
#include "Utils.h"
#include "fileaccess.h"
#include "gnudiff_diff.h"
#include "options.h"
......
......@@ -10,8 +10,9 @@
* *
***************************************************************************/
#include "selection.h"
#include "difftextwindow.h"
#include "selection.h"
#include "kdiff3.h"
#include "merger.h"
#include "options.h"
......
......@@ -9,11 +9,10 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <qglobal.h>
#include "directorymergewindow.h"
#include "MergeFileInfos.h"
#include "DirectoryInfo.h"
#include "directorymergewindow.h"
#include "guiutils.h"
#include "options.h"
#include "progress.h"
......@@ -23,6 +22,7 @@
#include <map>
#include <vector>
#include <qglobal.h>
#include <QAction>
#include <QApplication>
#include <QDir>
......@@ -2874,7 +2874,7 @@ bool DirectoryMergeWindow::DirectoryMergeWindowPrivate::deleteFLD(const QString&
bSuccess = FileAccess::removeDir(name);
if(!bSuccess)
{
m_pStatusInfo->addText(i18n("Error: rmdir( %1 ) operation failed.", name));
m_pStatusInfo->addText(i18n("Error: rmdir( %1 ) operation failed.", name));// krazy:exclude=syscalls
return false;
}
}
......@@ -3237,7 +3237,7 @@ void DirectoryMergeInfo::setInfo(
addListViewItem(i18n("C"), dirC.prettyAbsPath(), mfi.getFileInfoC());
if(!bHideDest)
{
FileAccess fiDest(dirDest.prettyAbsPath() + "/" + mfi.subPath(), true);
FileAccess fiDest(dirDest.prettyAbsPath() + '/' + mfi.subPath(), true);
addListViewItem(i18n("Dest"), dirDest.prettyAbsPath(), &fiDest);
}
for(int i = 0; i < m_pInfoList->columnCount(); ++i)
......
/* Analyze file differences for GNU DIFF.
Modified for KDiff3 by Joachim Eibl 2003.
Modified for KDiff3 by Joachim Eibl <joachim.eibl at gmx.de> 2003.
The original file was part of GNU DIFF.
Copyright (C) 1988, 1989, 1992, 1993, 1994, 1995, 1998, 2001, 2002
......
/* Shared definitions for GNU DIFF
Modified for KDiff3 by Joachim Eibl 2003, 2004, 2005.
Modified for KDiff3 by Joachim Eibl <joachim.eibl at gmx.de> 2003, 2004, 2005.
The original file was part of GNU DIFF.
Copyright (C) 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1998, 2001,
......
/* File I/O for GNU DIFF.
Modified for KDiff3 by Joachim Eibl 2003, 2004, 2005.
Modified for KDiff3 by Joachim Eibl <joachim.eibl at gmx.de> 2003, 2004, 2005.
The original file was part of GNU DIFF.
Copyright (C) 1988, 1989, 1992, 1993, 1994, 1995, 1998, 2001, 2002
......
/* System dependent declarations.
Modified for KDiff3 by Joachim Eibl 2003.
Modified for KDiff3 by Joachim Eibl <joachim.eibl at gmx.de> 2003.
The original file was part of GNU DIFF.
Copyright (C) 1988, 1989, 1992, 1993, 1994, 1995, 1998, 2001, 2002
......
......@@ -452,7 +452,8 @@ void KDiff3App::completeInit(const QString& fn1, const QString& fn2, const QStri
if(m_pKDiff3Shell)
{
if(m_pOptions->m_bMaximised)
m_pKDiff3Shell->showMaximized();
//We want showMaximized here as the window has never been shown.
m_pKDiff3Shell->showMaximized();// krazy:exclude=qmethods
else
m_pKDiff3Shell->show();
}
......
......@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#ifndef _KDIFF3PART_H_
#define _KDIFF3PART_H_
#ifndef KDIFF3PART_H
#define KDIFF3PART_H
#include <kparts/part.h>
#include <KPluginFactory>
......
......@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#ifndef _KDIFF3SHELL_H_
#define _KDIFF3SHELL_H_
#ifndef KDIFF3SHELL_H
#define KDIFF3SHELL_H
#include <KParts/MainWindow>
#include <QCommandLineParser>
......
......@@ -81,7 +81,7 @@ static bool isOptionUsed(const QString& s, int argc, char* argv[])
{
for(int j = 0; j < argc; ++j)
{
if(QString("-" + s) == QLatin1String(argv[j]) || QString("--" + s) == QLatin1String(argv[j]))
if(QString('-' + s) == QLatin1String(argv[j]) || QString("--" + s) == QLatin1String(argv[j]))
{
return true;
}
......
......@@ -17,6 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#include "optiondialog.h"
#include <QApplication>
#include <QCheckBox>
......@@ -50,7 +51,6 @@
#include <map>
#include "diff.h"
#include "optiondialog.h"
#include "smalldialogs.h"
#define KDIFF3_CONFIG_GROUP "KDiff3 Options"
......@@ -731,7 +731,7 @@ void OptionDialog::setupFontPage()
void OptionDialog::setupColorPage()
{
QFrame* page = new QFrame();
KPageWidgetItem* pageItem = new KPageWidgetItem(page, i18n("Color"));
KPageWidgetItem* pageItem = new KPageWidgetItem(page, i18nc("Title for color settings page","Color"));
pageItem->setHeader(i18n("Colors Settings"));
pageItem->setIcon(QIcon::fromTheme(QStringLiteral("colormanagement")));
addPage(pageItem);
......
......@@ -21,10 +21,12 @@
#ifndef OPTION_DIALOG_H
#define OPTION_DIALOG_H
#include <KPageDialog>
#include <QStringList>
#include <QGroupBox>
#include <KPageDialog>
#include <KSharedConfig>
#include <list>
#include "options.h"
......@@ -38,7 +40,6 @@ class OptionEncodingComboBox;
class OptionLineEdit;
class KKeyDialog;
class OptionDialog : public KPageDialog
{
Q_OBJECT
......
......@@ -8,8 +8,8 @@
* (at your option) any later version. *
***************************************************************************/
#include "gnudiff_diff.h"
#include "selection.h"
#include "gnudiff_diff.h"
#include <QtGlobal>
......
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