diff --git a/extras/Introjucer/Source/Application/jucer_CommonHeaders.h b/extras/Introjucer/Source/Application/jucer_CommonHeaders.h index abb217f230..9fd97dc81b 100644 --- a/extras/Introjucer/Source/Application/jucer_CommonHeaders.h +++ b/extras/Introjucer/Source/Application/jucer_CommonHeaders.h @@ -68,15 +68,6 @@ const char* const projectItemDragType = "Project Items"; const char* const drawableItemDragType = "Drawable Items"; const char* const componentItemDragType = "Components"; -const char* const sourceFileExtensions = "cpp;mm;m;c;cc;cxx;swift;s;asm"; -const char* const headerFileExtensions = "h;hpp;hxx;hh;inl"; -const char* const cOrCppFileExtensions = "cpp;cc;cxx;c"; -const char* const cppFileExtensions = "cpp;cc;cxx"; -const char* const objCFileExtensions = "mm;m"; -const char* const asmFileExtensions = "s;S;asm"; -const char* const sourceOrHeaderFileExtensions = "cpp;mm;m;c;cc;cxx;swift;s;S;asm;h;hpp;hxx;hh;inl"; -const char* const fileTypesToCompileByDefault = "cpp;mm;c;m;cc;cxx;swift;s;S;asm;r"; - enum ColourIds { mainBackgroundColourId = 0x2340000, diff --git a/extras/Introjucer/Source/Utility/jucer_FileHelpers.h b/extras/Introjucer/Source/Utility/jucer_FileHelpers.h index 97c4b9d683..da3792f181 100644 --- a/extras/Introjucer/Source/Utility/jucer_FileHelpers.h +++ b/extras/Introjucer/Source/Utility/jucer_FileHelpers.h @@ -54,13 +54,19 @@ namespace FileHelpers } //============================================================================== -class FileModificationDetector +const char* const sourceFileExtensions = "cpp;mm;m;c;cc;cxx;swift;s;asm"; +const char* const headerFileExtensions = "h;hpp;hxx;hh;inl"; +const char* const cOrCppFileExtensions = "cpp;cc;cxx;c"; +const char* const cppFileExtensions = "cpp;cc;cxx"; +const char* const objCFileExtensions = "mm;m"; +const char* const asmFileExtensions = "s;S;asm"; +const char* const sourceOrHeaderFileExtensions = "cpp;mm;m;c;cc;cxx;swift;s;S;asm;h;hpp;hxx;hh;inl"; +const char* const fileTypesToCompileByDefault = "cpp;mm;c;m;cc;cxx;swift;s;S;asm;r"; + +//============================================================================== +struct FileModificationDetector { -public: - FileModificationDetector (const File& f) - : file (f) - { - } + FileModificationDetector (const File& f) : file (f) {} const File& getFile() const { return file; } void fileHasBeenRenamed (const File& newFile) { file = newFile; }