Commit 7d2bdd3e authored by Michael Reeves's avatar Michael Reeves

Make m_dirInfo static

We only need one copy of the DirectoryInfo class.
parent bccc822c
......@@ -20,6 +20,8 @@
#include <KLocalizedString>
QSharedPointer<DirectoryInfo> MergeFileInfos::m_dirInfo;
MergeFileInfos::MergeFileInfos()
{
m_bEqualAB = false;
......
......@@ -178,7 +178,7 @@ class MergeFileInfos
FileAccess* m_pFileInfoB;
FileAccess* m_pFileInfoC;
QSharedPointer<DirectoryInfo> m_dirInfo;
static QSharedPointer<DirectoryInfo> m_dirInfo;
TotalDiffStatus m_totalDiffStatus;
......
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