From cac473bb1ea898c33e3045e5f501de8a484dcf72 Mon Sep 17 00:00:00 2001 From: Julian Storer Date: Thu, 2 Sep 2010 13:31:47 +0100 Subject: [PATCH] Minor code clean-ups. --- juce_amalgamated.cpp | 12 ++++++------ juce_amalgamated.h | 14 +++++++------- src/application/juce_ApplicationCommandManager.cpp | 8 ++++---- src/application/juce_ApplicationCommandManager.h | 12 ++++++------ src/application/juce_ApplicationCommandTarget.cpp | 2 +- src/application/juce_ApplicationCommandTarget.h | 2 +- src/audio/midi/juce_MidiBuffer.cpp | 2 +- src/audio/midi/juce_MidiBuffer.h | 2 +- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index 2542a94260..d18d6eb407 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -18601,7 +18601,7 @@ const String ApplicationCommandManager::getDescriptionOfCommand (const CommandID : String::empty; } -const StringArray ApplicationCommandManager::getCommandCategories() const throw() +const StringArray ApplicationCommandManager::getCommandCategories() const { StringArray s; @@ -18611,7 +18611,7 @@ const StringArray ApplicationCommandManager::getCommandCategories() const throw( return s; } -const Array ApplicationCommandManager::getCommandsInCategory (const String& categoryName) const throw() +const Array ApplicationCommandManager::getCommandsInCategory (const String& categoryName) const { Array results; @@ -18746,12 +18746,12 @@ ApplicationCommandTarget* ApplicationCommandManager::findDefaultComponentTarget( return JUCEApplication::getInstance(); } -void ApplicationCommandManager::addListener (ApplicationCommandManagerListener* const listener) throw() +void ApplicationCommandManager::addListener (ApplicationCommandManagerListener* const listener) { listeners.add (listener); } -void ApplicationCommandManager::removeListener (ApplicationCommandManagerListener* const listener) throw() +void ApplicationCommandManager::removeListener (ApplicationCommandManagerListener* const listener) { listeners.remove (listener); } @@ -18913,7 +18913,7 @@ bool ApplicationCommandTarget::invokeDirectly (const CommandID commandID, const return invoke (info, asynchronously); } -ApplicationCommandTarget::InvocationInfo::InvocationInfo (const CommandID commandID_) throw() +ApplicationCommandTarget::InvocationInfo::InvocationInfo (const CommandID commandID_) : commandID (commandID_), commandFlags (0), invocationMethod (direct), @@ -27527,7 +27527,7 @@ MidiBuffer& MidiBuffer::operator= (const MidiBuffer& other) throw() return *this; } -void MidiBuffer::swapWith (MidiBuffer& other) +void MidiBuffer::swapWith (MidiBuffer& other) throw() { data.swapWith (other.data); swapVariables (bytesUsed, other.bytesUsed); diff --git a/juce_amalgamated.h b/juce_amalgamated.h index 6ae5bb8068..33e51f81cb 100644 --- a/juce_amalgamated.h +++ b/juce_amalgamated.h @@ -27966,7 +27966,7 @@ public: struct JUCE_API InvocationInfo { - InvocationInfo (const CommandID commandID) throw(); + InvocationInfo (const CommandID commandID); /** The UID of the command that should be performed. */ CommandID commandID; @@ -28971,7 +28971,7 @@ public: The index is between 0 and (getNumCommands() - 1). */ - const ApplicationCommandInfo* getCommandForIndex (int index) const throw() { return commands [index]; } + const ApplicationCommandInfo* getCommandForIndex (int index) const throw() { return commands [index]; } /** Returns the details about a given command ID. @@ -29004,13 +29004,13 @@ public: @see getCommandsInCategory() */ - const StringArray getCommandCategories() const throw(); + const StringArray getCommandCategories() const; /** Returns a list of all the command UIDs in a particular category. @see getCommandCategories() */ - const Array getCommandsInCategory (const String& categoryName) const throw(); + const Array getCommandsInCategory (const String& categoryName) const; /** Returns the manager's internal set of key mappings. @@ -29092,10 +29092,10 @@ public: ApplicationCommandInfo& upToDateInfo); /** Registers a listener that will be called when various events occur. */ - void addListener (ApplicationCommandManagerListener* listener) throw(); + void addListener (ApplicationCommandManagerListener* listener); /** Deregisters a previously-added listener. */ - void removeListener (ApplicationCommandManagerListener* listener) throw(); + void removeListener (ApplicationCommandManagerListener* listener); /** Looks for a suitable command target based on which Components have the keyboard focus. @@ -34103,7 +34103,7 @@ public: This is a quick operation, because no memory allocating or copying is done, it just swaps the internal state of the two buffers. */ - void swapWith (MidiBuffer& other); + void swapWith (MidiBuffer& other) throw(); /** Preallocates some memory for the buffer to use. This helps to avoid needing to reallocate space when the buffer has messages diff --git a/src/application/juce_ApplicationCommandManager.cpp b/src/application/juce_ApplicationCommandManager.cpp index 52457ce392..fc7fd853bf 100644 --- a/src/application/juce_ApplicationCommandManager.cpp +++ b/src/application/juce_ApplicationCommandManager.cpp @@ -154,7 +154,7 @@ const String ApplicationCommandManager::getDescriptionOfCommand (const CommandID : String::empty; } -const StringArray ApplicationCommandManager::getCommandCategories() const throw() +const StringArray ApplicationCommandManager::getCommandCategories() const { StringArray s; @@ -164,7 +164,7 @@ const StringArray ApplicationCommandManager::getCommandCategories() const throw( return s; } -const Array ApplicationCommandManager::getCommandsInCategory (const String& categoryName) const throw() +const Array ApplicationCommandManager::getCommandsInCategory (const String& categoryName) const { Array results; @@ -303,12 +303,12 @@ ApplicationCommandTarget* ApplicationCommandManager::findDefaultComponentTarget( } //============================================================================== -void ApplicationCommandManager::addListener (ApplicationCommandManagerListener* const listener) throw() +void ApplicationCommandManager::addListener (ApplicationCommandManagerListener* const listener) { listeners.add (listener); } -void ApplicationCommandManager::removeListener (ApplicationCommandManagerListener* const listener) throw() +void ApplicationCommandManager::removeListener (ApplicationCommandManagerListener* const listener) { listeners.remove (listener); } diff --git a/src/application/juce_ApplicationCommandManager.h b/src/application/juce_ApplicationCommandManager.h index 86bb2e279e..00fce1ace1 100644 --- a/src/application/juce_ApplicationCommandManager.h +++ b/src/application/juce_ApplicationCommandManager.h @@ -155,13 +155,13 @@ public: @see registerCommand */ - int getNumCommands() const throw() { return commands.size(); } + int getNumCommands() const throw() { return commands.size(); } /** Returns the details about one of the registered commands. The index is between 0 and (getNumCommands() - 1). */ - const ApplicationCommandInfo* getCommandForIndex (int index) const throw() { return commands [index]; } + const ApplicationCommandInfo* getCommandForIndex (int index) const throw() { return commands [index]; } /** Returns the details about a given command ID. @@ -194,13 +194,13 @@ public: @see getCommandsInCategory() */ - const StringArray getCommandCategories() const throw(); + const StringArray getCommandCategories() const; /** Returns a list of all the command UIDs in a particular category. @see getCommandCategories() */ - const Array getCommandsInCategory (const String& categoryName) const throw(); + const Array getCommandsInCategory (const String& categoryName) const; //============================================================================== /** Returns the manager's internal set of key mappings. @@ -288,10 +288,10 @@ public: //============================================================================== /** Registers a listener that will be called when various events occur. */ - void addListener (ApplicationCommandManagerListener* listener) throw(); + void addListener (ApplicationCommandManagerListener* listener); /** Deregisters a previously-added listener. */ - void removeListener (ApplicationCommandManagerListener* listener) throw(); + void removeListener (ApplicationCommandManagerListener* listener); //============================================================================== /** Looks for a suitable command target based on which Components have the keyboard focus. diff --git a/src/application/juce_ApplicationCommandTarget.cpp b/src/application/juce_ApplicationCommandTarget.cpp index ca046910f4..c9de2e4026 100644 --- a/src/application/juce_ApplicationCommandTarget.cpp +++ b/src/application/juce_ApplicationCommandTarget.cpp @@ -170,7 +170,7 @@ bool ApplicationCommandTarget::invokeDirectly (const CommandID commandID, const } //============================================================================== -ApplicationCommandTarget::InvocationInfo::InvocationInfo (const CommandID commandID_) throw() +ApplicationCommandTarget::InvocationInfo::InvocationInfo (const CommandID commandID_) : commandID (commandID_), commandFlags (0), invocationMethod (direct), diff --git a/src/application/juce_ApplicationCommandTarget.h b/src/application/juce_ApplicationCommandTarget.h index a9f13940d8..1da0819af1 100644 --- a/src/application/juce_ApplicationCommandTarget.h +++ b/src/application/juce_ApplicationCommandTarget.h @@ -61,7 +61,7 @@ public: struct JUCE_API InvocationInfo { //============================================================================== - InvocationInfo (const CommandID commandID) throw(); + InvocationInfo (const CommandID commandID); //============================================================================== /** The UID of the command that should be performed. */ diff --git a/src/audio/midi/juce_MidiBuffer.cpp b/src/audio/midi/juce_MidiBuffer.cpp index 54e8f9f279..2f53813d32 100644 --- a/src/audio/midi/juce_MidiBuffer.cpp +++ b/src/audio/midi/juce_MidiBuffer.cpp @@ -56,7 +56,7 @@ MidiBuffer& MidiBuffer::operator= (const MidiBuffer& other) throw() return *this; } -void MidiBuffer::swapWith (MidiBuffer& other) +void MidiBuffer::swapWith (MidiBuffer& other) throw() { data.swapWith (other.data); swapVariables (bytesUsed, other.bytesUsed); diff --git a/src/audio/midi/juce_MidiBuffer.h b/src/audio/midi/juce_MidiBuffer.h index 9f26006798..143c278fd7 100644 --- a/src/audio/midi/juce_MidiBuffer.h +++ b/src/audio/midi/juce_MidiBuffer.h @@ -153,7 +153,7 @@ public: This is a quick operation, because no memory allocating or copying is done, it just swaps the internal state of the two buffers. */ - void swapWith (MidiBuffer& other); + void swapWith (MidiBuffer& other) throw(); /** Preallocates some memory for the buffer to use. This helps to avoid needing to reallocate space when the buffer has messages