From 51f22f0ed3a20b6213fcea91501a9bc803309757 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Thu, 3 Sep 2020 15:39:00 +0800 Subject: [PATCH] layout codes. --- inc/hgl/io/FileAccess.h | 36 +++--- inc/hgl/io/FileOutputStream.h | 12 +- inc/hgl/io/JavaInputStream.h | 2 +- src/CMakeLists.txt | 174 +++++++++++++++++++------- src/{DataType => Color}/Color.cpp | 0 src/{DataType => Color}/Color3f.cpp | 0 src/{DataType => Color}/Color4f.cpp | 0 src/IO/FileAccess.cpp | 18 +-- src/IO/FileInputStream.cpp | 2 +- src/IO/RandomAccessFile.cpp | 24 ++-- src/{Other => Text}/CodePage.cpp | 0 src/{DataType => Text}/Endian.cpp | 0 src/{DataType => Text}/StringList.cpp | 0 src/{Other => Text}/UnicodeBlocks.cpp | 0 src/{Other => Time}/DateTime.cpp | 0 src/{Other => Time}/TimeCount.cpp | 0 src/{Other => Time}/TimeVal.cpp | 0 17 files changed, 176 insertions(+), 92 deletions(-) rename src/{DataType => Color}/Color.cpp (100%) rename src/{DataType => Color}/Color3f.cpp (100%) rename src/{DataType => Color}/Color4f.cpp (100%) rename src/{Other => Text}/CodePage.cpp (100%) rename src/{DataType => Text}/Endian.cpp (100%) rename src/{DataType => Text}/StringList.cpp (100%) rename src/{Other => Text}/UnicodeBlocks.cpp (100%) rename src/{Other => Time}/DateTime.cpp (100%) rename src/{Other => Time}/TimeCount.cpp (100%) rename src/{Other => Time}/TimeVal.cpp (100%) diff --git a/inc/hgl/io/FileAccess.h b/inc/hgl/io/FileAccess.h index 0dc09fa..0b9aed3 100644 --- a/inc/hgl/io/FileAccess.h +++ b/inc/hgl/io/FileAccess.h @@ -8,19 +8,19 @@ namespace hgl { namespace io { - enum FileOpenMode ///文件访问模式枚举 + enum class FileOpenMode ///文件访问模式枚举 { - fomNone=0, + None=0, - fomCreate, ///<创建文件，如存在则失败 - fomCreateTrunc, ///<强制创建，如存在则抹掉 - fomCreateTemp, - fomOnlyRead, ///<只读方式 - fomOnlyWrite, ///<只写方式 - fomReadWrite, ///<可读可写 - fomAppend, ///<追加模式 + Create, ///<创建文件，如存在则失败 + CreateTrunc, ///<强制创建，如存在则抹掉 + CreateTemp, + OnlyRead, ///<只读方式 + OnlyWrite, ///<只写方式 + ReadWrite, ///<可读可写 + Append, ///<追加模式 - fomEnd + End };//enum FileOpenMode /** @@ -43,13 +43,13 @@ namespace hgl FileAccess(); virtual ~FileAccess(); - virtual bool Open(const OSString &,FileOpenMode fom); ///<以指定模式打开一个文件 - virtual bool Create(const OSString &fn){return Open(fn,fomCreate);} ///<创建一个新文件，如文件已存在则创建失败 - virtual bool CreateTrunc(const OSString &fn){return Open(fn,fomCreateTrunc);} ///<创建一个新文件，如文件已存在则抹消它 - virtual bool OpenRead(const OSString &fn){return Open(fn,fomOnlyRead);} ///<以只读模式打开一个文件 - virtual bool OpenWrite(const OSString &fn){return Open(fn,fomOnlyWrite);} ///<以只写模式打开一个文件 - virtual bool OpenReadWrite(const OSString &fn){return Open(fn,fomReadWrite);} ///<以读写模式打开一个文件 - virtual bool CreateTemp(); + virtual bool Open (const OSString &,FileOpenMode fom); ///<以指定模式打开一个文件 + virtual bool Create (const OSString &fn){return Open(fn,FileOpenMode::Create);} ///<创建一个新文件，如文件已存在则创建失败 + virtual bool CreateTrunc (const OSString &fn){return Open(fn,FileOpenMode::CreateTrunc);} ///<创建一个新文件，如文件已存在则抹消它 + virtual bool OpenRead (const OSString &fn){return Open(fn,FileOpenMode::OnlyRead);} ///<以只读模式打开一个文件 + virtual bool OpenWrite (const OSString &fn){return Open(fn,FileOpenMode::OnlyWrite);} ///<以只写模式打开一个文件 + virtual bool OpenReadWrite (const OSString &fn){return Open(fn,FileOpenMode::ReadWrite);} ///<以读写模式打开一个文件 + virtual bool CreateTemp (); ///<创建一个临时文件 virtual void Close(); ///<关闭文件 virtual void CloseRead(); ///<仅关闭读取 @@ -64,7 +64,7 @@ namespace hgl virtual bool CanRestart()const{return CanSeek();} ///<文件是否可复位访问 virtual bool CanSize()const{return(true);} ///<文件是否可取得长度 - virtual int64 Seek(int64,SeekOrigin=SeekOrigin::Begin); ///<定位访问指针 + virtual int64 Seek(int64,SeekOrigin=SeekOrigin::Begin); ///<定位访问指针 virtual int64 Tell()const; ///<取得访问指针位置 virtual int64 GetSize(); ///<取得文件长度 virtual bool Restart(); ///<复位访问指针 diff --git a/inc/hgl/io/FileOutputStream.h b/inc/hgl/io/FileOutputStream.h index 2ff8b0e..3d823c9 100644 --- a/inc/hgl/io/FileOutputStream.h +++ b/inc/hgl/io/FileOutputStream.h @@ -24,11 +24,11 @@ namespace hgl FileOutputStream(SharedPtr &); virtual ~FileOutputStream(); - virtual bool Open(const OSString &fn,FileOpenMode mode){return OpenFile(fn,mode);} ///<打开文件，指定一个模式 - virtual bool Open(const OSString &fn){return OpenFile(fn,fomOnlyWrite);} ///<打开文件 - virtual bool Create(const OSString &fn){return OpenFile(fn,fomCreate);} ///<创建文件，如存在创建失败 - virtual bool CreateTrunc(const OSString &fn){return OpenFile(fn,fomCreateTrunc);} ///<创建文件，如存在则抹去 - virtual bool OpenAppend(const OSString &fn){return OpenFile(fn,fomAppend);} ///<打开文件，追加模式 + virtual bool Open (const OSString &fn,FileOpenMode mode){return OpenFile(fn,mode);} ///<打开文件，指定一个模式 + virtual bool Open (const OSString &fn){return OpenFile(fn,FileOpenMode::OnlyWrite);} ///<打开文件 + virtual bool Create (const OSString &fn){return OpenFile(fn,FileOpenMode::Create);} ///<创建文件，如存在创建失败 + virtual bool CreateTrunc (const OSString &fn){return OpenFile(fn,FileOpenMode::CreateTrunc);} ///<创建文件，如存在则抹去 + virtual bool OpenAppend (const OSString &fn){return OpenFile(fn,FileOpenMode::Append);} ///<打开文件，追加模式 virtual void Close(); ///<关闭文件 @@ -67,7 +67,7 @@ namespace hgl * @param mode 打开模式，默认只写(必然可读) * @see FileOpenMode */ - OpenFileOutputStream(const OSString &filename,FileOpenMode mode=fomOnlyWrite) + OpenFileOutputStream(const OSString &filename,FileOpenMode mode=FileOpenMode::OnlyWrite) { fos=new FileOutputStream(); diff --git a/inc/hgl/io/JavaInputStream.h b/inc/hgl/io/JavaInputStream.h index 3b07a1c..db317ba 100644 --- a/inc/hgl/io/JavaInputStream.h +++ b/inc/hgl/io/JavaInputStream.h @@ -29,7 +29,7 @@ namespace hgl } int64 read (void *ptr,int size){return in?in->ReadFully(ptr,size):-1;} - int skipBytes (int size) {return in?in->Seek(size,soCurrent):-1;} + int skipBytes (int size) {return in?in->Seek(size,SeekOrigin::Current):-1;} bool readBoolean (bool &b) {return in?in->ReadBool (b):false;} bool readByte (int8 &i) {return in?in->ReadInt8 (i):false;} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d1f6d7f..caee46a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,49 +1,119 @@ -file(GLOB TYPE_TEMPLATE_HEADER ${CMCORE_ROOT_INCLUDE_PATH}/hgl/type/*.h) +SET(TYPE_INCLUDE_PATH ${CMCORE_ROOT_INCLUDE_PATH}/hgl/type) + +file(GLOB TYPE_TEMPLATE_HEADER ${TYPE_INCLUDE_PATH}/*.h) SET(SYSTEM_INFO_SOURCE SystemInfo.cpp) -SET(BASE_TYPE_SOURCE -# DataType/Info.cpp -# DataType/BitArray.cpp - DataType/Color.cpp - DataType/Color3f.cpp - DataType/Color4f.cpp -# DataType/FontInfo.cpp - DataType/StringList.cpp - DataType/Endian.cpp) +##Color-------------------------------------------------------- +SET(COLOR_HEADER_FILES ${TYPE_INCLUDE_PATH}/Color.h + ${TYPE_INCLUDE_PATH}/Color3f.h + ${TYPE_INCLUDE_PATH}/Color4f.h) -SOURCE_GROUP("DataType\\Template" FILES ${TYPE_TEMPLATE_HEADER}) -SOURCE_GROUP("DataType" FILES ${BASE_TYPE_SOURCE}) +SET(COLOR_SOURCE_FILES Color/Color.cpp + Color/Color3f.cpp + Color/Color4f.cpp) -SET(BASE_IO_SOURCE - IO/InputStream.cpp - IO/DataInputStream.cpp - IO/DataOutputStream.cpp - IO/FileAccess.cpp - IO/FileInputStream.cpp - IO/FileOutputStream.cpp - IO/IOType.cpp - IO/RandomAccessFile.cpp - IO/TextOutputStream.cpp) +SOURCE_GROUP("Datatype\\Color\\Header Files" FILES ${COLOR_HEADER_FILES}) +SOURCE_GROUP("Datatype\\Color\\Source Files" FILES ${COLOR_SOURCE_FILES}) -SOURCE_GROUP("IO" FILES ${BASE_IO_SOURCE}) +##Text-------------------------------------------------------- +SET(STRING_HEADER_FILES ${TYPE_INCLUDE_PATH}/BaseString.h + ${TYPE_INCLUDE_PATH}/StringInstance.h + ${TYPE_INCLUDE_PATH}/StringList.h + ${TYPE_INCLUDE_PATH}/StdString.h) -SET(BASE_FILE_SYSTEM_SOURCE - FileSystem/FileSystem.cpp - FileSystem/EnumFile.cpp) +SET(TEXT_HEADER_FILES ${CMCORE_ROOT_INCLUDE_PATH}/hgl/Endian.h + ${CMCORE_ROOT_INCLUDE_PATH}/hgl/CodePage.h + ${TYPE_INCLUDE_PATH}/UnicodeBlocks.h + ${TYPE_INCLUDE_PATH}/StrChar.h) -SOURCE_GROUP("FileSystem" FILES ${BASE_FILE_SYSTEM_SOURCE}) +SET(TEXT_SOURCE_FILES Text/Endian.cpp + Text/CodePage.cpp + Text/UnicodeBlocks.cpp + Text/StringList.cpp) -SET(BASE_OTHER_SOURCE - Other/CodePage.cpp - Other/UnicodeBlocks.cpp - Other/DateTime.cpp -# Other/ExpendString.cpp - Other/ThreadFunc.cpp - Other/TimeCount.cpp - Other/TimeVal.cpp) +SOURCE_GROUP("Text\\String" FILES ${STRING_HEADER_FILES} + Text/StringList.cpp) -SOURCE_GROUP("Other" FILES ${BASE_OTHER_SOURCE}) +SOURCE_GROUP("Text\\Header Files" FILES ${TEXT_HEADER_FILES}) +SOURCE_GROUP("Text\\Source Files" FILES ${TEXT_SOURCE_FILES}) + +SOURCE_GROUP("Datatype\\Template" FILES ${TYPE_TEMPLATE_HEADER}) + +##I/O------------------------------------------------------------ +SET(IO_INCLUDE_PATH ${CMCORE_ROOT_INCLUDE_PATH}/hgl/io) + +SET(IO_BASE_FILES ${IO_INCLUDE_PATH}/InputStream.h + ${IO_INCLUDE_PATH}/IOType.h + ${IO_INCLUDE_PATH}/OutputStream.h + ${IO_INCLUDE_PATH}/SeekAccess.h + IO/IOType.cpp) + +SET(IO_DATA_FILES ${IO_INCLUDE_PATH}/DataInputStream.h + ${IO_INCLUDE_PATH}/DataOutputStream.h + ${IO_INCLUDE_PATH}/EndianDataInputStream.h + ${IO_INCLUDE_PATH}/EndianDataOutputStream.h + IO/InputStream.cpp + IO/DataInputStream.cpp + IO/DataOutputStream.cpp) + +SET(IO_MEMORY_FILES ${IO_INCLUDE_PATH}/MemoryInputStream.h + ${IO_INCLUDE_PATH}/MemoryOutputStream.h) + +SET(IO_FILE_FILES ${IO_INCLUDE_PATH}/FileAccess.h + ${IO_INCLUDE_PATH}/FileInputStream.h + ${IO_INCLUDE_PATH}/FileOutputStream.h + ${IO_INCLUDE_PATH}/RandomAccessFile.h + ${IO_INCLUDE_PATH}/TextOutputStream.h + IO/FileAccess.cpp + IO/FileInputStream.cpp + IO/FileOutputStream.cpp + IO/RandomAccessFile.cpp) + + +SET(IO_JAVA_FILES ${IO_INCLUDE_PATH}/JavaInputStream.h + ${IO_INCLUDE_PATH}/JavaOutputStream.h) + +SET(IO_TEXT_FILES IO/TextOutputStream.cpp) + +SOURCE_GROUP("IO\\Base" FILES ${IO_BASE_FILES}) +SOURCE_GROUP("IO\\Data" FILES ${IO_DATA_FILES}) +SOURCE_GROUP("IO\\Memory" FILES ${IO_MEMORY_FILES}) +SOURCE_GROUP("IO\\File" FILES ${IO_FILE_FILES}) +SOURCE_GROUP("IO\\Jave" FILES ${IO_JAVA_FILES}) +SOURCE_GROUP("IO\\Text" FILES ${IO_TEXT_FILES}) + +SET(IO_SOURCE_FILES ${IO_BASE_FILES} + ${IO_DATA_FILES} + ${IO_MEMORY_FILES} + ${IO_FILE_FILES} + ${IO_JAVA_FILES} + ${IO_TEXT_FILES}) + +SET(FILESYSTEM_INCLUDE_PATH ${CMCORE_ROOT_INCLUDE_PATH}/hgl/filesystem) + +SET(FILESYSTEM_HEADER_FILES ${FILESYSTEM_INCLUDE_PATH}/EnumFile.h + ${FILESYSTEM_INCLUDE_PATH}/EnumVolume.h + ${FILESYSTEM_INCLUDE_PATH}/FileSystem.h) + +SET(FILESYSTEM_SOURCE_FILES FileSystem/FileSystem.cpp + FileSystem/EnumFile.cpp) + +SOURCE_GROUP("FileSystem" FILES ${FILESYSTEM_HEADER_FILES} ${FILESYSTEM_SOURCE_FILES}) + +SET(BASE_TIME_HEADER_FILES ${TYPE_INCLUDE_PATH}/DateTime.h + ${CMCORE_ROOT_INCLUDE_PATH}/hgl/Time.h) + +SET(BASE_TIME_SOURCE_FILES Time/DateTime.cpp + Time/TimeCount.cpp + Time/TimeVal.cpp) + +SOURCE_GROUP("Time\\Header Files" FILES ${BASE_TIME_HEADER_FILES}) +SOURCE_GROUP("Time\\Source Files" FILES ${BASE_TIME_SOURCE_FILES}) + +SET(BASE_THREAD_SOURCE Other/ThreadFunc.cpp) + +SOURCE_GROUP("Thread" FILES ${BASE_OTHER_SOURCE}) file(GLOB BASE_PLUG_IN_HEADER ${CMCORE_ROOT_INCLUDE_PATH}/hgl/plugin/*.h) file(GLOB BASE_PLUG_IN_SOURCE PlugIn/*.cpp) @@ -58,15 +128,29 @@ SOURCE_GROUP("Log\\Header Files" FILES ${BASE_LOG_HEADER}) SOURCE_GROUP("Log\\Source Files" FILES ${BASE_LOG_SOURCE}) add_cm_library(CMCore "CM" #${SYSTEM_INFO_SOURCE} - ${TYPE_TEMPLATE_HEADER} - ${BASE_TYPE_SOURCE} - ${BASE_IO_SOURCE} - ${BASE_FILE_SYSTEM_SOURCE} - ${BASE_OTHER_SOURCE} - ${BASE_PLUG_IN_HEADER} + ${COLOR_HEADER_FILES} + ${COLOR_SOURCE_FILES} + + ${STRING_HEADER_FILES} + ${TEXT_HEADER_FILES} + ${TEXT_SOURCE_FILES} + + ${TYPE_TEMPLATE_HEADER} + + ${IO_SOURCE_FILES} + + ${FILESYSTEM_HEADER_FILES} + ${FILESYSTEM_SOURCE_FILES} + + ${BASE_TIME_HEADER_FILES} + ${BASE_TIME_SOURCE_FILES} + + ${BASE_THREAD_SOURCE} + + ${BASE_PLUG_IN_HEADER} ${BASE_PLUG_IN_SOURCE} - ${BASE_LOG_HEADER} - ${BASE_LOG_SOURCE} - ) + ${BASE_LOG_HEADER} + ${BASE_LOG_SOURCE} + ) diff --git a/src/DataType/Color.cpp b/src/Color/Color.cpp similarity index 100% rename from src/DataType/Color.cpp rename to src/Color/Color.cpp diff --git a/src/DataType/Color3f.cpp b/src/Color/Color3f.cpp similarity index 100% rename from src/DataType/Color3f.cpp rename to src/Color/Color3f.cpp diff --git a/src/DataType/Color4f.cpp b/src/Color/Color4f.cpp similarity index 100% rename from src/DataType/Color4f.cpp rename to src/Color/Color4f.cpp diff --git a/src/IO/FileAccess.cpp b/src/IO/FileAccess.cpp index 5c9f899..970c7b0 100644 --- a/src/IO/FileAccess.cpp +++ b/src/IO/FileAccess.cpp @@ -14,7 +14,7 @@ namespace hgl FileAccess::FileAccess() { fp=-1; - mode=fomNone; + mode=FileOpenMode::None; } FileAccess::~FileAccess() @@ -56,7 +56,7 @@ namespace hgl CloseFile(fp); fp=-1; - mode=fomNone; + mode=FileOpenMode::None; } void FileAccess::CloseRead() @@ -66,7 +66,7 @@ namespace hgl if(!CanWrite()) Close(); - mode=fomOnlyWrite; + mode=FileOpenMode::OnlyWrite; } void FileAccess::CloseWrite() @@ -76,14 +76,14 @@ namespace hgl if(!CanRead()) Close(); - mode=fomOnlyRead; + mode=FileOpenMode::OnlyRead; } bool FileAccess::CanRead() const { if(fp==-1)return(false); - if(mode==fomOnlyWrite)return(false); + if(mode==FileOpenMode::OnlyWrite)return(false); return true; } @@ -92,7 +92,7 @@ namespace hgl { if(fp==-1)return(false); - if(mode==fomOnlyRead)return(false); + if(mode==FileOpenMode::OnlyRead)return(false); return(true); } @@ -100,7 +100,7 @@ namespace hgl bool FileAccess::CanSeek() const { if(fp==-1)return(false); - if(mode=fomAppend)return(false); + if(mode=FileOpenMode::Append)return(false); return(true); } @@ -131,8 +131,8 @@ namespace hgl { if(fp==-1)return(-1); - if(mode!=fomOnlyRead - &&mode!=fomReadWrite) + if(mode!=FileOpenMode::OnlyRead + &&mode!=FileOpenMode::ReadWrite) return(-1); return GetSize()-Tell(); diff --git a/src/IO/FileInputStream.cpp b/src/IO/FileInputStream.cpp index ab54e0e..8235a86 100644 --- a/src/IO/FileInputStream.cpp +++ b/src/IO/FileInputStream.cpp @@ -26,7 +26,7 @@ namespace hgl file=new FileAccess(); - if(!file->Open(filename,fomOnlyRead)) + if(!file->Open(filename,FileOpenMode::OnlyRead)) { file=nullptr; return(false); diff --git a/src/IO/RandomAccessFile.cpp b/src/IO/RandomAccessFile.cpp index 7feda48..ef4bef9 100644 --- a/src/IO/RandomAccessFile.cpp +++ b/src/IO/RandomAccessFile.cpp @@ -27,7 +27,7 @@ namespace hgl file=new FileAccess(); - if(!file->Open(filename,fomReadWrite)) + if(!file->Open(filename,FileOpenMode::ReadWrite)) { file=nullptr; return(false); @@ -42,19 +42,19 @@ namespace hgl file=nullptr; } - int64 RandomAccessFile::Read (void *buf,int64 size) {return file?file->Read(buf,size):-1;} - int64 RandomAccessFile::Write (const void *buf,int64 size) {return file?file->Write(buf,size):-1;} + int64 RandomAccessFile::Read (void *buf,int64 size) {return file?file->Read(buf,size):-1;} + int64 RandomAccessFile::Write (const void *buf,int64 size) {return file?file->Write(buf,size):-1;} - bool RandomAccessFile::CanSeek ()const {return file?file->CanSeek():false;} - bool RandomAccessFile::CanRestart()const {return file?file->CanRestart():false;} - bool RandomAccessFile::CanSize ()const {return file?file->CanSize():false;} + bool RandomAccessFile::CanSeek ()const {return file?file->CanSeek():false;} + bool RandomAccessFile::CanRestart()const {return file?file->CanRestart():false;} + bool RandomAccessFile::CanSize ()const {return file?file->CanSize():false;} - int64 RandomAccessFile::Tell ()const {return file?file->Tell():-1;} - int64 RandomAccessFile::GetSize () {return file?file->GetSize():-1;} - bool RandomAccessFile::Restart () {return file?file->Restart():false;} - int64 RandomAccessFile::Seek (int64 off,SeekOrigin so) {return file?file->Seek(off,so):-1;} + int64 RandomAccessFile::Tell ()const {return file?file->Tell():-1;} + int64 RandomAccessFile::GetSize () {return file?file->GetSize():-1;} + bool RandomAccessFile::Restart () {return file?file->Restart():false;} + int64 RandomAccessFile::Seek (int64 off,SeekOrigin so) {return file?file->Seek(off,so):-1;} - int64 RandomAccessFile::Read (int64 off,void *buf,int64 size) {return file?file->Read(off,buf,size):-1;} - int64 RandomAccessFile::Write (int64 off,const void *buf,int64 size) {return file?file->Write(off,buf,size):-1;} + int64 RandomAccessFile::Read (int64 off,void *buf,int64 size) {return file?file->Read(off,buf,size):-1;} + int64 RandomAccessFile::Write (int64 off,const void *buf,int64 size) {return file?file->Write(off,buf,size):-1;} }//namespace io }//namespace hgl diff --git a/src/Other/CodePage.cpp b/src/Text/CodePage.cpp similarity index 100% rename from src/Other/CodePage.cpp rename to src/Text/CodePage.cpp diff --git a/src/DataType/Endian.cpp b/src/Text/Endian.cpp similarity index 100% rename from src/DataType/Endian.cpp rename to src/Text/Endian.cpp diff --git a/src/DataType/StringList.cpp b/src/Text/StringList.cpp similarity index 100% rename from src/DataType/StringList.cpp rename to src/Text/StringList.cpp diff --git a/src/Other/UnicodeBlocks.cpp b/src/Text/UnicodeBlocks.cpp similarity index 100% rename from src/Other/UnicodeBlocks.cpp rename to src/Text/UnicodeBlocks.cpp diff --git a/src/Other/DateTime.cpp b/src/Time/DateTime.cpp similarity index 100% rename from src/Other/DateTime.cpp rename to src/Time/DateTime.cpp diff --git a/src/Other/TimeCount.cpp b/src/Time/TimeCount.cpp similarity index 100% rename from src/Other/TimeCount.cpp rename to src/Time/TimeCount.cpp diff --git a/src/Other/TimeVal.cpp b/src/Time/TimeVal.cpp similarity index 100% rename from src/Other/TimeVal.cpp rename to src/Time/TimeVal.cpp