Commit 924ad21b authored by Michael Reeves's avatar Michael Reeves

make m_pRoot private

parent e06968e6
......@@ -191,8 +191,6 @@ class DirectoryMergeWindow::DirectoryMergeWindowPrivate : public QAbstractItemMo
bool isThreeWay(void) const { return rootMFI()->getDirectoryInfo()->dirC().isValid(); }
MergeFileInfos* rootMFI(void) const { return m_pRoot; }
MergeFileInfos* m_pRoot;
static void setPixmaps(MergeFileInfos& mfi, bool);
Options* m_pOptions;
......@@ -279,6 +277,8 @@ private:
};
typedef QMap<FileKey, MergeFileInfos> t_fileMergeMap;
MergeFileInfos* m_pRoot;
public:
t_fileMergeMap m_fileMergeMap;
......
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