Commit b127da99 authored by Michael Reeves's avatar Michael Reeves

Header cleanup

parent 4982b0e0
......@@ -9,10 +9,11 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include "MergeFileInfos.h"
#include "directorymergewindow.h"
#include "DirectoryInfo.h"
#include "fileaccess.h"
#include "directorymergewindow.h"
#include "MergeFileInfos.h"
#include "progress.h"
#include <QString>
......
......@@ -14,11 +14,12 @@
#include "options.h"
#include "fileaccess.h"
#include "gnudiff_diff.h"
#include "LineRef.h"
#include <QTextCodec>
#include <QTemporaryFile>
#include <QString>
#include <QVector>
class LineData;
class SourceData
......
......@@ -12,12 +12,13 @@
#include "difftextwindow.h"
#include "selection.h"
#include "FileNameLineEdit.h"
#include "kdiff3.h"
#include "merger.h"
#include "options.h"
#include "FileNameLineEdit.h"
#include "progress.h"
#include "RLPainter.h"
#include "selection.h"
#include <algorithm>
#include <cmath>
......
......@@ -11,6 +11,7 @@
#include "cvsignorelist.h"
#include "common.h"
#include "progress.h"
#include "ProgressProxyExtender.h"
#include "Utils.h"
#include <cstdlib>
......
......@@ -11,9 +11,6 @@
#ifndef FILEACCESS_H
#define FILEACCESS_H
#include "progress.h"
#include "ProgressProxyExtender.h"
#include <QDir>
#include <QFile>
#include <QFileInfo>
......@@ -23,6 +20,7 @@
#include <QUrl>
#include <KIO/UDSEntry>
#include <KJob>
namespace KIO {
class Job;
......
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