From bd6336c629841c6db3a6ca53a936d629d34db53b Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:15:16 +0200 Subject: 4.1 --- file_hierarchy.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'file_hierarchy.h') diff --git a/file_hierarchy.h b/file_hierarchy.h index 8424376c..6ea9d244 100644 --- a/file_hierarchy.h +++ b/file_hierarchy.h @@ -7,18 +7,16 @@ #ifndef FILEHIERARCHY_H_INCLUDED #define FILEHIERARCHY_H_INCLUDED -#include "shared/zstring.h" #include #include #include #include -#include "shared/fixed_list.h" +#include +#include #include "structures.h" -#include "shared/guid.h" -#include "shared/file_id.h" -#include "shared/int64.h" +#include #include "structures.h" -#include "library/hard_filter.h" +#include "lib/hard_filter.h" namespace zen @@ -782,7 +780,7 @@ void FileSystemObject::removeObject() shortNameLeft_.clear(); removeObjectL(); - setSyncDir(SYNC_DIR_NONE); //calls notifySyncCfgChanged() + setSyncDir(SYNC_DIR_NONE); //calls notifySyncCfgChanged() } -- cgit