Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit a544a8db authored by Michael Reeves's avatar Michael Reeves

cleanup headers

parent be05275a
......@@ -17,7 +17,9 @@
#include "merger.h"
#include "options.h"
#include <QApplication>
#include <cmath>
#include <cstdlib>
#include <QDir>
#include <QDragEnterEvent>
#include <QFileDialog>
......@@ -34,13 +36,9 @@
#include <QThreadPool>
#include <QToolTip>
#include <QUrl>
#include <qnamespace.h>
#include <KLocalizedString>
#include <cmath>
#include <cstdlib>
QAtomicInt s_runnableCount = 0;
class DiffTextWindowData
......
......@@ -22,9 +22,6 @@
#include "smalldialogs.h"
#include "difftextwindow.h"
#include "mergeresultwindow.h"
// system headers
#include <cassert>
// include files for QT
#include <QClipboard>
#include <QCheckBox>
......@@ -45,6 +42,7 @@
#include <QPushButton>
#include <QSplitter>
#include <QStatusBar>
#include <QUrl>
// include files for KDE
#include <KConfig>
#include <KLocalizedString>
......@@ -57,7 +55,6 @@
#include <KToolBar>
#define ID_STATUS_MSG 1
#define MAIN_TOOLBAR_NAME QLatin1String("mainToolBar")
......
......@@ -20,10 +20,8 @@
#include <QPointer>
#include <QScrollBar>
#include <QSplitter>
#include <QUrl>
// include files for KDE
#include <KAboutData>
#include <KConfigGroup>
#include <KMainWindow>
#include <KParts/MainWindow>
......@@ -32,15 +30,13 @@
// forward declaration of the KDiff3 classes
class OptionDialog;
class FindDialog;
class ManualDiffHelpDialog;
//class ManualDiffHelpDialog;
class DiffTextWindow;
class DiffTextWindowFrame;
class MergeResultWindow;
class WindowTitleWidget;
class Overview;
class QScrollBar;
class QSplitter;
class QStatusBar;
class QMenu;
......
......@@ -27,9 +27,9 @@
#include <QTextStream>
#include <KAboutData>
#include <KStandardAction>
#include <KLocalizedString>
#include <KMessageBox>
#include <KParts/MainWindow>
#include <version.h>
......
......@@ -22,13 +22,9 @@
#include "kdiff3.h"
#include "kdiff3_part.h"
#include <QAction>
#include <QApplication>
#include <QCloseEvent>
#include <QStatusBar>
#include <QUrl>
#include <KPluginLoader>
#include <KPluginMetaData>
#include <KConfig>
#include <KEditToolBar>
......
......@@ -23,6 +23,7 @@
#include <KParts/MainWindow>
#include <QCommandLineParser>
#include <QString>
class KToggleAction;
......@@ -56,7 +57,7 @@ public:
bool queryClose() override;
bool queryExit();
void closeEvent(QCloseEvent*e) override;
static inline QCommandLineParser* getParser(){
static QCommandLineParser *parser = new QCommandLineParser();
return parser;
......
......@@ -17,11 +17,11 @@
#include <KMessageBox>
#include <QApplication>
#include <QByteArray>
#include <QCommandLineOption>
#include <QCommandLineParser>
#include <QFile>
#include <QFont>
#include <QLocale>
#include <QStringList>
#include <QStandardPaths>
#include <QTextStream>
......
/***************************************************************************
merger.cpp - description
-------------------
begin : Sun Mar 24 2002
copyright : (C) 2002-2007 by Joachim Eibl
email : joachim.eibl at gmx.de
***************************************************************************/
/***************************************************************************
* Copyright (C) 2003-2007 by Joachim Eibl <joachim.eibl at gmx.de> *
* Copyright (C) 2018 Michael Reeves reeves.87@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
......@@ -17,6 +11,8 @@
#include "merger.h"
#include <list>
Merger::Merger(const DiffList* pDiffListAB, const DiffList* pDiffListCA)
: md1(pDiffListAB, 0), md2(pDiffListCA, 1)
{
......
/***************************************************************************
merger.h - description
-------------------
begin : Sun Mar 24 2002
copyright : (C) 2002-2007 by Joachim Eibl
email : joachim.eibl at gmx.de
***************************************************************************/
/***************************************************************************
* Copyright (C) 2003-2007 by Joachim Eibl <joachim.eibl at gmx.de> *
* Copyright (C) 2018 Michael Reeves reeves.87@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
......@@ -47,7 +41,7 @@ private:
const DiffList* pDiffList;
Diff d;
int idx;
MergeData( const DiffList* p, int i );
bool eq();
void update();
......
......@@ -9,23 +9,38 @@
* *
***************************************************************************/
#include "difftextwindow.h"
#include "directorymergewindow.h"
#include "fileaccess.h"
#include "kdiff3.h"
#include "optiondialog.h"
#include "progress.h"
#include "Utils.h"
#include "DirectoryInfo.h"
#include "mergeresultwindow.h"
#include "smalldialogs.h"
#include <algorithm>
#include <cstdio>
#include <ctype.h>
#include <list>
#include <QCheckBox>
#include <QClipboard>
#include <QComboBox>
#include <QDir>
#include <QDropEvent>
#include <QDialog>
#include <QEvent> // QKeyEvent, QDropEvent, QInputEvent
#include <QFile>
#include <QLayout>
#include <QLineEdit>
#include <QMimeData>
#include <QPointer>
#include <QProcess>
#include <QScrollBar>
#include <QSplitter>
#include <QStatusBar>
#include <QStringList>
#include <QTextCodec>
#include <QUrl>
......@@ -33,18 +48,6 @@
#include <KShortcutsDialog>
#include <KMessageBox>
#include "difftextwindow.h"
#include "directorymergewindow.h"
#include "fileaccess.h"
#include "kdiff3.h"
#include "optiondialog.h"
#include "progress.h"
#include "Utils.h"
#include "DirectoryInfo.h"
#include "mergeresultwindow.h"
#include "smalldialogs.h"
bool g_bIgnoreWhiteSpace = true;
bool g_bIgnoreTrivialMatches = true;
......
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