diff --git a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj index e660503125..2ea1c22ae7 100644 --- a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj +++ b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj @@ -737,7 +737,7 @@ INSTALL_PATH = "$(HOME)/Applications"; MACOSX_DEPLOYMENT_TARGET = 10.9; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; - OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion"; + OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wextra-semi"; PRODUCT_BUNDLE_IDENTIFIER = com.juce.theprojucer; SDKROOT_ppc = macosx10.5; }; name = Debug; }; 0BC15DC2E5FE5ECFFB398D49 = {isa = XCBuildConfiguration; buildSettings = { @@ -769,7 +769,7 @@ INSTALL_PATH = "$(HOME)/Applications"; MACOSX_DEPLOYMENT_TARGET = 10.7; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; - OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion"; + OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wextra-semi"; PRODUCT_BUNDLE_IDENTIFIER = com.juce.theprojucer; SDKROOT_ppc = macosx10.5; }; name = Release; }; C42924A24AB55E6A940423EA = {isa = XCBuildConfiguration; buildSettings = { diff --git a/extras/Projucer/Projucer.jucer b/extras/Projucer/Projucer.jucer index 1846802028..510208ea5c 100644 --- a/extras/Projucer/Projucer.jucer +++ b/extras/Projucer/Projucer.jucer @@ -6,7 +6,7 @@ diff --git a/extras/Projucer/Source/Application/jucer_ProjucerLicenses.h b/extras/Projucer/Source/Application/jucer_ProjucerLicenses.h index 7af883d898..b57ca52163 100644 --- a/extras/Projucer/Source/Application/jucer_ProjucerLicenses.h +++ b/extras/Projucer/Source/Application/jucer_ProjucerLicenses.h @@ -33,7 +33,7 @@ struct ProjucerLicenses : private DeletedAtShutdown dll.initialise (crashCallback, quitCallback, false); } - juce_DeclareSingleton (ProjucerLicenses, false); + juce_DeclareSingleton (ProjucerLicenses, false) //============================================================================== struct LoginCallback diff --git a/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineDLL.h b/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineDLL.h index 3361545d7a..e82d27dbfd 100644 --- a/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineDLL.h +++ b/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineDLL.h @@ -78,7 +78,7 @@ struct CompileEngineDLL typedef returnType (*name##_type) params; \ name##_type name = nullptr; - LIVE_DLL_FUNCTIONS (DECLARE_LIVE_DLL_FN); + LIVE_DLL_FUNCTIONS (DECLARE_LIVE_DLL_FN) #undef DECLARE_LIVE_DLL_FN diff --git a/extras/Projucer/Source/Utility/jucer_JucerTreeViewBase.h b/extras/Projucer/Source/Utility/jucer_JucerTreeViewBase.h index ed8d33a07c..8a2479b32c 100644 --- a/extras/Projucer/Source/Utility/jucer_JucerTreeViewBase.h +++ b/extras/Projucer/Source/Utility/jucer_JucerTreeViewBase.h @@ -56,7 +56,7 @@ public: virtual bool isIconCrossedOut() const { return false; } virtual void paintIcon (Graphics& g, Rectangle area) { getIcon().draw (g, area.reduced (2).toFloat(), isIconCrossedOut()); } virtual void paintContent (Graphics& g, const Rectangle& area); - virtual int getMillisecsAllowedForDragGesture() { return 120; }; + virtual int getMillisecsAllowedForDragGesture() { return 120; } virtual File getDraggableFile() const { return {}; } void refreshSubItems(); diff --git a/modules/juce_core/containers/juce_Variant.cpp b/modules/juce_core/containers/juce_Variant.cpp index 29c8706527..a20b20df45 100644 --- a/modules/juce_core/containers/juce_Variant.cpp +++ b/modules/juce_core/containers/juce_Variant.cpp @@ -230,8 +230,8 @@ public: void createCopy (ValueUnion& dest, const ValueUnion& source) const override { new (dest.stringValue) String (*getString (source)); } bool isString() const noexcept override { return true; } - int toInt (const ValueUnion& data) const noexcept override { return getString (data)->getIntValue(); }; - int64 toInt64 (const ValueUnion& data) const noexcept override { return getString (data)->getLargeIntValue(); }; + int toInt (const ValueUnion& data) const noexcept override { return getString (data)->getIntValue(); } + int64 toInt64 (const ValueUnion& data) const noexcept override { return getString (data)->getLargeIntValue(); } double toDouble (const ValueUnion& data) const noexcept override { return getString (data)->getDoubleValue(); } String toString (const ValueUnion& data) const override { return *getString (data); } bool toBool (const ValueUnion& data) const noexcept override { return getString (data)->getIntValue() != 0 diff --git a/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm b/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm index 52fe4ee276..def3aaf3ba 100644 --- a/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm +++ b/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm @@ -938,7 +938,7 @@ public: lastRepaintTime = Time::getMillisecondCounter(); deferredRepaints.clear(); - }; + } void invokePaint (LowLevelGraphicsContext& context) { @@ -1622,7 +1622,7 @@ private: static BOOL acceptsFirstMouse (id, SEL, NSEvent*) { return YES; } static BOOL wantsDefaultClipping (id, SEL) { return YES; } // (this is the default, but may want to customise it in future) - static BOOL worksWhenModal (id self, SEL) { if (NSViewComponentPeer* p = getOwner (self)) return p->worksWhenModal(); return NO; }; + static BOOL worksWhenModal (id self, SEL) { if (NSViewComponentPeer* p = getOwner (self)) return p->worksWhenModal(); return NO; } static void drawRect (id self, SEL, NSRect r) { if (NSViewComponentPeer* p = getOwner (self)) p->drawRect (r); } static void frameChanged (id self, SEL, NSNotification*) { if (NSViewComponentPeer* p = getOwner (self)) p->redirectMovedOrResized(); }