diff --git a/src/DirectoryInfo.h b/src/DirectoryInfo.h
index 18a06e4..4c6fa08 100644
--- a/src/DirectoryInfo.h
+++ b/src/DirectoryInfo.h
@@ -1,51 +1,91 @@
/**
* Copyright (C) 2018 Michael Reeves reeves.87@gmail.com
- *
+ *
* This file is part of KDiff3.
- *
+ *
* KDiff3 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* KDiff3 is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with KDiff3. If not, see .
*/
#ifndef DIRECTORYINFO_H
#define DIRECTORYINFO_H
#include "fileaccess.h"
+#include "options.h"
class DirectoryInfo
{
public:
DirectoryInfo(FileAccess& dirA, FileAccess& dirB, FileAccess& dirC, FileAccess& dirDest)
{
m_dirA = dirA;
m_dirB = dirB;
m_dirC = dirC;
m_dirDest = dirDest;
+
+ m_dirListA.clear();
+ m_dirListB.clear();
+ m_dirListC.clear();
}
inline FileAccess dirA() const { return m_dirA; }
inline FileAccess dirB() const { return m_dirB; }
inline FileAccess dirC() const { return m_dirC; }
inline FileAccess destDir() const
{
if(m_dirDest.isValid())
return m_dirDest;
else
return m_dirC.isValid() ? m_dirC : m_dirB;
}
+ inline bool listDirA(const Options& options)
+ {
+ return m_dirA.listDir(&m_dirListA,
+ options.m_bDmRecursiveDirs, options.m_bDmFindHidden,
+ options.m_DmFilePattern, options.m_DmFileAntiPattern,
+ options.m_DmDirAntiPattern, options.m_bDmFollowDirLinks,
+ options.m_bDmUseCvsIgnore);
+ }
+
+ inline bool listDirB(const Options& options)
+ {
+ return m_dirB.listDir(&m_dirListB,
+ options.m_bDmRecursiveDirs, options.m_bDmFindHidden,
+ options.m_DmFilePattern, options.m_DmFileAntiPattern,
+ options.m_DmDirAntiPattern, options.m_bDmFollowDirLinks,
+ options.m_bDmUseCvsIgnore);
+ }
+
+ inline bool listDirC(const Options& options)
+ {
+ return m_dirC.listDir(&m_dirListC,
+ options.m_bDmRecursiveDirs, options.m_bDmFindHidden,
+ options.m_DmFilePattern, options.m_DmFileAntiPattern,
+ options.m_DmDirAntiPattern, options.m_bDmFollowDirLinks,
+ options.m_bDmUseCvsIgnore);
+ }
+
+ t_DirectoryList& getDirListA() { return m_dirListA; }
+ t_DirectoryList& getDirListB() { return m_dirListB; }
+ t_DirectoryList& getDirListC() { return m_dirListC; }
+
private:
FileAccess m_dirA, m_dirB, m_dirC;
+
+ t_DirectoryList m_dirListA;
+ t_DirectoryList m_dirListB;
+ t_DirectoryList m_dirListC;
FileAccess m_dirDest;
};
#endif
diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
index 47f2b8e..40aa56a 100644
--- a/src/directorymergewindow.cpp
+++ b/src/directorymergewindow.cpp
@@ -1,3497 +1,3480 @@
/***************************************************************************
* Copyright (C) 2003-2007 by Joachim Eibl *
* 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 *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "directorymergewindow.h"
#include "DirectoryInfo.h"
#include "MergeFileInfos.h"
#include "PixMapUtils.h"
#include "Utils.h"
#include "guiutils.h"
#include "kdiff3.h"
#include "options.h"
#include "progress.h"
#include
#include