From 8bf4d88d97bdb00abebc4a1d3d63770f6caa02d9 Mon Sep 17 00:00:00 2001 From: Julian Storer Date: Mon, 4 Jan 2010 15:24:13 +0000 Subject: [PATCH] Minor clean-ups. --- juce_amalgamated.cpp | 1078 ++++++++--------- juce_amalgamated.h | 646 +++++----- src/application/juce_Application.cpp | 2 +- src/audio/midi/juce_MidiFile.h | 2 +- .../processors/juce_AudioProcessorGraph.cpp | 77 +- .../processors/juce_AudioProcessorGraph.h | 30 +- .../processors/juce_AudioProcessorPlayer.h | 4 +- src/audio/synthesisers/juce_Sampler.h | 4 +- src/audio/synthesisers/juce_Synthesiser.cpp | 2 +- src/audio/synthesisers/juce_Synthesiser.h | 16 +- src/core/juce_StandardHeader.h | 2 +- src/gui/components/controls/juce_Slider.cpp | 42 +- src/gui/components/controls/juce_Slider.h | 72 +- .../controls/juce_TableHeaderComponent.cpp | 36 +- .../controls/juce_TableHeaderComponent.h | 36 +- .../components/controls/juce_TableListBox.cpp | 4 +- .../components/controls/juce_TableListBox.h | 8 +- .../juce_DirectoryContentsList.cpp | 10 +- .../filebrowser/juce_DirectoryContentsList.h | 10 +- src/gui/components/menus/juce_PopupMenu.cpp | 84 +- src/gui/components/menus/juce_PopupMenu.h | 46 +- .../mouse/juce_DragAndDropContainer.cpp | 2 +- .../juce_ChoicePropertyComponent.cpp | 2 +- .../properties/juce_ChoicePropertyComponent.h | 2 +- .../properties/juce_PropertyPanel.cpp | 4 +- .../properties/juce_PropertyPanel.h | 2 +- .../juce_AudioDeviceSelectorComponent.cpp | 4 +- .../components/special/juce_DropShadower.cpp | 2 +- .../components/special/juce_DropShadower.h | 2 +- .../special/juce_MagnifierComponent.cpp | 2 +- .../special/juce_MagnifierComponent.h | 6 +- .../juce_LowLevelGraphicsSoftwareRenderer.cpp | 2 +- .../graphics/fonts/juce_GlyphArrangement.cpp | 58 +- .../graphics/fonts/juce_GlyphArrangement.h | 74 +- src/gui/graphics/geometry/juce_Path.h | 2 +- src/gui/graphics/geometry/juce_PathIterator.h | 2 +- .../graphics/geometry/juce_PathStrokeType.cpp | 4 +- .../image_file_formats/juce_GIFLoader.cpp | 4 +- .../image_file_formats/juce_GIFLoader.h | 7 +- .../image_file_formats/juce_JPEGLoader.cpp | 16 +- .../image_file_formats/juce_PNGLoader.cpp | 8 +- src/gui/graphics/imaging/juce_CameraDevice.h | 2 +- src/gui/graphics/imaging/juce_Image.cpp | 6 +- src/gui/graphics/imaging/juce_Image.h | 10 +- src/gui/graphics/imaging/juce_ImageCache.cpp | 2 +- src/gui/graphics/imaging/juce_ImageCache.h | 2 +- .../imaging/juce_ImageConvolutionKernel.cpp | 14 +- .../imaging/juce_ImageConvolutionKernel.h | 18 +- .../graphics/imaging/juce_ImageFileFormat.cpp | 20 +- .../graphics/imaging/juce_ImageFileFormat.h | 12 +- src/io/files/juce_DirectoryIterator.cpp | 16 +- src/io/files/juce_DirectoryIterator.h | 10 +- src/io/files/juce_File.cpp | 172 +-- src/io/files/juce_File.h | 152 +-- src/io/files/juce_FileInputStream.cpp | 8 +- src/io/files/juce_FileOutputStream.cpp | 12 +- src/io/files/juce_FileOutputStream.h | 4 +- src/io/files/juce_NamedPipe.cpp | 4 +- src/io/files/juce_NamedPipe.h | 4 +- src/io/network/juce_URL.cpp | 17 +- src/io/network/juce_URL.h | 12 +- src/io/streams/juce_BufferedInputStream.cpp | 4 +- src/io/streams/juce_BufferedInputStream.h | 4 +- src/io/streams/juce_FileInputSource.cpp | 2 +- src/io/streams/juce_FileInputSource.h | 2 +- src/io/streams/juce_MemoryInputStream.cpp | 4 +- src/io/streams/juce_MemoryInputStream.h | 4 +- src/native/common/juce_posix_SharedCode.h | 50 +- src/native/linux/juce_linux_Files.cpp | 40 +- src/native/linux/juce_linux_Threads.cpp | 20 +- src/native/linux/juce_linux_Windowing.cpp | 2 +- src/native/mac/juce_mac_Debugging.mm | 4 +- src/native/mac/juce_mac_Files.mm | 41 +- src/native/mac/juce_mac_Threads.mm | 16 +- src/native/windows/juce_win32_Files.cpp | 86 +- src/native/windows/juce_win32_Threads.cpp | 36 +- src/native/windows/juce_win32_Windowing.cpp | 2 +- src/threads/juce_InterProcessLock.h | 8 +- src/threads/juce_Process.h | 4 +- src/threads/juce_Thread.cpp | 47 +- src/threads/juce_Thread.h | 44 +- src/threads/juce_ThreadPool.cpp | 14 +- src/threads/juce_ThreadPool.h | 18 +- src/threads/juce_TimeSliceThread.cpp | 4 +- src/threads/juce_TimeSliceThread.h | 4 +- src/utilities/juce_DeletedAtShutdown.cpp | 2 +- src/utilities/juce_DeletedAtShutdown.h | 2 +- src/utilities/juce_FileBasedDocument.h | 4 +- src/utilities/juce_PropertiesFile.cpp | 11 +- src/utilities/juce_PropertiesFile.h | 6 +- 90 files changed, 1681 insertions(+), 1717 deletions(-) diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index b08e9a93b7..702a76fff8 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -5833,16 +5833,16 @@ BEGIN_JUCE_NAMESPACE void* juce_findFileStart (const String& directory, const String& wildCard, String& firstResultFile, bool* isDirectory, bool* isHidden, int64* fileSize, - Time* modTime, Time* creationTime, bool* isReadOnly) throw(); + Time* modTime, Time* creationTime, bool* isReadOnly); bool juce_findFileNext (void* handle, String& resultFile, bool* isDirectory, bool* isHidden, int64* fileSize, - Time* modTime, Time* creationTime, bool* isReadOnly) throw(); -void juce_findFileClose (void* handle) throw(); + Time* modTime, Time* creationTime, bool* isReadOnly); +void juce_findFileClose (void* handle); DirectoryIterator::DirectoryIterator (const File& directory, bool isRecursive, const String& wc, - const int whatToLookFor_) throw() + const int whatToLookFor_) : wildCard (wc), index (-1), whatToLookFor (whatToLookFor_) @@ -5904,11 +5904,11 @@ DirectoryIterator::DirectoryIterator (const File& directory, } } -DirectoryIterator::~DirectoryIterator() throw() +DirectoryIterator::~DirectoryIterator() { } -bool DirectoryIterator::next() throw() +bool DirectoryIterator::next() { if (subIterator != 0) { @@ -5933,7 +5933,7 @@ bool DirectoryIterator::next() throw() return true; } -const File DirectoryIterator::getFile() const throw() +const File DirectoryIterator::getFile() const { if (subIterator != 0) return subIterator->getFile(); @@ -5944,7 +5944,7 @@ const File DirectoryIterator::getFile() const throw() : File::nonexistent; } -float DirectoryIterator::getEstimatedProgress() const throw() +float DirectoryIterator::getEstimatedProgress() const { if (filesFound.size() + dirsFound.size() == 0) { @@ -5978,33 +5978,33 @@ BEGIN_JUCE_NAMESPACE #pragma warning (pop) #endif -void* juce_fileOpen (const String& path, bool forWriting) throw(); -void juce_fileClose (void* handle) throw(); -int juce_fileWrite (void* handle, const void* buffer, int size) throw(); -int64 juce_fileGetPosition (void* handle) throw(); -int64 juce_fileSetPosition (void* handle, int64 pos) throw(); -void juce_fileFlush (void* handle) throw(); +void* juce_fileOpen (const String& path, bool forWriting); +void juce_fileClose (void* handle); +int juce_fileWrite (void* handle, const void* buffer, int size); +int64 juce_fileGetPosition (void* handle); +int64 juce_fileSetPosition (void* handle, int64 pos); +void juce_fileFlush (void* handle); -bool juce_fileExists (const String& fileName, const bool dontCountDirectories) throw(); -bool juce_isDirectory (const String& fileName) throw(); -int64 juce_getFileSize (const String& fileName) throw(); -bool juce_canWriteToFile (const String& fileName) throw(); -bool juce_setFileReadOnly (const String& fileName, bool isReadOnly) throw(); +bool juce_fileExists (const String& fileName, const bool dontCountDirectories); +bool juce_isDirectory (const String& fileName); +int64 juce_getFileSize (const String& fileName); +bool juce_canWriteToFile (const String& fileName); +bool juce_setFileReadOnly (const String& fileName, bool isReadOnly); -void juce_getFileTimes (const String& fileName, int64& modificationTime, int64& accessTime, int64& creationTime) throw(); -bool juce_setFileTimes (const String& fileName, int64 modificationTime, int64 accessTime, int64 creationTime) throw(); +void juce_getFileTimes (const String& fileName, int64& modificationTime, int64& accessTime, int64& creationTime); +bool juce_setFileTimes (const String& fileName, int64 modificationTime, int64 accessTime, int64 creationTime); -bool juce_deleteFile (const String& fileName) throw(); -bool juce_copyFile (const String& source, const String& dest) throw(); -bool juce_moveFile (const String& source, const String& dest) throw(); +bool juce_deleteFile (const String& fileName); +bool juce_copyFile (const String& source, const String& dest); +bool juce_moveFile (const String& source, const String& dest); // this must also create all paths involved in the directory. -void juce_createDirectory (const String& fileName) throw(); +void juce_createDirectory (const String& fileName); -bool juce_launchFile (const String& fileName, const String& parameters) throw(); +bool juce_launchFile (const String& fileName, const String& parameters); -const StringArray juce_getFileSystemRoots() throw(); -const String juce_getVolumeLabel (const String& filenameOnVolume, int& volumeSerialNumber) throw(); +const StringArray juce_getFileSystemRoots(); +const String juce_getVolumeLabel (const String& filenameOnVolume, int& volumeSerialNumber); // starts a directory search operation with a wildcard, returning a handle for // use in calls to juce_findFileNext. @@ -6012,22 +6012,22 @@ const String juce_getVolumeLabel (const String& filenameOnVolume, int& volumeSer // the other pointers, if non-null, are set based on the properties of the file. void* juce_findFileStart (const String& directory, const String& wildCard, String& firstResultFile, bool* isDirectory, bool* isHidden, int64* fileSize, Time* modTime, - Time* creationTime, bool* isReadOnly) throw(); + Time* creationTime, bool* isReadOnly); // returns false when no more files are found bool juce_findFileNext (void* handle, String& resultFile, bool* isDirectory, bool* isHidden, int64* fileSize, - Time* modTime, Time* creationTime, bool* isReadOnly) throw(); + Time* modTime, Time* creationTime, bool* isReadOnly); -void juce_findFileClose (void* handle) throw(); +void juce_findFileClose (void* handle); -static const String juce_addTrailingSeparator (const String& path) throw() +static const String juce_addTrailingSeparator (const String& path) { return path.endsWithChar (File::separator) ? path : path + File::separator; } -static const String parseAbsolutePath (String path) throw() +static const String parseAbsolutePath (String path) { if (path.isEmpty()) return String::empty; @@ -6119,28 +6119,28 @@ static const String parseAbsolutePath (String path) throw() const File File::nonexistent; -File::File (const String& fullPathName) throw() +File::File (const String& fullPathName) : fullPath (parseAbsolutePath (fullPathName)) { } -File::File (const String& path, int) throw() +File::File (const String& path, int) : fullPath (path) { } -File::File (const File& other) throw() +File::File (const File& other) : fullPath (other.fullPath) { } -const File& File::operator= (const String& newPath) throw() +const File& File::operator= (const String& newPath) { fullPath = parseAbsolutePath (newPath); return *this; } -const File& File::operator= (const File& other) throw() +const File& File::operator= (const File& other) { fullPath = other.fullPath; return *this; @@ -6159,7 +6159,7 @@ bool File::areFileNamesCaseSensitive() #endif } -bool File::operator== (const File& other) const throw() +bool File::operator== (const File& other) const { // case-insensitive on Windows, but not on linux. #if NAMES_ARE_CASE_SENSITIVE @@ -6169,27 +6169,27 @@ bool File::operator== (const File& other) const throw() #endif } -bool File::operator!= (const File& other) const throw() +bool File::operator!= (const File& other) const { return ! operator== (other); } -bool File::exists() const throw() +bool File::exists() const { return juce_fileExists (fullPath, false); } -bool File::existsAsFile() const throw() +bool File::existsAsFile() const { return juce_fileExists (fullPath, true); } -bool File::isDirectory() const throw() +bool File::isDirectory() const { return juce_isDirectory (fullPath); } -bool File::hasWriteAccess() const throw() +bool File::hasWriteAccess() const { if (exists()) return juce_canWriteToFile (fullPath); @@ -6208,7 +6208,7 @@ bool File::hasWriteAccess() const throw() } bool File::setReadOnly (const bool shouldBeReadOnly, - const bool applyRecursively) const throw() + const bool applyRecursively) const { bool worked = true; @@ -6224,13 +6224,13 @@ bool File::setReadOnly (const bool shouldBeReadOnly, return juce_setFileReadOnly (fullPath, shouldBeReadOnly) && worked; } -bool File::deleteFile() const throw() +bool File::deleteFile() const { return (! exists()) || juce_deleteFile (fullPath); } -bool File::deleteRecursively() const throw() +bool File::deleteRecursively() const { bool worked = true; @@ -6246,7 +6246,7 @@ bool File::deleteRecursively() const throw() return deleteFile() && worked; } -bool File::moveFileTo (const File& newFile) const throw() +bool File::moveFileTo (const File& newFile) const { if (newFile.fullPath == fullPath) return true; @@ -6260,7 +6260,7 @@ bool File::moveFileTo (const File& newFile) const throw() return juce_moveFile (fullPath, newFile.fullPath); } -bool File::copyFileTo (const File& newFile) const throw() +bool File::copyFileTo (const File& newFile) const { if (*this == newFile) return true; @@ -6271,7 +6271,7 @@ bool File::copyFileTo (const File& newFile) const throw() return juce_copyFile (fullPath, newFile.fullPath); } -bool File::copyDirectoryTo (const File& newDirectory) const throw() +bool File::copyDirectoryTo (const File& newDirectory) const { if (isDirectory() && newDirectory.createDirectory()) { @@ -6296,7 +6296,7 @@ bool File::copyDirectoryTo (const File& newDirectory) const throw() return false; } -const String File::getPathUpToLastSlash() const throw() +const String File::getPathUpToLastSlash() const { const int lastSlash = fullPath.lastIndexOfChar (separator); @@ -6308,27 +6308,27 @@ const String File::getPathUpToLastSlash() const throw() return fullPath; } -const File File::getParentDirectory() const throw() +const File File::getParentDirectory() const { return File (getPathUpToLastSlash()); } -const String File::getFileName() const throw() +const String File::getFileName() const { return fullPath.substring (fullPath.lastIndexOfChar (separator) + 1); } -int File::hashCode() const throw() +int File::hashCode() const { return fullPath.hashCode(); } -int64 File::hashCode64() const throw() +int64 File::hashCode64() const { return fullPath.hashCode64(); } -const String File::getFileNameWithoutExtension() const throw() +const String File::getFileNameWithoutExtension() const { const int lastSlash = fullPath.lastIndexOfChar (separator) + 1; const int lastDot = fullPath.lastIndexOfChar (T('.')); @@ -6339,7 +6339,7 @@ const String File::getFileNameWithoutExtension() const throw() return fullPath.substring (lastSlash); } -bool File::isAChildOf (const File& potentialParent) const throw() +bool File::isAChildOf (const File& potentialParent) const { const String ourPath (getPathUpToLastSlash()); @@ -6361,7 +6361,7 @@ bool File::isAChildOf (const File& potentialParent) const throw() } } -bool File::isAbsolutePath (const String& path) throw() +bool File::isAbsolutePath (const String& path) { return path.startsWithChar (T('/')) || path.startsWithChar (T('\\')) #if JUCE_WINDOWS @@ -6371,7 +6371,7 @@ bool File::isAbsolutePath (const String& path) throw() #endif } -const File File::getChildFile (String relativePath) const throw() +const File File::getChildFile (String relativePath) const { if (isAbsolutePath (relativePath)) { @@ -6422,12 +6422,12 @@ const File File::getChildFile (String relativePath) const throw() } } -const File File::getSiblingFile (const String& fileName) const throw() +const File File::getSiblingFile (const String& fileName) const { return getParentDirectory().getChildFile (fileName); } -int64 File::getSize() const throw() +int64 File::getSize() const { return juce_getFileSize (fullPath); } @@ -6456,7 +6456,7 @@ const String File::descriptionOfSizeInBytes (const int64 bytes) } } -bool File::create() const throw() +bool File::create() const { if (! exists()) { @@ -6476,7 +6476,7 @@ bool File::create() const throw() return true; } -bool File::createDirectory() const throw() +bool File::createDirectory() const { if (! isDirectory()) { @@ -6498,43 +6498,43 @@ bool File::createDirectory() const throw() return true; } -const Time File::getCreationTime() const throw() +const Time File::getCreationTime() const { int64 m, a, c; juce_getFileTimes (fullPath, m, a, c); return Time (c); } -bool File::setCreationTime (const Time& t) const throw() +bool File::setCreationTime (const Time& t) const { return juce_setFileTimes (fullPath, 0, 0, t.toMilliseconds()); } -const Time File::getLastModificationTime() const throw() +const Time File::getLastModificationTime() const { int64 m, a, c; juce_getFileTimes (fullPath, m, a, c); return Time (m); } -bool File::setLastModificationTime (const Time& t) const throw() +bool File::setLastModificationTime (const Time& t) const { return juce_setFileTimes (fullPath, t.toMilliseconds(), 0, 0); } -const Time File::getLastAccessTime() const throw() +const Time File::getLastAccessTime() const { int64 m, a, c; juce_getFileTimes (fullPath, m, a, c); return Time (a); } -bool File::setLastAccessTime (const Time& t) const throw() +bool File::setLastAccessTime (const Time& t) const { return juce_setFileTimes (fullPath, 0, t.toMilliseconds(), 0); } -bool File::loadFileAsData (MemoryBlock& destBlock) const throw() +bool File::loadFileAsData (MemoryBlock& destBlock) const { if (! existsAsFile()) return false; @@ -6543,7 +6543,7 @@ bool File::loadFileAsData (MemoryBlock& destBlock) const throw() return getSize() == in.readIntoMemoryBlock (destBlock); } -const String File::loadFileAsString() const throw() +const String File::loadFileAsString() const { if (! existsAsFile()) return String::empty; @@ -6565,7 +6565,7 @@ static inline bool fileTypeMatches (const int whatToLookFor, int File::findChildFiles (OwnedArray& results, const int whatToLookFor, const bool searchRecursively, - const String& wildCardPattern) const throw() + const String& wildCardPattern) const { // you have to specify the type of files you're looking for! jassert ((whatToLookFor & (findFiles | findDirectories)) != 0); @@ -6626,7 +6626,7 @@ int File::findChildFiles (OwnedArray& results, } int File::getNumberOfChildFiles (const int whatToLookFor, - const String& wildCardPattern) const throw() + const String& wildCardPattern) const { // you have to specify the type of files you're looking for! jassert (whatToLookFor > 0 && whatToLookFor <= 3); @@ -6666,7 +6666,7 @@ int File::getNumberOfChildFiles (const int whatToLookFor, return count; } -bool File::containsSubDirectories() const throw() +bool File::containsSubDirectories() const { bool result = false; @@ -6699,7 +6699,7 @@ bool File::containsSubDirectories() const throw() const File File::getNonexistentChildFile (const String& prefix_, const String& suffix, - bool putNumbersInBrackets) const throw() + bool putNumbersInBrackets) const { File f (getChildFile (prefix_ + suffix)); @@ -6742,7 +6742,7 @@ const File File::getNonexistentChildFile (const String& prefix_, return f; } -const File File::getNonexistentSibling (const bool putNumbersInBrackets) const throw() +const File File::getNonexistentSibling (const bool putNumbersInBrackets) const { if (exists()) { @@ -6757,7 +6757,7 @@ const File File::getNonexistentSibling (const bool putNumbersInBrackets) const t } } -const String File::getFileExtension() const throw() +const String File::getFileExtension() const { String ext; @@ -6772,7 +6772,7 @@ const String File::getFileExtension() const throw() return ext; } -bool File::hasFileExtension (const String& possibleSuffix) const throw() +bool File::hasFileExtension (const String& possibleSuffix) const { if (possibleSuffix.isEmpty()) return fullPath.lastIndexOfChar (T('.')) <= fullPath.lastIndexOfChar (separator); @@ -6801,7 +6801,7 @@ bool File::hasFileExtension (const String& possibleSuffix) const throw() return false; } -const File File::withFileExtension (const String& newExtension) const throw() +const File File::withFileExtension (const String& newExtension) const { if (fullPath.isEmpty()) return File::nonexistent; @@ -6820,13 +6820,13 @@ const File File::withFileExtension (const String& newExtension) const throw() return getSiblingFile (filePart.substring (0, i) + newExt); } -bool File::startAsProcess (const String& parameters) const throw() +bool File::startAsProcess (const String& parameters) const { return exists() && juce_launchFile (fullPath, parameters); } -FileInputStream* File::createInputStream() const throw() +FileInputStream* File::createInputStream() const { if (existsAsFile()) return new FileInputStream (*this); @@ -6834,7 +6834,7 @@ FileInputStream* File::createInputStream() const throw() return 0; } -FileOutputStream* File::createOutputStream (const int bufferSize) const throw() +FileOutputStream* File::createOutputStream (const int bufferSize) const { ScopedPointer out (new FileOutputStream (*this, bufferSize)); @@ -6845,7 +6845,7 @@ FileOutputStream* File::createOutputStream (const int bufferSize) const throw() } bool File::appendData (const void* const dataToAppend, - const int numberOfBytes) const throw() + const int numberOfBytes) const { if (numberOfBytes > 0) { @@ -6861,7 +6861,7 @@ bool File::appendData (const void* const dataToAppend, } bool File::replaceWithData (const void* const dataToWrite, - const int numberOfBytes) const throw() + const int numberOfBytes) const { jassert (numberOfBytes >= 0); // a negative number of bytes?? @@ -6882,7 +6882,7 @@ bool File::replaceWithData (const void* const dataToWrite, bool File::appendText (const String& text, const bool asUnicode, - const bool writeUnicodeHeaderBytes) const throw() + const bool writeUnicodeHeaderBytes) const { const ScopedPointer out (createOutputStream()); @@ -6895,7 +6895,7 @@ bool File::appendText (const String& text, return false; } -bool File::printf (const tchar* pf, ...) const throw() +bool File::printf (const tchar* pf, ...) const { va_list list; va_start (list, pf); @@ -6908,7 +6908,7 @@ bool File::printf (const tchar* pf, ...) const throw() bool File::replaceWithText (const String& textToWrite, const bool asUnicode, - const bool writeUnicodeHeaderBytes) const throw() + const bool writeUnicodeHeaderBytes) const { const File tempFile (getSiblingFile (T(".") + getFileName()).getNonexistentSibling (false)); @@ -6922,7 +6922,7 @@ bool File::replaceWithText (const String& textToWrite, return false; } -const String File::createLegalPathName (const String& original) throw() +const String File::createLegalPathName (const String& original) { String s (original); String start; @@ -6937,7 +6937,7 @@ const String File::createLegalPathName (const String& original) throw() .substring (0, 1024); } -const String File::createLegalFileName (const String& original) throw() +const String File::createLegalFileName (const String& original) { String s (original.removeCharacters (T("\"#@,;:<>*^|?\\/"))); @@ -6962,7 +6962,7 @@ const String File::createLegalFileName (const String& original) throw() return s; } -const String File::getRelativePathFrom (const File& dir) const throw() +const String File::getRelativePathFrom (const File& dir) const { String thisPath (fullPath); @@ -7023,7 +7023,7 @@ const String File::getRelativePathFrom (const File& dir) const throw() return thisPath; } -void File::findFileSystemRoots (OwnedArray& destArray) throw() +void File::findFileSystemRoots (OwnedArray& destArray) { const StringArray roots (juce_getFileSystemRoots()); @@ -7031,13 +7031,13 @@ void File::findFileSystemRoots (OwnedArray& destArray) throw() destArray.add (new File (roots[i])); } -const String File::getVolumeLabel() const throw() +const String File::getVolumeLabel() const { int serialNum; return juce_getVolumeLabel (fullPath, serialNum); } -int File::getVolumeSerialNumber() const throw() +int File::getVolumeSerialNumber() const { int serialNum; juce_getVolumeLabel (fullPath, serialNum); @@ -7045,7 +7045,7 @@ int File::getVolumeSerialNumber() const throw() return serialNum; } -const File File::createTempFile (const String& fileNameEnding) throw() +const File File::createTempFile (const String& fileNameEnding) { String tempName (T("temp")); static int tempNum = 0; @@ -7067,10 +7067,10 @@ END_JUCE_NAMESPACE BEGIN_JUCE_NAMESPACE -void* juce_fileOpen (const String& path, bool forWriting) throw(); -void juce_fileClose (void* handle) throw(); -int juce_fileRead (void* handle, void* buffer, int size) throw(); -int64 juce_fileSetPosition (void* handle, int64 pos) throw(); +void* juce_fileOpen (const String& path, bool forWriting); +void juce_fileClose (void* handle); +int juce_fileRead (void* handle, void* buffer, int size); +int64 juce_fileSetPosition (void* handle, int64 pos); FileInputStream::FileInputStream (const File& f) : file (f), @@ -7137,12 +7137,12 @@ END_JUCE_NAMESPACE BEGIN_JUCE_NAMESPACE -void* juce_fileOpen (const String& path, bool forWriting) throw(); -void juce_fileClose (void* handle) throw(); -int juce_fileWrite (void* handle, const void* buffer, int size) throw(); -void juce_fileFlush (void* handle) throw(); -int64 juce_fileGetPosition (void* handle) throw(); -int64 juce_fileSetPosition (void* handle, int64 pos) throw(); +void* juce_fileOpen (const String& path, bool forWriting); +void juce_fileClose (void* handle); +int juce_fileWrite (void* handle, const void* buffer, int size); +void juce_fileFlush (void* handle); +int64 juce_fileGetPosition (void* handle); +int64 juce_fileSetPosition (void* handle, int64 pos); FileOutputStream::FileOutputStream (const File& f, const int bufferSize_) @@ -7419,12 +7419,12 @@ bool NamedPipe::createNewPipe (const String& pipeName) return openInternal (pipeName, true); } -bool NamedPipe::isOpen() const throw() +bool NamedPipe::isOpen() const { return internal != 0; } -const String NamedPipe::getName() const throw() +const String NamedPipe::getName() const { return currentPipeName; } @@ -8028,7 +8028,7 @@ END_JUCE_NAMESPACE BEGIN_JUCE_NAMESPACE -URL::URL() throw() +URL::URL() { } @@ -8086,7 +8086,7 @@ const URL& URL::operator= (const URL& other) return *this; } -URL::~URL() throw() +URL::~URL() { } @@ -8272,7 +8272,7 @@ public: juce_closeInternetFile (handle); } - bool isError() const throw() + bool isError() const { return handle == 0; } @@ -8424,7 +8424,7 @@ private: } } - void appendUTF8ToPostData (const String& text) throw() + void appendUTF8ToPostData (const String& text) { postData.append (text.toUTF8(), (int) strlen (text.toUTF8())); @@ -8505,17 +8505,17 @@ const URL URL::withPOSTData (const String& postData_) const return u; } -const StringPairArray& URL::getParameters() const throw() +const StringPairArray& URL::getParameters() const { return parameters; } -const StringPairArray& URL::getFilesToUpload() const throw() +const StringPairArray& URL::getFilesToUpload() const { return filesToUpload; } -const StringPairArray& URL::getMimeTypesOfUploadFiles() const throw() +const StringPairArray& URL::getMimeTypesOfUploadFiles() const { return mimeTypes; } @@ -8581,8 +8581,7 @@ const String URL::addEscapeChars (const String& s, const bool isParameter) return result; } -extern bool juce_launchFile (const String& fileName, - const String& parameters) throw(); +extern bool juce_launchFile (const String& fileName, const String& parameters); bool URL::launchInDefaultBrowser() const { @@ -8603,7 +8602,7 @@ BEGIN_JUCE_NAMESPACE BufferedInputStream::BufferedInputStream (InputStream* const source_, const int bufferSize_, - const bool deleteSourceWhenDestroyed) throw() + const bool deleteSourceWhenDestroyed) : source (source_), sourceToDelete (deleteSourceWhenDestroyed ? source_ : 0), bufferSize (jmax (256, bufferSize_)), @@ -8619,7 +8618,7 @@ BufferedInputStream::BufferedInputStream (InputStream* const source_, buffer.malloc (bufferSize); } -BufferedInputStream::~BufferedInputStream() throw() +BufferedInputStream::~BufferedInputStream() { } @@ -8755,7 +8754,7 @@ END_JUCE_NAMESPACE BEGIN_JUCE_NAMESPACE -FileInputSource::FileInputSource (const File& file_) throw() +FileInputSource::FileInputSource (const File& file_) : file (file_) { } @@ -8788,7 +8787,7 @@ BEGIN_JUCE_NAMESPACE MemoryInputStream::MemoryInputStream (const void* const sourceData, const int sourceDataSize, - const bool keepInternalCopy) throw() + const bool keepInternalCopy) : data ((const char*) sourceData), dataSize (sourceDataSize), position (0) @@ -8800,7 +8799,7 @@ MemoryInputStream::MemoryInputStream (const void* const sourceData, } } -MemoryInputStream::~MemoryInputStream() throw() +MemoryInputStream::~MemoryInputStream() { } @@ -15513,18 +15512,18 @@ END_JUCE_NAMESPACE BEGIN_JUCE_NAMESPACE // these functions are implemented in the platform-specific code. -void* juce_createThread (void* userData) throw(); -void juce_killThread (void* handle) throw(); -bool juce_setThreadPriority (void* handle, int priority) throw(); -void juce_setCurrentThreadName (const String& name) throw(); +void* juce_createThread (void* userData); +void juce_killThread (void* handle); +bool juce_setThreadPriority (void* handle, int priority); +void juce_setCurrentThreadName (const String& name); #if JUCE_WIN32 -void juce_CloseThreadHandle (void* handle) throw(); +void juce_CloseThreadHandle (void* handle); #endif static VoidArray runningThreads (4); static CriticalSection runningThreadsLock; -void Thread::threadEntryPoint (Thread* const thread) throw() +void Thread::threadEntryPoint (Thread* const thread) { { const ScopedLock sl (runningThreadsLock); @@ -15584,7 +15583,7 @@ Thread::~Thread() stopThread (100); } -void Thread::startThread() throw() +void Thread::startThread() { const ScopedLock sl (startStopLock); @@ -15598,7 +15597,7 @@ void Thread::startThread() throw() } } -void Thread::startThread (const int priority) throw() +void Thread::startThread (const int priority) { const ScopedLock sl (startStopLock); @@ -15613,17 +15612,17 @@ void Thread::startThread (const int priority) throw() } } -bool Thread::isThreadRunning() const throw() +bool Thread::isThreadRunning() const { return threadHandle_ != 0; } -void Thread::signalThreadShouldExit() throw() +void Thread::signalThreadShouldExit() { threadShouldExit_ = true; } -bool Thread::waitForThreadToExit (const int timeOutMilliseconds) const throw() +bool Thread::waitForThreadToExit (const int timeOutMilliseconds) const { // Doh! So how exactly do you expect this thread to wait for itself to stop?? jassert (getThreadId() != getCurrentThreadId()); @@ -15642,7 +15641,7 @@ bool Thread::waitForThreadToExit (const int timeOutMilliseconds) const throw() return true; } -void Thread::stopThread (const int timeOutMilliseconds) throw() +void Thread::stopThread (const int timeOutMilliseconds) { // agh! You can't stop the thread that's calling this method! How on earth // would that work?? @@ -15676,7 +15675,7 @@ void Thread::stopThread (const int timeOutMilliseconds) throw() } } -bool Thread::setPriority (const int priority) throw() +bool Thread::setPriority (const int priority) { const ScopedLock sl (startStopLock); @@ -15688,37 +15687,32 @@ bool Thread::setPriority (const int priority) throw() return worked; } -bool Thread::setCurrentThreadPriority (const int priority) throw() +bool Thread::setCurrentThreadPriority (const int priority) { return juce_setThreadPriority (0, priority); } -void Thread::setAffinityMask (const uint32 affinityMask) throw() +void Thread::setAffinityMask (const uint32 affinityMask) { affinityMask_ = affinityMask; } -Thread::ThreadID Thread::getThreadId() const throw() -{ - return threadId_; -} - -bool Thread::wait (const int timeOutMilliseconds) const throw() +bool Thread::wait (const int timeOutMilliseconds) const { return defaultEvent_.wait (timeOutMilliseconds); } -void Thread::notify() const throw() +void Thread::notify() const { defaultEvent_.signal(); } -int Thread::getNumRunningThreads() throw() +int Thread::getNumRunningThreads() { return runningThreads.size(); } -Thread* Thread::getCurrentThread() throw() +Thread* Thread::getCurrentThread() { const ThreadID thisId = getCurrentThreadId(); @@ -15726,7 +15720,7 @@ Thread* Thread::getCurrentThread() throw() for (int i = runningThreads.size(); --i >= 0;) { - Thread* const t = (Thread*) (runningThreads.getUnchecked(i)); + Thread* const t = (Thread*) runningThreads.getUnchecked(i); if (t->threadId_ == thisId) return t; @@ -15735,7 +15729,7 @@ Thread* Thread::getCurrentThread() throw() return 0; } -void Thread::stopAllThreads (const int timeOutMilliseconds) throw() +void Thread::stopAllThreads (const int timeOutMilliseconds) { { const ScopedLock sl (runningThreadsLock); @@ -15780,17 +15774,17 @@ ThreadPoolJob::~ThreadPoolJob() jassert (pool == 0 || ! pool->contains (this)); } -const String ThreadPoolJob::getJobName() const throw() +const String ThreadPoolJob::getJobName() const { return jobName; } -void ThreadPoolJob::setJobName (const String& newName) throw() +void ThreadPoolJob::setJobName (const String& newName) { jobName = newName; } -void ThreadPoolJob::signalJobShouldExit() throw() +void ThreadPoolJob::signalJobShouldExit() { shouldStop = true; } @@ -15909,18 +15903,18 @@ void ThreadPool::addJob (ThreadPoolJob* const job) } } -int ThreadPool::getNumJobs() const throw() +int ThreadPool::getNumJobs() const { return jobs.size(); } -ThreadPoolJob* ThreadPool::getJob (const int index) const throw() +ThreadPoolJob* ThreadPool::getJob (const int index) const { const ScopedLock sl (lock); return (ThreadPoolJob*) jobs [index]; } -bool ThreadPool::contains (const ThreadPoolJob* const job) const throw() +bool ThreadPool::contains (const ThreadPoolJob* const job) const { const ScopedLock sl (lock); return jobs.contains ((void*) job); @@ -16036,7 +16030,7 @@ bool ThreadPool::removeAllJobs (const bool interruptRunningJobs, return true; } -const StringArray ThreadPool::getNamesOfAllJobs (const bool onlyReturnActiveJobs) const throw() +const StringArray ThreadPool::getNamesOfAllJobs (const bool onlyReturnActiveJobs) const { StringArray s; const ScopedLock sl (lock); @@ -16198,12 +16192,12 @@ void TimeSliceThread::removeTimeSliceClient (TimeSliceClient* const client) } } -int TimeSliceThread::getNumClients() const throw() +int TimeSliceThread::getNumClients() const { return clients.size(); } -TimeSliceClient* TimeSliceThread::getClient (const int i) const throw() +TimeSliceClient* TimeSliceThread::getClient (const int i) const { const ScopedLock sl (listLock); return clients [i]; @@ -16920,7 +16914,7 @@ END_JUCE_NAMESPACE BEGIN_JUCE_NAMESPACE -void juce_setCurrentThreadName (const String& name) throw(); +void juce_setCurrentThreadName (const String& name); static JUCEApplication* appInstance = 0; @@ -17885,7 +17879,7 @@ BEGIN_JUCE_NAMESPACE static VoidArray objectsToDelete (16); static CriticalSection lock; -DeletedAtShutdown::DeletedAtShutdown() throw() +DeletedAtShutdown::DeletedAtShutdown() { const ScopedLock sl (lock); objectsToDelete.add (this); @@ -17945,7 +17939,7 @@ static const tchar* const propertyTagName = T("VALUE"); PropertiesFile::PropertiesFile (const File& f, const int millisecondsBeforeSaving, - const int options_) throw() + const int options_) : PropertySet (ignoreCaseOfKeyNames), file (f), timerInterval (millisecondsBeforeSaving), @@ -18032,14 +18026,12 @@ PropertiesFile::~PropertiesFile() bool PropertiesFile::saveIfNeeded() { const ScopedLock sl (getLock()); - return (! needsWriting) || save(); } -bool PropertiesFile::needsToBeSaved() const throw() +bool PropertiesFile::needsToBeSaved() const { const ScopedLock sl (getLock()); - return needsWriting; } @@ -18142,11 +18134,6 @@ void PropertiesFile::propertyChanged() saveIfNeeded(); } -const File PropertiesFile::getFile() const throw() -{ - return file; -} - const File PropertiesFile::getDefaultAppSettingsFile (const String& applicationName, const String& fileNameSuffix, const String& folderName, @@ -34737,8 +34724,7 @@ BEGIN_JUCE_NAMESPACE const int AudioProcessorGraph::midiChannelIndex = 0x1000; -AudioProcessorGraph::Node::Node (const uint32 id_, - AudioProcessor* const processor_) throw() +AudioProcessorGraph::Node::Node (const uint32 id_, AudioProcessor* const processor_) : id (id_), processor (processor_), isPrepared (false) @@ -34806,7 +34792,7 @@ void AudioProcessorGraph::clear() triggerAsyncUpdate(); } -AudioProcessorGraph::Node* AudioProcessorGraph::getNodeForId (const uint32 nodeId) const throw() +AudioProcessorGraph::Node* AudioProcessorGraph::getNodeForId (const uint32 nodeId) const { for (int i = nodes.size(); --i >= 0;) if (nodes.getUnchecked(i)->id == nodeId) @@ -34877,7 +34863,7 @@ bool AudioProcessorGraph::removeNode (const uint32 nodeId) const AudioProcessorGraph::Connection* AudioProcessorGraph::getConnectionBetween (const uint32 sourceNodeId, const int sourceChannelIndex, const uint32 destNodeId, - const int destChannelIndex) const throw() + const int destChannelIndex) const { for (int i = connections.size(); --i >= 0;) { @@ -34896,7 +34882,7 @@ const AudioProcessorGraph::Connection* AudioProcessorGraph::getConnectionBetween } bool AudioProcessorGraph::isConnected (const uint32 possibleSourceNodeId, - const uint32 possibleDestNodeId) const throw() + const uint32 possibleDestNodeId) const { for (int i = connections.size(); --i >= 0;) { @@ -34915,7 +34901,7 @@ bool AudioProcessorGraph::isConnected (const uint32 possibleSourceNodeId, bool AudioProcessorGraph::canConnect (const uint32 sourceNodeId, const int sourceChannelIndex, const uint32 destNodeId, - const int destChannelIndex) const throw() + const int destChannelIndex) const { if (sourceChannelIndex < 0 || destChannelIndex < 0 @@ -35045,12 +35031,12 @@ namespace GraphRenderingOps class AudioGraphRenderingOp { public: - AudioGraphRenderingOp() throw() {} - virtual ~AudioGraphRenderingOp() throw() {} + AudioGraphRenderingOp() {} + virtual ~AudioGraphRenderingOp() {} virtual void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray & sharedMidiBuffers, - const int numSamples) throw() = 0; + const int numSamples) = 0; juce_UseDebuggingNewOperator }; @@ -35058,13 +35044,13 @@ public: class ClearChannelOp : public AudioGraphRenderingOp { public: - ClearChannelOp (const int channelNum_) throw() + ClearChannelOp (const int channelNum_) : channelNum (channelNum_) {} - ~ClearChannelOp() throw() {} + ~ClearChannelOp() {} - void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray &, const int numSamples) throw() + void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray &, const int numSamples) { sharedBufferChans.clear (channelNum, 0, numSamples); } @@ -35079,14 +35065,14 @@ private: class CopyChannelOp : public AudioGraphRenderingOp { public: - CopyChannelOp (const int srcChannelNum_, const int dstChannelNum_) throw() + CopyChannelOp (const int srcChannelNum_, const int dstChannelNum_) : srcChannelNum (srcChannelNum_), dstChannelNum (dstChannelNum_) {} - ~CopyChannelOp() throw() {} + ~CopyChannelOp() {} - void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray &, const int numSamples) throw() + void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray &, const int numSamples) { sharedBufferChans.copyFrom (dstChannelNum, 0, sharedBufferChans, srcChannelNum, 0, numSamples); } @@ -35101,14 +35087,14 @@ private: class AddChannelOp : public AudioGraphRenderingOp { public: - AddChannelOp (const int srcChannelNum_, const int dstChannelNum_) throw() + AddChannelOp (const int srcChannelNum_, const int dstChannelNum_) : srcChannelNum (srcChannelNum_), dstChannelNum (dstChannelNum_) {} - ~AddChannelOp() throw() {} + ~AddChannelOp() {} - void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray &, const int numSamples) throw() + void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray &, const int numSamples) { sharedBufferChans.addFrom (dstChannelNum, 0, sharedBufferChans, srcChannelNum, 0, numSamples); } @@ -35123,13 +35109,13 @@ private: class ClearMidiBufferOp : public AudioGraphRenderingOp { public: - ClearMidiBufferOp (const int bufferNum_) throw() + ClearMidiBufferOp (const int bufferNum_) : bufferNum (bufferNum_) {} - ~ClearMidiBufferOp() throw() {} + ~ClearMidiBufferOp() {} - void perform (AudioSampleBuffer&, const OwnedArray & sharedMidiBuffers, const int) throw() + void perform (AudioSampleBuffer&, const OwnedArray & sharedMidiBuffers, const int) { sharedMidiBuffers.getUnchecked (bufferNum)->clear(); } @@ -35144,14 +35130,14 @@ private: class CopyMidiBufferOp : public AudioGraphRenderingOp { public: - CopyMidiBufferOp (const int srcBufferNum_, const int dstBufferNum_) throw() + CopyMidiBufferOp (const int srcBufferNum_, const int dstBufferNum_) : srcBufferNum (srcBufferNum_), dstBufferNum (dstBufferNum_) {} - ~CopyMidiBufferOp() throw() {} + ~CopyMidiBufferOp() {} - void perform (AudioSampleBuffer&, const OwnedArray & sharedMidiBuffers, const int) throw() + void perform (AudioSampleBuffer&, const OwnedArray & sharedMidiBuffers, const int) { *sharedMidiBuffers.getUnchecked (dstBufferNum) = *sharedMidiBuffers.getUnchecked (srcBufferNum); } @@ -35166,14 +35152,14 @@ private: class AddMidiBufferOp : public AudioGraphRenderingOp { public: - AddMidiBufferOp (const int srcBufferNum_, const int dstBufferNum_) throw() + AddMidiBufferOp (const int srcBufferNum_, const int dstBufferNum_) : srcBufferNum (srcBufferNum_), dstBufferNum (dstBufferNum_) {} - ~AddMidiBufferOp() throw() {} + ~AddMidiBufferOp() {} - void perform (AudioSampleBuffer&, const OwnedArray & sharedMidiBuffers, const int numSamples) throw() + void perform (AudioSampleBuffer&, const OwnedArray & sharedMidiBuffers, const int numSamples) { sharedMidiBuffers.getUnchecked (dstBufferNum) ->addEvents (*sharedMidiBuffers.getUnchecked (srcBufferNum), 0, numSamples, 0); @@ -35192,7 +35178,7 @@ public: ProcessBufferOp (const AudioProcessorGraph::Node::Ptr& node_, const Array & audioChannelsToUse_, const int totalChans_, - const int midiBufferToUse_) throw() + const int midiBufferToUse_) : node (node_), processor (node_->processor), audioChannelsToUse (audioChannelsToUse_), @@ -35205,11 +35191,11 @@ public: audioChannelsToUse.add (0); } - ~ProcessBufferOp() throw() + ~ProcessBufferOp() { } - void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray & sharedMidiBuffers, const int numSamples) throw() + void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray & sharedMidiBuffers, const int numSamples) { for (int i = totalChans; --i >= 0;) channels[i] = sharedBufferChans.getSampleData (audioChannelsToUse.getUnchecked (i), 0); @@ -35259,9 +35245,9 @@ public: } } - int getNumBuffersNeeded() const throw() { return nodeIds.size(); } + int getNumBuffersNeeded() const { return nodeIds.size(); } - int getNumMidiBuffersNeeded() const throw() { return midiNodeIds.size(); } + int getNumMidiBuffersNeeded() const { return midiNodeIds.size(); } juce_UseDebuggingNewOperator @@ -35544,12 +35530,12 @@ private: } } - int getReadOnlyEmptyBuffer() const throw() + int getReadOnlyEmptyBuffer() const { return 0; } - int getBufferContaining (const int nodeId, const int outputChannel) const throw() + int getBufferContaining (const int nodeId, const int outputChannel) const { if (outputChannel == AudioProcessorGraph::midiChannelIndex) { @@ -35597,7 +35583,7 @@ private: bool isBufferNeededLater (int stepIndexToSearchFrom, int inputChannelOfIndexToIgnore, const int nodeId, - const int outputChanIndex) const throw() + const int outputChanIndex) const { while (stepIndexToSearchFrom < orderedNodes.size()) { @@ -35665,7 +35651,7 @@ void AudioProcessorGraph::clearRenderingSequence() bool AudioProcessorGraph::isAnInputTo (const uint32 possibleInputId, const uint32 possibleDestinationId, - const int recursionCheck) const throw() + const int recursionCheck) const { if (recursionCheck > 0) { @@ -35984,12 +35970,12 @@ bool AudioProcessorGraph::AudioGraphIOProcessor::isOutputChannelStereoPair (int return isInputChannelStereoPair (index); } -bool AudioProcessorGraph::AudioGraphIOProcessor::isInput() const throw() +bool AudioProcessorGraph::AudioGraphIOProcessor::isInput() const { return type == audioInputNode || type == midiInputNode; } -bool AudioProcessorGraph::AudioGraphIOProcessor::isOutput() const throw() +bool AudioProcessorGraph::AudioGraphIOProcessor::isOutput() const { return type == audioOutputNode || type == midiOutputNode; } @@ -36021,7 +36007,7 @@ void AudioProcessorGraph::AudioGraphIOProcessor::setStateInformation (const void { } -void AudioProcessorGraph::AudioGraphIOProcessor::setParentGraph (AudioProcessorGraph* const newGraph) throw() +void AudioProcessorGraph::AudioGraphIOProcessor::setParentGraph (AudioProcessorGraph* const newGraph) { graph = newGraph; @@ -36592,7 +36578,7 @@ Synthesiser::~Synthesiser() { } -SynthesiserVoice* Synthesiser::getVoice (const int index) const throw() +SynthesiserVoice* Synthesiser::getVoice (const int index) const { const ScopedLock sl (lock); return voices [index]; @@ -48653,14 +48639,14 @@ void Slider::sendDragEnd() } } -void Slider::addListener (SliderListener* const listener) throw() +void Slider::addListener (SliderListener* const listener) { jassert (listener != 0); if (listener != 0) listeners.add (listener); } -void Slider::removeListener (SliderListener* const listener) throw() +void Slider::removeListener (SliderListener* const listener) { listeners.removeValue (listener); } @@ -48689,7 +48675,7 @@ void Slider::setRotaryParameters (const float startAngleRadians, rotaryStop = stopAtEnd; } -void Slider::setVelocityBasedMode (const bool velBased) throw() +void Slider::setVelocityBasedMode (const bool velBased) { isVelocityBased = velBased; } @@ -48697,7 +48683,7 @@ void Slider::setVelocityBasedMode (const bool velBased) throw() void Slider::setVelocityModeParameters (const double sensitivity, const int threshold, const double offset, - const bool userCanPressKeyToSwapMode) throw() + const bool userCanPressKeyToSwapMode) { jassert (threshold >= 0); jassert (sensitivity > 0); @@ -48709,12 +48695,12 @@ void Slider::setVelocityModeParameters (const double sensitivity, userKeyOverridesVelocity = userCanPressKeyToSwapMode; } -void Slider::setSkewFactor (const double factor) throw() +void Slider::setSkewFactor (const double factor) { skewFactor = factor; } -void Slider::setSkewFactorFromMidPoint (const double sliderValueToShowAtMidPoint) throw() +void Slider::setSkewFactorFromMidPoint (const double sliderValueToShowAtMidPoint) { if (maximum > minimum) skewFactor = log (0.5) / log ((sliderValueToShowAtMidPoint - minimum) @@ -48751,7 +48737,7 @@ void Slider::setTextBoxStyle (const TextEntryBoxPosition newPosition, lookAndFeelChanged(); } -void Slider::setTextBoxIsEditable (const bool shouldBeEditable) throw() +void Slider::setTextBoxIsEditable (const bool shouldBeEditable) { editableText = shouldBeEditable; @@ -48778,18 +48764,18 @@ void Slider::hideTextBox (const bool discardCurrentEditorContents) } } -void Slider::setChangeNotificationOnlyOnRelease (const bool onlyNotifyOnRelease) throw() +void Slider::setChangeNotificationOnlyOnRelease (const bool onlyNotifyOnRelease) { sendChangeOnlyOnRelease = onlyNotifyOnRelease; } -void Slider::setSliderSnapsToMousePosition (const bool shouldSnapToMouse) throw() +void Slider::setSliderSnapsToMousePosition (const bool shouldSnapToMouse) { snapsToMousePos = shouldSnapToMouse; } void Slider::setPopupDisplayEnabled (const bool enabled, - Component* const parentComponentToUse) throw() + Component* const parentComponentToUse) { popupDisplayEnabled = enabled; parentForPopupDisplay = parentComponentToUse; @@ -48910,7 +48896,7 @@ void Slider::triggerChangeMessage (const bool synchronous) valueChanged(); } -double Slider::getValue() const throw() +double Slider::getValue() const { // for a two-value style slider, you should use the getMinValue() and getMaxValue() // methods to get the two values. @@ -48955,7 +48941,7 @@ void Slider::setValue (double newValue, } } -double Slider::getMinValue() const throw() +double Slider::getMinValue() const { // The minimum value only applies to sliders that are in two- or three-value mode. jassert (style == TwoValueHorizontal || style == TwoValueVertical @@ -48964,7 +48950,7 @@ double Slider::getMinValue() const throw() return valueMin; } -double Slider::getMaxValue() const throw() +double Slider::getMaxValue() const { // The maximum value only applies to sliders that are in two- or three-value mode. jassert (style == TwoValueHorizontal || style == TwoValueVertical @@ -49052,13 +49038,13 @@ void Slider::setMaxValue (double newValue, const bool sendUpdateMessage, const b } void Slider::setDoubleClickReturnValue (const bool isDoubleClickEnabled, - const double valueToSetOnDoubleClick) throw() + const double valueToSetOnDoubleClick) { doubleClickToValue = isDoubleClickEnabled; doubleClickReturnValue = valueToSetOnDoubleClick; } -double Slider::getDoubleClickReturnValue (bool& isEnabled_) const throw() +double Slider::getDoubleClickReturnValue (bool& isEnabled_) const { isEnabled_ = doubleClickToValue; return doubleClickReturnValue; @@ -49138,12 +49124,12 @@ void Slider::enablementChanged() repaint(); } -void Slider::setPopupMenuEnabled (const bool menuEnabled_) throw() +void Slider::setPopupMenuEnabled (const bool menuEnabled_) { menuEnabled = menuEnabled_; } -void Slider::setScrollWheelEnabled (const bool enabled) throw() +void Slider::setScrollWheelEnabled (const bool enabled) { scrollWheelEnabled = enabled; } @@ -49177,7 +49163,7 @@ void Slider::buttonClicked (Button* button) } } -double Slider::constrainedValue (double value) const throw() +double Slider::constrainedValue (double value) const { if (interval > 0) value = minimum + interval * floor ((value - minimum) / interval + 0.5); @@ -49221,7 +49207,7 @@ float Slider::getLinearSliderPos (const double value) return (float) (sliderRegionStart + sliderPosProportional * sliderRegionSize); } -bool Slider::isHorizontal() const throw() +bool Slider::isHorizontal() const { return style == LinearHorizontal || style == LinearBar @@ -49229,14 +49215,14 @@ bool Slider::isHorizontal() const throw() || style == ThreeValueHorizontal; } -bool Slider::isVertical() const throw() +bool Slider::isVertical() const { return style == LinearVertical || style == TwoValueVertical || style == ThreeValueVertical; } -bool Slider::incDecDragDirectionIsHorizontal() const throw() +bool Slider::incDecDragDirectionIsHorizontal() const { return incDecButtonMode == incDecButtonsDraggable_Horizontal || (incDecButtonMode == incDecButtonsDraggable_AutoDirection && incDecButtonsSideBySide); @@ -49930,9 +49916,9 @@ void TableHeaderComponent::setPopupMenuActive (const bool hasMenu) menuActive = hasMenu; } -bool TableHeaderComponent::isPopupMenuActive() const throw() { return menuActive; } +bool TableHeaderComponent::isPopupMenuActive() const { return menuActive; } -int TableHeaderComponent::getNumColumns (const bool onlyCountVisibleColumns) const throw() +int TableHeaderComponent::getNumColumns (const bool onlyCountVisibleColumns) const { if (onlyCountVisibleColumns) { @@ -49950,7 +49936,7 @@ int TableHeaderComponent::getNumColumns (const bool onlyCountVisibleColumns) con } } -const String TableHeaderComponent::getColumnName (const int columnId) const throw() +const String TableHeaderComponent::getColumnName (const int columnId) const { const ColumnInfo* const ci = getInfoForId (columnId); return ci != 0 ? ci->name : String::empty; @@ -50028,7 +50014,7 @@ void TableHeaderComponent::moveColumn (const int columnId, int newIndex) } } -int TableHeaderComponent::getColumnWidth (const int columnId) const throw() +int TableHeaderComponent::getColumnWidth (const int columnId) const { const ColumnInfo* const ci = getInfoForId (columnId); return ci != 0 ? ci->width : 0; @@ -50066,7 +50052,7 @@ void TableHeaderComponent::setColumnWidth (const int columnId, const int newWidt } } -int TableHeaderComponent::getIndexOfColumnId (const int columnId, const bool onlyCountVisibleColumns) const throw() +int TableHeaderComponent::getIndexOfColumnId (const int columnId, const bool onlyCountVisibleColumns) const { int n = 0; @@ -50084,7 +50070,7 @@ int TableHeaderComponent::getIndexOfColumnId (const int columnId, const bool onl return -1; } -int TableHeaderComponent::getColumnIdOfIndex (int index, const bool onlyCountVisibleColumns) const throw() +int TableHeaderComponent::getColumnIdOfIndex (int index, const bool onlyCountVisibleColumns) const { if (onlyCountVisibleColumns) index = visibleIndexToTotalIndex (index); @@ -50093,7 +50079,7 @@ int TableHeaderComponent::getColumnIdOfIndex (int index, const bool onlyCountVis return (ci != 0) ? ci->id : 0; } -const Rectangle TableHeaderComponent::getColumnPosition (const int index) const throw() +const Rectangle TableHeaderComponent::getColumnPosition (const int index) const { int x = 0, width = 0, n = 0; @@ -50117,7 +50103,7 @@ const Rectangle TableHeaderComponent::getColumnPosition (const int index) const return Rectangle (x, 0, width, getHeight()); } -int TableHeaderComponent::getColumnIdAtX (const int xToFind) const throw() +int TableHeaderComponent::getColumnIdAtX (const int xToFind) const { if (xToFind >= 0) { @@ -50140,7 +50126,7 @@ int TableHeaderComponent::getColumnIdAtX (const int xToFind) const throw() return 0; } -int TableHeaderComponent::getTotalWidth() const throw() +int TableHeaderComponent::getTotalWidth() const { int w = 0; @@ -50158,7 +50144,7 @@ void TableHeaderComponent::setStretchToFitActive (const bool shouldStretchToFit) resized(); } -bool TableHeaderComponent::isStretchToFitActive() const throw() +bool TableHeaderComponent::isStretchToFitActive() const { return stretchToFit; } @@ -50248,7 +50234,7 @@ void TableHeaderComponent::setSortColumnId (const int columnId, const bool sortF } } -int TableHeaderComponent::getSortColumnId() const throw() +int TableHeaderComponent::getSortColumnId() const { for (int i = columns.size(); --i >= 0;) if ((columns.getUnchecked(i)->propertyFlags & (sortedForwards | sortedBackwards)) != 0) @@ -50257,7 +50243,7 @@ int TableHeaderComponent::getSortColumnId() const throw() return 0; } -bool TableHeaderComponent::isSortedForwards() const throw() +bool TableHeaderComponent::isSortedForwards() const { for (int i = columns.size(); --i >= 0;) if ((columns.getUnchecked(i)->propertyFlags & (sortedForwards | sortedBackwards)) != 0) @@ -50330,12 +50316,12 @@ void TableHeaderComponent::restoreFromString (const String& storedVersion) } } -void TableHeaderComponent::addListener (TableHeaderListener* const newListener) throw() +void TableHeaderComponent::addListener (TableHeaderListener* const newListener) { listeners.addIfNotAlreadyThere (newListener); } -void TableHeaderComponent::removeListener (TableHeaderListener* const listenerToRemove) throw() +void TableHeaderComponent::removeListener (TableHeaderListener* const listenerToRemove) { listeners.removeValue (listenerToRemove); } @@ -50644,12 +50630,12 @@ const MouseCursor TableHeaderComponent::getMouseCursor() return Component::getMouseCursor(); } -bool TableHeaderComponent::ColumnInfo::isVisible() const throw() +bool TableHeaderComponent::ColumnInfo::isVisible() const { return (propertyFlags & TableHeaderComponent::visible) != 0; } -TableHeaderComponent::ColumnInfo* TableHeaderComponent::getInfoForId (const int id) const throw() +TableHeaderComponent::ColumnInfo* TableHeaderComponent::getInfoForId (const int id) const { for (int i = columns.size(); --i >= 0;) if (columns.getUnchecked(i)->id == id) @@ -50658,7 +50644,7 @@ TableHeaderComponent::ColumnInfo* TableHeaderComponent::getInfoForId (const int return 0; } -int TableHeaderComponent::visibleIndexToTotalIndex (const int visibleIndex) const throw() +int TableHeaderComponent::visibleIndexToTotalIndex (const int visibleIndex) const { int n = 0; @@ -50723,7 +50709,7 @@ void TableHeaderComponent::handleAsyncUpdate() } } -int TableHeaderComponent::getResizeDraggerAt (const int mouseX) const throw() +int TableHeaderComponent::getResizeDraggerAt (const int mouseX) const { if (((unsigned int) mouseX) < (unsigned int) getWidth()) { @@ -51093,7 +51079,7 @@ void TableListBox::setModel (TableListBoxModel* const newModel) } } -int TableListBox::getHeaderHeight() const throw() +int TableListBox::getHeaderHeight() const { return header->getHeight(); } @@ -51123,7 +51109,7 @@ void TableListBox::setAutoSizeMenuOptionShown (const bool shouldBeShown) autoSizeOptionsShown = shouldBeShown; } -bool TableListBox::isAutoSizeMenuOptionShown() const throw() +bool TableListBox::isAutoSizeMenuOptionShown() const { return autoSizeOptionsShown; } @@ -56909,11 +56895,11 @@ BEGIN_JUCE_NAMESPACE void* juce_findFileStart (const String& directory, const String& wildCard, String& firstResultFile, bool* isDirectory, bool* isHidden, int64* fileSize, Time* modTime, - Time* creationTime, bool* isReadOnly) throw(); + Time* creationTime, bool* isReadOnly); bool juce_findFileNext (void* handle, String& resultFile, bool* isDirectory, bool* isHidden, int64* fileSize, - Time* modTime, Time* creationTime, bool* isReadOnly) throw(); -void juce_findFileClose (void* handle) throw(); + Time* modTime, Time* creationTime, bool* isReadOnly); +void juce_findFileClose (void* handle); DirectoryContentsList::DirectoryContentsList (const FileFilter* const fileFilter_, TimeSliceThread& thread_) @@ -56937,7 +56923,7 @@ void DirectoryContentsList::setIgnoresHiddenFiles (const bool shouldIgnoreHidden ignoreHiddenFiles = shouldIgnoreHiddenFiles; } -const File& DirectoryContentsList::getDirectory() const throw() +const File& DirectoryContentsList::getDirectory() const { return root; } @@ -57119,7 +57105,7 @@ bool DirectoryContentsList::checkNextFile (bool& hasChanged) } int DirectoryContentsList::compareElements (const DirectoryContentsList::FileInfo* const first, - const DirectoryContentsList::FileInfo* const second) throw() + const DirectoryContentsList::FileInfo* const second) { #if JUCE_WINDOWS if (first->isDirectory != second->isDirectory) @@ -68036,7 +68022,7 @@ public: ScopedPointer subMenu; ApplicationCommandManager* const commandManager; - MenuItemInfo() throw() + MenuItemInfo() : itemId (0), active (true), isSeparator (true), @@ -68056,7 +68042,7 @@ public: const bool usesColour_, PopupMenuCustomComponent* const customComp_, const PopupMenu* const subMenu_, - ApplicationCommandManager* const commandManager_) throw() + ApplicationCommandManager* const commandManager_) : itemId (itemId_), text (text_), textColour (textColour_), @@ -68103,7 +68089,7 @@ public: } } - MenuItemInfo (const MenuItemInfo& other) throw() + MenuItemInfo (const MenuItemInfo& other) : itemId (other.itemId), text (other.text), textColour (other.textColour), @@ -68124,18 +68110,18 @@ public: customComp->refCount_++; } - ~MenuItemInfo() throw() + ~MenuItemInfo() { if (customComp != 0 && --(customComp->refCount_) == 0) delete customComp; } - bool canBeTriggered() const throw() + bool canBeTriggered() const { return active && ! (isSeparator || (subMenu != 0)); } - bool hasActiveSubMenu() const throw() + bool hasActiveSubMenu() const { return active && (subMenu != 0); } @@ -68253,7 +68239,7 @@ class PopupMenuWindow : public Component, { public: - PopupMenuWindow() throw() + PopupMenuWindow() : Component (T("menu")), owner (0), currentChild (0), @@ -68316,7 +68302,7 @@ public: const int itemIdThatMustBeVisible, Component* const menuBarComponent, ApplicationCommandManager** managerOfChosenCommand, - Component* const componentAttachedTo) throw() + Component* const componentAttachedTo) { if (menu.items.size() > 0) { @@ -68399,7 +68385,7 @@ public: : childYOffset > 0); } - void addItem (const MenuItemInfo& item) throw() + void addItem (const MenuItemInfo& item) { MenuItemComponent* const mic = new MenuItemComponent (item); addAndMakeVisible (mic); @@ -68412,7 +68398,7 @@ public: } // hide this and all sub-comps - void hide (const MenuItemInfo* const item) throw() + void hide (const MenuItemInfo* const item) { if (isVisible()) { @@ -68433,7 +68419,7 @@ public: } } - void dismissMenu (const MenuItemInfo* const item) throw() + void dismissMenu (const MenuItemInfo* const item) { if (owner != 0) { @@ -68739,19 +68725,19 @@ private: uint32 menuCreationTime, lastFocused, lastScroll, lastMouseMoveTime, timeEnteredCurrentChildComp; double scrollAcceleration; - bool overlaps (const Rectangle& r) const throw() + bool overlaps (const Rectangle& r) const { return r.intersects (getBounds()) || (owner != 0 && owner->overlaps (r)); } - bool isOverAnyMenu() const throw() + bool isOverAnyMenu() const { return (owner != 0) ? owner->isOverAnyMenu() : isOverChildren(); } - bool isOverChildren() const throw() + bool isOverChildren() const { jassert (activeSubMenu == 0 || activeSubMenu->isValidComponent()); @@ -68759,7 +68745,7 @@ private: && (isOver || (activeSubMenu != 0 && activeSubMenu->isOverChildren())); } - void updateMouseOverStatus (const int mx, const int my) throw() + void updateMouseOverStatus (const int mx, const int my) { int rx = mx, ry = my; globalPositionToRelative (rx, ry); @@ -68769,7 +68755,7 @@ private: activeSubMenu->updateMouseOverStatus (mx, my); } - bool treeContains (const PopupMenuWindow* const window) const throw() + bool treeContains (const PopupMenuWindow* const window) const { const PopupMenuWindow* mw = this; @@ -69063,12 +69049,12 @@ private: return x; } - bool isScrolling() const throw() + bool isScrolling() const { return childYOffset != 0 || needsToScroll; } - void setCurrentlyHighlightedChild (MenuItemComponent* const child) throw() + void setCurrentlyHighlightedChild (MenuItemComponent* const child) { if (currentChild->isValidComponent()) currentChild->setHighlighted (false); @@ -69233,7 +69219,7 @@ private: setCurrentlyHighlightedChild (mic); } - void disableTimerUntilMouseMoves() throw() + void disableTimerUntilMouseMoves() { disableMouseMoves = true; @@ -69245,14 +69231,14 @@ private: const PopupMenuWindow& operator= (const PopupMenuWindow&); }; -PopupMenu::PopupMenu() throw() +PopupMenu::PopupMenu() : items (8), lookAndFeel (0), separatorPending (false) { } -PopupMenu::PopupMenu (const PopupMenu& other) throw() +PopupMenu::PopupMenu (const PopupMenu& other) : items (8), lookAndFeel (other.lookAndFeel), separatorPending (false) @@ -69263,7 +69249,7 @@ PopupMenu::PopupMenu (const PopupMenu& other) throw() items.add (new MenuItemInfo (*(const MenuItemInfo*) other.items.getUnchecked(i))); } -const PopupMenu& PopupMenu::operator= (const PopupMenu& other) throw() +const PopupMenu& PopupMenu::operator= (const PopupMenu& other) { if (this != &other) { @@ -69279,12 +69265,12 @@ const PopupMenu& PopupMenu::operator= (const PopupMenu& other) throw() return *this; } -PopupMenu::~PopupMenu() throw() +PopupMenu::~PopupMenu() { clear(); } -void PopupMenu::clear() throw() +void PopupMenu::clear() { for (int i = items.size(); --i >= 0;) delete (MenuItemInfo*) items.getUnchecked(i); @@ -69308,7 +69294,7 @@ void PopupMenu::addItem (const int itemResultId, const String& itemText, const bool isActive, const bool isTicked, - const Image* const iconToUse) throw() + const Image* const iconToUse) { jassert (itemResultId != 0); // 0 is used as a return value to indicate that the user // didn't pick anything, so you shouldn't use it as the id @@ -69328,7 +69314,7 @@ void PopupMenu::addItem (const int itemResultId, void PopupMenu::addCommandItem (ApplicationCommandManager* commandManager, const int commandID, - const String& displayName) throw() + const String& displayName) { jassert (commandManager != 0 && commandID != 0); @@ -69359,7 +69345,7 @@ void PopupMenu::addColouredItem (const int itemResultId, const Colour& itemTextColour, const bool isActive, const bool isTicked, - const Image* const iconToUse) throw() + const Image* const iconToUse) { jassert (itemResultId != 0); // 0 is used as a return value to indicate that the user // didn't pick anything, so you shouldn't use it as the id @@ -69378,7 +69364,7 @@ void PopupMenu::addColouredItem (const int itemResultId, } void PopupMenu::addCustomItem (const int itemResultId, - PopupMenuCustomComponent* const customComponent) throw() + PopupMenuCustomComponent* const customComponent) { jassert (itemResultId != 0); // 0 is used as a return value to indicate that the user // didn't pick anything, so you shouldn't use it as the id @@ -69436,7 +69422,7 @@ private: void PopupMenu::addCustomItem (const int itemResultId, Component* customComponent, int idealWidth, int idealHeight, - const bool triggerMenuItemAutomaticallyWhenClicked) throw() + const bool triggerMenuItemAutomaticallyWhenClicked) { addCustomItem (itemResultId, new NormalComponentWrapper (customComponent, @@ -69448,7 +69434,7 @@ void PopupMenu::addSubMenu (const String& subMenuName, const PopupMenu& subMenu, const bool isActive, Image* const iconToUse, - const bool isTicked) throw() + const bool isTicked) { addSeparatorIfPending(); @@ -69464,7 +69450,7 @@ void PopupMenu::addSubMenu (const String& subMenuName, 0)); } -void PopupMenu::addSeparator() throw() +void PopupMenu::addSeparator() { separatorPending = true; } @@ -69506,7 +69492,7 @@ public: juce_UseDebuggingNewOperator }; -void PopupMenu::addSectionHeader (const String& title) throw() +void PopupMenu::addSectionHeader (const String& title) { addCustomItem (0X4734a34f, new HeaderItemComponent (title)); } @@ -69519,7 +69505,7 @@ Component* PopupMenu::createMenuComponent (const int x, const int y, const int w const bool alignToRectangle, Component* menuBarComponent, ApplicationCommandManager** managerOfChosenCommand, - Component* const componentAttachedTo) throw() + Component* const componentAttachedTo) { PopupMenuWindow* const pw = PopupMenuWindow::create (*this, @@ -69548,7 +69534,7 @@ int PopupMenu::showMenu (const int x, const int y, const int w, const int h, const int maximumNumColumns, const int standardItemHeight, const bool alignToRectangle, - Component* const componentAttachedTo) throw() + Component* const componentAttachedTo) { Component* const prevFocused = Component::getCurrentlyFocusedComponent(); @@ -69661,7 +69647,7 @@ int PopupMenu::showAt (Component* componentToAttachTo, } } -void JUCE_CALLTYPE PopupMenu::dismissAllActiveMenus() throw() +void JUCE_CALLTYPE PopupMenu::dismissAllActiveMenus() { for (int i = activeMenuWindows.size(); --i >= 0;) { @@ -69672,7 +69658,7 @@ void JUCE_CALLTYPE PopupMenu::dismissAllActiveMenus() throw() } } -int PopupMenu::getNumItems() const throw() +int PopupMenu::getNumItems() const { int num = 0; @@ -69683,7 +69669,7 @@ int PopupMenu::getNumItems() const throw() return num; } -bool PopupMenu::containsCommandItem (const int commandID) const throw() +bool PopupMenu::containsCommandItem (const int commandID) const { for (int i = items.size(); --i >= 0;) { @@ -69699,7 +69685,7 @@ bool PopupMenu::containsCommandItem (const int commandID) const throw() return false; } -bool PopupMenu::containsAnyActiveItems() const throw() +bool PopupMenu::containsAnyActiveItems() const { for (int i = items.size(); --i >= 0;) { @@ -69719,7 +69705,7 @@ bool PopupMenu::containsAnyActiveItems() const throw() return false; } -void PopupMenu::setLookAndFeel (LookAndFeel* const newLookAndFeel) throw() +void PopupMenu::setLookAndFeel (LookAndFeel* const newLookAndFeel) { lookAndFeel = newLookAndFeel; } @@ -69762,7 +69748,7 @@ void PopupMenuCustomComponent::triggerMenuItem() } } -PopupMenu::MenuItemIterator::MenuItemIterator (const PopupMenu& menu_) throw() +PopupMenu::MenuItemIterator::MenuItemIterator (const PopupMenu& menu_) : subMenu (0), itemId (0), isSeparator (false), @@ -69777,11 +69763,11 @@ PopupMenu::MenuItemIterator::MenuItemIterator (const PopupMenu& menu_) throw() { } -PopupMenu::MenuItemIterator::~MenuItemIterator() throw() +PopupMenu::MenuItemIterator::~MenuItemIterator() { } -bool PopupMenu::MenuItemIterator::next() throw() +bool PopupMenu::MenuItemIterator::next() { if (index >= menu.items.size()) return false; @@ -69955,7 +69941,7 @@ public: } DragAndDropTarget* findTarget (const int screenX, const int screenY, - int& relX, int& relY) const throw() + int& relX, int& relY) const { Component* hit = getParentComponent(); @@ -70853,7 +70839,7 @@ ChoicePropertyComponent::~ChoicePropertyComponent() deleteAllChildren(); } -const StringArray& ChoicePropertyComponent::getChoices() const throw() +const StringArray& ChoicePropertyComponent::getChoices() const { return choices; } @@ -71036,7 +71022,7 @@ public: } } - bool isOpen() const throw() + bool isOpen() const { return isOpen_; } @@ -71317,7 +71303,7 @@ void PropertyPanel::setMessageWhenEmpty (const String& newMessage) } } -const String& PropertyPanel::getMessageWhenEmpty() const throw() +const String& PropertyPanel::getMessageWhenEmpty() const { return messageWhenEmpty; } @@ -71605,7 +71591,7 @@ private: } } - int getTickX() const throw() + int getTickX() const { return getRowHeight() + 5; } @@ -72329,7 +72315,7 @@ private: } } - int getTickX() const throw() + int getTickX() const { return getRowHeight() + 5; } @@ -73753,7 +73739,7 @@ void DropShadower::setShadowImage (Image* const src, const int w, const int h, const int sx, - const int sy) throw() + const int sy) { shadowImageSections[num] = new Image (Image::ARGB, w, h, true); @@ -74077,7 +74063,7 @@ void MagnifierComponent::mouseWheelMove (const MouseEvent& e, float ix, float iy Component::mouseWheelMove (e, ix, iy); } -int MagnifierComponent::scaleInt (const int n) const throw() +int MagnifierComponent::scaleInt (const int n) const { return roundDoubleToInt (n / scaleFactor); } @@ -81481,7 +81467,7 @@ private: PixelRGB filler [4]; bool areRGBComponentsEqual; - forcedinline void blendLine (PixelType* dest, const PixelARGB& colour, int width) const throw() + forcedinline void blendLine (PixelType* dest, const PixelARGB& colour, int width) const { do { @@ -85752,11 +85738,11 @@ BEGIN_JUCE_NAMESPACE #define SHOULD_WRAP(x, wrapwidth) (((x) - 0.0001f) >= (wrapwidth)) -PositionedGlyph::PositionedGlyph() throw() +PositionedGlyph::PositionedGlyph() { } -void PositionedGlyph::draw (const Graphics& g) const throw() +void PositionedGlyph::draw (const Graphics& g) const { if (! isWhitespace()) { @@ -85766,7 +85752,7 @@ void PositionedGlyph::draw (const Graphics& g) const throw() } void PositionedGlyph::draw (const Graphics& g, - const AffineTransform& transform) const throw() + const AffineTransform& transform) const { if (! isWhitespace()) { @@ -85776,7 +85762,7 @@ void PositionedGlyph::draw (const Graphics& g, } } -void PositionedGlyph::createPath (Path& path) const throw() +void PositionedGlyph::createPath (Path& path) const { if (! isWhitespace()) { @@ -85793,7 +85779,7 @@ void PositionedGlyph::createPath (Path& path) const throw() } } -bool PositionedGlyph::hitTest (float px, float py) const throw() +bool PositionedGlyph::hitTest (float px, float py) const { if (px >= getLeft() && px < getRight() && py >= getTop() && py < getBottom() @@ -85818,23 +85804,23 @@ bool PositionedGlyph::hitTest (float px, float py) const throw() } void PositionedGlyph::moveBy (const float deltaX, - const float deltaY) throw() + const float deltaY) { x += deltaX; y += deltaY; } -GlyphArrangement::GlyphArrangement() throw() +GlyphArrangement::GlyphArrangement() : glyphs (128) { } -GlyphArrangement::GlyphArrangement (const GlyphArrangement& other) throw() +GlyphArrangement::GlyphArrangement (const GlyphArrangement& other) { addGlyphArrangement (other); } -const GlyphArrangement& GlyphArrangement::operator= (const GlyphArrangement& other) throw() +const GlyphArrangement& GlyphArrangement::operator= (const GlyphArrangement& other) { if (this != &other) { @@ -85845,23 +85831,23 @@ const GlyphArrangement& GlyphArrangement::operator= (const GlyphArrangement& oth return *this; } -GlyphArrangement::~GlyphArrangement() throw() +GlyphArrangement::~GlyphArrangement() { } -void GlyphArrangement::clear() throw() +void GlyphArrangement::clear() { glyphs.clear(); } -PositionedGlyph& GlyphArrangement::getGlyph (const int index) const throw() +PositionedGlyph& GlyphArrangement::getGlyph (const int index) const { jassert (((unsigned int) index) < (unsigned int) glyphs.size()); return *glyphs [index]; } -void GlyphArrangement::addGlyphArrangement (const GlyphArrangement& other) throw() +void GlyphArrangement::addGlyphArrangement (const GlyphArrangement& other) { glyphs.ensureStorageAllocated (glyphs.size() + other.glyphs.size()); @@ -85869,7 +85855,7 @@ void GlyphArrangement::addGlyphArrangement (const GlyphArrangement& other) throw glyphs.add (new PositionedGlyph (*other.glyphs.getUnchecked (i))); } -void GlyphArrangement::removeRangeOfGlyphs (int startIndex, const int num) throw() +void GlyphArrangement::removeRangeOfGlyphs (int startIndex, const int num) { glyphs.removeRange (startIndex, num < 0 ? glyphs.size() : num); } @@ -85877,7 +85863,7 @@ void GlyphArrangement::removeRangeOfGlyphs (int startIndex, const int num) throw void GlyphArrangement::addLineOfText (const Font& font, const String& text, const float xOffset, - const float yOffset) throw() + const float yOffset) { addCurtailedLineOfText (font, text, xOffset, yOffset, @@ -85889,7 +85875,7 @@ void GlyphArrangement::addCurtailedLineOfText (const Font& font, float xOffset, const float yOffset, const float maxWidthPixels, - const bool useEllipsis) throw() + const bool useEllipsis) { int textLen = text.length(); @@ -85932,7 +85918,7 @@ void GlyphArrangement::addCurtailedLineOfText (const Font& font, } int GlyphArrangement::insertEllipsis (const Font& font, const float maxXPos, - const int startIndex, int endIndex) throw() + const int startIndex, int endIndex) { int numDeleted = 0; @@ -85984,7 +85970,7 @@ void GlyphArrangement::addJustifiedText (const Font& font, const String& text, float x, float y, const float maxLineWidth, - const Justification& horizontalLayout) throw() + const Justification& horizontalLayout) { int lineStartIndex = glyphs.size(); addLineOfText (font, text, x, y); @@ -86068,7 +86054,7 @@ void GlyphArrangement::addFittedText (const Font& f, const float width, const float height, const Justification& layout, int maximumLines, - const float minimumHorizontalScale) throw() + const float minimumHorizontalScale) { // doesn't make much sense if this is outside a sensible range of 0.5 to 1.0 jassert (minimumHorizontalScale > 0 && minimumHorizontalScale <= 1.0f); @@ -86258,7 +86244,7 @@ void GlyphArrangement::addFittedText (const Font& f, } void GlyphArrangement::moveRangeOfGlyphs (int startIndex, int num, - const float dx, const float dy) throw() + const float dx, const float dy) { jassert (startIndex >= 0); @@ -86273,7 +86259,7 @@ void GlyphArrangement::moveRangeOfGlyphs (int startIndex, int num, } int GlyphArrangement::fitLineIntoSpace (int start, int numGlyphs, float x, float y, float w, float h, const Font& font, - const Justification& justification, float minimumHorizontalScale) throw() + const Justification& justification, float minimumHorizontalScale) { int numDeleted = 0; const float lineStartX = glyphs.getUnchecked (start)->getLeft(); @@ -86299,7 +86285,7 @@ int GlyphArrangement::fitLineIntoSpace (int start, int numGlyphs, float x, float } void GlyphArrangement::stretchRangeOfGlyphs (int startIndex, int num, - const float horizontalScaleFactor) throw() + const float horizontalScaleFactor) { jassert (startIndex >= 0); @@ -86326,7 +86312,7 @@ void GlyphArrangement::getBoundingBox (int startIndex, int num, float& top, float& right, float& bottom, - const bool includeWhitespace) const throw() + const bool includeWhitespace) const { jassert (startIndex >= 0); @@ -86368,7 +86354,7 @@ void GlyphArrangement::justifyGlyphs (const int startIndex, const int num, const float x, const float y, const float width, const float height, - const Justification& justification) throw() + const Justification& justification) { jassert (num >= 0 && startIndex >= 0); @@ -86426,7 +86412,7 @@ void GlyphArrangement::justifyGlyphs (const int startIndex, } } -void GlyphArrangement::spreadOutLine (const int start, const int num, const float targetWidth) throw() +void GlyphArrangement::spreadOutLine (const int start, const int num, const float targetWidth) { if (start + num < glyphs.size() && glyphs.getUnchecked (start + num - 1)->getCharacter() != T('\r') @@ -86471,7 +86457,7 @@ void GlyphArrangement::spreadOutLine (const int start, const int num, const floa } } -void GlyphArrangement::draw (const Graphics& g) const throw() +void GlyphArrangement::draw (const Graphics& g) const { for (int i = 0; i < glyphs.size(); ++i) { @@ -86494,7 +86480,7 @@ void GlyphArrangement::draw (const Graphics& g) const throw() } } -void GlyphArrangement::draw (const Graphics& g, const AffineTransform& transform) const throw() +void GlyphArrangement::draw (const Graphics& g, const AffineTransform& transform) const { for (int i = 0; i < glyphs.size(); ++i) { @@ -86521,13 +86507,13 @@ void GlyphArrangement::draw (const Graphics& g, const AffineTransform& transform } } -void GlyphArrangement::createPath (Path& path) const throw() +void GlyphArrangement::createPath (Path& path) const { for (int i = 0; i < glyphs.size(); ++i) glyphs.getUnchecked (i)->createPath (path); } -int GlyphArrangement::findGlyphIndexAt (float x, float y) const throw() +int GlyphArrangement::findGlyphIndexAt (float x, float y) const { for (int i = 0; i < glyphs.size(); ++i) if (glyphs.getUnchecked (i)->hitTest (x, y)) @@ -90076,8 +90062,8 @@ static inline void addLineEnd (Path& destPath, struct LineSection { - LineSection() throw() {} - LineSection (int) throw() {} + LineSection() {} + LineSection (int) {} float x1, y1, x2, y2; // original line float lx1, ly1, lx2, ly2; // the left-hand stroke @@ -91697,7 +91683,7 @@ LowLevelGraphicsContext* Image::createLowLevelContext() return new LowLevelGraphicsSoftwareRenderer (*this); } -Image::BitmapData::BitmapData (Image& image, int x, int y, int w, int h, const bool /*makeWritable*/) throw() +Image::BitmapData::BitmapData (Image& image, int x, int y, int w, int h, const bool /*makeWritable*/) : data (image.imageData + image.lineStride * y + image.pixelStride * x), lineStride (image.lineStride), pixelStride (image.pixelStride), @@ -91707,7 +91693,7 @@ Image::BitmapData::BitmapData (Image& image, int x, int y, int w, int h, const b jassert (x >= 0 && y >= 0 && w > 0 && h > 0 && x + w <= image.getWidth() && y + h <= image.getHeight()); } -Image::BitmapData::BitmapData (const Image& image, int x, int y, int w, int h) throw() +Image::BitmapData::BitmapData (const Image& image, int x, int y, int w, int h) : data (image.imageData + image.lineStride * y + image.pixelStride * x), lineStride (image.lineStride), pixelStride (image.pixelStride), @@ -91717,7 +91703,7 @@ Image::BitmapData::BitmapData (const Image& image, int x, int y, int w, int h) t jassert (x >= 0 && y >= 0 && w > 0 && h > 0 && x + w <= image.getWidth() && y + h <= image.getHeight()); } -Image::BitmapData::~BitmapData() throw() +Image::BitmapData::~BitmapData() { } @@ -92106,7 +92092,7 @@ struct ImageCacheItem static ImageCache* instance = 0; static int cacheTimeout = 5000; -ImageCache::ImageCache() throw() +ImageCache::ImageCache() : images (4) { } @@ -92295,20 +92281,20 @@ END_JUCE_NAMESPACE BEGIN_JUCE_NAMESPACE -ImageConvolutionKernel::ImageConvolutionKernel (const int size_) throw() +ImageConvolutionKernel::ImageConvolutionKernel (const int size_) : values (size_ * size_), size (size_) { clear(); } -ImageConvolutionKernel::~ImageConvolutionKernel() throw() +ImageConvolutionKernel::~ImageConvolutionKernel() { } void ImageConvolutionKernel::setKernelValue (const int x, const int y, - const float value) throw() + const float value) { if (((unsigned int) x) < (unsigned int) size && ((unsigned int) y) < (unsigned int) size) @@ -92321,13 +92307,13 @@ void ImageConvolutionKernel::setKernelValue (const int x, } } -void ImageConvolutionKernel::clear() throw() +void ImageConvolutionKernel::clear() { for (int i = size * size; --i >= 0;) values[i] = 0; } -void ImageConvolutionKernel::setOverallSum (const float desiredTotalSum) throw() +void ImageConvolutionKernel::setOverallSum (const float desiredTotalSum) { double currentTotal = 0.0; @@ -92337,13 +92323,13 @@ void ImageConvolutionKernel::setOverallSum (const float desiredTotalSum) throw() rescaleAllValues ((float) (desiredTotalSum / currentTotal)); } -void ImageConvolutionKernel::rescaleAllValues (const float multiplier) throw() +void ImageConvolutionKernel::rescaleAllValues (const float multiplier) { for (int i = size * size; --i >= 0;) values[i] *= multiplier; } -void ImageConvolutionKernel::createGaussianBlur (const float radius) throw() +void ImageConvolutionKernel::createGaussianBlur (const float radius) { const double radiusFactor = -1.0 / (radius * radius * 2); const int centre = size >> 1; @@ -92531,8 +92517,6 @@ BEGIN_JUCE_NAMESPACE #ifndef DOXYGEN -static const int maxGifCode = 1 << 12; - /** Used internally by ImageFileFormat - don't use this class directly in your application. @@ -92543,9 +92527,9 @@ class GIFLoader { public: GIFLoader (InputStream& in); - ~GIFLoader() throw(); + ~GIFLoader(); - Image* getImage() const throw() { return image; } + Image* getImage() const { return image; } private: Image* image; @@ -92558,6 +92542,7 @@ private: int maxCode, maxCodeSize; int firstcode, oldcode; int clearCode, end_code; + enum { maxGifCode = 1 << 12 }; int table [2] [maxGifCode]; int stack [2 * maxGifCode]; int *sp; @@ -92580,11 +92565,11 @@ private: #endif // __JUCE_GIFLOADER_JUCEHEADER__ /********* End of inlined file: juce_GIFLoader.h *********/ -Image* juce_loadPNGImageFromStream (InputStream& inputStream) throw(); -bool juce_writePNGImageToStream (const Image& image, OutputStream& out) throw(); +Image* juce_loadPNGImageFromStream (InputStream& inputStream); +bool juce_writePNGImageToStream (const Image& image, OutputStream& out); -PNGImageFormat::PNGImageFormat() throw() {} -PNGImageFormat::~PNGImageFormat() throw() {} +PNGImageFormat::PNGImageFormat() {} +PNGImageFormat::~PNGImageFormat() {} const String PNGImageFormat::getFormatName() { @@ -92613,15 +92598,15 @@ bool PNGImageFormat::writeImageToStream (const Image& sourceImage, return juce_writePNGImageToStream (sourceImage, destStream); } -Image* juce_loadJPEGImageFromStream (InputStream& inputStream) throw(); -bool juce_writeJPEGImageToStream (const Image& image, OutputStream& out, float quality) throw(); +Image* juce_loadJPEGImageFromStream (InputStream& inputStream); +bool juce_writeJPEGImageToStream (const Image& image, OutputStream& out, float quality); -JPEGImageFormat::JPEGImageFormat() throw() +JPEGImageFormat::JPEGImageFormat() : quality (-1.0f) { } -JPEGImageFormat::~JPEGImageFormat() throw() {} +JPEGImageFormat::~JPEGImageFormat() {} void JPEGImageFormat::setQuality (const float newQuality) { @@ -92663,8 +92648,8 @@ bool JPEGImageFormat::writeImageToStream (const Image& sourceImage, class GIFImageFormat : public ImageFileFormat { public: - GIFImageFormat() throw() {} - ~GIFImageFormat() throw() {} + GIFImageFormat() {} + ~GIFImageFormat() {} const String getFormatName() { @@ -92762,7 +92747,7 @@ END_JUCE_NAMESPACE BEGIN_JUCE_NAMESPACE -static inline int makeWord (const unsigned char a, const unsigned char b) throw() +static inline int makeWord (const unsigned char a, const unsigned char b) { return (b << 8) | a; } @@ -92842,7 +92827,7 @@ GIFLoader::GIFLoader (InputStream& in) } } -GIFLoader::~GIFLoader() throw() +GIFLoader::~GIFLoader() { } @@ -207996,11 +207981,11 @@ static void setupSilentErrorHandler (struct jpeg_error_mgr& err) err.reset_error_mgr = silentErrorCallback1; } -static void dummyCallback1 (j_decompress_ptr) throw() +static void dummyCallback1 (j_decompress_ptr) { } -static void jpegSkip (j_decompress_ptr decompStruct, long num) throw() +static void jpegSkip (j_decompress_ptr decompStruct, long num) { decompStruct->src->next_input_byte += num; @@ -208008,12 +207993,12 @@ static void jpegSkip (j_decompress_ptr decompStruct, long num) throw() decompStruct->src->bytes_in_buffer -= num; } -static boolean jpegFill (j_decompress_ptr) throw() +static boolean jpegFill (j_decompress_ptr) { return 0; } -Image* juce_loadJPEGImageFromStream (InputStream& in) throw() +Image* juce_loadJPEGImageFromStream (InputStream& in) { MemoryBlock mb; in.readIntoMemoryBlock (mb); @@ -208115,11 +208100,11 @@ struct JuceJpegDest : public jpeg_destination_mgr char* buffer; }; -static void jpegWriteInit (j_compress_ptr) throw() +static void jpegWriteInit (j_compress_ptr) { } -static void jpegWriteTerminate (j_compress_ptr cinfo) throw() +static void jpegWriteTerminate (j_compress_ptr cinfo) { JuceJpegDest* const dest = (JuceJpegDest*) cinfo->dest; @@ -208127,7 +208112,7 @@ static void jpegWriteTerminate (j_compress_ptr cinfo) throw() dest->output->write (dest->buffer, numToWrite); } -static boolean jpegWriteFlush (j_compress_ptr cinfo) throw() +static boolean jpegWriteFlush (j_compress_ptr cinfo) { JuceJpegDest* const dest = (JuceJpegDest*) cinfo->dest; @@ -208141,7 +208126,7 @@ static boolean jpegWriteFlush (j_compress_ptr cinfo) throw() bool juce_writeJPEGImageToStream (const Image& image, OutputStream& out, - float quality) throw() + float quality) { if (image.hasAlphaChannel()) { @@ -233662,7 +233647,7 @@ using ::calloc; using ::malloc; using ::free; -static void pngReadCallback (png_structp pngReadStruct, png_bytep data, png_size_t length) throw() +static void pngReadCallback (png_structp pngReadStruct, png_bytep data, png_size_t length) { InputStream* const in = (InputStream*) png_get_io_ptr (pngReadStruct); in->read (data, (int) length); @@ -233675,7 +233660,7 @@ static void pngErrorCallback (png_structp, png_const_charp) throw PNGErrorStruct(); } -Image* juce_loadPNGImageFromStream (InputStream& in) throw() +Image* juce_loadPNGImageFromStream (InputStream& in) { Image* image = 0; @@ -233785,7 +233770,7 @@ Image* juce_loadPNGImageFromStream (InputStream& in) throw() return image; } -static void pngWriteDataCallback (png_structp png_ptr, png_bytep data, png_size_t length) throw() +static void pngWriteDataCallback (png_structp png_ptr, png_bytep data, png_size_t length) { OutputStream* const out = (OutputStream*) png_ptr->io_ptr; @@ -233795,7 +233780,7 @@ static void pngWriteDataCallback (png_structp png_ptr, png_bytep data, png_size_ jassert (ok); } -bool juce_writePNGImageToStream (const Image& image, OutputStream& out) throw() +bool juce_writePNGImageToStream (const Image& image, OutputStream& out) { const int width = image.getWidth(); const int height = image.getHeight(); @@ -234445,7 +234430,7 @@ void WaitableEvent::reset() const throw() void JUCE_API juce_threadEntryPoint (void*); -static unsigned int __stdcall threadEntryProc (void* userData) throw() +static unsigned int __stdcall threadEntryProc (void* userData) { #if ! JUCE_ONLY_BUILD_CORE_LIBRARY AttachThreadInput (GetWindowThreadProcessId (juce_messageWindowHandle, 0), @@ -234458,12 +234443,12 @@ static unsigned int __stdcall threadEntryProc (void* userData) throw() return 0; } -void juce_CloseThreadHandle (void* handle) throw() +void juce_CloseThreadHandle (void* handle) { CloseHandle ((HANDLE) handle); } -void* juce_createThread (void* userData) throw() +void* juce_createThread (void* userData) { unsigned int threadId; @@ -234473,7 +234458,7 @@ void* juce_createThread (void* userData) throw() 0, &threadId); } -void juce_killThread (void* handle) throw() +void juce_killThread (void* handle) { if (handle != 0) { @@ -234484,7 +234469,7 @@ void juce_killThread (void* handle) throw() } } -void juce_setCurrentThreadName (const String& name) throw() +void juce_setCurrentThreadName (const String& name) { #if defined (JUCE_DEBUG) && JUCE_MSVC struct @@ -234513,13 +234498,13 @@ void juce_setCurrentThreadName (const String& name) throw() #endif } -Thread::ThreadID Thread::getCurrentThreadId() throw() +Thread::ThreadID Thread::getCurrentThreadId() { return (ThreadID) (pointer_sized_int) GetCurrentThreadId(); } // priority 1 to 10 where 5=normal, 1=low -bool juce_setThreadPriority (void* threadHandle, int priority) throw() +bool juce_setThreadPriority (void* threadHandle, int priority) { int pri = THREAD_PRIORITY_TIME_CRITICAL; @@ -234542,14 +234527,14 @@ bool juce_setThreadPriority (void* threadHandle, int priority) throw() return SetThreadPriority (threadHandle, pri) != FALSE; } -void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask) throw() +void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask) { SetThreadAffinityMask (GetCurrentThread(), affinityMask); } static HANDLE sleepEvent = 0; -void juce_initialiseThreadEvents() throw() +void juce_initialiseThreadEvents() { if (sleepEvent == 0) #ifdef JUCE_DEBUG @@ -234559,12 +234544,12 @@ void juce_initialiseThreadEvents() throw() #endif } -void Thread::yield() throw() +void Thread::yield() { Sleep (0); } -void JUCE_CALLTYPE Thread::sleep (const int millisecs) throw() +void JUCE_CALLTYPE Thread::sleep (const int millisecs) { if (millisecs >= 10) { @@ -234585,7 +234570,7 @@ static int lastProcessPriority = -1; // called by WindowDriver because Windows does wierd things to process priority // when you swap apps, and this forces an update when the app is brought to the front. -void juce_repeatLastProcessPriority() throw() +void juce_repeatLastProcessPriority() { if (lastProcessPriority >= 0) // (avoid changing this if it's not been explicitly set by the app..) { @@ -234627,12 +234612,12 @@ void Process::setPriority (ProcessPriority prior) } } -bool JUCE_API JUCE_CALLTYPE juce_isRunningUnderDebugger() throw() +bool JUCE_API JUCE_CALLTYPE juce_isRunningUnderDebugger() { return IsDebuggerPresent() != FALSE; } -bool JUCE_CALLTYPE Process::isRunningUnderDebugger() throw() +bool JUCE_CALLTYPE Process::isRunningUnderDebugger() { return juce_isRunningUnderDebugger(); } @@ -234686,19 +234671,19 @@ void* PlatformUtilities::getProcedureEntryPoint (void* h, const String& name) : 0; } -InterProcessLock::InterProcessLock (const String& name_) throw() +InterProcessLock::InterProcessLock (const String& name_) : internal (0), name (name_), reentrancyLevel (0) { } -InterProcessLock::~InterProcessLock() throw() +InterProcessLock::~InterProcessLock() { exit(); } -bool InterProcessLock::enter (const int timeOutMillisecs) throw() +bool InterProcessLock::enter (const int timeOutMillisecs) { if (reentrancyLevel++ == 0) { @@ -234720,7 +234705,7 @@ bool InterProcessLock::enter (const int timeOutMillisecs) throw() return (internal != 0); } -void InterProcessLock::exit() throw() +void InterProcessLock::exit() { if (--reentrancyLevel == 0 && internal != 0) { @@ -234749,8 +234734,7 @@ void InterProcessLock::exit() throw() const tchar File::separator = T('\\'); const tchar* File::separatorString = T("\\"); -bool juce_fileExists (const String& fileName, - const bool dontCountDirectories) throw() +bool juce_fileExists (const String& fileName, const bool dontCountDirectories) { if (fileName.isEmpty()) return false; @@ -234761,7 +234745,7 @@ bool juce_fileExists (const String& fileName, : (attr != 0xffffffff); } -bool juce_isDirectory (const String& fileName) throw() +bool juce_isDirectory (const String& fileName) { const DWORD attr = GetFileAttributes (fileName); @@ -234769,15 +234753,14 @@ bool juce_isDirectory (const String& fileName) throw() && ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0); } -bool juce_canWriteToFile (const String& fileName) throw() +bool juce_canWriteToFile (const String& fileName) { const DWORD attr = GetFileAttributes (fileName); return ((attr & FILE_ATTRIBUTE_READONLY) == 0); } -bool juce_setFileReadOnly (const String& fileName, - bool isReadOnly) throw() +bool juce_setFileReadOnly (const String& fileName, bool isReadOnly) { DWORD attr = GetFileAttributes (fileName); @@ -234795,12 +234778,12 @@ bool juce_setFileReadOnly (const String& fileName, return SetFileAttributes (fileName, attr) != FALSE; } -bool File::isHidden() const throw() +bool File::isHidden() const { return (GetFileAttributes (getFullPathName()) & FILE_ATTRIBUTE_HIDDEN) != 0; } -bool juce_deleteFile (const String& fileName) throw() +bool juce_deleteFile (const String& fileName) { if (juce_isDirectory (fileName)) return RemoveDirectory (fileName) != 0; @@ -234808,7 +234791,7 @@ bool juce_deleteFile (const String& fileName) throw() return DeleteFile (fileName) != 0; } -bool File::moveToTrash() const throw() +bool File::moveToTrash() const { if (! exists()) return true; @@ -234831,17 +234814,17 @@ bool File::moveToTrash() const throw() return SHFileOperation (&fos) == 0; } -bool juce_moveFile (const String& source, const String& dest) throw() +bool juce_moveFile (const String& source, const String& dest) { return MoveFile (source, dest) != 0; } -bool juce_copyFile (const String& source, const String& dest) throw() +bool juce_copyFile (const String& source, const String& dest) { return CopyFile (source, dest, false) != 0; } -void juce_createDirectory (const String& fileName) throw() +void juce_createDirectory (const String& fileName) { if (! juce_fileExists (fileName, true)) { @@ -234850,7 +234833,7 @@ void juce_createDirectory (const String& fileName) throw() } // return 0 if not possible -void* juce_fileOpen (const String& fileName, bool forWriting) throw() +void* juce_fileOpen (const String& fileName, bool forWriting) { HANDLE h; @@ -234876,19 +234859,19 @@ void* juce_fileOpen (const String& fileName, bool forWriting) throw() return (void*) h; } -void juce_fileClose (void* handle) throw() +void juce_fileClose (void* handle) { CloseHandle (handle); } -int juce_fileRead (void* handle, void* buffer, int size) throw() +int juce_fileRead (void* handle, void* buffer, int size) { DWORD num = 0; ReadFile ((HANDLE) handle, buffer, size, &num, 0); return num; } -int juce_fileWrite (void* handle, const void* buffer, int size) throw() +int juce_fileWrite (void* handle, const void* buffer, int size) { DWORD num; @@ -234899,7 +234882,7 @@ int juce_fileWrite (void* handle, const void* buffer, int size) throw() return num; } -int64 juce_fileSetPosition (void* handle, int64 pos) throw() +int64 juce_fileSetPosition (void* handle, int64 pos) { LARGE_INTEGER li; li.QuadPart = pos; @@ -234911,7 +234894,7 @@ int64 juce_fileSetPosition (void* handle, int64 pos) throw() return li.QuadPart; } -int64 juce_fileGetPosition (void* handle) throw() +int64 juce_fileGetPosition (void* handle) { LARGE_INTEGER li; li.QuadPart = 0; @@ -234922,12 +234905,12 @@ int64 juce_fileGetPosition (void* handle) throw() return jmax ((int64) 0, li.QuadPart); } -void juce_fileFlush (void* handle) throw() +void juce_fileFlush (void* handle) { FlushFileBuffers ((HANDLE) handle); } -int64 juce_getFileSize (const String& fileName) throw() +int64 juce_getFileSize (const String& fileName) { WIN32_FILE_ATTRIBUTE_DATA attributes; @@ -234940,7 +234923,7 @@ int64 juce_getFileSize (const String& fileName) throw() return 0; } -static int64 fileTimeToTime (const FILETIME* const ft) throw() +static int64 fileTimeToTime (const FILETIME* const ft) { // tell me if this fails! static_jassert (sizeof (ULARGE_INTEGER) == sizeof (FILETIME)); @@ -234952,7 +234935,7 @@ static int64 fileTimeToTime (const FILETIME* const ft) throw() #endif } -static void timeToFileTime (const int64 time, FILETIME* const ft) throw() +static void timeToFileTime (const int64 time, FILETIME* const ft) { #if JUCE_GCC ((ULARGE_INTEGER*) ft)->QuadPart = time * 10000 + 116444736000000000LL; @@ -234964,7 +234947,7 @@ static void timeToFileTime (const int64 time, FILETIME* const ft) throw() void juce_getFileTimes (const String& fileName, int64& modificationTime, int64& accessTime, - int64& creationTime) throw() + int64& creationTime) { WIN32_FILE_ATTRIBUTE_DATA attributes; @@ -234983,7 +234966,7 @@ void juce_getFileTimes (const String& fileName, bool juce_setFileTimes (const String& fileName, int64 modificationTime, int64 accessTime, - int64 creationTime) throw() + int64 creationTime) { FILETIME m, a, c; @@ -235012,7 +234995,7 @@ bool juce_setFileTimes (const String& fileName, } // return '\0' separated list of strings -const StringArray juce_getFileSystemRoots() throw() +const StringArray juce_getFileSystemRoots() { TCHAR buffer [2048]; buffer[0] = 0; @@ -235036,7 +235019,7 @@ const StringArray juce_getFileSystemRoots() throw() } const String juce_getVolumeLabel (const String& filenameOnVolume, - int& volumeSerialNumber) throw() + int& volumeSerialNumber) { TCHAR n [4]; n[0] = *(const TCHAR*) filenameOnVolume; @@ -235057,7 +235040,7 @@ const String juce_getVolumeLabel (const String& filenameOnVolume, return String (dest); } -static int64 getDiskSpaceInfo (String fn, const bool total) throw() +static int64 getDiskSpaceInfo (String fn, const bool total) { if (fn[1] == T(':')) fn = fn.substring (0, 2) + T("\\"); @@ -235071,17 +235054,17 @@ static int64 getDiskSpaceInfo (String fn, const bool total) throw() return 0; } -int64 File::getBytesFreeOnVolume() const throw() +int64 File::getBytesFreeOnVolume() const { return getDiskSpaceInfo (getFullPathName(), false); } -int64 File::getVolumeTotalSize() const throw() +int64 File::getVolumeTotalSize() const { return getDiskSpaceInfo (getFullPathName(), true); } -static unsigned int getWindowsDriveType (const String& fileName) throw() +static unsigned int getWindowsDriveType (const String& fileName) { TCHAR n[4]; n[0] = *(const TCHAR*) fileName; @@ -235092,12 +235075,12 @@ static unsigned int getWindowsDriveType (const String& fileName) throw() return GetDriveType (n); } -bool File::isOnCDRomDrive() const throw() +bool File::isOnCDRomDrive() const { return getWindowsDriveType (getFullPathName()) == DRIVE_CDROM; } -bool File::isOnHardDisk() const throw() +bool File::isOnHardDisk() const { if (fullPath.isEmpty()) return false; @@ -235115,7 +235098,7 @@ bool File::isOnHardDisk() const throw() } } -bool File::isOnRemovableDrive() const throw() +bool File::isOnRemovableDrive() const { if (fullPath.isEmpty()) return false; @@ -235130,7 +235113,7 @@ bool File::isOnRemovableDrive() const throw() #define MAX_PATH_CHARS (MAX_PATH + 256) -static const File juce_getSpecialFolderPath (int type) throw() +static const File juce_getSpecialFolderPath (int type) { WCHAR path [MAX_PATH_CHARS]; @@ -235207,7 +235190,7 @@ const File JUCE_CALLTYPE File::getSpecialLocation (const SpecialLocationType typ return juce_getSpecialFolderPath (csidlType); } -const File File::getCurrentWorkingDirectory() throw() +const File File::getCurrentWorkingDirectory() { WCHAR dest [MAX_PATH_CHARS]; dest[0] = 0; @@ -235215,12 +235198,12 @@ const File File::getCurrentWorkingDirectory() throw() return File (String (dest)); } -bool File::setAsCurrentWorkingDirectory() const throw() +bool File::setAsCurrentWorkingDirectory() const { return SetCurrentDirectory (getFullPathName()) != FALSE; } -const String File::getVersion() const throw() +const String File::getVersion() const { String result; @@ -235247,7 +235230,7 @@ const String File::getVersion() const throw() return result; } -const File File::getLinkedTarget() const throw() +const File File::getLinkedTarget() const { File result (*this); String p (getFullPathName()); @@ -235282,7 +235265,7 @@ template static void getFindFileInfo (FindDataType& findData, String& filename, bool* const isDir, bool* const isHidden, int64* const fileSize, Time* const modTime, Time* const creationTime, - bool* const isReadOnly) throw() + bool* const isReadOnly) { filename = findData.cFileName; @@ -235308,7 +235291,7 @@ static void getFindFileInfo (FindDataType& findData, void* juce_findFileStart (const String& directory, const String& wildCard, String& firstResult, bool* isDir, bool* isHidden, int64* fileSize, - Time* modTime, Time* creationTime, bool* isReadOnly) throw() + Time* modTime, Time* creationTime, bool* isReadOnly) { String wc (directory); @@ -235333,7 +235316,7 @@ void* juce_findFileStart (const String& directory, const String& wildCard, Strin bool juce_findFileNext (void* handle, String& resultFile, bool* isDir, bool* isHidden, int64* fileSize, - Time* modTime, Time* creationTime, bool* isReadOnly) throw() + Time* modTime, Time* creationTime, bool* isReadOnly) { WIN32_FIND_DATA findData; @@ -235348,13 +235331,13 @@ bool juce_findFileNext (void* handle, String& resultFile, return false; } -void juce_findFileClose (void* handle) throw() +void juce_findFileClose (void* handle) { FindClose (handle); } bool juce_launchFile (const String& fileName, - const String& parameters) throw() + const String& parameters) { HINSTANCE hInstance = 0; @@ -235367,7 +235350,7 @@ bool juce_launchFile (const String& fileName, return hInstance > (HINSTANCE) 32; } -void File::revealToUser() const throw() +void File::revealToUser() const { if (isDirectory()) startAsProcess(); @@ -238695,7 +238678,7 @@ void juce_setWindowStyleBit (HWND h, const int styleType, const int feature, con | SWP_NOOWNERZORDER | SWP_FRAMECHANGED | SWP_NOSENDCHANGING); } -bool Process::isForegroundProcess() throw() +bool Process::isForegroundProcess() { HWND fg = GetForegroundWindow(); @@ -250550,7 +250533,7 @@ void WaitableEvent::reset() const throw() pthread_mutex_unlock (&es->mutex); } -void JUCE_CALLTYPE Thread::sleep (int millisecs) throw() +void JUCE_CALLTYPE Thread::sleep (int millisecs) { struct timespec time; time.tv_sec = millisecs / 1000; @@ -250561,15 +250544,15 @@ void JUCE_CALLTYPE Thread::sleep (int millisecs) throw() const tchar File::separator = T('/'); const tchar* File::separatorString = T("/"); -bool juce_copyFile (const String& s, const String& d) throw(); +bool juce_copyFile (const String& s, const String& d); -static bool juce_stat (const String& fileName, struct stat& info) throw() +static bool juce_stat (const String& fileName, struct stat& info) { return fileName.isNotEmpty() && (stat (fileName.toUTF8(), &info) == 0); } -bool juce_isDirectory (const String& fileName) throw() +bool juce_isDirectory (const String& fileName) { struct stat info; @@ -250578,7 +250561,7 @@ bool juce_isDirectory (const String& fileName) throw() && ((info.st_mode & S_IFDIR) != 0)); } -bool juce_fileExists (const String& fileName, const bool dontCountDirectories) throw() +bool juce_fileExists (const String& fileName, const bool dontCountDirectories) { if (fileName.isEmpty()) return false; @@ -250598,18 +250581,18 @@ bool juce_fileExists (const String& fileName, const bool dontCountDirectories) t return exists; } -int64 juce_getFileSize (const String& fileName) throw() +int64 juce_getFileSize (const String& fileName) { struct stat info; return juce_stat (fileName, info) ? info.st_size : 0; } -bool juce_canWriteToFile (const String& fileName) throw() +bool juce_canWriteToFile (const String& fileName) { return access (fileName.toUTF8(), W_OK) == 0; } -bool juce_deleteFile (const String& fileName) throw() +bool juce_deleteFile (const String& fileName) { if (juce_isDirectory (fileName)) return rmdir ((const char*) fileName.toUTF8()) == 0; @@ -250617,7 +250600,7 @@ bool juce_deleteFile (const String& fileName) throw() return remove ((const char*) fileName.toUTF8()) == 0; } -bool juce_moveFile (const String& source, const String& dest) throw() +bool juce_moveFile (const String& source, const String& dest) { if (rename (source.toUTF8(), dest.toUTF8()) == 0) return true; @@ -250634,12 +250617,12 @@ bool juce_moveFile (const String& source, const String& dest) throw() return false; } -void juce_createDirectory (const String& fileName) throw() +void juce_createDirectory (const String& fileName) { mkdir (fileName.toUTF8(), 0777); } -void* juce_fileOpen (const String& fileName, bool forWriting) throw() +void* juce_fileOpen (const String& fileName, bool forWriting) { int flags = O_RDONLY; @@ -250663,13 +250646,13 @@ void* juce_fileOpen (const String& fileName, bool forWriting) throw() return (void*) open ((const char*) fileName.toUTF8(), flags, 00644); } -void juce_fileClose (void* handle) throw() +void juce_fileClose (void* handle) { if (handle != 0) close ((int) (pointer_sized_int) handle); } -int juce_fileRead (void* handle, void* buffer, int size) throw() +int juce_fileRead (void* handle, void* buffer, int size) { if (handle != 0) return read ((int) (pointer_sized_int) handle, buffer, size); @@ -250677,7 +250660,7 @@ int juce_fileRead (void* handle, void* buffer, int size) throw() return 0; } -int juce_fileWrite (void* handle, const void* buffer, int size) throw() +int juce_fileWrite (void* handle, const void* buffer, int size) { if (handle != 0) return write ((int) (pointer_sized_int) handle, buffer, size); @@ -250685,7 +250668,7 @@ int juce_fileWrite (void* handle, const void* buffer, int size) throw() return 0; } -int64 juce_fileSetPosition (void* handle, int64 pos) throw() +int64 juce_fileSetPosition (void* handle, int64 pos) { if (handle != 0 && lseek ((int) (pointer_sized_int) handle, pos, SEEK_SET) == pos) return pos; @@ -250693,7 +250676,7 @@ int64 juce_fileSetPosition (void* handle, int64 pos) throw() return -1; } -int64 juce_fileGetPosition (void* handle) throw() +int64 juce_fileGetPosition (void* handle) { if (handle != 0) return lseek ((int) (pointer_sized_int) handle, 0, SEEK_CUR); @@ -250701,7 +250684,7 @@ int64 juce_fileGetPosition (void* handle) throw() return -1; } -void juce_fileFlush (void* handle) throw() +void juce_fileFlush (void* handle) { if (handle != 0) fsync ((int) (pointer_sized_int) handle); @@ -250715,7 +250698,7 @@ const File juce_getExecutableFile() } // if this file doesn't exist, find a parent of it that does.. -static bool doStatFS (const File* file, struct statfs& result) throw() +static bool doStatFS (const File* file, struct statfs& result) { File f (*file); @@ -250730,7 +250713,7 @@ static bool doStatFS (const File* file, struct statfs& result) throw() return statfs (f.getFullPathName().toUTF8(), &result) == 0; } -int64 File::getBytesFreeOnVolume() const throw() +int64 File::getBytesFreeOnVolume() const { struct statfs buf; if (doStatFS (this, buf)) @@ -250739,7 +250722,7 @@ int64 File::getBytesFreeOnVolume() const throw() return 0; } -int64 File::getVolumeTotalSize() const throw() +int64 File::getVolumeTotalSize() const { struct statfs buf; if (doStatFS (this, buf)) @@ -250749,7 +250732,7 @@ int64 File::getVolumeTotalSize() const throw() } const String juce_getVolumeLabel (const String& filenameOnVolume, - int& volumeSerialNumber) throw() + int& volumeSerialNumber) { volumeSerialNumber = 0; @@ -250814,7 +250797,7 @@ const String juce_getOutputFromCommand (const String& command) #define filedesc ((int) internal) #endif -InterProcessLock::InterProcessLock (const String& name_) throw() +InterProcessLock::InterProcessLock (const String& name_) : internal (0), name (name_), reentrancyLevel (0) @@ -250831,7 +250814,7 @@ InterProcessLock::InterProcessLock (const String& name_) throw() internal = (void*) open (temp.getFullPathName().toUTF8(), O_RDWR); } -InterProcessLock::~InterProcessLock() throw() +InterProcessLock::~InterProcessLock() { while (reentrancyLevel > 0) this->exit(); @@ -250839,7 +250822,7 @@ InterProcessLock::~InterProcessLock() throw() close (filedesc); } -bool InterProcessLock::enter (const int timeOutMillisecs) throw() +bool InterProcessLock::enter (const int timeOutMillisecs) { if (internal == 0) return false; @@ -250877,7 +250860,7 @@ bool InterProcessLock::enter (const int timeOutMillisecs) throw() return false; } -void InterProcessLock::exit() throw() +void InterProcessLock::exit() { if (reentrancyLevel > 0 && internal != 0) { @@ -250912,7 +250895,7 @@ void InterProcessLock::exit() throw() void juce_getFileTimes (const String& fileName, int64& modificationTime, int64& accessTime, - int64& creationTime) throw() + int64& creationTime) { modificationTime = 0; accessTime = 0; @@ -250931,7 +250914,7 @@ void juce_getFileTimes (const String& fileName, bool juce_setFileTimes (const String& fileName, int64 modificationTime, int64 accessTime, - int64 creationTime) throw() + int64 creationTime) { struct utimbuf times; times.actime = (time_t) (accessTime / 1000); @@ -250940,7 +250923,7 @@ bool juce_setFileTimes (const String& fileName, return utime (fileName.toUTF8(), ×) == 0; } -bool juce_setFileReadOnly (const String& fileName, bool isReadOnly) throw() +bool juce_setFileReadOnly (const String& fileName, bool isReadOnly) { struct stat info; const int res = stat (fileName.toUTF8(), &info); @@ -250958,7 +250941,7 @@ bool juce_setFileReadOnly (const String& fileName, bool isReadOnly) throw() return chmod (fileName.toUTF8(), info.st_mode) == 0; } -bool juce_copyFile (const String& s, const String& d) throw() +bool juce_copyFile (const String& s, const String& d) { const File source (s), dest (d); @@ -250989,14 +250972,14 @@ bool juce_copyFile (const String& s, const String& d) throw() return ok; } -const StringArray juce_getFileSystemRoots() throw() +const StringArray juce_getFileSystemRoots() { StringArray s; s.add (T("/")); return s; } -bool File::isOnCDRomDrive() const throw() +bool File::isOnCDRomDrive() const { struct statfs buf; @@ -251007,7 +250990,7 @@ bool File::isOnCDRomDrive() const throw() return false; } -bool File::isOnHardDisk() const throw() +bool File::isOnHardDisk() const { struct statfs buf; @@ -251033,13 +251016,13 @@ bool File::isOnHardDisk() const throw() return true; } -bool File::isOnRemovableDrive() const throw() +bool File::isOnRemovableDrive() const { jassertfalse // xxx not implemented for linux! return false; } -bool File::isHidden() const throw() +bool File::isHidden() const { return getFileName().startsWithChar (T('.')); } @@ -251111,23 +251094,23 @@ const File File::getSpecialLocation (const SpecialLocationType type) return File::nonexistent; } -const File File::getCurrentWorkingDirectory() throw() +const File File::getCurrentWorkingDirectory() { char buf [2048]; return File (String::fromUTF8 ((const uint8*) getcwd (buf, sizeof (buf)))); } -bool File::setAsCurrentWorkingDirectory() const throw() +bool File::setAsCurrentWorkingDirectory() const { return chdir (getFullPathName().toUTF8()) == 0; } -const String File::getVersion() const throw() +const String File::getVersion() const { return String::empty; // xxx not yet implemented } -const File File::getLinkedTarget() const throw() +const File File::getLinkedTarget() const { char buffer [4096]; size_t numChars = readlink ((const char*) getFullPathName().toUTF8(), @@ -251139,7 +251122,7 @@ const File File::getLinkedTarget() const throw() return *this; } -bool File::moveToTrash() const throw() +bool File::moveToTrash() const { if (! exists()) return true; @@ -251162,7 +251145,7 @@ struct FindFileStruct DIR* dir; bool getNextMatch (String& result, bool* const isDir, bool* const isHidden, int64* const fileSize, - Time* const modTime, Time* const creationTime, bool* const isReadOnly) throw() + Time* const modTime, Time* const creationTime, bool* const isReadOnly) { const char* const wildcardUTF8 = wildCard.toUTF8(); @@ -251220,7 +251203,7 @@ struct FindFileStruct // returns 0 on failure void* juce_findFileStart (const String& directory, const String& wildCard, String& firstResultFile, bool* isDir, bool* isHidden, int64* fileSize, Time* modTime, - Time* creationTime, bool* isReadOnly) throw() + Time* creationTime, bool* isReadOnly) { DIR* d = opendir (directory.toUTF8()); @@ -251256,7 +251239,7 @@ void* juce_findFileStart (const String& directory, const String& wildCard, Strin } bool juce_findFileNext (void* handle, String& resultFile, - bool* isDir, bool* isHidden, int64* fileSize, Time* modTime, Time* creationTime, bool* isReadOnly) throw() + bool* isDir, bool* isHidden, int64* fileSize, Time* modTime, Time* creationTime, bool* isReadOnly) { FindFileStruct* const ff = (FindFileStruct*) handle; @@ -251266,7 +251249,7 @@ bool juce_findFileNext (void* handle, String& resultFile, return false; } -void juce_findFileClose (void* handle) throw() +void juce_findFileClose (void* handle) { FindFileStruct* const ff = (FindFileStruct*) handle; @@ -251278,7 +251261,7 @@ void juce_findFileClose (void* handle) throw() } bool juce_launchFile (const String& fileName, - const String& parameters) throw() + const String& parameters) { String cmdString (fileName); cmdString << " " << parameters; @@ -251314,7 +251297,7 @@ bool juce_launchFile (const String& fileName, return cpid >= 0; } -void File::revealToUser() const throw() +void File::revealToUser() const { if (isDirectory()) startAsProcess(); @@ -252204,7 +252187,7 @@ void PlatformUtilities::fpuReset() void JUCE_API juce_threadEntryPoint (void*); -void* threadEntryProc (void* value) throw() +void* threadEntryProc (void* value) { // New threads start off as root when running suid Process::lowerPrivilege(); @@ -252213,7 +252196,7 @@ void* threadEntryProc (void* value) throw() return 0; } -void* juce_createThread (void* userData) throw() +void* juce_createThread (void* userData) { pthread_t handle = 0; @@ -252226,17 +252209,17 @@ void* juce_createThread (void* userData) throw() return 0; } -void juce_killThread (void* handle) throw() +void juce_killThread (void* handle) { if (handle != 0) pthread_cancel ((pthread_t)handle); } -void juce_setCurrentThreadName (const String& /*name*/) throw() +void juce_setCurrentThreadName (const String& /*name*/) { } -Thread::ThreadID Thread::getCurrentThreadId() throw() +Thread::ThreadID Thread::getCurrentThreadId() { return (ThreadID) pthread_self(); } @@ -252257,7 +252240,7 @@ Thread::ThreadID Thread::getCurrentThreadId() throw() // priority 1 to 10 where 5=normal, 1=low. If the handle is 0, sets the // priority of the current thread -bool juce_setThreadPriority (void* handle, int priority) throw() +bool juce_setThreadPriority (void* handle, int priority) { struct sched_param param; int policy, maxp, minp, pri; @@ -252288,7 +252271,7 @@ bool juce_setThreadPriority (void* handle, int priority) throw() return false; } -void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask) throw() +void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask) { #if SUPPORT_AFFINITIES cpu_set_t affinity; @@ -252317,7 +252300,7 @@ void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask) throw() #endif } -void Thread::yield() throw() +void Thread::yield() { sched_yield(); } @@ -252355,7 +252338,7 @@ void Process::terminate() exit (0); } -bool JUCE_CALLTYPE juce_isRunningUnderDebugger() throw() +bool JUCE_CALLTYPE juce_isRunningUnderDebugger() { static char testResult = 0; @@ -252373,7 +252356,7 @@ bool JUCE_CALLTYPE juce_isRunningUnderDebugger() throw() return testResult < 0; } -bool JUCE_CALLTYPE Process::isRunningUnderDebugger() throw() +bool JUCE_CALLTYPE Process::isRunningUnderDebugger() { return juce_isRunningUnderDebugger(); } @@ -253420,7 +253403,7 @@ static bool untrapErrors() static bool isActiveApplication = false; -bool Process::isForegroundProcess() throw() +bool Process::isForegroundProcess() { return isActiveApplication; } @@ -259802,7 +259785,7 @@ void* threadEntryProc (void* userData) return 0; } -void* juce_createThread (void* userData) throw() +void* juce_createThread (void* userData) { pthread_t handle = 0; @@ -259815,22 +259798,22 @@ void* juce_createThread (void* userData) throw() return 0; } -void juce_killThread (void* handle) throw() +void juce_killThread (void* handle) { if (handle != 0) pthread_cancel ((pthread_t) handle); } -void juce_setCurrentThreadName (const String& /*name*/) throw() +void juce_setCurrentThreadName (const String& /*name*/) { } -Thread::ThreadID Thread::getCurrentThreadId() throw() +Thread::ThreadID Thread::getCurrentThreadId() { return (ThreadID) pthread_self(); } -bool juce_setThreadPriority (void* handle, int priority) throw() +bool juce_setThreadPriority (void* handle, int priority) { if (handle == 0) handle = (void*) pthread_self(); @@ -259842,18 +259825,18 @@ bool juce_setThreadPriority (void* handle, int priority) throw() return pthread_setschedparam ((pthread_t) handle, policy, ¶m) == 0; } -void Thread::yield() throw() +void Thread::yield() { sched_yield(); } -void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask) throw() +void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask) { // xxx jassertfalse } -bool Process::isForegroundProcess() throw() +bool Process::isForegroundProcess() { #if JUCE_MAC return [NSApp isActive]; @@ -260007,7 +259990,7 @@ void WaitableEvent::reset() const throw() pthread_mutex_unlock (&es->mutex); } -void JUCE_CALLTYPE Thread::sleep (int millisecs) throw() +void JUCE_CALLTYPE Thread::sleep (int millisecs) { struct timespec time; time.tv_sec = millisecs / 1000; @@ -260018,15 +260001,15 @@ void JUCE_CALLTYPE Thread::sleep (int millisecs) throw() const tchar File::separator = T('/'); const tchar* File::separatorString = T("/"); -bool juce_copyFile (const String& s, const String& d) throw(); +bool juce_copyFile (const String& s, const String& d); -static bool juce_stat (const String& fileName, struct stat& info) throw() +static bool juce_stat (const String& fileName, struct stat& info) { return fileName.isNotEmpty() && (stat (fileName.toUTF8(), &info) == 0); } -bool juce_isDirectory (const String& fileName) throw() +bool juce_isDirectory (const String& fileName) { struct stat info; @@ -260035,7 +260018,7 @@ bool juce_isDirectory (const String& fileName) throw() && ((info.st_mode & S_IFDIR) != 0)); } -bool juce_fileExists (const String& fileName, const bool dontCountDirectories) throw() +bool juce_fileExists (const String& fileName, const bool dontCountDirectories) { if (fileName.isEmpty()) return false; @@ -260055,18 +260038,18 @@ bool juce_fileExists (const String& fileName, const bool dontCountDirectories) t return exists; } -int64 juce_getFileSize (const String& fileName) throw() +int64 juce_getFileSize (const String& fileName) { struct stat info; return juce_stat (fileName, info) ? info.st_size : 0; } -bool juce_canWriteToFile (const String& fileName) throw() +bool juce_canWriteToFile (const String& fileName) { return access (fileName.toUTF8(), W_OK) == 0; } -bool juce_deleteFile (const String& fileName) throw() +bool juce_deleteFile (const String& fileName) { if (juce_isDirectory (fileName)) return rmdir ((const char*) fileName.toUTF8()) == 0; @@ -260074,7 +260057,7 @@ bool juce_deleteFile (const String& fileName) throw() return remove ((const char*) fileName.toUTF8()) == 0; } -bool juce_moveFile (const String& source, const String& dest) throw() +bool juce_moveFile (const String& source, const String& dest) { if (rename (source.toUTF8(), dest.toUTF8()) == 0) return true; @@ -260091,12 +260074,12 @@ bool juce_moveFile (const String& source, const String& dest) throw() return false; } -void juce_createDirectory (const String& fileName) throw() +void juce_createDirectory (const String& fileName) { mkdir (fileName.toUTF8(), 0777); } -void* juce_fileOpen (const String& fileName, bool forWriting) throw() +void* juce_fileOpen (const String& fileName, bool forWriting) { int flags = O_RDONLY; @@ -260120,13 +260103,13 @@ void* juce_fileOpen (const String& fileName, bool forWriting) throw() return (void*) open ((const char*) fileName.toUTF8(), flags, 00644); } -void juce_fileClose (void* handle) throw() +void juce_fileClose (void* handle) { if (handle != 0) close ((int) (pointer_sized_int) handle); } -int juce_fileRead (void* handle, void* buffer, int size) throw() +int juce_fileRead (void* handle, void* buffer, int size) { if (handle != 0) return read ((int) (pointer_sized_int) handle, buffer, size); @@ -260134,7 +260117,7 @@ int juce_fileRead (void* handle, void* buffer, int size) throw() return 0; } -int juce_fileWrite (void* handle, const void* buffer, int size) throw() +int juce_fileWrite (void* handle, const void* buffer, int size) { if (handle != 0) return write ((int) (pointer_sized_int) handle, buffer, size); @@ -260142,7 +260125,7 @@ int juce_fileWrite (void* handle, const void* buffer, int size) throw() return 0; } -int64 juce_fileSetPosition (void* handle, int64 pos) throw() +int64 juce_fileSetPosition (void* handle, int64 pos) { if (handle != 0 && lseek ((int) (pointer_sized_int) handle, pos, SEEK_SET) == pos) return pos; @@ -260150,7 +260133,7 @@ int64 juce_fileSetPosition (void* handle, int64 pos) throw() return -1; } -int64 juce_fileGetPosition (void* handle) throw() +int64 juce_fileGetPosition (void* handle) { if (handle != 0) return lseek ((int) (pointer_sized_int) handle, 0, SEEK_CUR); @@ -260158,7 +260141,7 @@ int64 juce_fileGetPosition (void* handle) throw() return -1; } -void juce_fileFlush (void* handle) throw() +void juce_fileFlush (void* handle) { if (handle != 0) fsync ((int) (pointer_sized_int) handle); @@ -260172,7 +260155,7 @@ const File juce_getExecutableFile() } // if this file doesn't exist, find a parent of it that does.. -static bool doStatFS (const File* file, struct statfs& result) throw() +static bool doStatFS (const File* file, struct statfs& result) { File f (*file); @@ -260187,7 +260170,7 @@ static bool doStatFS (const File* file, struct statfs& result) throw() return statfs (f.getFullPathName().toUTF8(), &result) == 0; } -int64 File::getBytesFreeOnVolume() const throw() +int64 File::getBytesFreeOnVolume() const { struct statfs buf; if (doStatFS (this, buf)) @@ -260196,7 +260179,7 @@ int64 File::getBytesFreeOnVolume() const throw() return 0; } -int64 File::getVolumeTotalSize() const throw() +int64 File::getVolumeTotalSize() const { struct statfs buf; if (doStatFS (this, buf)) @@ -260206,7 +260189,7 @@ int64 File::getVolumeTotalSize() const throw() } const String juce_getVolumeLabel (const String& filenameOnVolume, - int& volumeSerialNumber) throw() + int& volumeSerialNumber) { volumeSerialNumber = 0; @@ -260271,7 +260254,7 @@ const String juce_getOutputFromCommand (const String& command) #define filedesc ((int) internal) #endif -InterProcessLock::InterProcessLock (const String& name_) throw() +InterProcessLock::InterProcessLock (const String& name_) : internal (0), name (name_), reentrancyLevel (0) @@ -260288,7 +260271,7 @@ InterProcessLock::InterProcessLock (const String& name_) throw() internal = (void*) open (temp.getFullPathName().toUTF8(), O_RDWR); } -InterProcessLock::~InterProcessLock() throw() +InterProcessLock::~InterProcessLock() { while (reentrancyLevel > 0) this->exit(); @@ -260296,7 +260279,7 @@ InterProcessLock::~InterProcessLock() throw() close (filedesc); } -bool InterProcessLock::enter (const int timeOutMillisecs) throw() +bool InterProcessLock::enter (const int timeOutMillisecs) { if (internal == 0) return false; @@ -260334,7 +260317,7 @@ bool InterProcessLock::enter (const int timeOutMillisecs) throw() return false; } -void InterProcessLock::exit() throw() +void InterProcessLock::exit() { if (reentrancyLevel > 0 && internal != 0) { @@ -260369,7 +260352,7 @@ void InterProcessLock::exit() throw() void juce_getFileTimes (const String& fileName, int64& modificationTime, int64& accessTime, - int64& creationTime) throw() + int64& creationTime) { modificationTime = 0; accessTime = 0; @@ -260388,7 +260371,7 @@ void juce_getFileTimes (const String& fileName, bool juce_setFileTimes (const String& fileName, int64 modificationTime, int64 accessTime, - int64 creationTime) throw() + int64 creationTime) { struct utimbuf times; times.actime = (time_t) (accessTime / 1000); @@ -260397,7 +260380,7 @@ bool juce_setFileTimes (const String& fileName, return utime (fileName.toUTF8(), ×) == 0; } -bool juce_setFileReadOnly (const String& fileName, bool isReadOnly) throw() +bool juce_setFileReadOnly (const String& fileName, bool isReadOnly) { struct stat info; const int res = stat (fileName.toUTF8(), &info); @@ -260415,7 +260398,7 @@ bool juce_setFileReadOnly (const String& fileName, bool isReadOnly) throw() return chmod (fileName.toUTF8(), info.st_mode) == 0; } -bool juce_copyFile (const String& src, const String& dst) throw() +bool juce_copyFile (const String& src, const String& dst) { const ScopedAutoReleasePool pool; NSFileManager* fm = [NSFileManager defaultManager]; @@ -260432,7 +260415,7 @@ bool juce_copyFile (const String& src, const String& dst) throw() #endif } -const StringArray juce_getFileSystemRoots() throw() +const StringArray juce_getFileSystemRoots() { StringArray s; s.add (T("/")); @@ -260455,21 +260438,21 @@ static bool isFileOnDriveType (const File* const f, const char** types) return false; } -bool File::isOnCDRomDrive() const throw() +bool File::isOnCDRomDrive() const { static const char* const cdTypes[] = { "cd9660", "cdfs", "cddafs", "udf", 0 }; return isFileOnDriveType (this, (const char**) cdTypes); } -bool File::isOnHardDisk() const throw() +bool File::isOnHardDisk() const { static const char* const nonHDTypes[] = { "nfs", "smbfs", "ramfs", 0 }; return ! (isOnCDRomDrive() || isFileOnDriveType (this, (const char**) nonHDTypes)); } -bool File::isOnRemovableDrive() const throw() +bool File::isOnRemovableDrive() const { #if JUCE_IPHONE return false; // xxx is this possible? @@ -260508,7 +260491,7 @@ static bool juce_isHiddenFile (const String& path) #endif } -bool File::isHidden() const throw() +bool File::isHidden() const { return juce_isHiddenFile (getFullPathName()); } @@ -260592,7 +260575,7 @@ const File File::getSpecialLocation (const SpecialLocationType type) return File::nonexistent; } -const File File::getCurrentWorkingDirectory() throw() +const File File::getCurrentWorkingDirectory() { char buf [2048]; getcwd (buf, sizeof(buf)); @@ -260600,12 +260583,12 @@ const File File::getCurrentWorkingDirectory() throw() return File (PlatformUtilities::convertToPrecomposedUnicode (buf)); } -bool File::setAsCurrentWorkingDirectory() const throw() +bool File::setAsCurrentWorkingDirectory() const { return chdir (getFullPathName().toUTF8()) == 0; } -const String File::getVersion() const throw() +const String File::getVersion() const { const ScopedAutoReleasePool pool; String result; @@ -260628,7 +260611,7 @@ const String File::getVersion() const throw() return result; } -const File File::getLinkedTarget() const throw() +const File File::getLinkedTarget() const { #if JUCE_IPHONE || (defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) NSString* dest = [[NSFileManager defaultManager] destinationOfSymbolicLinkAtPath: juceStringToNS (getFullPathName()) error: nil]; @@ -260643,7 +260626,7 @@ const File File::getLinkedTarget() const throw() return *this; } -bool File::moveToTrash() const throw() +bool File::moveToTrash() const { if (! exists()) return true; @@ -260671,7 +260654,7 @@ struct FindFileStruct }; bool juce_findFileNext (void* handle, String& resultFile, - bool* isDir, bool* isHidden, int64* fileSize, Time* modTime, Time* creationTime, bool* isReadOnly) throw() + bool* isDir, bool* isHidden, int64* fileSize, Time* modTime, Time* creationTime, bool* isReadOnly) { FindFileStruct* ff = (FindFileStruct*) handle; NSString* file; @@ -260726,7 +260709,7 @@ bool juce_findFileNext (void* handle, String& resultFile, void* juce_findFileStart (const String& directory, const String& wildCard, String& firstResultFile, bool* isDir, bool* isHidden, int64* fileSize, Time* modTime, - Time* creationTime, bool* isReadOnly) throw() + Time* creationTime, bool* isReadOnly) { NSDirectoryEnumerator* e = [[NSFileManager defaultManager] enumeratorAtPath: juceStringToNS (directory)]; @@ -260750,14 +260733,14 @@ void* juce_findFileStart (const String& directory, const String& wildCard, Strin return 0; } -void juce_findFileClose (void* handle) throw() +void juce_findFileClose (void* handle) { FindFileStruct* ff = (FindFileStruct*) handle; [ff->enumerator release]; delete ff; } -bool juce_launchExecutable (const String& pathAndArguments) throw() +bool juce_launchExecutable (const String& pathAndArguments) { const char* const argv[4] = { "/bin/sh", "-c", (const char*) pathAndArguments, 0 }; @@ -260778,8 +260761,7 @@ bool juce_launchExecutable (const String& pathAndArguments) throw() return true; } -bool juce_launchFile (const String& fileName, - const String& parameters) throw() +bool juce_launchFile (const String& fileName, const String& parameters) { #if JUCE_IPHONE return [[UIApplication sharedApplication] openURL: [NSURL fileURLWithPath: juceStringToNS (fileName)]]; @@ -260822,7 +260804,7 @@ bool juce_launchFile (const String& fileName, #endif } -void File::revealToUser() const throw() +void File::revealToUser() const { #if ! JUCE_IPHONE if (exists()) @@ -261306,7 +261288,7 @@ void Logger::outputDebugPrintf (const tchar* format, ...) throw() outputDebugString (text); } -bool JUCE_CALLTYPE juce_isRunningUnderDebugger() throw() +bool JUCE_CALLTYPE juce_isRunningUnderDebugger() { static char testResult = 0; @@ -261322,7 +261304,7 @@ bool JUCE_CALLTYPE juce_isRunningUnderDebugger() throw() return testResult > 0; } -bool JUCE_CALLTYPE Process::isRunningUnderDebugger() throw() +bool JUCE_CALLTYPE Process::isRunningUnderDebugger() { return juce_isRunningUnderDebugger(); } diff --git a/juce_amalgamated.h b/juce_amalgamated.h index 292abd6857..60d6bd180f 100644 --- a/juce_amalgamated.h +++ b/juce_amalgamated.h @@ -743,7 +743,7 @@ // Now include some basics that are needed by most of the Juce classes... BEGIN_JUCE_NAMESPACE -extern bool JUCE_API JUCE_CALLTYPE juce_isRunningUnderDebugger() throw(); +extern bool JUCE_API JUCE_CALLTYPE juce_isRunningUnderDebugger(); #if JUCE_LOG_ASSERTIONS extern void JUCE_API juce_LogAssertion (const char* filename, const int lineNum) throw(); @@ -7285,7 +7285,7 @@ public: You can use its operator= method to point it at a proper file. */ - File() throw() {} + File() {} /** Creates a file from an absolute path. @@ -7297,13 +7297,13 @@ public: On the Mac/Linux, the path can include "~" notation for referring to user home directories. */ - File (const String& path) throw(); + File (const String& path); /** Creates a copy of another file object. */ - File (const File& other) throw(); + File (const File& other); /** Destructor. */ - ~File() throw() {} + ~File() {} /** Sets the file based on an absolute pathname. @@ -7315,10 +7315,10 @@ public: On the Mac/Linux, the path can include "~" notation for referring to user home directories. */ - const File& operator= (const String& newFilePath) throw(); + const File& operator= (const String& newFilePath); /** Copies from another file object. */ - const File& operator= (const File& otherFile) throw(); + const File& operator= (const File& otherFile); /** This static constant is used for referring to an 'invalid' file. */ static const File nonexistent; @@ -7328,7 +7328,7 @@ public: @returns true if the file exists, either as a file or a directory. @see existsAsFile, isDirectory */ - bool exists() const throw(); + bool exists() const; /** Checks whether the file exists and is a file rather than a directory. @@ -7336,7 +7336,7 @@ public: or doesn't exist @see exists, isDirectory */ - bool existsAsFile() const throw(); + bool existsAsFile() const; /** Checks whether the file is a directory that exists. @@ -7344,13 +7344,13 @@ public: false if it's a file or doesn't exist at all @see exists, existsAsFile */ - bool isDirectory() const throw(); + bool isDirectory() const; /** Returns the size of the file in bytes. @returns the number of bytes in the file, or 0 if it doesn't exist. */ - int64 getSize() const throw(); + int64 getSize() const; /** Utility function to convert a file size in bytes to a neat string description. @@ -7370,7 +7370,7 @@ public: @see getFileName, getRelativePathFrom */ - const String& getFullPathName() const throw() { return fullPath; } + const String& getFullPathName() const { return fullPath; } /** Returns the last section of the pathname. @@ -7385,7 +7385,7 @@ public: @see getFullPathName, getFileNameWithoutExtension */ - const String getFileName() const throw(); + const String getFileName() const; /** Creates a relative path that refers to a file relatively to a given directory. @@ -7402,7 +7402,7 @@ public: If it doesn't exist, it's assumed to be a directory. @see getChildFile, isAbsolutePath */ - const String getRelativePathFrom (const File& directoryToBeRelativeTo) const throw(); + const String getRelativePathFrom (const File& directoryToBeRelativeTo) const; /** Returns the file's extension. @@ -7412,7 +7412,7 @@ public: @see hasFileExtension, withFileExtension, getFileNameWithoutExtension */ - const String getFileExtension() const throw(); + const String getFileExtension() const; /** Checks whether the file has a given extension. @@ -7426,7 +7426,7 @@ public: @see getFileExtension, withFileExtension, getFileNameWithoutExtension */ - bool hasFileExtension (const String& extensionToTest) const throw(); + bool hasFileExtension (const String& extensionToTest) const; /** Returns a version of this file with a different file extension. @@ -7438,7 +7438,7 @@ public: @see getFileName, getFileExtension, hasFileExtension, getFileNameWithoutExtension */ - const File withFileExtension (const String& newExtension) const throw(); + const File withFileExtension (const String& newExtension) const; /** Returns the last part of the filename, without its file extension. @@ -7446,21 +7446,21 @@ public: @see getFileName, getFileExtension, hasFileExtension, withFileExtension */ - const String getFileNameWithoutExtension() const throw(); + const String getFileNameWithoutExtension() const; /** Returns a 32-bit hash-code that identifies this file. This is based on the filename. Obviously it's possible, although unlikely, that two files will have the same hash-code. */ - int hashCode() const throw(); + int hashCode() const; /** Returns a 64-bit hash-code that identifies this file. This is based on the filename. Obviously it's possible, although unlikely, that two files will have the same hash-code. */ - int64 hashCode64() const throw(); + int64 hashCode64() const; /** Returns a file based on a relative path. @@ -7475,7 +7475,7 @@ public: @see getSiblingFile, getParentDirectory, getRelativePathFrom, isAChildOf */ - const File getChildFile (String relativePath) const throw(); + const File getChildFile (String relativePath) const; /** Returns a file which is in the same directory as this one. @@ -7483,13 +7483,13 @@ public: @see getChildFile, getParentDirectory */ - const File getSiblingFile (const String& siblingFileName) const throw(); + const File getSiblingFile (const String& siblingFileName) const; /** Returns the directory that contains this file or directory. e.g. for "/moose/fish/foo.txt" this will return "/moose/fish". */ - const File getParentDirectory() const throw(); + const File getParentDirectory() const; /** Checks whether a file is somewhere inside a directory. @@ -7500,7 +7500,7 @@ public: e.g. File ("/moose/fish/foo.txt").isAChildOf ("/moose") is true. File ("/moose/fish/foo.txt").isAChildOf ("/moose/fish") is also true. */ - bool isAChildOf (const File& potentialParentDirectory) const throw(); + bool isAChildOf (const File& potentialParentDirectory) const; /** Chooses a filename relative to this one that doesn't already exist. @@ -7521,7 +7521,7 @@ public: */ const File getNonexistentChildFile (const String& prefix, const String& suffix, - bool putNumbersInBrackets = true) const throw(); + bool putNumbersInBrackets = true) const; /** Chooses a filename for a sibling file to this one that doesn't already exist. @@ -7532,12 +7532,12 @@ public: @param putNumbersInBrackets whether to add brackets around the numbers that get appended to the new filename. */ - const File getNonexistentSibling (const bool putNumbersInBrackets = true) const throw(); + const File getNonexistentSibling (const bool putNumbersInBrackets = true) const; /** Compares the pathnames for two files. */ - bool operator== (const File& otherFile) const throw(); + bool operator== (const File& otherFile) const; /** Compares the pathnames for two files. */ - bool operator!= (const File& otherFile) const throw(); + bool operator!= (const File& otherFile) const; /** Checks whether a file can be created or written to. @@ -7546,7 +7546,7 @@ public: see if writing is allowed. @see setReadOnly */ - bool hasWriteAccess() const throw(); + bool hasWriteAccess() const; /** Changes the write-permission of a file or directory. @@ -7558,40 +7558,40 @@ public: @see hasWriteAccess */ bool setReadOnly (const bool shouldBeReadOnly, - const bool applyRecursively = false) const throw(); + const bool applyRecursively = false) const; /** Returns true if this file is a hidden or system file. The criteria for deciding whether a file is hidden are platform-dependent. */ - bool isHidden() const throw(); + bool isHidden() const; /** If this file is a link, this returns the file that it points to. If this file isn't actually link, it'll just return itself. */ - const File getLinkedTarget() const throw(); + const File getLinkedTarget() const; /** Returns the last modification time of this file. @returns the time, or an invalid time if the file doesn't exist. @see setLastModificationTime, getLastAccessTime, getCreationTime */ - const Time getLastModificationTime() const throw(); + const Time getLastModificationTime() const; /** Returns the last time this file was accessed. @returns the time, or an invalid time if the file doesn't exist. @see setLastAccessTime, getLastModificationTime, getCreationTime */ - const Time getLastAccessTime() const throw(); + const Time getLastAccessTime() const; /** Returns the time that this file was created. @returns the time, or an invalid time if the file doesn't exist. @see getLastModificationTime, getLastAccessTime */ - const Time getCreationTime() const throw(); + const Time getCreationTime() const; /** Changes the modification time for this file. @@ -7599,7 +7599,7 @@ public: @returns true if it manages to change the file's time. @see getLastModificationTime, setLastAccessTime, setCreationTime */ - bool setLastModificationTime (const Time& newTime) const throw(); + bool setLastModificationTime (const Time& newTime) const; /** Changes the last-access time for this file. @@ -7607,7 +7607,7 @@ public: @returns true if it manages to change the file's time. @see getLastAccessTime, setLastModificationTime, setCreationTime */ - bool setLastAccessTime (const Time& newTime) const throw(); + bool setLastAccessTime (const Time& newTime) const; /** Changes the creation date for this file. @@ -7615,7 +7615,7 @@ public: @returns true if it manages to change the file's time. @see getCreationTime, setLastModificationTime, setLastAccessTime */ - bool setCreationTime (const Time& newTime) const throw(); + bool setCreationTime (const Time& newTime) const; /** If possible, this will try to create a version string for the given file. @@ -7623,7 +7623,7 @@ public: executables, bundles, dlls, etc. If no version is available, this will return an empty string. */ - const String getVersion() const throw(); + const String getVersion() const; /** Creates an empty file if it doesn't already exist. @@ -7635,7 +7635,7 @@ public: @returns true if the file has been created (or if it already existed). @see createDirectory */ - bool create() const throw(); + bool create() const; /** Creates a new directory for this filename. @@ -7646,7 +7646,7 @@ public: already existed beforehand). @see create */ - bool createDirectory() const throw(); + bool createDirectory() const; /** Deletes a file. @@ -7657,7 +7657,7 @@ public: begin with). @see deleteRecursively */ - bool deleteFile() const throw(); + bool deleteFile() const; /** Deletes a file or directory and all its subdirectories. @@ -7668,7 +7668,7 @@ public: (or if it didn't exist to begin with). @see deleteFile */ - bool deleteRecursively() const throw(); + bool deleteRecursively() const; /** Moves this file or folder to the trash. @@ -7676,7 +7676,7 @@ public: if the file is write-protected, so you should check the return value and act appropriately. */ - bool moveToTrash() const throw(); + bool moveToTrash() const; /** Moves or renames a file. @@ -7689,7 +7689,7 @@ public: @returns true if the operation succeeds */ - bool moveFileTo (const File& targetLocation) const throw(); + bool moveFileTo (const File& targetLocation) const; /** Copies a file. @@ -7699,7 +7699,7 @@ public: @returns true if the operation succeeds */ - bool copyFileTo (const File& targetLocation) const throw(); + bool copyFileTo (const File& targetLocation) const; /** Copies a directory. @@ -7714,7 +7714,7 @@ public: write privileges to create it if it doesn't exist. Any files inside it will be overwritten by similarly named ones that are copied. */ - bool copyDirectoryTo (const File& newDirectory) const throw(); + bool copyDirectoryTo (const File& newDirectory) const; /** Used in file searching, to specify whether to return files, directories, or both. */ @@ -7746,7 +7746,7 @@ public: int findChildFiles (OwnedArray& results, const int whatToLookFor, const bool searchRecursively, - const String& wildCardPattern = JUCE_T("*")) const throw(); + const String& wildCardPattern = JUCE_T("*")) const; /** Searches inside a directory and counts how many files match a wildcard pattern. @@ -7765,12 +7765,12 @@ public: @see findChildFiles, DirectoryIterator */ int getNumberOfChildFiles (const int whatToLookFor, - const String& wildCardPattern = JUCE_T("*")) const throw(); + const String& wildCardPattern = JUCE_T("*")) const; /** Returns true if this file is a directory that contains one or more subdirectories. @see isDirectory, findChildFiles */ - bool containsSubDirectories() const throw(); + bool containsSubDirectories() const; /** Creates a stream to read from this file. @@ -7778,7 +7778,7 @@ public: start of the file), or 0 if the file can't be opened for some reason @see createOutputStream, loadFileAsData */ - FileInputStream* createInputStream() const throw(); + FileInputStream* createInputStream() const; /** Creates a stream to write to this file. @@ -7790,7 +7790,7 @@ public: end of the file), or 0 if the file can't be opened for some reason @see createInputStream, printf, appendData, appendText */ - FileOutputStream* createOutputStream (const int bufferSize = 0x8000) const throw(); + FileOutputStream* createOutputStream (const int bufferSize = 0x8000) const; /** Loads a file's contents into memory as a block of binary data. @@ -7802,7 +7802,7 @@ public: might want to clear it first @returns true if the file could all be read into memory */ - bool loadFileAsData (MemoryBlock& result) const throw(); + bool loadFileAsData (MemoryBlock& result) const; /** Reads a file into memory as a string. @@ -7811,7 +7811,7 @@ public: This makes use of InputStream::readEntireStreamAsString, which should automatically cope with unicode/acsii file formats. */ - const String loadFileAsString() const throw(); + const String loadFileAsString() const; /** Writes text to the end of the file. @@ -7819,7 +7819,7 @@ public: @returns false if it can't write to the file for some reason */ - bool printf (const tchar* format, ...) const throw(); + bool printf (const tchar* format, ...) const; /** Appends a block of binary data to the end of the file. @@ -7828,7 +7828,7 @@ public: @returns false if it can't write to the file for some reason */ bool appendData (const void* const dataToAppend, - const int numberOfBytes) const throw(); + const int numberOfBytes) const; /** Replaces this file's contents with a given block of data. @@ -7845,7 +7845,7 @@ public: @see appendText */ bool replaceWithData (const void* const dataToWrite, - const int numberOfBytes) const throw(); + const int numberOfBytes) const; /** Appends a string to the end of the file. @@ -7861,7 +7861,7 @@ public: */ bool appendText (const String& textToAppend, const bool asUnicode = false, - const bool writeUnicodeHeaderBytes = false) const throw(); + const bool writeUnicodeHeaderBytes = false) const; /** Replaces this file's contents with a given text string. @@ -7881,7 +7881,7 @@ public: */ bool replaceWithText (const String& textToWrite, const bool asUnicode = false, - const bool writeUnicodeHeaderBytes = false) const throw(); + const bool writeUnicodeHeaderBytes = false) const; /** Creates a set of files to represent each file root. @@ -7889,49 +7889,49 @@ public: to which ones are available. On the Mac/Linux, this will probably just add a single entry for "/". */ - static void findFileSystemRoots (OwnedArray& results) throw(); + static void findFileSystemRoots (OwnedArray& results); /** Finds the name of the drive on which this file lives. @returns the volume label of the drive, or an empty string if this isn't possible */ - const String getVolumeLabel() const throw(); + const String getVolumeLabel() const; /** Returns the serial number of the volume on which this file lives. @returns the serial number, or zero if there's a problem doing this */ - int getVolumeSerialNumber() const throw(); + int getVolumeSerialNumber() const; /** Returns the number of bytes free on the drive that this file lives on. @returns the number of bytes free, or 0 if there's a problem finding this out @see getVolumeTotalSize */ - int64 getBytesFreeOnVolume() const throw(); + int64 getBytesFreeOnVolume() const; /** Returns the total size of the drive that contains this file. @returns the total number of bytes that the volume can hold @see getBytesFreeOnVolume */ - int64 getVolumeTotalSize() const throw(); + int64 getVolumeTotalSize() const; /** Returns true if this file is on a CD or DVD drive. */ - bool isOnCDRomDrive() const throw(); + bool isOnCDRomDrive() const; /** Returns true if this file is on a hard disk. This will fail if it's a network drive, but will still be true for removable hard-disks. */ - bool isOnHardDisk() const throw(); + bool isOnHardDisk() const; /** Returns true if this file is on a removable disk drive. This might be a usb-drive, a CD-rom, or maybe a network drive. */ - bool isOnRemovableDrive() const throw(); + bool isOnRemovableDrive() const; /** Launches the file as a process. @@ -7944,12 +7944,12 @@ public: @see revealToUser */ - bool startAsProcess (const String& parameters = String::empty) const throw(); + bool startAsProcess (const String& parameters = String::empty) const; /** Opens Finder, Explorer, or whatever the OS uses, to show the user this file's location. @see startAsProcess */ - void revealToUser() const throw(); + void revealToUser() const; /** A set of types of location that can be passed to the getSpecialLocation() method. */ @@ -8049,13 +8049,13 @@ public: To get the temp folder, you can use getSpecialLocation (File::tempDirectory). */ - static const File createTempFile (const String& fileNameEnding) throw(); + static const File createTempFile (const String& fileNameEnding); /** Returns the current working directory. @see setAsCurrentWorkingDirectory */ - static const File getCurrentWorkingDirectory() throw(); + static const File getCurrentWorkingDirectory(); /** Sets the current working directory to be this file. @@ -8064,7 +8064,7 @@ public: @returns true if the current directory has been changed. @see getCurrentWorkingDirectory */ - bool setAsCurrentWorkingDirectory() const throw(); + bool setAsCurrentWorkingDirectory() const; /** The system-specific file separator character. @@ -8088,7 +8088,7 @@ public: @see createLegalPathName */ - static const String createLegalFileName (const String& fileNameToFix) throw(); + static const String createLegalFileName (const String& fileNameToFix); /** Removes illegal characters from a pathname. @@ -8097,7 +8097,7 @@ public: @see createLegalFileName */ - static const String createLegalPathName (const String& pathNameToFix) throw(); + static const String createLegalPathName (const String& pathNameToFix); /** Indicates whether filenames are case-sensitive on the current operating system. */ @@ -8105,7 +8105,7 @@ public: /** Returns true if the string seems to be a fully-specified absolute path. */ - static bool isAbsolutePath (const String& path) throw(); + static bool isAbsolutePath (const String& path); juce_UseDebuggingNewOperator @@ -8115,8 +8115,8 @@ private: // internal way of contructing a file without checking the path friend class DirectoryIterator; - File (const String&, int) throw(); - const String getPathUpToLastSlash() const throw(); + File (const String&, int); + const String getPathUpToLastSlash() const; }; #endif // __JUCE_FILE_JUCEHEADER__ @@ -13806,30 +13806,30 @@ public: DirectoryIterator (const File& directory, bool isRecursive, const String& wildCard = JUCE_T("*"), - const int whatToLookFor = File::findFiles) throw(); + const int whatToLookFor = File::findFiles); /** Destructor. */ - ~DirectoryIterator() throw(); + ~DirectoryIterator(); /** Call this to move the iterator along to the next file. @returns true if a file was found (you can then use getFile() to see what it was) - or false if there are no more matching files. */ - bool next() throw(); + bool next(); /** Returns the file that the iterator is currently pointing at. The result of this call is only valid after a call to next() has returned true. */ - const File getFile() const throw(); + const File getFile() const; /** Returns a guess of how far through the search the iterator has got. @returns a value 0.0 to 1.0 to show the progress, although this won't be very accurate. */ - float getEstimatedProgress() const throw(); + float getEstimatedProgress() const; juce_UseDebuggingNewOperator @@ -13938,11 +13938,11 @@ public: /** Returns the file that this stream is writing to. */ - const File& getFile() const throw() { return file; } + const File& getFile() const { return file; } /** Returns true if the stream couldn't be opened for some reason. */ - bool failedToOpen() const throw() { return fileHandle == 0; } + bool failedToOpen() const { return fileHandle == 0; } void flush(); int64 getPosition(); @@ -14139,10 +14139,10 @@ public: void close(); /** True if the pipe is currently open. */ - bool isOpen() const throw(); + bool isOpen() const; /** Returns the last name that was used to try to open this pipe. */ - const String getName() const throw(); + const String getName() const; /** Reads data from the pipe. @@ -14653,7 +14653,7 @@ class JUCE_API URL public: /** Creates an empty URL. */ - URL() throw(); + URL(); /** Creates a URL from a string. */ URL (const String& url); @@ -14662,7 +14662,7 @@ public: URL (const URL& other); /** Destructor. */ - ~URL() throw(); + ~URL(); /** Copies this URL from another one. */ const URL& operator= (const URL& other); @@ -14736,18 +14736,18 @@ public: @see getNamedParameter, withParameter */ - const StringPairArray& getParameters() const throw(); + const StringPairArray& getParameters() const; /** Returns the set of files that should be uploaded as part of a POST operation. This is the set of files that were added to the URL with the withFileToUpload() method. */ - const StringPairArray& getFilesToUpload() const throw(); + const StringPairArray& getFilesToUpload() const; /** Returns the set of mime types associated with each of the upload files. */ - const StringPairArray& getMimeTypesOfUploadFiles() const throw(); + const StringPairArray& getMimeTypesOfUploadFiles() const; /** Returns a copy of this URL, with a block of data to send as the POST data. @@ -14765,7 +14765,7 @@ public: /** Returns the data that was set using withPOSTData(). */ - const String getPostData() const throw() { return postData; } + const String getPostData() const { return postData; } /** Tries to launch the system's default browser to open the URL. @@ -14920,14 +14920,14 @@ public: */ BufferedInputStream (InputStream* const sourceStream, const int bufferSize, - const bool deleteSourceWhenDestroyed) throw(); + const bool deleteSourceWhenDestroyed); /** Destructor. This may also delete the source stream, if that option was chosen when the buffered stream was created. */ - ~BufferedInputStream() throw(); + ~BufferedInputStream(); int64 getTotalLength(); int64 getPosition(); @@ -14969,7 +14969,7 @@ class JUCE_API FileInputSource : public InputSource { public: - FileInputSource (const File& file) throw(); + FileInputSource (const File& file); ~FileInputSource(); InputStream* createInputStream(); @@ -15150,10 +15150,10 @@ public: */ MemoryInputStream (const void* const sourceData, const int sourceDataSize, - const bool keepInternalCopyOfData) throw(); + const bool keepInternalCopyOfData); /** Destructor. */ - ~MemoryInputStream() throw(); + ~MemoryInputStream(); int64 getPosition(); bool setPosition (int64 pos); @@ -15638,13 +15638,13 @@ public: @param name a name that processes will use to identify this lock object */ - InterProcessLock (const String& name) throw(); + InterProcessLock (const String& name); /** Destructor. This will also release the lock if it's currently held by this process. */ - ~InterProcessLock() throw(); + ~InterProcessLock(); /** Attempts to lock the critical section. @@ -15655,11 +15655,11 @@ public: @returns true if the lock could be gained within the timeout period, or false if the timeout expired. */ - bool enter (int timeOutMillisecs = -1) throw(); + bool enter (int timeOutMillisecs = -1); /** Releases the lock if it's currently held by this process. */ - void exit() throw(); + void exit(); juce_UseDebuggingNewOperator @@ -15722,7 +15722,7 @@ public: /** Returns true if this application process is the one that the user is currently using. */ - static bool isForegroundProcess() throw(); + static bool isForegroundProcess(); /** Raises the current process's privilege level. @@ -15740,7 +15740,7 @@ public: /** Returns true if this process is being hosted by a debugger. */ - static bool JUCE_CALLTYPE isRunningUnderDebugger() throw(); + static bool JUCE_CALLTYPE isRunningUnderDebugger(); }; #endif // __JUCE_PROCESS_JUCEHEADER__ @@ -15878,7 +15878,7 @@ public: @see stopThread */ - void startThread() throw(); + void startThread(); /** Starts the thread with a given priority. @@ -15887,7 +15887,7 @@ public: @see startThread, setPriority */ - void startThread (const int priority) throw(); + void startThread (const int priority); /** Attempts to stop the thread running. @@ -15907,10 +15907,10 @@ public: value in here will wait forever. @see signalThreadShouldExit, threadShouldExit, waitForThreadToExit, isThreadRunning */ - void stopThread (const int timeOutMilliseconds) throw(); + void stopThread (const int timeOutMilliseconds); /** Returns true if the thread is currently active */ - bool isThreadRunning() const throw(); + bool isThreadRunning() const; /** Sets a flag to tell the thread it should stop. @@ -15920,7 +15920,7 @@ public: @see threadShouldExit @see waitForThreadToExit */ - void signalThreadShouldExit() throw(); + void signalThreadShouldExit(); /** Checks whether the thread has been told to stop running. @@ -15929,7 +15929,7 @@ public: @see signalThreadShouldExit */ - inline bool threadShouldExit() const throw() { return threadShouldExit_; } + inline bool threadShouldExit() const { return threadShouldExit_; } /** Waits for the thread to stop. @@ -15939,7 +15939,7 @@ public: is less than zero, it will wait forever. @returns true if the thread exits, or false if the timeout expires first. */ - bool waitForThreadToExit (const int timeOutMilliseconds) const throw(); + bool waitForThreadToExit (const int timeOutMilliseconds) const; /** Changes the thread's priority. May return false if for some reason the priority can't be changed. @@ -15947,7 +15947,7 @@ public: @param priority the new priority, in the range 0 (lowest) to 10 (highest). A priority of 5 is normal. */ - bool setPriority (const int priority) throw(); + bool setPriority (const int priority); /** Changes the priority of the caller thread. @@ -15956,7 +15956,7 @@ public: @see setPriority */ - static bool setCurrentThreadPriority (const int priority) throw(); + static bool setCurrentThreadPriority (const int priority); /** Sets the affinity mask for the thread. @@ -15965,7 +15965,7 @@ public: @see setCurrentThreadAffinityMask */ - void setAffinityMask (const uint32 affinityMask) throw(); + void setAffinityMask (const uint32 affinityMask); /** Changes the affinity mask for the caller thread. @@ -15973,13 +15973,13 @@ public: @see setAffinityMask */ - static void setCurrentThreadAffinityMask (const uint32 affinityMask) throw(); + static void setCurrentThreadAffinityMask (const uint32 affinityMask); // this can be called from any thread that needs to pause.. - static void JUCE_CALLTYPE sleep (int milliseconds) throw(); + static void JUCE_CALLTYPE sleep (int milliseconds); /** Yields the calling thread's current time-slot. */ - static void JUCE_CALLTYPE yield() throw(); + static void JUCE_CALLTYPE yield(); /** Makes the thread wait for a notification. @@ -15988,7 +15988,7 @@ public: @returns true if the event has been signalled, false if the timeout expires. */ - bool wait (const int timeOutMilliseconds) const throw(); + bool wait (const int timeOutMilliseconds) const; /** Wakes up the thread. @@ -15996,7 +15996,7 @@ public: @see wait */ - void notify() const throw(); + void notify() const; /** A value type used for thread IDs. @see getCurrentThreadId(), getThreadId() @@ -16010,14 +16010,14 @@ public: @returns a unique identifier that identifies the calling thread. @see getThreadId */ - static ThreadID getCurrentThreadId() throw(); + static ThreadID getCurrentThreadId(); /** Finds the thread object that is currently running. Note that the main UI thread (or other non-Juce threads) don't have a Thread object associated with them, so this will return 0. */ - static Thread* getCurrentThread() throw(); + static Thread* getCurrentThread(); /** Returns the ID of this thread. @@ -16028,26 +16028,26 @@ public: @see getCurrentThreadId */ - ThreadID getThreadId() const throw(); + ThreadID getThreadId() const { return threadId_; } /** Returns the name of the thread. This is the name that gets set in the constructor. */ - const String getThreadName() const throw() { return threadName_; } + const String getThreadName() const { return threadName_; } /** Returns the number of currently-running threads. @returns the number of Thread objects known to be currently running. @see stopAllThreads */ - static int getNumRunningThreads() throw(); + static int getNumRunningThreads(); /** Tries to stop all currently-running threads. This will attempt to stop all the threads known to be running at the moment. */ - static void stopAllThreads (const int timeoutInMillisecs) throw(); + static void stopAllThreads (const int timeoutInMillisecs); juce_UseDebuggingNewOperator @@ -16063,7 +16063,7 @@ private: bool volatile threadShouldExit_; friend void JUCE_API juce_threadEntryPoint (void*); - static void threadEntryPoint (Thread* thread) throw(); + static void threadEntryPoint (Thread* thread); Thread (const Thread&); const Thread& operator= (const Thread&); @@ -16431,12 +16431,12 @@ public: /** Returns the name of this job. @see setJobName */ - const String getJobName() const throw(); + const String getJobName() const; /** Changes the job's name. @see getJobName */ - void setJobName (const String& newName) throw(); + void setJobName (const String& newName); /** These are the values that can be returned by the runJob() method. */ @@ -16469,7 +16469,7 @@ public: virtual JobStatus runJob() = 0; /** Returns true if this job is currently running its runJob() method. */ - bool isRunning() const throw() { return isActive; } + bool isRunning() const { return isActive; } /** Returns true if something is trying to interrupt this job and make it stop. @@ -16478,14 +16478,14 @@ public: @see signalJobShouldExit() */ - bool shouldExit() const throw() { return shouldStop; } + bool shouldExit() const { return shouldStop; } /** Calling this will cause the shouldExit() method to return true, and the job should (if it's been implemented correctly) stop as soon as possible. @see shouldExit() */ - void signalJobShouldExit() throw(); + void signalJobShouldExit(); juce_UseDebuggingNewOperator @@ -16607,20 +16607,20 @@ public: /** Returns the number of jobs currently running or queued. */ - int getNumJobs() const throw(); + int getNumJobs() const; /** Returns one of the jobs in the queue. Note that this can be a very volatile list as jobs might be continuously getting shifted around in the list, and this method may return 0 if the index is currently out-of-range. */ - ThreadPoolJob* getJob (const int index) const throw(); + ThreadPoolJob* getJob (const int index) const; /** Returns true if the given job is currently queued or running. @see isJobRunning() */ - bool contains (const ThreadPoolJob* const job) const throw(); + bool contains (const ThreadPoolJob* const job) const; /** Returns true if the given job is currently being run by a thread. */ @@ -16641,7 +16641,7 @@ public: If onlyReturnActiveJobs is true, only the ones currently running are returned. */ - const StringArray getNamesOfAllJobs (const bool onlyReturnActiveJobs) const throw(); + const StringArray getNamesOfAllJobs (const bool onlyReturnActiveJobs) const; /** Changes the priority of all the threads. @@ -16755,10 +16755,10 @@ public: void removeTimeSliceClient (TimeSliceClient* const client); /** Returns the number of registered clients. */ - int getNumClients() const throw(); + int getNumClients() const; /** Returns one of the registered clients. */ - TimeSliceClient* getClient (const int index) const throw(); + TimeSliceClient* getClient (const int index) const; /** @internal */ void run(); @@ -19178,7 +19178,7 @@ public: @see setUsingNonZeroWinding */ - bool isUsingNonZeroWinding() const throw() { return useNonZeroWinding; } + bool isUsingNonZeroWinding() const { return useNonZeroWinding; } /** Iterates the lines and curves that a path contains. @@ -25741,7 +25741,7 @@ class JUCE_API DeletedAtShutdown { protected: /** Creates a DeletedAtShutdown object. */ - DeletedAtShutdown() throw(); + DeletedAtShutdown(); /** Destructor. @@ -26473,7 +26473,7 @@ public: */ PropertiesFile (const File& file, const int millisecondsBeforeSaving, - const int options) throw(); + const int options); /** Destructor. @@ -26504,10 +26504,10 @@ public: /** Returns true if the properties have been altered since the last time they were saved. */ - bool needsToBeSaved() const throw(); + bool needsToBeSaved() const; /** Returns the file that's being used. */ - const File getFile() const throw(); + const File getFile() const { return file; } /** Handy utility to create a properties file in whatever the standard OS-specific location is for these things. @@ -32675,19 +32675,19 @@ class JUCE_API PopupMenu public: /** Creates an empty popup menu. */ - PopupMenu() throw(); + PopupMenu(); /** Creates a copy of another menu. */ - PopupMenu (const PopupMenu& other) throw(); + PopupMenu (const PopupMenu& other); /** Destructor. */ - ~PopupMenu() throw(); + ~PopupMenu(); /** Copies this menu from another one. */ - const PopupMenu& operator= (const PopupMenu& other) throw(); + const PopupMenu& operator= (const PopupMenu& other); /** Resets the menu, removing all its items. */ - void clear() throw(); + void clear(); /** Appends a new text item for this menu to show. @@ -32710,7 +32710,7 @@ public: const String& itemText, const bool isActive = true, const bool isTicked = false, - const Image* const iconToUse = 0) throw(); + const Image* const iconToUse = 0); /** Adds an item that represents one of the commands in a command manager object. @@ -32722,7 +32722,7 @@ public: */ void addCommandItem (ApplicationCommandManager* commandManager, const int commandID, - const String& displayName = String::empty) throw(); + const String& displayName = String::empty); /** Appends a text item with a special colour. @@ -32735,7 +32735,7 @@ public: const Colour& itemTextColour, const bool isActive = true, const bool isTicked = false, - const Image* const iconToUse = 0) throw(); + const Image* const iconToUse = 0); /** Appends a custom menu item. @@ -32745,7 +32745,7 @@ public: @see PopupMenuCustomComponent */ void addCustomItem (const int itemResultId, - PopupMenuCustomComponent* const customComponent) throw(); + PopupMenuCustomComponent* const customComponent); /** Appends a custom menu item that can't be used to trigger a result. @@ -32765,7 +32765,7 @@ public: void addCustomItem (const int itemResultId, Component* customComponent, int idealWidth, int idealHeight, - const bool triggerMenuItemAutomaticallyWhenClicked) throw(); + const bool triggerMenuItemAutomaticallyWhenClicked); /** Appends a sub-menu. @@ -32775,7 +32775,7 @@ public: const PopupMenu& subMenu, const bool isActive = true, Image* const iconToUse = 0, - const bool isTicked = false) throw(); + const bool isTicked = false); /** Appends a separator to the menu, to help break it up into sections. @@ -32784,26 +32784,26 @@ public: one, so your code can be quite free and easy about adding these, and it'll always look ok. */ - void addSeparator() throw(); + void addSeparator(); /** Adds a non-clickable text item to the menu. This is a bold-font items which can be used as a header to separate the items into named groups. */ - void addSectionHeader (const String& title) throw(); + void addSectionHeader (const String& title); /** Returns the number of items that the menu currently contains. (This doesn't count separators). */ - int getNumItems() const throw(); + int getNumItems() const; /** Returns true if the menu contains a command item that triggers the given command. */ - bool containsCommandItem (const int commandID) const throw(); + bool containsCommandItem (const int commandID) const; /** Returns true if the menu contains any items that can be used. */ - bool containsAnyActiveItems() const throw(); + bool containsAnyActiveItems() const; /** Displays the menu and waits for the user to pick something. @@ -32873,14 +32873,14 @@ public: by some means other than a user action, and you'd like to make sure that menus aren't left hanging around. */ - static void JUCE_CALLTYPE dismissAllActiveMenus() throw(); + static void JUCE_CALLTYPE dismissAllActiveMenus(); /** Specifies a look-and-feel for the menu and any sub-menus that it has. This can be called before show() if you need a customised menu. Be careful not to delete the LookAndFeel object before the menu has been deleted. */ - void setLookAndFeel (LookAndFeel* const newLookAndFeel) throw(); + void setLookAndFeel (LookAndFeel* const newLookAndFeel); /** A set of colour IDs to use to change the colour of various aspects of the menu. @@ -32921,15 +32921,15 @@ public: Be careful not to add any items to a menu while it is being iterated, or things could get out of step. */ - MenuItemIterator (const PopupMenu& menu) throw(); + MenuItemIterator (const PopupMenu& menu); /** Destructor. */ - ~MenuItemIterator() throw(); + ~MenuItemIterator(); /** Returns true if there is another item, and sets up all this object's member variables to reflect that item's properties. */ - bool next() throw(); + bool next(); String itemName; const PopupMenu* subMenu; @@ -32970,7 +32970,7 @@ private: const int maximumNumColumns, const int standardItemHeight, const bool alignToRectangle, - Component* const componentAttachedTo) throw(); + Component* const componentAttachedTo); friend class MenuBarComponent; Component* createMenuComponent (const int x, const int y, const int w, const int h, @@ -32981,7 +32981,7 @@ private: const bool alignToRectangle, Component* menuBarComponent, ApplicationCommandManager** managerOfChosenCommand, - Component* const componentAttachedTo) throw(); + Component* const componentAttachedTo); }; #endif // __JUCE_POPUPMENU_JUCEHEADER__ @@ -35116,7 +35116,7 @@ public: @see getNumTracks, getTrack */ - void addTrack (const MidiMessageSequence& trackSequence) throw(); + void addTrack (const MidiMessageSequence& trackSequence) throw(); /** Removes all midi tracks from the file. @@ -37905,7 +37905,7 @@ public: bool isPrepared; - Node (const uint32 id, AudioProcessor* const processor) throw(); + Node (const uint32 id, AudioProcessor* const processor); void prepare (const double sampleRate, const int blockSize, AudioProcessorGraph* const graph); void unprepare(); @@ -37962,21 +37962,21 @@ public: void clear(); /** Returns the number of nodes in the graph. */ - int getNumNodes() const throw() { return nodes.size(); } + int getNumNodes() const { return nodes.size(); } /** Returns a pointer to one of the nodes in the graph. This will return 0 if the index is out of range. @see getNodeForId */ - Node* getNode (const int index) const throw() { return nodes [index]; } + Node* getNode (const int index) const { return nodes [index]; } /** Searches the graph for a node with the given ID number and returns it. If no such node was found, this returns 0. @see getNode */ - Node* getNodeForId (const uint32 nodeId) const throw(); + Node* getNodeForId (const uint32 nodeId) const; /** Adds a node to the graph. @@ -37999,10 +37999,10 @@ public: bool removeNode (const uint32 nodeId); /** Returns the number of connections in the graph. */ - int getNumConnections() const throw() { return connections.size(); } + int getNumConnections() const { return connections.size(); } /** Returns a pointer to one of the connections in the graph. */ - const Connection* getConnection (const int index) const throw() { return connections [index]; } + const Connection* getConnection (const int index) const { return connections [index]; } /** Searches for a connection between some specified channels. @@ -38011,18 +38011,18 @@ public: const Connection* getConnectionBetween (const uint32 sourceNodeId, const int sourceChannelIndex, const uint32 destNodeId, - const int destChannelIndex) const throw(); + const int destChannelIndex) const; /** Returns true if there is a connection between any of the channels of two specified nodes. */ bool isConnected (const uint32 possibleSourceNodeId, - const uint32 possibleDestNodeId) const throw(); + const uint32 possibleDestNodeId) const; /** Returns true if it would be legal to connect the specified points. */ bool canConnect (const uint32 sourceNodeId, const int sourceChannelIndex, - const uint32 destNodeId, const int destChannelIndex) const throw(); + const uint32 destNodeId, const int destChannelIndex) const; /** Attempts to connect two specified channels of two nodes. @@ -38098,16 +38098,16 @@ public: }; /** Returns the mode of this processor. */ - IODeviceType getType() const throw() { return type; } + IODeviceType getType() const { return type; } /** Returns the parent graph to which this processor belongs, or 0 if it hasn't yet been added to one. */ - AudioProcessorGraph* getParentGraph() const throw() { return graph; } + AudioProcessorGraph* getParentGraph() const { return graph; } /** True if this is an audio or midi input. */ - bool isInput() const throw(); + bool isInput() const; /** True if this is an audio or midi output. */ - bool isOutput() const throw(); + bool isOutput() const; AudioGraphIOProcessor (const IODeviceType type); ~AudioGraphIOProcessor(); @@ -38144,7 +38144,7 @@ public: void setStateInformation (const void* data, int sizeInBytes); /** @internal */ - void setParentGraph (AudioProcessorGraph* const graph) throw(); + void setParentGraph (AudioProcessorGraph* const graph); juce_UseDebuggingNewOperator @@ -38215,7 +38215,7 @@ private: bool isAnInputTo (const uint32 possibleInputId, const uint32 possibleDestinationId, - const int recursionCheck) const throw(); + const int recursionCheck) const; AudioProcessorGraph (const AudioProcessorGraph&); const AudioProcessorGraph& operator= (const AudioProcessorGraph&); @@ -38266,13 +38266,13 @@ public: /** Returns the current audio processor that is being played. */ - AudioProcessor* getCurrentProcessor() const throw() { return processor; } + AudioProcessor* getCurrentProcessor() const { return processor; } /** Returns a midi message collector that you can pass midi messages to if you want them to be injected into the midi stream that is being sent to the processor. */ - MidiMessageCollector& getMidiMessageCollector() throw() { return messageCollector; } + MidiMessageCollector& getMidiMessageCollector() { return messageCollector; } /** @internal */ void audioDeviceIOCallback (const float** inputChannelData, @@ -38516,7 +38516,7 @@ public: /** Returns the message that is displayed when there are no properties. @see setMessageWhenEmpty */ - const String& getMessageWhenEmpty() const throw(); + const String& getMessageWhenEmpty() const; /** @internal */ void paint (Graphics& g); @@ -38641,13 +38641,13 @@ public: Returns a value less than 0 if no note is playing. */ - int getCurrentlyPlayingNote() const throw() { return currentlyPlayingNote; } + int getCurrentlyPlayingNote() const { return currentlyPlayingNote; } /** Returns the sound that this voice is currently playing. Returns 0 if it's not playing. */ - const SynthesiserSound::Ptr getCurrentlyPlayingSound() const throw() { return currentlyPlayingSound; } + const SynthesiserSound::Ptr getCurrentlyPlayingSound() const { return currentlyPlayingSound; } /** Must return true if this voice object is capable of playing the given sound. @@ -38741,7 +38741,7 @@ protected: This is available for subclasses so they can pitch things correctly. */ - double getSampleRate() const throw() { return currentSampleRate; } + double getSampleRate() const { return currentSampleRate; } /** Resets the state of this voice after a sound has finished playing. @@ -38807,10 +38807,10 @@ public: void clearVoices(); /** Returns the number of voices that have been added. */ - int getNumVoices() const throw() { return voices.size(); } + int getNumVoices() const { return voices.size(); } /** Returns one of the voices that have been added. */ - SynthesiserVoice* getVoice (const int index) const throw(); + SynthesiserVoice* getVoice (const int index) const; /** Adds a new voice to the synth. @@ -38829,10 +38829,10 @@ public: void clearSounds(); /** Returns the number of sounds that have been added to the synth. */ - int getNumSounds() const throw() { return sounds.size(); } + int getNumSounds() const { return sounds.size(); } /** Returns one of the sounds. */ - SynthesiserSound* getSound (const int index) const throw() { return sounds [index]; } + SynthesiserSound* getSound (const int index) const { return sounds [index]; } /** Adds a new sound to the synthesiser. @@ -38855,7 +38855,7 @@ public: /** Returns true if note-stealing is enabled. @see setNoteStealingEnabled */ - bool isNoteStealingEnabled() const throw() { return shouldStealNotes; } + bool isNoteStealingEnabled() const { return shouldStealNotes; } /** Triggers a note-on event. @@ -39051,12 +39051,12 @@ public: ~SamplerSound(); /** Returns the sample's name */ - const String& getName() const throw() { return name; } + const String& getName() const { return name; } /** Returns the audio sample data. This could be 0 if there was a problem loading it. */ - AudioSampleBuffer* getAudioData() const throw() { return data; } + AudioSampleBuffer* getAudioData() const { return data; } bool appliesToNote (const int midiNoteNumber); bool appliesToChannel (const int midiChannel); @@ -42638,7 +42638,7 @@ public: @see setSliderStyle */ - SliderStyle getSliderStyle() const throw() { return style; } + SliderStyle getSliderStyle() const { return style; } /** Changes the properties of a rotary slider. @@ -42671,12 +42671,12 @@ public: If false, the slider will just try to snap to wherever the mouse is. */ - void setVelocityBasedMode (const bool isVelocityBased) throw(); + void setVelocityBasedMode (const bool isVelocityBased); /** Returns true if velocity-based mode is active. @see setVelocityBasedMode */ - bool getVelocityBasedMode() const throw() { return isVelocityBased; } + bool getVelocityBasedMode() const { return isVelocityBased; } /** Changes aspects of the scaling used when in velocity-sensitive mode. @@ -42694,27 +42694,27 @@ public: void setVelocityModeParameters (const double sensitivity = 1.0, const int threshold = 1, const double offset = 0.0, - const bool userCanPressKeyToSwapMode = true) throw(); + const bool userCanPressKeyToSwapMode = true); /** Returns the velocity sensitivity setting. @see setVelocityModeParameters */ - double getVelocitySensitivity() const throw() { return velocityModeSensitivity; } + double getVelocitySensitivity() const { return velocityModeSensitivity; } /** Returns the velocity threshold setting. @see setVelocityModeParameters */ - int getVelocityThreshold() const throw() { return velocityModeThreshold; } + int getVelocityThreshold() const { return velocityModeThreshold; } /** Returns the velocity offset setting. @see setVelocityModeParameters */ - double getVelocityOffset() const throw() { return velocityModeOffset; } + double getVelocityOffset() const { return velocityModeOffset; } /** Returns the velocity user key setting. @see setVelocityModeParameters */ - bool getVelocityModeIsSwappable() const throw() { return userKeyOverridesVelocity; } + bool getVelocityModeIsSwappable() const { return userKeyOverridesVelocity; } /** Sets up a skew factor to alter the way values are distributed. @@ -42731,7 +42731,7 @@ public: @see getSkewFactor, setSkewFactorFromMidPoint */ - void setSkewFactor (const double factor) throw(); + void setSkewFactor (const double factor); /** Sets up a skew factor to alter the way values are distributed. @@ -42740,7 +42740,7 @@ public: @see setSkewFactor, getSkewFactor */ - void setSkewFactorFromMidPoint (const double sliderValueToShowAtMidPoint) throw(); + void setSkewFactorFromMidPoint (const double sliderValueToShowAtMidPoint); /** Returns the current skew factor. @@ -42748,7 +42748,7 @@ public: @see setSkewFactor, setSkewFactorFromMidPoint */ - double getSkewFactor() const throw() { return skewFactor; } + double getSkewFactor() const { return skewFactor; } /** Used by setIncDecButtonsMode(). */ @@ -42804,17 +42804,17 @@ public: /** Returns the status of the text-box. @see setTextBoxStyle */ - const TextEntryBoxPosition getTextBoxPosition() const throw() { return textBoxPos; } + const TextEntryBoxPosition getTextBoxPosition() const { return textBoxPos; } /** Returns the width used for the text-box. @see setTextBoxStyle */ - int getTextBoxWidth() const throw() { return textBoxWidth; } + int getTextBoxWidth() const { return textBoxWidth; } /** Returns the height used for the text-box. @see setTextBoxStyle */ - int getTextBoxHeight() const throw() { return textBoxHeight; } + int getTextBoxHeight() const { return textBoxHeight; } /** Makes the text-box editable. @@ -42823,12 +42823,12 @@ public: @see setTextBoxStyle, getValueFromText, getTextFromValue */ - void setTextBoxIsEditable (const bool shouldBeEditable) throw(); + void setTextBoxIsEditable (const bool shouldBeEditable); /** Returns true if the text-box is read-only. @see setTextBoxStyle */ - bool isTextBoxEditable() const throw() { return editableText; } + bool isTextBoxEditable() const { return editableText; } /** If the text-box is editable, this will give it the focus so that the user can type directly into it. @@ -42866,7 +42866,7 @@ public: const bool sendMessageSynchronously = false); /** Returns the slider's current value. */ - double getValue() const throw(); + double getValue() const; /** Sets the limits that the slider's value can take. @@ -42882,17 +42882,17 @@ public: /** Returns the current maximum value. @see setRange */ - double getMaximum() const throw() { return maximum; } + double getMaximum() const { return maximum; } /** Returns the current minimum value. @see setRange */ - double getMinimum() const throw() { return minimum; } + double getMinimum() const { return minimum; } /** Returns the current step-size for values. @see setRange */ - double getInterval() const throw() { return interval; } + double getInterval() const { return interval; } /** For a slider with two or three thumbs, this returns the lower of its values. @@ -42902,7 +42902,7 @@ public: @see setMinValue, getMaxValue, TwoValueHorizontal, TwoValueVertical, ThreeValueHorizontal, ThreeValueVertical */ - double getMinValue() const throw(); + double getMinValue() const; /** For a slider with two or three thumbs, this sets the lower of its values. @@ -42936,7 +42936,7 @@ public: @see getMinValue, TwoValueHorizontal, TwoValueVertical, ThreeValueHorizontal, ThreeValueVertical */ - double getMaxValue() const throw(); + double getMaxValue() const; /** For a slider with two or three thumbs, this sets the lower of its values. @@ -42963,10 +42963,10 @@ public: const bool allowNudgingOfOtherValues = false); /** Adds a listener to be called when this slider's value changes. */ - void addListener (SliderListener* const listener) throw(); + void addListener (SliderListener* const listener); /** Removes a previously-registered listener. */ - void removeListener (SliderListener* const listener) throw(); + void removeListener (SliderListener* const listener); /** This lets you choose whether double-clicking moves the slider to a given position. @@ -42977,7 +42977,7 @@ public: @see getDoubleClickReturnValue */ void setDoubleClickReturnValue (const bool isDoubleClickEnabled, - const double valueToSetOnDoubleClick) throw(); + const double valueToSetOnDoubleClick); /** Returns the values last set by setDoubleClickReturnValue() method. @@ -42986,7 +42986,7 @@ public: @see setDoubleClickReturnValue */ - double getDoubleClickReturnValue (bool& isEnabled) const throw(); + double getDoubleClickReturnValue (bool& isEnabled) const; /** Tells the slider whether to keep sending change messages while the user is dragging the slider. @@ -42996,7 +42996,7 @@ public: will be continuously sent as they drag it while the mouse button is still held down. */ - void setChangeNotificationOnlyOnRelease (const bool onlyNotifyOnRelease) throw(); + void setChangeNotificationOnlyOnRelease (const bool onlyNotifyOnRelease); /** This lets you change whether the slider thumb jumps to the mouse position when you click. @@ -43007,7 +43007,7 @@ public: This only applies to linear bars, and won't affect two- or three- value sliders. */ - void setSliderSnapsToMousePosition (const bool shouldSnapToMouse) throw(); + void setSliderSnapsToMousePosition (const bool shouldSnapToMouse); /** If enabled, this gives the slider a pop-up bubble which appears while the slider is being dragged. @@ -43022,7 +43022,7 @@ public: you'll have to add it to a parent component instead). */ void setPopupDisplayEnabled (const bool isEnabled, - Component* const parentComponentToUse) throw(); + Component* const parentComponentToUse); /** If this is set to true, then right-clicking on the slider will pop-up a menu to let the user change the way it works. @@ -43031,13 +43031,13 @@ public: things like velocity sensitivity, and for rotary sliders, whether they use a linear or rotary mouse-drag to move them. */ - void setPopupMenuEnabled (const bool menuEnabled) throw(); + void setPopupMenuEnabled (const bool menuEnabled); /** This can be used to stop the mouse scroll-wheel from moving the slider. By default it's enabled. */ - void setScrollWheelEnabled (const bool enabled) throw(); + void setScrollWheelEnabled (const bool enabled); /** Returns a number to indicate which thumb is currently being dragged by the mouse. @@ -43045,7 +43045,7 @@ public: This will return 0 for the main thumb, 1 for the minimum-value thumb, 2 for the maximum-value thumb, or -1 if none is currently down. */ - int getThumbBeingDragged() const throw() { return sliderBeingDragged; } + int getThumbBeingDragged() const { return sliderBeingDragged; } /** Callback to indicate that the user is about to start dragging the slider. @@ -43164,9 +43164,9 @@ public: void updateText(); /** True if the slider moves horizontally. */ - bool isHorizontal() const throw(); + bool isHorizontal() const; /** True if the slider moves vertically. */ - bool isVertical() const throw(); + bool isVertical() const; /** A set of colour IDs to use to change the colour of various aspects of the slider. @@ -43261,9 +43261,9 @@ private: void restoreMouseIfHidden(); void sendDragStart(); void sendDragEnd(); - double constrainedValue (double value) const throw(); + double constrainedValue (double value) const; void triggerChangeMessage (const bool synchronous); - bool incDecDragDirectionIsHorizontal() const throw(); + bool incDecDragDirectionIsHorizontal() const; Slider (const Slider&); const Slider& operator= (const Slider&); @@ -43423,12 +43423,12 @@ public: @see isColumnVisible */ - int getNumColumns (const bool onlyCountVisibleColumns) const throw(); + int getNumColumns (const bool onlyCountVisibleColumns) const; /** Returns the name for a column. @see setColumnName */ - const String getColumnName (const int columnId) const throw(); + const String getColumnName (const int columnId) const; /** Changes the name of a column. */ void setColumnName (const int columnId, const String& newName); @@ -43442,7 +43442,7 @@ public: /** Returns the width of one of the columns. */ - int getColumnWidth (const int columnId) const throw(); + int getColumnWidth (const int columnId) const; /** Changes the width of a column. @@ -43477,12 +43477,12 @@ public: @see setSortColumnId, isSortedForwards */ - int getSortColumnId() const throw(); + int getSortColumnId() const; /** Returns true if the table is currently sorted forwards, or false if it's backwards. @see setSortColumnId */ - bool isSortedForwards() const throw(); + bool isSortedForwards() const; /** Triggers a re-sort of the table according to the current sort-column. @@ -43496,7 +43496,7 @@ public: /** Returns the total width of all the visible columns in the table. */ - int getTotalWidth() const throw(); + int getTotalWidth() const; /** Returns the index of a given column. @@ -43505,7 +43505,7 @@ public: If onlyCountVisibleColumns is true, this will return the index amoungst the visible columns; otherwise it'll return the index amongst all the columns, including any hidden ones. */ - int getIndexOfColumnId (const int columnId, const bool onlyCountVisibleColumns) const throw(); + int getIndexOfColumnId (const int columnId, const bool onlyCountVisibleColumns) const; /** Returns the ID of the column at a given index. @@ -43514,7 +43514,7 @@ public: If the index is out-of-range, it'll return 0. */ - int getColumnIdOfIndex (int index, const bool onlyCountVisibleColumns) const throw(); + int getColumnIdOfIndex (int index, const bool onlyCountVisibleColumns) const; /** Returns the rectangle containing of one of the columns. @@ -43522,13 +43522,13 @@ public: ones are not counted). It returns a rectangle showing the position of the column relative to this component's top-left. If the index is out-of-range, an empty rectangle is retrurned. */ - const Rectangle getColumnPosition (const int index) const throw(); + const Rectangle getColumnPosition (const int index) const; /** Finds the column ID at a given x-position in the component. If there is a column at this point this returns its ID, or if not, it will return 0. */ - int getColumnIdAtX (const int xToFind) const throw(); + int getColumnIdAtX (const int xToFind) const; /** If set to true, this indicates that the columns should be expanded or shrunk to fill the entire width of the component. @@ -43541,7 +43541,7 @@ public: /** Returns true if stretch-to-fit has been enabled. @see setStretchToFitActive */ - bool isStretchToFitActive() const throw(); + bool isStretchToFitActive() const; /** If stretch-to-fit is enabled, this will resize all the columns to make them fit into the specified width, keeping their relative proportions the same. @@ -43565,7 +43565,7 @@ public: /** Returns true if the pop-up menu is enabled. @see setPopupMenuActive */ - bool isPopupMenuActive() const throw(); + bool isPopupMenuActive() const; /** Returns a string that encapsulates the table's current layout. @@ -43584,10 +43584,10 @@ public: void restoreFromString (const String& storedVersion); /** Adds a listener to be informed about things that happen to the header. */ - void addListener (TableHeaderListener* const newListener) throw(); + void addListener (TableHeaderListener* const newListener); /** Removes a previously-registered listener. */ - void removeListener (TableHeaderListener* const listenerToRemove) throw(); + void removeListener (TableHeaderListener* const listenerToRemove); /** This can be overridden to handle a mouse-click on one of the column headers. @@ -43649,7 +43649,7 @@ private: int id, propertyFlags, width, minimumWidth, maximumWidth; double lastDeliberateWidth; - bool isVisible() const throw(); + bool isVisible() const; }; OwnedArray columns; @@ -43660,13 +43660,13 @@ private: int columnIdBeingResized, columnIdBeingDragged, initialColumnWidth; int columnIdUnderMouse, draggingColumnOffset, draggingColumnOriginalIndex, lastDeliberateWidth; - ColumnInfo* getInfoForId (const int columnId) const throw(); - int visibleIndexToTotalIndex (const int visibleIndex) const throw(); + ColumnInfo* getInfoForId (const int columnId) const; + int visibleIndexToTotalIndex (const int visibleIndex) const; void sendColumnsChanged(); void handleAsyncUpdate(); void beginDrag (const MouseEvent&); void endDrag (const int finalIndex); - int getResizeDraggerAt (const int mouseX) const throw(); + int getResizeDraggerAt (const int mouseX) const; void updateColumnUnderMouse (int x, int y); void resizeColumnsToFit (int firstColumnIndex, int targetTotalWidth); @@ -43863,10 +43863,10 @@ public: void setModel (TableListBoxModel* const newModel); /** Returns the model currently in use. */ - TableListBoxModel* getModel() const throw() { return model; } + TableListBoxModel* getModel() const { return model; } /** Returns the header component being used in this table. */ - TableHeaderComponent* getHeader() const throw() { return header; } + TableHeaderComponent* getHeader() const { return header; } /** Changes the height of the table header component. @see getHeaderHeight @@ -43876,7 +43876,7 @@ public: /** Returns the height of the table header. @see setHeaderHeight */ - int getHeaderHeight() const throw(); + int getHeaderHeight() const; /** Resizes a column to fit its contents. @@ -43899,7 +43899,7 @@ public: /** True if the auto-size options should be shown on the menu. @see setAutoSizeMenuOptionsShown */ - bool isAutoSizeMenuOptionShown() const throw(); + bool isAutoSizeMenuOptionShown() const; /** Returns the position of one of the cells in the table. @@ -45182,21 +45182,21 @@ public: class BitmapData { public: - BitmapData (Image& image, int x, int y, int w, int h, const bool needsToBeWritable) throw(); - BitmapData (const Image& image, int x, int y, int w, int h) throw(); - ~BitmapData() throw(); + BitmapData (Image& image, int x, int y, int w, int h, const bool needsToBeWritable); + BitmapData (const Image& image, int x, int y, int w, int h); + ~BitmapData(); /** Returns a pointer to the start of a line in the image. The co-ordinate you provide here isn't checked, so it's the caller's responsibility to make sure it's not out-of-range. */ - inline uint8* getLinePointer (const int y) const throw() { return data + y * lineStride; } + inline uint8* getLinePointer (const int y) const { return data + y * lineStride; } /** Returns a pointer to a pixel in the image. The co-ordinates you give here are not checked, so it's the caller's responsibility to make sure they're not out-of-range. */ - inline uint8* getPixelPointer (const int x, const int y) const throw() { return data + y * lineStride + x * pixelStride; } + inline uint8* getPixelPointer (const int x, const int y) const { return data + y * lineStride + x * pixelStride; } uint8* data; int lineStride, pixelStride, width, height; @@ -45309,7 +45309,7 @@ public: const bool includeFiles); /** Returns the directory that's currently being used. */ - const File& getDirectory() const throw(); + const File& getDirectory() const; /** Clears the list, and stops the thread scanning for files. */ void clear(); @@ -45329,7 +45329,7 @@ public: /** Returns true if hidden files are ignored. @see setIgnoresHiddenFiles */ - bool ignoresHiddenFiles() const throw() { return ignoreHiddenFiles; } + bool ignoresHiddenFiles() const { return ignoreHiddenFiles; } /** Contains cached information about one of the files in a DirectoryContentsList. */ @@ -45404,15 +45404,15 @@ public: The filter is specified in the constructor. */ - const FileFilter* getFilter() const throw() { return fileFilter; } + const FileFilter* getFilter() const { return fileFilter; } /** @internal */ bool useTimeSlice(); /** @internal */ - TimeSliceThread& getTimeSliceThread() throw() { return thread; } + TimeSliceThread& getTimeSliceThread() { return thread; } /** @internal */ static int compareElements (const DirectoryContentsList::FileInfo* const first, - const DirectoryContentsList::FileInfo* const second) throw(); + const DirectoryContentsList::FileInfo* const second); juce_UseDebuggingNewOperator @@ -46049,7 +46049,7 @@ private: void setShadowImage (Image* const src, const int num, const int w, const int h, - const int sx, const int sy) throw(); + const int sx, const int sy); void bringShadowWindowsToFront(); void deleteShadowWindows(); @@ -46930,39 +46930,39 @@ class JUCE_API PositionedGlyph public: /** Returns the character the glyph represents. */ - juce_wchar getCharacter() const throw() { return character; } + juce_wchar getCharacter() const { return character; } /** Checks whether the glyph is actually empty. */ - bool isWhitespace() const throw() { return CharacterFunctions::isWhitespace (character); } + bool isWhitespace() const { return CharacterFunctions::isWhitespace (character); } /** Returns the position of the glyph's left-hand edge. */ - float getLeft() const throw() { return x; } + float getLeft() const { return x; } /** Returns the position of the glyph's right-hand edge. */ - float getRight() const throw() { return x + w; } + float getRight() const { return x + w; } /** Returns the y position of the glyph's baseline. */ - float getBaselineY() const throw() { return y; } + float getBaselineY() const { return y; } /** Returns the y position of the top of the glyph. */ - float getTop() const throw() { return y - font.getAscent(); } + float getTop() const { return y - font.getAscent(); } /** Returns the y position of the bottom of the glyph. */ - float getBottom() const throw() { return y + font.getDescent(); } + float getBottom() const { return y + font.getDescent(); } /** Shifts the glyph's position by a relative amount. */ void moveBy (const float deltaX, - const float deltaY) throw(); + const float deltaY); /** Draws the glyph into a graphics context. */ - void draw (const Graphics& g) const throw(); + void draw (const Graphics& g) const; /** Draws the glyph into a graphics context, with an extra transform applied to it. */ - void draw (const Graphics& g, const AffineTransform& transform) const throw(); + void draw (const Graphics& g, const AffineTransform& transform) const; /** Returns the path for this glyph. @param path the glyph's outline will be appended to this path */ - void createPath (Path& path) const throw(); + void createPath (Path& path) const; /** Checks to see if a point lies within this glyph. */ - bool hitTest (float x, float y) const throw(); + bool hitTest (float x, float y) const; juce_UseDebuggingNewOperator @@ -46974,7 +46974,7 @@ private: juce_wchar character; int glyph; - PositionedGlyph() throw(); + PositionedGlyph(); }; /** @@ -46991,22 +46991,22 @@ class JUCE_API GlyphArrangement public: /** Creates an empty arrangement. */ - GlyphArrangement() throw(); + GlyphArrangement(); /** Takes a copy of another arrangement. */ - GlyphArrangement (const GlyphArrangement& other) throw(); + GlyphArrangement (const GlyphArrangement& other); /** Copies another arrangement onto this one. To add another arrangement without clearing this one, use addGlyphArrangement(). */ - const GlyphArrangement& operator= (const GlyphArrangement& other) throw(); + const GlyphArrangement& operator= (const GlyphArrangement& other); /** Destructor. */ - ~GlyphArrangement() throw(); + ~GlyphArrangement(); /** Returns the total number of glyphs in the arrangement. */ - int getNumGlyphs() const throw() { return glyphs.size(); } + int getNumGlyphs() const { return glyphs.size(); } /** Returns one of the glyphs from the arrangement. @@ -47014,11 +47014,11 @@ public: careful not to pass an out-of-range index here, as it doesn't do any bounds-checking. */ - PositionedGlyph& getGlyph (const int index) const throw(); + PositionedGlyph& getGlyph (const int index) const; /** Clears all text from the arrangement and resets it. */ - void clear() throw(); + void clear(); /** Appends a line of text to the arrangement. @@ -47031,7 +47031,7 @@ public: void addLineOfText (const Font& font, const String& text, const float x, - const float y) throw(); + const float y); /** Adds a line of text, truncating it if it's wider than a specified size. @@ -47044,7 +47044,7 @@ public: float x, const float y, const float maxWidthPixels, - const bool useEllipsis) throw(); + const bool useEllipsis); /** Adds some multi-line text, breaking lines at word-boundaries if they are too wide. @@ -47063,7 +47063,7 @@ public: const String& text, float x, float y, const float maxLineWidth, - const Justification& horizontalLayout) throw(); + const Justification& horizontalLayout); /** Tries to fit some text withing a given space. @@ -47086,36 +47086,36 @@ public: const float width, const float height, const Justification& layout, int maximumLinesToUse, - const float minimumHorizontalScale = 0.7f) throw(); + const float minimumHorizontalScale = 0.7f); /** Appends another glyph arrangement to this one. */ - void addGlyphArrangement (const GlyphArrangement& other) throw(); + void addGlyphArrangement (const GlyphArrangement& other); /** Draws this glyph arrangement to a graphics context. This uses cached bitmaps so is much faster than the draw (Graphics&, const AffineTransform&) method, which renders the glyphs as filled vectors. */ - void draw (const Graphics& g) const throw(); + void draw (const Graphics& g) const; /** Draws this glyph arrangement to a graphics context. This renders the paths as filled vectors, so is far slower than the draw (Graphics&) method for non-transformed arrangements. */ - void draw (const Graphics& g, const AffineTransform& transform) const throw(); + void draw (const Graphics& g, const AffineTransform& transform) const; /** Converts the set of glyphs into a path. @param path the glyphs' outlines will be appended to this path */ - void createPath (Path& path) const throw(); + void createPath (Path& path) const; /** Looks for a glyph that contains the given co-ordinate. @returns the index of the glyph, or -1 if none were found. */ - int findGlyphIndexAt (float x, float y) const throw(); + int findGlyphIndexAt (float x, float y) const; /** Finds the smallest rectangle that will enclose a subset of the glyphs. @@ -47135,7 +47135,7 @@ public: float& top, float& right, float& bottom, - const bool includeWhitespace) const throw(); + const bool includeWhitespace) const; /** Shifts a set of glyphs by a given amount. @@ -47147,7 +47147,7 @@ public: */ void moveRangeOfGlyphs (int startIndex, int numGlyphs, const float deltaX, - const float deltaY) throw(); + const float deltaY); /** Removes a set of glyphs from the arrangement. @@ -47155,7 +47155,7 @@ public: @param numGlyphs the number of glyphs to remove; if this is < 0, all glyphs after startIndex will be deleted */ - void removeRangeOfGlyphs (int startIndex, int numGlyphs) throw(); + void removeRangeOfGlyphs (int startIndex, int numGlyphs); /** Expands or compresses a set of glyphs horizontally. @@ -47165,7 +47165,7 @@ public: @param horizontalScaleFactor how much to scale their horizontal width by */ void stretchRangeOfGlyphs (int startIndex, int numGlyphs, - const float horizontalScaleFactor) throw(); + const float horizontalScaleFactor); /** Justifies a set of glyphs within a given space. @@ -47180,17 +47180,17 @@ public: const float y, const float width, const float height, - const Justification& justification) throw(); + const Justification& justification); juce_UseDebuggingNewOperator private: OwnedArray glyphs; - int insertEllipsis (const Font& font, const float maxXPos, const int startIndex, int endIndex) throw(); + int insertEllipsis (const Font& font, const float maxXPos, const int startIndex, int endIndex); int fitLineIntoSpace (int start, int numGlyphs, float x, float y, float w, float h, const Font& font, - const Justification& justification, float minimumHorizontalScale) throw(); - void spreadOutLine (const int start, const int numGlyphs, const float targetWidth) throw(); + const Justification& justification, float minimumHorizontalScale); + void spreadOutLine (const int start, const int numGlyphs, const float targetWidth); }; #endif // __JUCE_GLYPHARRANGEMENT_JUCEHEADER__ @@ -51992,7 +51992,7 @@ public: virtual int getIndex() const = 0; /** Returns the list of options. */ - const StringArray& getChoices() const throw(); + const StringArray& getChoices() const; /** @internal */ void refresh(); @@ -52767,7 +52767,7 @@ public: ~MagnifierComponent(); /** Returns the current content component. */ - Component* getContentComponent() const throw() { return content; } + Component* getContentComponent() const { return content; } /** Changes the zoom level. @@ -52780,7 +52780,7 @@ public: void setScaleFactor (double newScaleFactor); /** Returns the current zoom factor. */ - double getScaleFactor() const throw() { return scaleFactor; } + double getScaleFactor() const { return scaleFactor; } /** Changes the quality setting used to rescale the graphics. */ @@ -52808,7 +52808,7 @@ private: void mouseExit (const MouseEvent& e); void mouseWheelMove (const MouseEvent& e, float, float); - int scaleInt (const int n) const throw(); + int scaleInt (const int n) const; MagnifierComponent (const MagnifierComponent&); const MagnifierComponent& operator= (const MagnifierComponent&); @@ -55330,7 +55330,7 @@ public: int subPathIndex; /** Returns true if the current segment is the last in the current sub-path. */ - bool isLastInSubpath() const throw() { return stackPos == stackBase + bool isLastInSubpath() const { return stackPos == stackBase && (index >= path.numElements || points [index] == Path::moveMarker); } @@ -55743,7 +55743,7 @@ public: int maxWidth = 1024, int maxHeight = 768); /** Returns the name of this device */ - const String getName() const throw() { return name; } + const String getName() const { return name; } /** Creates a component that can be used to display a preview of the video from this camera. @@ -55949,7 +55949,7 @@ private: CriticalSection lock; OwnedArray images; - ImageCache() throw(); + ImageCache(); ImageCache (const ImageCache&); const ImageCache& operator= (const ImageCache&); ~ImageCache(); @@ -55981,14 +55981,14 @@ public: @param size the length of each dimension of the kernel, so e.g. if the size is 5, it will create a 5x5 kernel */ - ImageConvolutionKernel (const int size) throw(); + ImageConvolutionKernel (const int size); /** Destructor. */ - ~ImageConvolutionKernel() throw(); + ~ImageConvolutionKernel(); /** Resets all values in the kernel to zero. */ - void clear() throw(); + void clear(); /** Sets the value of a specific cell in the kernel. @@ -55998,16 +55998,16 @@ public: */ void setKernelValue (const int x, const int y, - const float value) throw(); + const float value); /** Rescales all values in the kernel to make the total add up to a fixed value. This will multiply all values in the kernel by (desiredTotalSum / currentTotalSum). */ - void setOverallSum (const float desiredTotalSum) throw(); + void setOverallSum (const float desiredTotalSum); /** Multiplies all values in the kernel by a value. */ - void rescaleAllValues (const float multiplier) throw(); + void rescaleAllValues (const float multiplier); /** Intialises the kernel for a gaussian blur. @@ -56016,19 +56016,19 @@ public: edges. Ideally the kernel should be just larger than (blurRadius * 2). */ - void createGaussianBlur (const float blurRadius) throw(); + void createGaussianBlur (const float blurRadius); /** Returns the size of the kernel. E.g. if it's a 3x3 kernel, this returns 3. */ - int getKernelSize() const throw() { return size; } + int getKernelSize() const { return size; } /** Returns a 2-dimensional array of the kernel's values. The size of each dimension of the array will be getKernelSize(). */ - float** getValues() const throw() { return values; } + float** getValues() const { return values; } /** Applies the kernel to an image. @@ -56084,11 +56084,11 @@ class JUCE_API ImageFileFormat protected: /** Creates an ImageFormat. */ - ImageFileFormat() throw() {} + ImageFileFormat() {} public: /** Destructor. */ - virtual ~ImageFileFormat() throw() {} + virtual ~ImageFileFormat() {} /** Returns a description of this file format. @@ -56182,8 +56182,8 @@ class JUCE_API PNGImageFormat : public ImageFileFormat { public: - PNGImageFormat() throw(); - ~PNGImageFormat() throw(); + PNGImageFormat(); + ~PNGImageFormat(); const String getFormatName(); bool canUnderstand (InputStream& input); @@ -56202,8 +56202,8 @@ class JUCE_API JPEGImageFormat : public ImageFileFormat { public: - JPEGImageFormat() throw(); - ~JPEGImageFormat() throw(); + JPEGImageFormat(); + ~JPEGImageFormat(); /** Specifies the quality to be used when writing a JPEG file. @@ -56279,7 +56279,7 @@ public: @see resetChangedFlag, changed */ - bool hasChangedSinceSaved() const throw() { return changedSinceSave; } + bool hasChangedSinceSaved() const { return changedSinceSave; } /** Called to indicate that the document has changed and needs saving. @@ -56413,7 +56413,7 @@ public: It is changed when one of the load or save methods is used, or when setFile() is used to explicitly set it. */ - const File getFile() const throw() { return documentFile; } + const File getFile() const { return documentFile; } /** Sets the file that this document thinks it was loaded from. diff --git a/src/application/juce_Application.cpp b/src/application/juce_Application.cpp index 2ae76e1582..c55ad3c9b0 100644 --- a/src/application/juce_Application.cpp +++ b/src/application/juce_Application.cpp @@ -46,7 +46,7 @@ BEGIN_JUCE_NAMESPACE #include "../threads/juce_Process.h" #include "../core/juce_PlatformUtilities.h" -void juce_setCurrentThreadName (const String& name) throw(); +void juce_setCurrentThreadName (const String& name); static JUCEApplication* appInstance = 0; diff --git a/src/audio/midi/juce_MidiFile.h b/src/audio/midi/juce_MidiFile.h index 09fa82d47f..5bbab8a5c0 100644 --- a/src/audio/midi/juce_MidiFile.h +++ b/src/audio/midi/juce_MidiFile.h @@ -75,7 +75,7 @@ public: @see getNumTracks, getTrack */ - void addTrack (const MidiMessageSequence& trackSequence) throw(); + void addTrack (const MidiMessageSequence& trackSequence) throw(); /** Removes all midi tracks from the file. diff --git a/src/audio/processors/juce_AudioProcessorGraph.cpp b/src/audio/processors/juce_AudioProcessorGraph.cpp index 571c152e7f..a115b0d62f 100644 --- a/src/audio/processors/juce_AudioProcessorGraph.cpp +++ b/src/audio/processors/juce_AudioProcessorGraph.cpp @@ -34,8 +34,7 @@ BEGIN_JUCE_NAMESPACE const int AudioProcessorGraph::midiChannelIndex = 0x1000; //============================================================================== -AudioProcessorGraph::Node::Node (const uint32 id_, - AudioProcessor* const processor_) throw() +AudioProcessorGraph::Node::Node (const uint32 id_, AudioProcessor* const processor_) : id (id_), processor (processor_), isPrepared (false) @@ -105,7 +104,7 @@ void AudioProcessorGraph::clear() triggerAsyncUpdate(); } -AudioProcessorGraph::Node* AudioProcessorGraph::getNodeForId (const uint32 nodeId) const throw() +AudioProcessorGraph::Node* AudioProcessorGraph::getNodeForId (const uint32 nodeId) const { for (int i = nodes.size(); --i >= 0;) if (nodes.getUnchecked(i)->id == nodeId) @@ -177,7 +176,7 @@ bool AudioProcessorGraph::removeNode (const uint32 nodeId) const AudioProcessorGraph::Connection* AudioProcessorGraph::getConnectionBetween (const uint32 sourceNodeId, const int sourceChannelIndex, const uint32 destNodeId, - const int destChannelIndex) const throw() + const int destChannelIndex) const { for (int i = connections.size(); --i >= 0;) { @@ -196,7 +195,7 @@ const AudioProcessorGraph::Connection* AudioProcessorGraph::getConnectionBetween } bool AudioProcessorGraph::isConnected (const uint32 possibleSourceNodeId, - const uint32 possibleDestNodeId) const throw() + const uint32 possibleDestNodeId) const { for (int i = connections.size(); --i >= 0;) { @@ -215,7 +214,7 @@ bool AudioProcessorGraph::isConnected (const uint32 possibleSourceNodeId, bool AudioProcessorGraph::canConnect (const uint32 sourceNodeId, const int sourceChannelIndex, const uint32 destNodeId, - const int destChannelIndex) const throw() + const int destChannelIndex) const { if (sourceChannelIndex < 0 || destChannelIndex < 0 @@ -347,12 +346,12 @@ namespace GraphRenderingOps class AudioGraphRenderingOp { public: - AudioGraphRenderingOp() throw() {} - virtual ~AudioGraphRenderingOp() throw() {} + AudioGraphRenderingOp() {} + virtual ~AudioGraphRenderingOp() {} virtual void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray & sharedMidiBuffers, - const int numSamples) throw() = 0; + const int numSamples) = 0; juce_UseDebuggingNewOperator }; @@ -361,13 +360,13 @@ public: class ClearChannelOp : public AudioGraphRenderingOp { public: - ClearChannelOp (const int channelNum_) throw() + ClearChannelOp (const int channelNum_) : channelNum (channelNum_) {} - ~ClearChannelOp() throw() {} + ~ClearChannelOp() {} - void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray &, const int numSamples) throw() + void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray &, const int numSamples) { sharedBufferChans.clear (channelNum, 0, numSamples); } @@ -383,14 +382,14 @@ private: class CopyChannelOp : public AudioGraphRenderingOp { public: - CopyChannelOp (const int srcChannelNum_, const int dstChannelNum_) throw() + CopyChannelOp (const int srcChannelNum_, const int dstChannelNum_) : srcChannelNum (srcChannelNum_), dstChannelNum (dstChannelNum_) {} - ~CopyChannelOp() throw() {} + ~CopyChannelOp() {} - void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray &, const int numSamples) throw() + void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray &, const int numSamples) { sharedBufferChans.copyFrom (dstChannelNum, 0, sharedBufferChans, srcChannelNum, 0, numSamples); } @@ -406,14 +405,14 @@ private: class AddChannelOp : public AudioGraphRenderingOp { public: - AddChannelOp (const int srcChannelNum_, const int dstChannelNum_) throw() + AddChannelOp (const int srcChannelNum_, const int dstChannelNum_) : srcChannelNum (srcChannelNum_), dstChannelNum (dstChannelNum_) {} - ~AddChannelOp() throw() {} + ~AddChannelOp() {} - void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray &, const int numSamples) throw() + void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray &, const int numSamples) { sharedBufferChans.addFrom (dstChannelNum, 0, sharedBufferChans, srcChannelNum, 0, numSamples); } @@ -429,13 +428,13 @@ private: class ClearMidiBufferOp : public AudioGraphRenderingOp { public: - ClearMidiBufferOp (const int bufferNum_) throw() + ClearMidiBufferOp (const int bufferNum_) : bufferNum (bufferNum_) {} - ~ClearMidiBufferOp() throw() {} + ~ClearMidiBufferOp() {} - void perform (AudioSampleBuffer&, const OwnedArray & sharedMidiBuffers, const int) throw() + void perform (AudioSampleBuffer&, const OwnedArray & sharedMidiBuffers, const int) { sharedMidiBuffers.getUnchecked (bufferNum)->clear(); } @@ -451,14 +450,14 @@ private: class CopyMidiBufferOp : public AudioGraphRenderingOp { public: - CopyMidiBufferOp (const int srcBufferNum_, const int dstBufferNum_) throw() + CopyMidiBufferOp (const int srcBufferNum_, const int dstBufferNum_) : srcBufferNum (srcBufferNum_), dstBufferNum (dstBufferNum_) {} - ~CopyMidiBufferOp() throw() {} + ~CopyMidiBufferOp() {} - void perform (AudioSampleBuffer&, const OwnedArray & sharedMidiBuffers, const int) throw() + void perform (AudioSampleBuffer&, const OwnedArray & sharedMidiBuffers, const int) { *sharedMidiBuffers.getUnchecked (dstBufferNum) = *sharedMidiBuffers.getUnchecked (srcBufferNum); } @@ -474,14 +473,14 @@ private: class AddMidiBufferOp : public AudioGraphRenderingOp { public: - AddMidiBufferOp (const int srcBufferNum_, const int dstBufferNum_) throw() + AddMidiBufferOp (const int srcBufferNum_, const int dstBufferNum_) : srcBufferNum (srcBufferNum_), dstBufferNum (dstBufferNum_) {} - ~AddMidiBufferOp() throw() {} + ~AddMidiBufferOp() {} - void perform (AudioSampleBuffer&, const OwnedArray & sharedMidiBuffers, const int numSamples) throw() + void perform (AudioSampleBuffer&, const OwnedArray & sharedMidiBuffers, const int numSamples) { sharedMidiBuffers.getUnchecked (dstBufferNum) ->addEvents (*sharedMidiBuffers.getUnchecked (srcBufferNum), 0, numSamples, 0); @@ -501,7 +500,7 @@ public: ProcessBufferOp (const AudioProcessorGraph::Node::Ptr& node_, const Array & audioChannelsToUse_, const int totalChans_, - const int midiBufferToUse_) throw() + const int midiBufferToUse_) : node (node_), processor (node_->processor), audioChannelsToUse (audioChannelsToUse_), @@ -514,11 +513,11 @@ public: audioChannelsToUse.add (0); } - ~ProcessBufferOp() throw() + ~ProcessBufferOp() { } - void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray & sharedMidiBuffers, const int numSamples) throw() + void perform (AudioSampleBuffer& sharedBufferChans, const OwnedArray & sharedMidiBuffers, const int numSamples) { for (int i = totalChans; --i >= 0;) channels[i] = sharedBufferChans.getSampleData (audioChannelsToUse.getUnchecked (i), 0); @@ -569,9 +568,9 @@ public: } } - int getNumBuffersNeeded() const throw() { return nodeIds.size(); } + int getNumBuffersNeeded() const { return nodeIds.size(); } - int getNumMidiBuffersNeeded() const throw() { return midiNodeIds.size(); } + int getNumMidiBuffersNeeded() const { return midiNodeIds.size(); } //============================================================================== @@ -858,12 +857,12 @@ private: } } - int getReadOnlyEmptyBuffer() const throw() + int getReadOnlyEmptyBuffer() const { return 0; } - int getBufferContaining (const int nodeId, const int outputChannel) const throw() + int getBufferContaining (const int nodeId, const int outputChannel) const { if (outputChannel == AudioProcessorGraph::midiChannelIndex) { @@ -911,7 +910,7 @@ private: bool isBufferNeededLater (int stepIndexToSearchFrom, int inputChannelOfIndexToIgnore, const int nodeId, - const int outputChanIndex) const throw() + const int outputChanIndex) const { while (stepIndexToSearchFrom < orderedNodes.size()) { @@ -980,7 +979,7 @@ void AudioProcessorGraph::clearRenderingSequence() bool AudioProcessorGraph::isAnInputTo (const uint32 possibleInputId, const uint32 possibleDestinationId, - const int recursionCheck) const throw() + const int recursionCheck) const { if (recursionCheck > 0) { @@ -1302,12 +1301,12 @@ bool AudioProcessorGraph::AudioGraphIOProcessor::isOutputChannelStereoPair (int return isInputChannelStereoPair (index); } -bool AudioProcessorGraph::AudioGraphIOProcessor::isInput() const throw() +bool AudioProcessorGraph::AudioGraphIOProcessor::isInput() const { return type == audioInputNode || type == midiInputNode; } -bool AudioProcessorGraph::AudioGraphIOProcessor::isOutput() const throw() +bool AudioProcessorGraph::AudioGraphIOProcessor::isOutput() const { return type == audioOutputNode || type == midiOutputNode; } @@ -1339,7 +1338,7 @@ void AudioProcessorGraph::AudioGraphIOProcessor::setStateInformation (const void { } -void AudioProcessorGraph::AudioGraphIOProcessor::setParentGraph (AudioProcessorGraph* const newGraph) throw() +void AudioProcessorGraph::AudioGraphIOProcessor::setParentGraph (AudioProcessorGraph* const newGraph) { graph = newGraph; diff --git a/src/audio/processors/juce_AudioProcessorGraph.h b/src/audio/processors/juce_AudioProcessorGraph.h index c2a038475a..e8fc94fea9 100644 --- a/src/audio/processors/juce_AudioProcessorGraph.h +++ b/src/audio/processors/juce_AudioProcessorGraph.h @@ -105,7 +105,7 @@ public: bool isPrepared; - Node (const uint32 id, AudioProcessor* const processor) throw(); + Node (const uint32 id, AudioProcessor* const processor); void prepare (const double sampleRate, const int blockSize, AudioProcessorGraph* const graph); void unprepare(); @@ -165,21 +165,21 @@ public: void clear(); /** Returns the number of nodes in the graph. */ - int getNumNodes() const throw() { return nodes.size(); } + int getNumNodes() const { return nodes.size(); } /** Returns a pointer to one of the nodes in the graph. This will return 0 if the index is out of range. @see getNodeForId */ - Node* getNode (const int index) const throw() { return nodes [index]; } + Node* getNode (const int index) const { return nodes [index]; } /** Searches the graph for a node with the given ID number and returns it. If no such node was found, this returns 0. @see getNode */ - Node* getNodeForId (const uint32 nodeId) const throw(); + Node* getNodeForId (const uint32 nodeId) const; /** Adds a node to the graph. @@ -203,10 +203,10 @@ public: //============================================================================== /** Returns the number of connections in the graph. */ - int getNumConnections() const throw() { return connections.size(); } + int getNumConnections() const { return connections.size(); } /** Returns a pointer to one of the connections in the graph. */ - const Connection* getConnection (const int index) const throw() { return connections [index]; } + const Connection* getConnection (const int index) const { return connections [index]; } /** Searches for a connection between some specified channels. @@ -215,18 +215,18 @@ public: const Connection* getConnectionBetween (const uint32 sourceNodeId, const int sourceChannelIndex, const uint32 destNodeId, - const int destChannelIndex) const throw(); + const int destChannelIndex) const; /** Returns true if there is a connection between any of the channels of two specified nodes. */ bool isConnected (const uint32 possibleSourceNodeId, - const uint32 possibleDestNodeId) const throw(); + const uint32 possibleDestNodeId) const; /** Returns true if it would be legal to connect the specified points. */ bool canConnect (const uint32 sourceNodeId, const int sourceChannelIndex, - const uint32 destNodeId, const int destChannelIndex) const throw(); + const uint32 destNodeId, const int destChannelIndex) const; /** Attempts to connect two specified channels of two nodes. @@ -306,16 +306,16 @@ public: //============================================================================== /** Returns the mode of this processor. */ - IODeviceType getType() const throw() { return type; } + IODeviceType getType() const { return type; } /** Returns the parent graph to which this processor belongs, or 0 if it hasn't yet been added to one. */ - AudioProcessorGraph* getParentGraph() const throw() { return graph; } + AudioProcessorGraph* getParentGraph() const { return graph; } /** True if this is an audio or midi input. */ - bool isInput() const throw(); + bool isInput() const; /** True if this is an audio or midi output. */ - bool isOutput() const throw(); + bool isOutput() const; //============================================================================== AudioGraphIOProcessor (const IODeviceType type); @@ -353,7 +353,7 @@ public: void setStateInformation (const void* data, int sizeInBytes); /** @internal */ - void setParentGraph (AudioProcessorGraph* const graph) throw(); + void setParentGraph (AudioProcessorGraph* const graph); juce_UseDebuggingNewOperator @@ -426,7 +426,7 @@ private: bool isAnInputTo (const uint32 possibleInputId, const uint32 possibleDestinationId, - const int recursionCheck) const throw(); + const int recursionCheck) const; AudioProcessorGraph (const AudioProcessorGraph&); const AudioProcessorGraph& operator= (const AudioProcessorGraph&); diff --git a/src/audio/processors/juce_AudioProcessorPlayer.h b/src/audio/processors/juce_AudioProcessorPlayer.h index 1f0c18fccf..1808b048e7 100644 --- a/src/audio/processors/juce_AudioProcessorPlayer.h +++ b/src/audio/processors/juce_AudioProcessorPlayer.h @@ -66,13 +66,13 @@ public: /** Returns the current audio processor that is being played. */ - AudioProcessor* getCurrentProcessor() const throw() { return processor; } + AudioProcessor* getCurrentProcessor() const { return processor; } /** Returns a midi message collector that you can pass midi messages to if you want them to be injected into the midi stream that is being sent to the processor. */ - MidiMessageCollector& getMidiMessageCollector() throw() { return messageCollector; } + MidiMessageCollector& getMidiMessageCollector() { return messageCollector; } //============================================================================== /** @internal */ diff --git a/src/audio/synthesisers/juce_Sampler.h b/src/audio/synthesisers/juce_Sampler.h index ec0c5a0203..bff63a7bc1 100644 --- a/src/audio/synthesisers/juce_Sampler.h +++ b/src/audio/synthesisers/juce_Sampler.h @@ -77,12 +77,12 @@ public: //============================================================================== /** Returns the sample's name */ - const String& getName() const throw() { return name; } + const String& getName() const { return name; } /** Returns the audio sample data. This could be 0 if there was a problem loading it. */ - AudioSampleBuffer* getAudioData() const throw() { return data; } + AudioSampleBuffer* getAudioData() const { return data; } //============================================================================== diff --git a/src/audio/synthesisers/juce_Synthesiser.cpp b/src/audio/synthesisers/juce_Synthesiser.cpp index e32224e91d..f0061c7c2d 100644 --- a/src/audio/synthesisers/juce_Synthesiser.cpp +++ b/src/audio/synthesisers/juce_Synthesiser.cpp @@ -87,7 +87,7 @@ Synthesiser::~Synthesiser() } //============================================================================== -SynthesiserVoice* Synthesiser::getVoice (const int index) const throw() +SynthesiserVoice* Synthesiser::getVoice (const int index) const { const ScopedLock sl (lock); return voices [index]; diff --git a/src/audio/synthesisers/juce_Synthesiser.h b/src/audio/synthesisers/juce_Synthesiser.h index 70b15a75a4..a917014899 100644 --- a/src/audio/synthesisers/juce_Synthesiser.h +++ b/src/audio/synthesisers/juce_Synthesiser.h @@ -105,13 +105,13 @@ public: Returns a value less than 0 if no note is playing. */ - int getCurrentlyPlayingNote() const throw() { return currentlyPlayingNote; } + int getCurrentlyPlayingNote() const { return currentlyPlayingNote; } /** Returns the sound that this voice is currently playing. Returns 0 if it's not playing. */ - const SynthesiserSound::Ptr getCurrentlyPlayingSound() const throw() { return currentlyPlayingSound; } + const SynthesiserSound::Ptr getCurrentlyPlayingSound() const { return currentlyPlayingSound; } /** Must return true if this voice object is capable of playing the given sound. @@ -208,7 +208,7 @@ protected: This is available for subclasses so they can pitch things correctly. */ - double getSampleRate() const throw() { return currentSampleRate; } + double getSampleRate() const { return currentSampleRate; } /** Resets the state of this voice after a sound has finished playing. @@ -278,10 +278,10 @@ public: void clearVoices(); /** Returns the number of voices that have been added. */ - int getNumVoices() const throw() { return voices.size(); } + int getNumVoices() const { return voices.size(); } /** Returns one of the voices that have been added. */ - SynthesiserVoice* getVoice (const int index) const throw(); + SynthesiserVoice* getVoice (const int index) const; /** Adds a new voice to the synth. @@ -301,10 +301,10 @@ public: void clearSounds(); /** Returns the number of sounds that have been added to the synth. */ - int getNumSounds() const throw() { return sounds.size(); } + int getNumSounds() const { return sounds.size(); } /** Returns one of the sounds. */ - SynthesiserSound* getSound (const int index) const throw() { return sounds [index]; } + SynthesiserSound* getSound (const int index) const { return sounds [index]; } /** Adds a new sound to the synthesiser. @@ -328,7 +328,7 @@ public: /** Returns true if note-stealing is enabled. @see setNoteStealingEnabled */ - bool isNoteStealingEnabled() const throw() { return shouldStealNotes; } + bool isNoteStealingEnabled() const { return shouldStealNotes; } //============================================================================== /** Triggers a note-on event. diff --git a/src/core/juce_StandardHeader.h b/src/core/juce_StandardHeader.h index abe8cf2c85..b13c4a86a5 100644 --- a/src/core/juce_StandardHeader.h +++ b/src/core/juce_StandardHeader.h @@ -128,7 +128,7 @@ // Now include some basics that are needed by most of the Juce classes... BEGIN_JUCE_NAMESPACE -extern bool JUCE_API JUCE_CALLTYPE juce_isRunningUnderDebugger() throw(); +extern bool JUCE_API JUCE_CALLTYPE juce_isRunningUnderDebugger(); #if JUCE_LOG_ASSERTIONS extern void JUCE_API juce_LogAssertion (const char* filename, const int lineNum) throw(); diff --git a/src/gui/components/controls/juce_Slider.cpp b/src/gui/components/controls/juce_Slider.cpp index d878a9369e..6b17233f60 100644 --- a/src/gui/components/controls/juce_Slider.cpp +++ b/src/gui/components/controls/juce_Slider.cpp @@ -182,14 +182,14 @@ void Slider::sendDragEnd() } } -void Slider::addListener (SliderListener* const listener) throw() +void Slider::addListener (SliderListener* const listener) { jassert (listener != 0); if (listener != 0) listeners.add (listener); } -void Slider::removeListener (SliderListener* const listener) throw() +void Slider::removeListener (SliderListener* const listener) { listeners.removeValue (listener); } @@ -219,7 +219,7 @@ void Slider::setRotaryParameters (const float startAngleRadians, rotaryStop = stopAtEnd; } -void Slider::setVelocityBasedMode (const bool velBased) throw() +void Slider::setVelocityBasedMode (const bool velBased) { isVelocityBased = velBased; } @@ -227,7 +227,7 @@ void Slider::setVelocityBasedMode (const bool velBased) throw() void Slider::setVelocityModeParameters (const double sensitivity, const int threshold, const double offset, - const bool userCanPressKeyToSwapMode) throw() + const bool userCanPressKeyToSwapMode) { jassert (threshold >= 0); jassert (sensitivity > 0); @@ -239,12 +239,12 @@ void Slider::setVelocityModeParameters (const double sensitivity, userKeyOverridesVelocity = userCanPressKeyToSwapMode; } -void Slider::setSkewFactor (const double factor) throw() +void Slider::setSkewFactor (const double factor) { skewFactor = factor; } -void Slider::setSkewFactorFromMidPoint (const double sliderValueToShowAtMidPoint) throw() +void Slider::setSkewFactorFromMidPoint (const double sliderValueToShowAtMidPoint) { if (maximum > minimum) skewFactor = log (0.5) / log ((sliderValueToShowAtMidPoint - minimum) @@ -281,7 +281,7 @@ void Slider::setTextBoxStyle (const TextEntryBoxPosition newPosition, lookAndFeelChanged(); } -void Slider::setTextBoxIsEditable (const bool shouldBeEditable) throw() +void Slider::setTextBoxIsEditable (const bool shouldBeEditable) { editableText = shouldBeEditable; @@ -308,18 +308,18 @@ void Slider::hideTextBox (const bool discardCurrentEditorContents) } } -void Slider::setChangeNotificationOnlyOnRelease (const bool onlyNotifyOnRelease) throw() +void Slider::setChangeNotificationOnlyOnRelease (const bool onlyNotifyOnRelease) { sendChangeOnlyOnRelease = onlyNotifyOnRelease; } -void Slider::setSliderSnapsToMousePosition (const bool shouldSnapToMouse) throw() +void Slider::setSliderSnapsToMousePosition (const bool shouldSnapToMouse) { snapsToMousePos = shouldSnapToMouse; } void Slider::setPopupDisplayEnabled (const bool enabled, - Component* const parentComponentToUse) throw() + Component* const parentComponentToUse) { popupDisplayEnabled = enabled; parentForPopupDisplay = parentComponentToUse; @@ -442,7 +442,7 @@ void Slider::triggerChangeMessage (const bool synchronous) valueChanged(); } -double Slider::getValue() const throw() +double Slider::getValue() const { // for a two-value style slider, you should use the getMinValue() and getMaxValue() // methods to get the two values. @@ -487,7 +487,7 @@ void Slider::setValue (double newValue, } } -double Slider::getMinValue() const throw() +double Slider::getMinValue() const { // The minimum value only applies to sliders that are in two- or three-value mode. jassert (style == TwoValueHorizontal || style == TwoValueVertical @@ -496,7 +496,7 @@ double Slider::getMinValue() const throw() return valueMin; } -double Slider::getMaxValue() const throw() +double Slider::getMaxValue() const { // The maximum value only applies to sliders that are in two- or three-value mode. jassert (style == TwoValueHorizontal || style == TwoValueVertical @@ -584,13 +584,13 @@ void Slider::setMaxValue (double newValue, const bool sendUpdateMessage, const b } void Slider::setDoubleClickReturnValue (const bool isDoubleClickEnabled, - const double valueToSetOnDoubleClick) throw() + const double valueToSetOnDoubleClick) { doubleClickToValue = isDoubleClickEnabled; doubleClickReturnValue = valueToSetOnDoubleClick; } -double Slider::getDoubleClickReturnValue (bool& isEnabled_) const throw() +double Slider::getDoubleClickReturnValue (bool& isEnabled_) const { isEnabled_ = doubleClickToValue; return doubleClickReturnValue; @@ -672,12 +672,12 @@ void Slider::enablementChanged() repaint(); } -void Slider::setPopupMenuEnabled (const bool menuEnabled_) throw() +void Slider::setPopupMenuEnabled (const bool menuEnabled_) { menuEnabled = menuEnabled_; } -void Slider::setScrollWheelEnabled (const bool enabled) throw() +void Slider::setScrollWheelEnabled (const bool enabled) { scrollWheelEnabled = enabled; } @@ -713,7 +713,7 @@ void Slider::buttonClicked (Button* button) } //============================================================================== -double Slider::constrainedValue (double value) const throw() +double Slider::constrainedValue (double value) const { if (interval > 0) value = minimum + interval * floor ((value - minimum) / interval + 0.5); @@ -757,7 +757,7 @@ float Slider::getLinearSliderPos (const double value) return (float) (sliderRegionStart + sliderPosProportional * sliderRegionSize); } -bool Slider::isHorizontal() const throw() +bool Slider::isHorizontal() const { return style == LinearHorizontal || style == LinearBar @@ -765,14 +765,14 @@ bool Slider::isHorizontal() const throw() || style == ThreeValueHorizontal; } -bool Slider::isVertical() const throw() +bool Slider::isVertical() const { return style == LinearVertical || style == TwoValueVertical || style == ThreeValueVertical; } -bool Slider::incDecDragDirectionIsHorizontal() const throw() +bool Slider::incDecDragDirectionIsHorizontal() const { return incDecButtonMode == incDecButtonsDraggable_Horizontal || (incDecButtonMode == incDecButtonsDraggable_AutoDirection && incDecButtonsSideBySide); diff --git a/src/gui/components/controls/juce_Slider.h b/src/gui/components/controls/juce_Slider.h index 9408aa7f75..bb7c77dba7 100644 --- a/src/gui/components/controls/juce_Slider.h +++ b/src/gui/components/controls/juce_Slider.h @@ -114,7 +114,7 @@ public: @see setSliderStyle */ - SliderStyle getSliderStyle() const throw() { return style; } + SliderStyle getSliderStyle() const { return style; } //============================================================================== /** Changes the properties of a rotary slider. @@ -149,12 +149,12 @@ public: If false, the slider will just try to snap to wherever the mouse is. */ - void setVelocityBasedMode (const bool isVelocityBased) throw(); + void setVelocityBasedMode (const bool isVelocityBased); /** Returns true if velocity-based mode is active. @see setVelocityBasedMode */ - bool getVelocityBasedMode() const throw() { return isVelocityBased; } + bool getVelocityBasedMode() const { return isVelocityBased; } /** Changes aspects of the scaling used when in velocity-sensitive mode. @@ -172,27 +172,27 @@ public: void setVelocityModeParameters (const double sensitivity = 1.0, const int threshold = 1, const double offset = 0.0, - const bool userCanPressKeyToSwapMode = true) throw(); + const bool userCanPressKeyToSwapMode = true); /** Returns the velocity sensitivity setting. @see setVelocityModeParameters */ - double getVelocitySensitivity() const throw() { return velocityModeSensitivity; } + double getVelocitySensitivity() const { return velocityModeSensitivity; } /** Returns the velocity threshold setting. @see setVelocityModeParameters */ - int getVelocityThreshold() const throw() { return velocityModeThreshold; } + int getVelocityThreshold() const { return velocityModeThreshold; } /** Returns the velocity offset setting. @see setVelocityModeParameters */ - double getVelocityOffset() const throw() { return velocityModeOffset; } + double getVelocityOffset() const { return velocityModeOffset; } /** Returns the velocity user key setting. @see setVelocityModeParameters */ - bool getVelocityModeIsSwappable() const throw() { return userKeyOverridesVelocity; } + bool getVelocityModeIsSwappable() const { return userKeyOverridesVelocity; } //============================================================================== /** Sets up a skew factor to alter the way values are distributed. @@ -210,7 +210,7 @@ public: @see getSkewFactor, setSkewFactorFromMidPoint */ - void setSkewFactor (const double factor) throw(); + void setSkewFactor (const double factor); /** Sets up a skew factor to alter the way values are distributed. @@ -219,7 +219,7 @@ public: @see setSkewFactor, getSkewFactor */ - void setSkewFactorFromMidPoint (const double sliderValueToShowAtMidPoint) throw(); + void setSkewFactorFromMidPoint (const double sliderValueToShowAtMidPoint); /** Returns the current skew factor. @@ -227,7 +227,7 @@ public: @see setSkewFactor, setSkewFactorFromMidPoint */ - double getSkewFactor() const throw() { return skewFactor; } + double getSkewFactor() const { return skewFactor; } //============================================================================== /** Used by setIncDecButtonsMode(). @@ -285,17 +285,17 @@ public: /** Returns the status of the text-box. @see setTextBoxStyle */ - const TextEntryBoxPosition getTextBoxPosition() const throw() { return textBoxPos; } + const TextEntryBoxPosition getTextBoxPosition() const { return textBoxPos; } /** Returns the width used for the text-box. @see setTextBoxStyle */ - int getTextBoxWidth() const throw() { return textBoxWidth; } + int getTextBoxWidth() const { return textBoxWidth; } /** Returns the height used for the text-box. @see setTextBoxStyle */ - int getTextBoxHeight() const throw() { return textBoxHeight; } + int getTextBoxHeight() const { return textBoxHeight; } /** Makes the text-box editable. @@ -304,12 +304,12 @@ public: @see setTextBoxStyle, getValueFromText, getTextFromValue */ - void setTextBoxIsEditable (const bool shouldBeEditable) throw(); + void setTextBoxIsEditable (const bool shouldBeEditable); /** Returns true if the text-box is read-only. @see setTextBoxStyle */ - bool isTextBoxEditable() const throw() { return editableText; } + bool isTextBoxEditable() const { return editableText; } /** If the text-box is editable, this will give it the focus so that the user can type directly into it. @@ -349,7 +349,7 @@ public: const bool sendMessageSynchronously = false); /** Returns the slider's current value. */ - double getValue() const throw(); + double getValue() const; //============================================================================== /** Sets the limits that the slider's value can take. @@ -366,17 +366,17 @@ public: /** Returns the current maximum value. @see setRange */ - double getMaximum() const throw() { return maximum; } + double getMaximum() const { return maximum; } /** Returns the current minimum value. @see setRange */ - double getMinimum() const throw() { return minimum; } + double getMinimum() const { return minimum; } /** Returns the current step-size for values. @see setRange */ - double getInterval() const throw() { return interval; } + double getInterval() const { return interval; } //============================================================================== /** For a slider with two or three thumbs, this returns the lower of its values. @@ -387,7 +387,7 @@ public: @see setMinValue, getMaxValue, TwoValueHorizontal, TwoValueVertical, ThreeValueHorizontal, ThreeValueVertical */ - double getMinValue() const throw(); + double getMinValue() const; /** For a slider with two or three thumbs, this sets the lower of its values. @@ -421,7 +421,7 @@ public: @see getMinValue, TwoValueHorizontal, TwoValueVertical, ThreeValueHorizontal, ThreeValueVertical */ - double getMaxValue() const throw(); + double getMaxValue() const; /** For a slider with two or three thumbs, this sets the lower of its values. @@ -449,10 +449,10 @@ public: //============================================================================== /** Adds a listener to be called when this slider's value changes. */ - void addListener (SliderListener* const listener) throw(); + void addListener (SliderListener* const listener); /** Removes a previously-registered listener. */ - void removeListener (SliderListener* const listener) throw(); + void removeListener (SliderListener* const listener); //============================================================================== /** This lets you choose whether double-clicking moves the slider to a given position. @@ -464,7 +464,7 @@ public: @see getDoubleClickReturnValue */ void setDoubleClickReturnValue (const bool isDoubleClickEnabled, - const double valueToSetOnDoubleClick) throw(); + const double valueToSetOnDoubleClick); /** Returns the values last set by setDoubleClickReturnValue() method. @@ -473,7 +473,7 @@ public: @see setDoubleClickReturnValue */ - double getDoubleClickReturnValue (bool& isEnabled) const throw(); + double getDoubleClickReturnValue (bool& isEnabled) const; //============================================================================== /** Tells the slider whether to keep sending change messages while the user @@ -484,7 +484,7 @@ public: will be continuously sent as they drag it while the mouse button is still held down. */ - void setChangeNotificationOnlyOnRelease (const bool onlyNotifyOnRelease) throw(); + void setChangeNotificationOnlyOnRelease (const bool onlyNotifyOnRelease); /** This lets you change whether the slider thumb jumps to the mouse position when you click. @@ -495,7 +495,7 @@ public: This only applies to linear bars, and won't affect two- or three- value sliders. */ - void setSliderSnapsToMousePosition (const bool shouldSnapToMouse) throw(); + void setSliderSnapsToMousePosition (const bool shouldSnapToMouse); /** If enabled, this gives the slider a pop-up bubble which appears while the slider is being dragged. @@ -510,7 +510,7 @@ public: you'll have to add it to a parent component instead). */ void setPopupDisplayEnabled (const bool isEnabled, - Component* const parentComponentToUse) throw(); + Component* const parentComponentToUse); /** If this is set to true, then right-clicking on the slider will pop-up a menu to let the user change the way it works. @@ -519,13 +519,13 @@ public: things like velocity sensitivity, and for rotary sliders, whether they use a linear or rotary mouse-drag to move them. */ - void setPopupMenuEnabled (const bool menuEnabled) throw(); + void setPopupMenuEnabled (const bool menuEnabled); /** This can be used to stop the mouse scroll-wheel from moving the slider. By default it's enabled. */ - void setScrollWheelEnabled (const bool enabled) throw(); + void setScrollWheelEnabled (const bool enabled); /** Returns a number to indicate which thumb is currently being dragged by the mouse. @@ -533,7 +533,7 @@ public: This will return 0 for the main thumb, 1 for the minimum-value thumb, 2 for the maximum-value thumb, or -1 if none is currently down. */ - int getThumbBeingDragged() const throw() { return sliderBeingDragged; } + int getThumbBeingDragged() const { return sliderBeingDragged; } //============================================================================== /** Callback to indicate that the user is about to start dragging the slider. @@ -659,9 +659,9 @@ public: /** True if the slider moves horizontally. */ - bool isHorizontal() const throw(); + bool isHorizontal() const; /** True if the slider moves vertically. */ - bool isVertical() const throw(); + bool isVertical() const; //============================================================================== /** A set of colour IDs to use to change the colour of various aspects of the slider. @@ -758,9 +758,9 @@ private: void restoreMouseIfHidden(); void sendDragStart(); void sendDragEnd(); - double constrainedValue (double value) const throw(); + double constrainedValue (double value) const; void triggerChangeMessage (const bool synchronous); - bool incDecDragDirectionIsHorizontal() const throw(); + bool incDecDragDirectionIsHorizontal() const; Slider (const Slider&); const Slider& operator= (const Slider&); diff --git a/src/gui/components/controls/juce_TableHeaderComponent.cpp b/src/gui/components/controls/juce_TableHeaderComponent.cpp index 44891dd4d4..9b45cd1f2a 100644 --- a/src/gui/components/controls/juce_TableHeaderComponent.cpp +++ b/src/gui/components/controls/juce_TableHeaderComponent.cpp @@ -88,11 +88,11 @@ void TableHeaderComponent::setPopupMenuActive (const bool hasMenu) menuActive = hasMenu; } -bool TableHeaderComponent::isPopupMenuActive() const throw() { return menuActive; } +bool TableHeaderComponent::isPopupMenuActive() const { return menuActive; } //============================================================================== -int TableHeaderComponent::getNumColumns (const bool onlyCountVisibleColumns) const throw() +int TableHeaderComponent::getNumColumns (const bool onlyCountVisibleColumns) const { if (onlyCountVisibleColumns) { @@ -110,7 +110,7 @@ int TableHeaderComponent::getNumColumns (const bool onlyCountVisibleColumns) con } } -const String TableHeaderComponent::getColumnName (const int columnId) const throw() +const String TableHeaderComponent::getColumnName (const int columnId) const { const ColumnInfo* const ci = getInfoForId (columnId); return ci != 0 ? ci->name : String::empty; @@ -188,7 +188,7 @@ void TableHeaderComponent::moveColumn (const int columnId, int newIndex) } } -int TableHeaderComponent::getColumnWidth (const int columnId) const throw() +int TableHeaderComponent::getColumnWidth (const int columnId) const { const ColumnInfo* const ci = getInfoForId (columnId); return ci != 0 ? ci->width : 0; @@ -227,7 +227,7 @@ void TableHeaderComponent::setColumnWidth (const int columnId, const int newWidt } //============================================================================== -int TableHeaderComponent::getIndexOfColumnId (const int columnId, const bool onlyCountVisibleColumns) const throw() +int TableHeaderComponent::getIndexOfColumnId (const int columnId, const bool onlyCountVisibleColumns) const { int n = 0; @@ -245,7 +245,7 @@ int TableHeaderComponent::getIndexOfColumnId (const int columnId, const bool onl return -1; } -int TableHeaderComponent::getColumnIdOfIndex (int index, const bool onlyCountVisibleColumns) const throw() +int TableHeaderComponent::getColumnIdOfIndex (int index, const bool onlyCountVisibleColumns) const { if (onlyCountVisibleColumns) index = visibleIndexToTotalIndex (index); @@ -254,7 +254,7 @@ int TableHeaderComponent::getColumnIdOfIndex (int index, const bool onlyCountVis return (ci != 0) ? ci->id : 0; } -const Rectangle TableHeaderComponent::getColumnPosition (const int index) const throw() +const Rectangle TableHeaderComponent::getColumnPosition (const int index) const { int x = 0, width = 0, n = 0; @@ -278,7 +278,7 @@ const Rectangle TableHeaderComponent::getColumnPosition (const int index) const return Rectangle (x, 0, width, getHeight()); } -int TableHeaderComponent::getColumnIdAtX (const int xToFind) const throw() +int TableHeaderComponent::getColumnIdAtX (const int xToFind) const { if (xToFind >= 0) { @@ -301,7 +301,7 @@ int TableHeaderComponent::getColumnIdAtX (const int xToFind) const throw() return 0; } -int TableHeaderComponent::getTotalWidth() const throw() +int TableHeaderComponent::getTotalWidth() const { int w = 0; @@ -319,7 +319,7 @@ void TableHeaderComponent::setStretchToFitActive (const bool shouldStretchToFit) resized(); } -bool TableHeaderComponent::isStretchToFitActive() const throw() +bool TableHeaderComponent::isStretchToFitActive() const { return stretchToFit; } @@ -410,7 +410,7 @@ void TableHeaderComponent::setSortColumnId (const int columnId, const bool sortF } } -int TableHeaderComponent::getSortColumnId() const throw() +int TableHeaderComponent::getSortColumnId() const { for (int i = columns.size(); --i >= 0;) if ((columns.getUnchecked(i)->propertyFlags & (sortedForwards | sortedBackwards)) != 0) @@ -419,7 +419,7 @@ int TableHeaderComponent::getSortColumnId() const throw() return 0; } -bool TableHeaderComponent::isSortedForwards() const throw() +bool TableHeaderComponent::isSortedForwards() const { for (int i = columns.size(); --i >= 0;) if ((columns.getUnchecked(i)->propertyFlags & (sortedForwards | sortedBackwards)) != 0) @@ -494,12 +494,12 @@ void TableHeaderComponent::restoreFromString (const String& storedVersion) } //============================================================================== -void TableHeaderComponent::addListener (TableHeaderListener* const newListener) throw() +void TableHeaderComponent::addListener (TableHeaderListener* const newListener) { listeners.addIfNotAlreadyThere (newListener); } -void TableHeaderComponent::removeListener (TableHeaderListener* const listenerToRemove) throw() +void TableHeaderComponent::removeListener (TableHeaderListener* const listenerToRemove) { listeners.removeValue (listenerToRemove); } @@ -810,12 +810,12 @@ const MouseCursor TableHeaderComponent::getMouseCursor() } //============================================================================== -bool TableHeaderComponent::ColumnInfo::isVisible() const throw() +bool TableHeaderComponent::ColumnInfo::isVisible() const { return (propertyFlags & TableHeaderComponent::visible) != 0; } -TableHeaderComponent::ColumnInfo* TableHeaderComponent::getInfoForId (const int id) const throw() +TableHeaderComponent::ColumnInfo* TableHeaderComponent::getInfoForId (const int id) const { for (int i = columns.size(); --i >= 0;) if (columns.getUnchecked(i)->id == id) @@ -824,7 +824,7 @@ TableHeaderComponent::ColumnInfo* TableHeaderComponent::getInfoForId (const int return 0; } -int TableHeaderComponent::visibleIndexToTotalIndex (const int visibleIndex) const throw() +int TableHeaderComponent::visibleIndexToTotalIndex (const int visibleIndex) const { int n = 0; @@ -889,7 +889,7 @@ void TableHeaderComponent::handleAsyncUpdate() } } -int TableHeaderComponent::getResizeDraggerAt (const int mouseX) const throw() +int TableHeaderComponent::getResizeDraggerAt (const int mouseX) const { if (((unsigned int) mouseX) < (unsigned int) getWidth()) { diff --git a/src/gui/components/controls/juce_TableHeaderComponent.h b/src/gui/components/controls/juce_TableHeaderComponent.h index c4488dffc2..7c509c576f 100644 --- a/src/gui/components/controls/juce_TableHeaderComponent.h +++ b/src/gui/components/controls/juce_TableHeaderComponent.h @@ -176,12 +176,12 @@ public: @see isColumnVisible */ - int getNumColumns (const bool onlyCountVisibleColumns) const throw(); + int getNumColumns (const bool onlyCountVisibleColumns) const; /** Returns the name for a column. @see setColumnName */ - const String getColumnName (const int columnId) const throw(); + const String getColumnName (const int columnId) const; /** Changes the name of a column. */ void setColumnName (const int columnId, const String& newName); @@ -195,7 +195,7 @@ public: /** Returns the width of one of the columns. */ - int getColumnWidth (const int columnId) const throw(); + int getColumnWidth (const int columnId) const; /** Changes the width of a column. @@ -230,12 +230,12 @@ public: @see setSortColumnId, isSortedForwards */ - int getSortColumnId() const throw(); + int getSortColumnId() const; /** Returns true if the table is currently sorted forwards, or false if it's backwards. @see setSortColumnId */ - bool isSortedForwards() const throw(); + bool isSortedForwards() const; /** Triggers a re-sort of the table according to the current sort-column. @@ -250,7 +250,7 @@ public: //============================================================================== /** Returns the total width of all the visible columns in the table. */ - int getTotalWidth() const throw(); + int getTotalWidth() const; /** Returns the index of a given column. @@ -259,7 +259,7 @@ public: If onlyCountVisibleColumns is true, this will return the index amoungst the visible columns; otherwise it'll return the index amongst all the columns, including any hidden ones. */ - int getIndexOfColumnId (const int columnId, const bool onlyCountVisibleColumns) const throw(); + int getIndexOfColumnId (const int columnId, const bool onlyCountVisibleColumns) const; /** Returns the ID of the column at a given index. @@ -268,7 +268,7 @@ public: If the index is out-of-range, it'll return 0. */ - int getColumnIdOfIndex (int index, const bool onlyCountVisibleColumns) const throw(); + int getColumnIdOfIndex (int index, const bool onlyCountVisibleColumns) const; /** Returns the rectangle containing of one of the columns. @@ -276,13 +276,13 @@ public: ones are not counted). It returns a rectangle showing the position of the column relative to this component's top-left. If the index is out-of-range, an empty rectangle is retrurned. */ - const Rectangle getColumnPosition (const int index) const throw(); + const Rectangle getColumnPosition (const int index) const; /** Finds the column ID at a given x-position in the component. If there is a column at this point this returns its ID, or if not, it will return 0. */ - int getColumnIdAtX (const int xToFind) const throw(); + int getColumnIdAtX (const int xToFind) const; /** If set to true, this indicates that the columns should be expanded or shrunk to fill the entire width of the component. @@ -295,7 +295,7 @@ public: /** Returns true if stretch-to-fit has been enabled. @see setStretchToFitActive */ - bool isStretchToFitActive() const throw(); + bool isStretchToFitActive() const; /** If stretch-to-fit is enabled, this will resize all the columns to make them fit into the specified width, keeping their relative proportions the same. @@ -320,7 +320,7 @@ public: /** Returns true if the pop-up menu is enabled. @see setPopupMenuActive */ - bool isPopupMenuActive() const throw(); + bool isPopupMenuActive() const; //============================================================================== /** Returns a string that encapsulates the table's current layout. @@ -341,10 +341,10 @@ public: //============================================================================== /** Adds a listener to be informed about things that happen to the header. */ - void addListener (TableHeaderListener* const newListener) throw(); + void addListener (TableHeaderListener* const newListener); /** Removes a previously-registered listener. */ - void removeListener (TableHeaderListener* const listenerToRemove) throw(); + void removeListener (TableHeaderListener* const listenerToRemove); //============================================================================== /** This can be overridden to handle a mouse-click on one of the column headers. @@ -408,7 +408,7 @@ private: int id, propertyFlags, width, minimumWidth, maximumWidth; double lastDeliberateWidth; - bool isVisible() const throw(); + bool isVisible() const; }; OwnedArray columns; @@ -419,13 +419,13 @@ private: int columnIdBeingResized, columnIdBeingDragged, initialColumnWidth; int columnIdUnderMouse, draggingColumnOffset, draggingColumnOriginalIndex, lastDeliberateWidth; - ColumnInfo* getInfoForId (const int columnId) const throw(); - int visibleIndexToTotalIndex (const int visibleIndex) const throw(); + ColumnInfo* getInfoForId (const int columnId) const; + int visibleIndexToTotalIndex (const int visibleIndex) const; void sendColumnsChanged(); void handleAsyncUpdate(); void beginDrag (const MouseEvent&); void endDrag (const int finalIndex); - int getResizeDraggerAt (const int mouseX) const throw(); + int getResizeDraggerAt (const int mouseX) const; void updateColumnUnderMouse (int x, int y); void resizeColumnsToFit (int firstColumnIndex, int targetTotalWidth); diff --git a/src/gui/components/controls/juce_TableListBox.cpp b/src/gui/components/controls/juce_TableListBox.cpp index 41c79a26bd..aa23dccd4b 100644 --- a/src/gui/components/controls/juce_TableListBox.cpp +++ b/src/gui/components/controls/juce_TableListBox.cpp @@ -345,7 +345,7 @@ void TableListBox::setModel (TableListBoxModel* const newModel) } } -int TableListBox::getHeaderHeight() const throw() +int TableListBox::getHeaderHeight() const { return header->getHeight(); } @@ -375,7 +375,7 @@ void TableListBox::setAutoSizeMenuOptionShown (const bool shouldBeShown) autoSizeOptionsShown = shouldBeShown; } -bool TableListBox::isAutoSizeMenuOptionShown() const throw() +bool TableListBox::isAutoSizeMenuOptionShown() const { return autoSizeOptionsShown; } diff --git a/src/gui/components/controls/juce_TableListBox.h b/src/gui/components/controls/juce_TableListBox.h index 9dd4e14f61..d3dcc1ab78 100644 --- a/src/gui/components/controls/juce_TableListBox.h +++ b/src/gui/components/controls/juce_TableListBox.h @@ -220,11 +220,11 @@ public: void setModel (TableListBoxModel* const newModel); /** Returns the model currently in use. */ - TableListBoxModel* getModel() const throw() { return model; } + TableListBoxModel* getModel() const { return model; } //============================================================================== /** Returns the header component being used in this table. */ - TableHeaderComponent* getHeader() const throw() { return header; } + TableHeaderComponent* getHeader() const { return header; } /** Changes the height of the table header component. @see getHeaderHeight @@ -234,7 +234,7 @@ public: /** Returns the height of the table header. @see setHeaderHeight */ - int getHeaderHeight() const throw(); + int getHeaderHeight() const; //============================================================================== /** Resizes a column to fit its contents. @@ -258,7 +258,7 @@ public: /** True if the auto-size options should be shown on the menu. @see setAutoSizeMenuOptionsShown */ - bool isAutoSizeMenuOptionShown() const throw(); + bool isAutoSizeMenuOptionShown() const; /** Returns the position of one of the cells in the table. diff --git a/src/gui/components/filebrowser/juce_DirectoryContentsList.cpp b/src/gui/components/filebrowser/juce_DirectoryContentsList.cpp index aeaae566ea..ead0b89ed5 100644 --- a/src/gui/components/filebrowser/juce_DirectoryContentsList.cpp +++ b/src/gui/components/filebrowser/juce_DirectoryContentsList.cpp @@ -32,11 +32,11 @@ BEGIN_JUCE_NAMESPACE void* juce_findFileStart (const String& directory, const String& wildCard, String& firstResultFile, bool* isDirectory, bool* isHidden, int64* fileSize, Time* modTime, - Time* creationTime, bool* isReadOnly) throw(); + Time* creationTime, bool* isReadOnly); bool juce_findFileNext (void* handle, String& resultFile, bool* isDirectory, bool* isHidden, int64* fileSize, - Time* modTime, Time* creationTime, bool* isReadOnly) throw(); -void juce_findFileClose (void* handle) throw(); + Time* modTime, Time* creationTime, bool* isReadOnly); +void juce_findFileClose (void* handle); //============================================================================== @@ -63,7 +63,7 @@ void DirectoryContentsList::setIgnoresHiddenFiles (const bool shouldIgnoreHidden } //============================================================================== -const File& DirectoryContentsList::getDirectory() const throw() +const File& DirectoryContentsList::getDirectory() const { return root; } @@ -247,7 +247,7 @@ bool DirectoryContentsList::checkNextFile (bool& hasChanged) } int DirectoryContentsList::compareElements (const DirectoryContentsList::FileInfo* const first, - const DirectoryContentsList::FileInfo* const second) throw() + const DirectoryContentsList::FileInfo* const second) { #if JUCE_WINDOWS if (first->isDirectory != second->isDirectory) diff --git a/src/gui/components/filebrowser/juce_DirectoryContentsList.h b/src/gui/components/filebrowser/juce_DirectoryContentsList.h index 78b485ba29..54a7294612 100644 --- a/src/gui/components/filebrowser/juce_DirectoryContentsList.h +++ b/src/gui/components/filebrowser/juce_DirectoryContentsList.h @@ -84,7 +84,7 @@ public: const bool includeFiles); /** Returns the directory that's currently being used. */ - const File& getDirectory() const throw(); + const File& getDirectory() const; /** Clears the list, and stops the thread scanning for files. */ void clear(); @@ -104,7 +104,7 @@ public: /** Returns true if hidden files are ignored. @see setIgnoresHiddenFiles */ - bool ignoresHiddenFiles() const throw() { return ignoreHiddenFiles; } + bool ignoresHiddenFiles() const { return ignoreHiddenFiles; } //============================================================================== /** Contains cached information about one of the files in a DirectoryContentsList. @@ -181,16 +181,16 @@ public: The filter is specified in the constructor. */ - const FileFilter* getFilter() const throw() { return fileFilter; } + const FileFilter* getFilter() const { return fileFilter; } //============================================================================== /** @internal */ bool useTimeSlice(); /** @internal */ - TimeSliceThread& getTimeSliceThread() throw() { return thread; } + TimeSliceThread& getTimeSliceThread() { return thread; } /** @internal */ static int compareElements (const DirectoryContentsList::FileInfo* const first, - const DirectoryContentsList::FileInfo* const second) throw(); + const DirectoryContentsList::FileInfo* const second); juce_UseDebuggingNewOperator diff --git a/src/gui/components/menus/juce_PopupMenu.cpp b/src/gui/components/menus/juce_PopupMenu.cpp index 96dd7656f1..d9b8e8f4d7 100644 --- a/src/gui/components/menus/juce_PopupMenu.cpp +++ b/src/gui/components/menus/juce_PopupMenu.cpp @@ -55,7 +55,7 @@ public: ApplicationCommandManager* const commandManager; //============================================================================== - MenuItemInfo() throw() + MenuItemInfo() : itemId (0), active (true), isSeparator (true), @@ -75,7 +75,7 @@ public: const bool usesColour_, PopupMenuCustomComponent* const customComp_, const PopupMenu* const subMenu_, - ApplicationCommandManager* const commandManager_) throw() + ApplicationCommandManager* const commandManager_) : itemId (itemId_), text (text_), textColour (textColour_), @@ -122,7 +122,7 @@ public: } } - MenuItemInfo (const MenuItemInfo& other) throw() + MenuItemInfo (const MenuItemInfo& other) : itemId (other.itemId), text (other.text), textColour (other.textColour), @@ -143,18 +143,18 @@ public: customComp->refCount_++; } - ~MenuItemInfo() throw() + ~MenuItemInfo() { if (customComp != 0 && --(customComp->refCount_) == 0) delete customComp; } - bool canBeTriggered() const throw() + bool canBeTriggered() const { return active && ! (isSeparator || (subMenu != 0)); } - bool hasActiveSubMenu() const throw() + bool hasActiveSubMenu() const { return active && (subMenu != 0); } @@ -277,7 +277,7 @@ class PopupMenuWindow : public Component, { public: //============================================================================== - PopupMenuWindow() throw() + PopupMenuWindow() : Component (T("menu")), owner (0), currentChild (0), @@ -341,7 +341,7 @@ public: const int itemIdThatMustBeVisible, Component* const menuBarComponent, ApplicationCommandManager** managerOfChosenCommand, - Component* const componentAttachedTo) throw() + Component* const componentAttachedTo) { if (menu.items.size() > 0) { @@ -426,7 +426,7 @@ public: } //============================================================================== - void addItem (const MenuItemInfo& item) throw() + void addItem (const MenuItemInfo& item) { MenuItemComponent* const mic = new MenuItemComponent (item); addAndMakeVisible (mic); @@ -440,7 +440,7 @@ public: //============================================================================== // hide this and all sub-comps - void hide (const MenuItemInfo* const item) throw() + void hide (const MenuItemInfo* const item) { if (isVisible()) { @@ -461,7 +461,7 @@ public: } } - void dismissMenu (const MenuItemInfo* const item) throw() + void dismissMenu (const MenuItemInfo* const item) { if (owner != 0) { @@ -771,19 +771,19 @@ private: double scrollAcceleration; //============================================================================== - bool overlaps (const Rectangle& r) const throw() + bool overlaps (const Rectangle& r) const { return r.intersects (getBounds()) || (owner != 0 && owner->overlaps (r)); } - bool isOverAnyMenu() const throw() + bool isOverAnyMenu() const { return (owner != 0) ? owner->isOverAnyMenu() : isOverChildren(); } - bool isOverChildren() const throw() + bool isOverChildren() const { jassert (activeSubMenu == 0 || activeSubMenu->isValidComponent()); @@ -791,7 +791,7 @@ private: && (isOver || (activeSubMenu != 0 && activeSubMenu->isOverChildren())); } - void updateMouseOverStatus (const int mx, const int my) throw() + void updateMouseOverStatus (const int mx, const int my) { int rx = mx, ry = my; globalPositionToRelative (rx, ry); @@ -801,7 +801,7 @@ private: activeSubMenu->updateMouseOverStatus (mx, my); } - bool treeContains (const PopupMenuWindow* const window) const throw() + bool treeContains (const PopupMenuWindow* const window) const { const PopupMenuWindow* mw = this; @@ -1096,12 +1096,12 @@ private: return x; } - bool isScrolling() const throw() + bool isScrolling() const { return childYOffset != 0 || needsToScroll; } - void setCurrentlyHighlightedChild (MenuItemComponent* const child) throw() + void setCurrentlyHighlightedChild (MenuItemComponent* const child) { if (currentChild->isValidComponent()) currentChild->setHighlighted (false); @@ -1266,7 +1266,7 @@ private: setCurrentlyHighlightedChild (mic); } - void disableTimerUntilMouseMoves() throw() + void disableTimerUntilMouseMoves() { disableMouseMoves = true; @@ -1280,14 +1280,14 @@ private: //============================================================================== -PopupMenu::PopupMenu() throw() +PopupMenu::PopupMenu() : items (8), lookAndFeel (0), separatorPending (false) { } -PopupMenu::PopupMenu (const PopupMenu& other) throw() +PopupMenu::PopupMenu (const PopupMenu& other) : items (8), lookAndFeel (other.lookAndFeel), separatorPending (false) @@ -1298,7 +1298,7 @@ PopupMenu::PopupMenu (const PopupMenu& other) throw() items.add (new MenuItemInfo (*(const MenuItemInfo*) other.items.getUnchecked(i))); } -const PopupMenu& PopupMenu::operator= (const PopupMenu& other) throw() +const PopupMenu& PopupMenu::operator= (const PopupMenu& other) { if (this != &other) { @@ -1314,12 +1314,12 @@ const PopupMenu& PopupMenu::operator= (const PopupMenu& other) throw() return *this; } -PopupMenu::~PopupMenu() throw() +PopupMenu::~PopupMenu() { clear(); } -void PopupMenu::clear() throw() +void PopupMenu::clear() { for (int i = items.size(); --i >= 0;) delete (MenuItemInfo*) items.getUnchecked(i); @@ -1343,7 +1343,7 @@ void PopupMenu::addItem (const int itemResultId, const String& itemText, const bool isActive, const bool isTicked, - const Image* const iconToUse) throw() + const Image* const iconToUse) { jassert (itemResultId != 0); // 0 is used as a return value to indicate that the user // didn't pick anything, so you shouldn't use it as the id @@ -1363,7 +1363,7 @@ void PopupMenu::addItem (const int itemResultId, void PopupMenu::addCommandItem (ApplicationCommandManager* commandManager, const int commandID, - const String& displayName) throw() + const String& displayName) { jassert (commandManager != 0 && commandID != 0); @@ -1394,7 +1394,7 @@ void PopupMenu::addColouredItem (const int itemResultId, const Colour& itemTextColour, const bool isActive, const bool isTicked, - const Image* const iconToUse) throw() + const Image* const iconToUse) { jassert (itemResultId != 0); // 0 is used as a return value to indicate that the user // didn't pick anything, so you shouldn't use it as the id @@ -1414,7 +1414,7 @@ void PopupMenu::addColouredItem (const int itemResultId, //============================================================================== void PopupMenu::addCustomItem (const int itemResultId, - PopupMenuCustomComponent* const customComponent) throw() + PopupMenuCustomComponent* const customComponent) { jassert (itemResultId != 0); // 0 is used as a return value to indicate that the user // didn't pick anything, so you shouldn't use it as the id @@ -1472,7 +1472,7 @@ private: void PopupMenu::addCustomItem (const int itemResultId, Component* customComponent, int idealWidth, int idealHeight, - const bool triggerMenuItemAutomaticallyWhenClicked) throw() + const bool triggerMenuItemAutomaticallyWhenClicked) { addCustomItem (itemResultId, new NormalComponentWrapper (customComponent, @@ -1485,7 +1485,7 @@ void PopupMenu::addSubMenu (const String& subMenuName, const PopupMenu& subMenu, const bool isActive, Image* const iconToUse, - const bool isTicked) throw() + const bool isTicked) { addSeparatorIfPending(); @@ -1501,7 +1501,7 @@ void PopupMenu::addSubMenu (const String& subMenuName, 0)); } -void PopupMenu::addSeparator() throw() +void PopupMenu::addSeparator() { separatorPending = true; } @@ -1545,7 +1545,7 @@ public: juce_UseDebuggingNewOperator }; -void PopupMenu::addSectionHeader (const String& title) throw() +void PopupMenu::addSectionHeader (const String& title) { addCustomItem (0X4734a34f, new HeaderItemComponent (title)); } @@ -1559,7 +1559,7 @@ Component* PopupMenu::createMenuComponent (const int x, const int y, const int w const bool alignToRectangle, Component* menuBarComponent, ApplicationCommandManager** managerOfChosenCommand, - Component* const componentAttachedTo) throw() + Component* const componentAttachedTo) { PopupMenuWindow* const pw = PopupMenuWindow::create (*this, @@ -1588,7 +1588,7 @@ int PopupMenu::showMenu (const int x, const int y, const int w, const int h, const int maximumNumColumns, const int standardItemHeight, const bool alignToRectangle, - Component* const componentAttachedTo) throw() + Component* const componentAttachedTo) { Component* const prevFocused = Component::getCurrentlyFocusedComponent(); @@ -1701,7 +1701,7 @@ int PopupMenu::showAt (Component* componentToAttachTo, } } -void JUCE_CALLTYPE PopupMenu::dismissAllActiveMenus() throw() +void JUCE_CALLTYPE PopupMenu::dismissAllActiveMenus() { for (int i = activeMenuWindows.size(); --i >= 0;) { @@ -1713,7 +1713,7 @@ void JUCE_CALLTYPE PopupMenu::dismissAllActiveMenus() throw() } //============================================================================== -int PopupMenu::getNumItems() const throw() +int PopupMenu::getNumItems() const { int num = 0; @@ -1724,7 +1724,7 @@ int PopupMenu::getNumItems() const throw() return num; } -bool PopupMenu::containsCommandItem (const int commandID) const throw() +bool PopupMenu::containsCommandItem (const int commandID) const { for (int i = items.size(); --i >= 0;) { @@ -1740,7 +1740,7 @@ bool PopupMenu::containsCommandItem (const int commandID) const throw() return false; } -bool PopupMenu::containsAnyActiveItems() const throw() +bool PopupMenu::containsAnyActiveItems() const { for (int i = items.size(); --i >= 0;) { @@ -1760,7 +1760,7 @@ bool PopupMenu::containsAnyActiveItems() const throw() return false; } -void PopupMenu::setLookAndFeel (LookAndFeel* const newLookAndFeel) throw() +void PopupMenu::setLookAndFeel (LookAndFeel* const newLookAndFeel) { lookAndFeel = newLookAndFeel; } @@ -1805,7 +1805,7 @@ void PopupMenuCustomComponent::triggerMenuItem() } //============================================================================== -PopupMenu::MenuItemIterator::MenuItemIterator (const PopupMenu& menu_) throw() +PopupMenu::MenuItemIterator::MenuItemIterator (const PopupMenu& menu_) : subMenu (0), itemId (0), isSeparator (false), @@ -1820,11 +1820,11 @@ PopupMenu::MenuItemIterator::MenuItemIterator (const PopupMenu& menu_) throw() { } -PopupMenu::MenuItemIterator::~MenuItemIterator() throw() +PopupMenu::MenuItemIterator::~MenuItemIterator() { } -bool PopupMenu::MenuItemIterator::next() throw() +bool PopupMenu::MenuItemIterator::next() { if (index >= menu.items.size()) return false; diff --git a/src/gui/components/menus/juce_PopupMenu.h b/src/gui/components/menus/juce_PopupMenu.h index 9167cb85d2..c6fb653963 100644 --- a/src/gui/components/menus/juce_PopupMenu.h +++ b/src/gui/components/menus/juce_PopupMenu.h @@ -83,20 +83,20 @@ class JUCE_API PopupMenu public: //============================================================================== /** Creates an empty popup menu. */ - PopupMenu() throw(); + PopupMenu(); /** Creates a copy of another menu. */ - PopupMenu (const PopupMenu& other) throw(); + PopupMenu (const PopupMenu& other); /** Destructor. */ - ~PopupMenu() throw(); + ~PopupMenu(); /** Copies this menu from another one. */ - const PopupMenu& operator= (const PopupMenu& other) throw(); + const PopupMenu& operator= (const PopupMenu& other); //============================================================================== /** Resets the menu, removing all its items. */ - void clear() throw(); + void clear(); /** Appends a new text item for this menu to show. @@ -119,7 +119,7 @@ public: const String& itemText, const bool isActive = true, const bool isTicked = false, - const Image* const iconToUse = 0) throw(); + const Image* const iconToUse = 0); /** Adds an item that represents one of the commands in a command manager object. @@ -131,7 +131,7 @@ public: */ void addCommandItem (ApplicationCommandManager* commandManager, const int commandID, - const String& displayName = String::empty) throw(); + const String& displayName = String::empty); /** Appends a text item with a special colour. @@ -145,7 +145,7 @@ public: const Colour& itemTextColour, const bool isActive = true, const bool isTicked = false, - const Image* const iconToUse = 0) throw(); + const Image* const iconToUse = 0); /** Appends a custom menu item. @@ -155,7 +155,7 @@ public: @see PopupMenuCustomComponent */ void addCustomItem (const int itemResultId, - PopupMenuCustomComponent* const customComponent) throw(); + PopupMenuCustomComponent* const customComponent); /** Appends a custom menu item that can't be used to trigger a result. @@ -175,7 +175,7 @@ public: void addCustomItem (const int itemResultId, Component* customComponent, int idealWidth, int idealHeight, - const bool triggerMenuItemAutomaticallyWhenClicked) throw(); + const bool triggerMenuItemAutomaticallyWhenClicked); /** Appends a sub-menu. @@ -185,7 +185,7 @@ public: const PopupMenu& subMenu, const bool isActive = true, Image* const iconToUse = 0, - const bool isTicked = false) throw(); + const bool isTicked = false); /** Appends a separator to the menu, to help break it up into sections. @@ -194,26 +194,26 @@ public: one, so your code can be quite free and easy about adding these, and it'll always look ok. */ - void addSeparator() throw(); + void addSeparator(); /** Adds a non-clickable text item to the menu. This is a bold-font items which can be used as a header to separate the items into named groups. */ - void addSectionHeader (const String& title) throw(); + void addSectionHeader (const String& title); /** Returns the number of items that the menu currently contains. (This doesn't count separators). */ - int getNumItems() const throw(); + int getNumItems() const; /** Returns true if the menu contains a command item that triggers the given command. */ - bool containsCommandItem (const int commandID) const throw(); + bool containsCommandItem (const int commandID) const; /** Returns true if the menu contains any items that can be used. */ - bool containsAnyActiveItems() const throw(); + bool containsAnyActiveItems() const; //============================================================================== /** Displays the menu and waits for the user to pick something. @@ -286,7 +286,7 @@ public: by some means other than a user action, and you'd like to make sure that menus aren't left hanging around. */ - static void JUCE_CALLTYPE dismissAllActiveMenus() throw(); + static void JUCE_CALLTYPE dismissAllActiveMenus(); //============================================================================== @@ -295,7 +295,7 @@ public: This can be called before show() if you need a customised menu. Be careful not to delete the LookAndFeel object before the menu has been deleted. */ - void setLookAndFeel (LookAndFeel* const newLookAndFeel) throw(); + void setLookAndFeel (LookAndFeel* const newLookAndFeel); //============================================================================== /** A set of colour IDs to use to change the colour of various aspects of the menu. @@ -338,15 +338,15 @@ public: Be careful not to add any items to a menu while it is being iterated, or things could get out of step. */ - MenuItemIterator (const PopupMenu& menu) throw(); + MenuItemIterator (const PopupMenu& menu); /** Destructor. */ - ~MenuItemIterator() throw(); + ~MenuItemIterator(); /** Returns true if there is another item, and sets up all this object's member variables to reflect that item's properties. */ - bool next() throw(); + bool next(); //============================================================================== String itemName; @@ -390,7 +390,7 @@ private: const int maximumNumColumns, const int standardItemHeight, const bool alignToRectangle, - Component* const componentAttachedTo) throw(); + Component* const componentAttachedTo); friend class MenuBarComponent; Component* createMenuComponent (const int x, const int y, const int w, const int h, @@ -401,7 +401,7 @@ private: const bool alignToRectangle, Component* menuBarComponent, ApplicationCommandManager** managerOfChosenCommand, - Component* const componentAttachedTo) throw(); + Component* const componentAttachedTo); }; #endif // __JUCE_POPUPMENU_JUCEHEADER__ diff --git a/src/gui/components/mouse/juce_DragAndDropContainer.cpp b/src/gui/components/mouse/juce_DragAndDropContainer.cpp index 0888e0a488..6a156859bf 100644 --- a/src/gui/components/mouse/juce_DragAndDropContainer.cpp +++ b/src/gui/components/mouse/juce_DragAndDropContainer.cpp @@ -121,7 +121,7 @@ public: } DragAndDropTarget* findTarget (const int screenX, const int screenY, - int& relX, int& relY) const throw() + int& relX, int& relY) const { Component* hit = getParentComponent(); diff --git a/src/gui/components/properties/juce_ChoicePropertyComponent.cpp b/src/gui/components/properties/juce_ChoicePropertyComponent.cpp index 3fce3a9db7..37322104bc 100644 --- a/src/gui/components/properties/juce_ChoicePropertyComponent.cpp +++ b/src/gui/components/properties/juce_ChoicePropertyComponent.cpp @@ -43,7 +43,7 @@ ChoicePropertyComponent::~ChoicePropertyComponent() } //============================================================================== -const StringArray& ChoicePropertyComponent::getChoices() const throw() +const StringArray& ChoicePropertyComponent::getChoices() const { return choices; } diff --git a/src/gui/components/properties/juce_ChoicePropertyComponent.h b/src/gui/components/properties/juce_ChoicePropertyComponent.h index 2f34ebf51e..e21fa7316d 100644 --- a/src/gui/components/properties/juce_ChoicePropertyComponent.h +++ b/src/gui/components/properties/juce_ChoicePropertyComponent.h @@ -80,7 +80,7 @@ public: virtual int getIndex() const = 0; /** Returns the list of options. */ - const StringArray& getChoices() const throw(); + const StringArray& getChoices() const; //============================================================================== diff --git a/src/gui/components/properties/juce_PropertyPanel.cpp b/src/gui/components/properties/juce_PropertyPanel.cpp index fe40793b55..2b615fad32 100644 --- a/src/gui/components/properties/juce_PropertyPanel.cpp +++ b/src/gui/components/properties/juce_PropertyPanel.cpp @@ -140,7 +140,7 @@ public: } } - bool isOpen() const throw() + bool isOpen() const { return isOpen_; } @@ -427,7 +427,7 @@ void PropertyPanel::setMessageWhenEmpty (const String& newMessage) } } -const String& PropertyPanel::getMessageWhenEmpty() const throw() +const String& PropertyPanel::getMessageWhenEmpty() const { return messageWhenEmpty; } diff --git a/src/gui/components/properties/juce_PropertyPanel.h b/src/gui/components/properties/juce_PropertyPanel.h index a34b3ecce8..e600414e4b 100644 --- a/src/gui/components/properties/juce_PropertyPanel.h +++ b/src/gui/components/properties/juce_PropertyPanel.h @@ -140,7 +140,7 @@ public: /** Returns the message that is displayed when there are no properties. @see setMessageWhenEmpty */ - const String& getMessageWhenEmpty() const throw(); + const String& getMessageWhenEmpty() const; //============================================================================== /** @internal */ diff --git a/src/gui/components/special/juce_AudioDeviceSelectorComponent.cpp b/src/gui/components/special/juce_AudioDeviceSelectorComponent.cpp index 7776ecf5b8..b246def589 100644 --- a/src/gui/components/special/juce_AudioDeviceSelectorComponent.cpp +++ b/src/gui/components/special/juce_AudioDeviceSelectorComponent.cpp @@ -192,7 +192,7 @@ private: } } - int getTickX() const throw() + int getTickX() const { return getRowHeight() + 5; } @@ -921,7 +921,7 @@ private: } } - int getTickX() const throw() + int getTickX() const { return getRowHeight() + 5; } diff --git a/src/gui/components/special/juce_DropShadower.cpp b/src/gui/components/special/juce_DropShadower.cpp index 548628d67f..17f1d3a4b6 100644 --- a/src/gui/components/special/juce_DropShadower.cpp +++ b/src/gui/components/special/juce_DropShadower.cpp @@ -334,7 +334,7 @@ void DropShadower::setShadowImage (Image* const src, const int w, const int h, const int sx, - const int sy) throw() + const int sy) { shadowImageSections[num] = new Image (Image::ARGB, w, h, true); diff --git a/src/gui/components/special/juce_DropShadower.h b/src/gui/components/special/juce_DropShadower.h index 4f0161e4ea..0e7b8258a1 100644 --- a/src/gui/components/special/juce_DropShadower.h +++ b/src/gui/components/special/juce_DropShadower.h @@ -95,7 +95,7 @@ private: void setShadowImage (Image* const src, const int num, const int w, const int h, - const int sx, const int sy) throw(); + const int sx, const int sy); void bringShadowWindowsToFront(); void deleteShadowWindows(); diff --git a/src/gui/components/special/juce_MagnifierComponent.cpp b/src/gui/components/special/juce_MagnifierComponent.cpp index c097294bb6..9e1829338a 100644 --- a/src/gui/components/special/juce_MagnifierComponent.cpp +++ b/src/gui/components/special/juce_MagnifierComponent.cpp @@ -332,7 +332,7 @@ void MagnifierComponent::mouseWheelMove (const MouseEvent& e, float ix, float iy Component::mouseWheelMove (e, ix, iy); } -int MagnifierComponent::scaleInt (const int n) const throw() +int MagnifierComponent::scaleInt (const int n) const { return roundDoubleToInt (n / scaleFactor); } diff --git a/src/gui/components/special/juce_MagnifierComponent.h b/src/gui/components/special/juce_MagnifierComponent.h index 24f4403350..a025f6bac1 100644 --- a/src/gui/components/special/juce_MagnifierComponent.h +++ b/src/gui/components/special/juce_MagnifierComponent.h @@ -67,7 +67,7 @@ public: //============================================================================== /** Returns the current content component. */ - Component* getContentComponent() const throw() { return content; } + Component* getContentComponent() const { return content; } //============================================================================== /** Changes the zoom level. @@ -81,7 +81,7 @@ public: void setScaleFactor (double newScaleFactor); /** Returns the current zoom factor. */ - double getScaleFactor() const throw() { return scaleFactor; } + double getScaleFactor() const { return scaleFactor; } /** Changes the quality setting used to rescale the graphics. */ @@ -111,7 +111,7 @@ private: void mouseExit (const MouseEvent& e); void mouseWheelMove (const MouseEvent& e, float, float); - int scaleInt (const int n) const throw(); + int scaleInt (const int n) const; MagnifierComponent (const MagnifierComponent&); const MagnifierComponent& operator= (const MagnifierComponent&); diff --git a/src/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp b/src/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp index 1d24ad79ba..ecd6f6a530 100644 --- a/src/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp +++ b/src/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp @@ -103,7 +103,7 @@ private: PixelRGB filler [4]; bool areRGBComponentsEqual; - forcedinline void blendLine (PixelType* dest, const PixelARGB& colour, int width) const throw() + forcedinline void blendLine (PixelType* dest, const PixelARGB& colour, int width) const { do { diff --git a/src/gui/graphics/fonts/juce_GlyphArrangement.cpp b/src/gui/graphics/fonts/juce_GlyphArrangement.cpp index 0d65f5d310..551d4f8a25 100644 --- a/src/gui/graphics/fonts/juce_GlyphArrangement.cpp +++ b/src/gui/graphics/fonts/juce_GlyphArrangement.cpp @@ -36,11 +36,11 @@ BEGIN_JUCE_NAMESPACE //============================================================================== -PositionedGlyph::PositionedGlyph() throw() +PositionedGlyph::PositionedGlyph() { } -void PositionedGlyph::draw (const Graphics& g) const throw() +void PositionedGlyph::draw (const Graphics& g) const { if (! isWhitespace()) { @@ -50,7 +50,7 @@ void PositionedGlyph::draw (const Graphics& g) const throw() } void PositionedGlyph::draw (const Graphics& g, - const AffineTransform& transform) const throw() + const AffineTransform& transform) const { if (! isWhitespace()) { @@ -60,7 +60,7 @@ void PositionedGlyph::draw (const Graphics& g, } } -void PositionedGlyph::createPath (Path& path) const throw() +void PositionedGlyph::createPath (Path& path) const { if (! isWhitespace()) { @@ -77,7 +77,7 @@ void PositionedGlyph::createPath (Path& path) const throw() } } -bool PositionedGlyph::hitTest (float px, float py) const throw() +bool PositionedGlyph::hitTest (float px, float py) const { if (px >= getLeft() && px < getRight() && py >= getTop() && py < getBottom() @@ -102,7 +102,7 @@ bool PositionedGlyph::hitTest (float px, float py) const throw() } void PositionedGlyph::moveBy (const float deltaX, - const float deltaY) throw() + const float deltaY) { x += deltaX; y += deltaY; @@ -110,17 +110,17 @@ void PositionedGlyph::moveBy (const float deltaX, //============================================================================== -GlyphArrangement::GlyphArrangement() throw() +GlyphArrangement::GlyphArrangement() : glyphs (128) { } -GlyphArrangement::GlyphArrangement (const GlyphArrangement& other) throw() +GlyphArrangement::GlyphArrangement (const GlyphArrangement& other) { addGlyphArrangement (other); } -const GlyphArrangement& GlyphArrangement::operator= (const GlyphArrangement& other) throw() +const GlyphArrangement& GlyphArrangement::operator= (const GlyphArrangement& other) { if (this != &other) { @@ -131,17 +131,17 @@ const GlyphArrangement& GlyphArrangement::operator= (const GlyphArrangement& oth return *this; } -GlyphArrangement::~GlyphArrangement() throw() +GlyphArrangement::~GlyphArrangement() { } //============================================================================== -void GlyphArrangement::clear() throw() +void GlyphArrangement::clear() { glyphs.clear(); } -PositionedGlyph& GlyphArrangement::getGlyph (const int index) const throw() +PositionedGlyph& GlyphArrangement::getGlyph (const int index) const { jassert (((unsigned int) index) < (unsigned int) glyphs.size()); @@ -149,7 +149,7 @@ PositionedGlyph& GlyphArrangement::getGlyph (const int index) const throw() } //============================================================================== -void GlyphArrangement::addGlyphArrangement (const GlyphArrangement& other) throw() +void GlyphArrangement::addGlyphArrangement (const GlyphArrangement& other) { glyphs.ensureStorageAllocated (glyphs.size() + other.glyphs.size()); @@ -157,7 +157,7 @@ void GlyphArrangement::addGlyphArrangement (const GlyphArrangement& other) throw glyphs.add (new PositionedGlyph (*other.glyphs.getUnchecked (i))); } -void GlyphArrangement::removeRangeOfGlyphs (int startIndex, const int num) throw() +void GlyphArrangement::removeRangeOfGlyphs (int startIndex, const int num) { glyphs.removeRange (startIndex, num < 0 ? glyphs.size() : num); } @@ -166,7 +166,7 @@ void GlyphArrangement::removeRangeOfGlyphs (int startIndex, const int num) throw void GlyphArrangement::addLineOfText (const Font& font, const String& text, const float xOffset, - const float yOffset) throw() + const float yOffset) { addCurtailedLineOfText (font, text, xOffset, yOffset, @@ -178,7 +178,7 @@ void GlyphArrangement::addCurtailedLineOfText (const Font& font, float xOffset, const float yOffset, const float maxWidthPixels, - const bool useEllipsis) throw() + const bool useEllipsis) { int textLen = text.length(); @@ -221,7 +221,7 @@ void GlyphArrangement::addCurtailedLineOfText (const Font& font, } int GlyphArrangement::insertEllipsis (const Font& font, const float maxXPos, - const int startIndex, int endIndex) throw() + const int startIndex, int endIndex) { int numDeleted = 0; @@ -273,7 +273,7 @@ void GlyphArrangement::addJustifiedText (const Font& font, const String& text, float x, float y, const float maxLineWidth, - const Justification& horizontalLayout) throw() + const Justification& horizontalLayout) { int lineStartIndex = glyphs.size(); addLineOfText (font, text, x, y); @@ -357,7 +357,7 @@ void GlyphArrangement::addFittedText (const Font& f, const float width, const float height, const Justification& layout, int maximumLines, - const float minimumHorizontalScale) throw() + const float minimumHorizontalScale) { // doesn't make much sense if this is outside a sensible range of 0.5 to 1.0 jassert (minimumHorizontalScale > 0 && minimumHorizontalScale <= 1.0f); @@ -548,7 +548,7 @@ void GlyphArrangement::addFittedText (const Font& f, //============================================================================== void GlyphArrangement::moveRangeOfGlyphs (int startIndex, int num, - const float dx, const float dy) throw() + const float dx, const float dy) { jassert (startIndex >= 0); @@ -563,7 +563,7 @@ void GlyphArrangement::moveRangeOfGlyphs (int startIndex, int num, } int GlyphArrangement::fitLineIntoSpace (int start, int numGlyphs, float x, float y, float w, float h, const Font& font, - const Justification& justification, float minimumHorizontalScale) throw() + const Justification& justification, float minimumHorizontalScale) { int numDeleted = 0; const float lineStartX = glyphs.getUnchecked (start)->getLeft(); @@ -589,7 +589,7 @@ int GlyphArrangement::fitLineIntoSpace (int start, int numGlyphs, float x, float } void GlyphArrangement::stretchRangeOfGlyphs (int startIndex, int num, - const float horizontalScaleFactor) throw() + const float horizontalScaleFactor) { jassert (startIndex >= 0); @@ -616,7 +616,7 @@ void GlyphArrangement::getBoundingBox (int startIndex, int num, float& top, float& right, float& bottom, - const bool includeWhitespace) const throw() + const bool includeWhitespace) const { jassert (startIndex >= 0); @@ -658,7 +658,7 @@ void GlyphArrangement::justifyGlyphs (const int startIndex, const int num, const float x, const float y, const float width, const float height, - const Justification& justification) throw() + const Justification& justification) { jassert (num >= 0 && startIndex >= 0); @@ -716,7 +716,7 @@ void GlyphArrangement::justifyGlyphs (const int startIndex, } } -void GlyphArrangement::spreadOutLine (const int start, const int num, const float targetWidth) throw() +void GlyphArrangement::spreadOutLine (const int start, const int num, const float targetWidth) { if (start + num < glyphs.size() && glyphs.getUnchecked (start + num - 1)->getCharacter() != T('\r') @@ -762,7 +762,7 @@ void GlyphArrangement::spreadOutLine (const int start, const int num, const floa } //============================================================================== -void GlyphArrangement::draw (const Graphics& g) const throw() +void GlyphArrangement::draw (const Graphics& g) const { for (int i = 0; i < glyphs.size(); ++i) { @@ -785,7 +785,7 @@ void GlyphArrangement::draw (const Graphics& g) const throw() } } -void GlyphArrangement::draw (const Graphics& g, const AffineTransform& transform) const throw() +void GlyphArrangement::draw (const Graphics& g, const AffineTransform& transform) const { for (int i = 0; i < glyphs.size(); ++i) { @@ -812,13 +812,13 @@ void GlyphArrangement::draw (const Graphics& g, const AffineTransform& transform } } -void GlyphArrangement::createPath (Path& path) const throw() +void GlyphArrangement::createPath (Path& path) const { for (int i = 0; i < glyphs.size(); ++i) glyphs.getUnchecked (i)->createPath (path); } -int GlyphArrangement::findGlyphIndexAt (float x, float y) const throw() +int GlyphArrangement::findGlyphIndexAt (float x, float y) const { for (int i = 0; i < glyphs.size(); ++i) if (glyphs.getUnchecked (i)->hitTest (x, y)) diff --git a/src/gui/graphics/fonts/juce_GlyphArrangement.h b/src/gui/graphics/fonts/juce_GlyphArrangement.h index 8ee54ea018..4550d4ea1e 100644 --- a/src/gui/graphics/fonts/juce_GlyphArrangement.h +++ b/src/gui/graphics/fonts/juce_GlyphArrangement.h @@ -42,41 +42,41 @@ class JUCE_API PositionedGlyph public: //============================================================================== /** Returns the character the glyph represents. */ - juce_wchar getCharacter() const throw() { return character; } + juce_wchar getCharacter() const { return character; } /** Checks whether the glyph is actually empty. */ - bool isWhitespace() const throw() { return CharacterFunctions::isWhitespace (character); } + bool isWhitespace() const { return CharacterFunctions::isWhitespace (character); } /** Returns the position of the glyph's left-hand edge. */ - float getLeft() const throw() { return x; } + float getLeft() const { return x; } /** Returns the position of the glyph's right-hand edge. */ - float getRight() const throw() { return x + w; } + float getRight() const { return x + w; } /** Returns the y position of the glyph's baseline. */ - float getBaselineY() const throw() { return y; } + float getBaselineY() const { return y; } /** Returns the y position of the top of the glyph. */ - float getTop() const throw() { return y - font.getAscent(); } + float getTop() const { return y - font.getAscent(); } /** Returns the y position of the bottom of the glyph. */ - float getBottom() const throw() { return y + font.getDescent(); } + float getBottom() const { return y + font.getDescent(); } //============================================================================== /** Shifts the glyph's position by a relative amount. */ void moveBy (const float deltaX, - const float deltaY) throw(); + const float deltaY); //============================================================================== /** Draws the glyph into a graphics context. */ - void draw (const Graphics& g) const throw(); + void draw (const Graphics& g) const; /** Draws the glyph into a graphics context, with an extra transform applied to it. */ - void draw (const Graphics& g, const AffineTransform& transform) const throw(); + void draw (const Graphics& g, const AffineTransform& transform) const; /** Returns the path for this glyph. @param path the glyph's outline will be appended to this path */ - void createPath (Path& path) const throw(); + void createPath (Path& path) const; /** Checks to see if a point lies within this glyph. */ - bool hitTest (float x, float y) const throw(); + bool hitTest (float x, float y) const; //============================================================================== juce_UseDebuggingNewOperator @@ -89,7 +89,7 @@ private: juce_wchar character; int glyph; - PositionedGlyph() throw(); + PositionedGlyph(); }; @@ -108,23 +108,23 @@ class JUCE_API GlyphArrangement public: //============================================================================== /** Creates an empty arrangement. */ - GlyphArrangement() throw(); + GlyphArrangement(); /** Takes a copy of another arrangement. */ - GlyphArrangement (const GlyphArrangement& other) throw(); + GlyphArrangement (const GlyphArrangement& other); /** Copies another arrangement onto this one. To add another arrangement without clearing this one, use addGlyphArrangement(). */ - const GlyphArrangement& operator= (const GlyphArrangement& other) throw(); + const GlyphArrangement& operator= (const GlyphArrangement& other); /** Destructor. */ - ~GlyphArrangement() throw(); + ~GlyphArrangement(); //============================================================================== /** Returns the total number of glyphs in the arrangement. */ - int getNumGlyphs() const throw() { return glyphs.size(); } + int getNumGlyphs() const { return glyphs.size(); } /** Returns one of the glyphs from the arrangement. @@ -132,12 +132,12 @@ public: careful not to pass an out-of-range index here, as it doesn't do any bounds-checking. */ - PositionedGlyph& getGlyph (const int index) const throw(); + PositionedGlyph& getGlyph (const int index) const; //============================================================================== /** Clears all text from the arrangement and resets it. */ - void clear() throw(); + void clear(); /** Appends a line of text to the arrangement. @@ -150,7 +150,7 @@ public: void addLineOfText (const Font& font, const String& text, const float x, - const float y) throw(); + const float y); /** Adds a line of text, truncating it if it's wider than a specified size. @@ -163,7 +163,7 @@ public: float x, const float y, const float maxWidthPixels, - const bool useEllipsis) throw(); + const bool useEllipsis); /** Adds some multi-line text, breaking lines at word-boundaries if they are too wide. @@ -182,7 +182,7 @@ public: const String& text, float x, float y, const float maxLineWidth, - const Justification& horizontalLayout) throw(); + const Justification& horizontalLayout); /** Tries to fit some text withing a given space. @@ -205,11 +205,11 @@ public: const float width, const float height, const Justification& layout, int maximumLinesToUse, - const float minimumHorizontalScale = 0.7f) throw(); + const float minimumHorizontalScale = 0.7f); /** Appends another glyph arrangement to this one. */ - void addGlyphArrangement (const GlyphArrangement& other) throw(); + void addGlyphArrangement (const GlyphArrangement& other); //============================================================================== /** Draws this glyph arrangement to a graphics context. @@ -217,26 +217,26 @@ public: This uses cached bitmaps so is much faster than the draw (Graphics&, const AffineTransform&) method, which renders the glyphs as filled vectors. */ - void draw (const Graphics& g) const throw(); + void draw (const Graphics& g) const; /** Draws this glyph arrangement to a graphics context. This renders the paths as filled vectors, so is far slower than the draw (Graphics&) method for non-transformed arrangements. */ - void draw (const Graphics& g, const AffineTransform& transform) const throw(); + void draw (const Graphics& g, const AffineTransform& transform) const; /** Converts the set of glyphs into a path. @param path the glyphs' outlines will be appended to this path */ - void createPath (Path& path) const throw(); + void createPath (Path& path) const; /** Looks for a glyph that contains the given co-ordinate. @returns the index of the glyph, or -1 if none were found. */ - int findGlyphIndexAt (float x, float y) const throw(); + int findGlyphIndexAt (float x, float y) const; //============================================================================== /** Finds the smallest rectangle that will enclose a subset of the glyphs. @@ -258,7 +258,7 @@ public: float& top, float& right, float& bottom, - const bool includeWhitespace) const throw(); + const bool includeWhitespace) const; /** Shifts a set of glyphs by a given amount. @@ -270,7 +270,7 @@ public: */ void moveRangeOfGlyphs (int startIndex, int numGlyphs, const float deltaX, - const float deltaY) throw(); + const float deltaY); /** Removes a set of glyphs from the arrangement. @@ -278,7 +278,7 @@ public: @param numGlyphs the number of glyphs to remove; if this is < 0, all glyphs after startIndex will be deleted */ - void removeRangeOfGlyphs (int startIndex, int numGlyphs) throw(); + void removeRangeOfGlyphs (int startIndex, int numGlyphs); /** Expands or compresses a set of glyphs horizontally. @@ -288,7 +288,7 @@ public: @param horizontalScaleFactor how much to scale their horizontal width by */ void stretchRangeOfGlyphs (int startIndex, int numGlyphs, - const float horizontalScaleFactor) throw(); + const float horizontalScaleFactor); /** Justifies a set of glyphs within a given space. @@ -303,7 +303,7 @@ public: const float y, const float width, const float height, - const Justification& justification) throw(); + const Justification& justification); //============================================================================== @@ -312,10 +312,10 @@ public: private: OwnedArray glyphs; - int insertEllipsis (const Font& font, const float maxXPos, const int startIndex, int endIndex) throw(); + int insertEllipsis (const Font& font, const float maxXPos, const int startIndex, int endIndex); int fitLineIntoSpace (int start, int numGlyphs, float x, float y, float w, float h, const Font& font, - const Justification& justification, float minimumHorizontalScale) throw(); - void spreadOutLine (const int start, const int numGlyphs, const float targetWidth) throw(); + const Justification& justification, float minimumHorizontalScale); + void spreadOutLine (const int start, const int numGlyphs, const float targetWidth); }; diff --git a/src/gui/graphics/geometry/juce_Path.h b/src/gui/graphics/geometry/juce_Path.h index bf5224dd2b..fe4dbd8755 100644 --- a/src/gui/graphics/geometry/juce_Path.h +++ b/src/gui/graphics/geometry/juce_Path.h @@ -536,7 +536,7 @@ public: @see setUsingNonZeroWinding */ - bool isUsingNonZeroWinding() const throw() { return useNonZeroWinding; } + bool isUsingNonZeroWinding() const { return useNonZeroWinding; } //============================================================================== diff --git a/src/gui/graphics/geometry/juce_PathIterator.h b/src/gui/graphics/geometry/juce_PathIterator.h index 7ea8b17811..e8f1481f88 100644 --- a/src/gui/graphics/geometry/juce_PathIterator.h +++ b/src/gui/graphics/geometry/juce_PathIterator.h @@ -95,7 +95,7 @@ public: int subPathIndex; /** Returns true if the current segment is the last in the current sub-path. */ - bool isLastInSubpath() const throw() { return stackPos == stackBase + bool isLastInSubpath() const { return stackPos == stackBase && (index >= path.numElements || points [index] == Path::moveMarker); } diff --git a/src/gui/graphics/geometry/juce_PathStrokeType.cpp b/src/gui/graphics/geometry/juce_PathStrokeType.cpp index 1add4db0eb..56151e496b 100644 --- a/src/gui/graphics/geometry/juce_PathStrokeType.cpp +++ b/src/gui/graphics/geometry/juce_PathStrokeType.cpp @@ -348,8 +348,8 @@ static inline void addLineEnd (Path& destPath, struct LineSection { - LineSection() throw() {} - LineSection (int) throw() {} + LineSection() {} + LineSection (int) {} float x1, y1, x2, y2; // original line float lx1, ly1, lx2, ly2; // the left-hand stroke diff --git a/src/gui/graphics/imaging/image_file_formats/juce_GIFLoader.cpp b/src/gui/graphics/imaging/image_file_formats/juce_GIFLoader.cpp index 01da3ac431..af5e2ddcb4 100644 --- a/src/gui/graphics/imaging/image_file_formats/juce_GIFLoader.cpp +++ b/src/gui/graphics/imaging/image_file_formats/juce_GIFLoader.cpp @@ -33,7 +33,7 @@ BEGIN_JUCE_NAMESPACE //============================================================================== -static inline int makeWord (const unsigned char a, const unsigned char b) throw() +static inline int makeWord (const unsigned char a, const unsigned char b) { return (b << 8) | a; } @@ -113,7 +113,7 @@ GIFLoader::GIFLoader (InputStream& in) } } -GIFLoader::~GIFLoader() throw() +GIFLoader::~GIFLoader() { } diff --git a/src/gui/graphics/imaging/image_file_formats/juce_GIFLoader.h b/src/gui/graphics/imaging/image_file_formats/juce_GIFLoader.h index 756f6b523b..3bc27a8d60 100644 --- a/src/gui/graphics/imaging/image_file_formats/juce_GIFLoader.h +++ b/src/gui/graphics/imaging/image_file_formats/juce_GIFLoader.h @@ -33,8 +33,6 @@ //============================================================================== -static const int maxGifCode = 1 << 12; - /** Used internally by ImageFileFormat - don't use this class directly in your application. @@ -45,9 +43,9 @@ class GIFLoader { public: GIFLoader (InputStream& in); - ~GIFLoader() throw(); + ~GIFLoader(); - Image* getImage() const throw() { return image; } + Image* getImage() const { return image; } private: Image* image; @@ -60,6 +58,7 @@ private: int maxCode, maxCodeSize; int firstcode, oldcode; int clearCode, end_code; + enum { maxGifCode = 1 << 12 }; int table [2] [maxGifCode]; int stack [2 * maxGifCode]; int *sp; diff --git a/src/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp b/src/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp index 9834323135..dbacb1b30f 100644 --- a/src/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp +++ b/src/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp @@ -156,11 +156,11 @@ static void setupSilentErrorHandler (struct jpeg_error_mgr& err) //============================================================================== -static void dummyCallback1 (j_decompress_ptr) throw() +static void dummyCallback1 (j_decompress_ptr) { } -static void jpegSkip (j_decompress_ptr decompStruct, long num) throw() +static void jpegSkip (j_decompress_ptr decompStruct, long num) { decompStruct->src->next_input_byte += num; @@ -168,13 +168,13 @@ static void jpegSkip (j_decompress_ptr decompStruct, long num) throw() decompStruct->src->bytes_in_buffer -= num; } -static boolean jpegFill (j_decompress_ptr) throw() +static boolean jpegFill (j_decompress_ptr) { return 0; } //============================================================================== -Image* juce_loadJPEGImageFromStream (InputStream& in) throw() +Image* juce_loadJPEGImageFromStream (InputStream& in) { MemoryBlock mb; in.readIntoMemoryBlock (mb); @@ -278,11 +278,11 @@ struct JuceJpegDest : public jpeg_destination_mgr char* buffer; }; -static void jpegWriteInit (j_compress_ptr) throw() +static void jpegWriteInit (j_compress_ptr) { } -static void jpegWriteTerminate (j_compress_ptr cinfo) throw() +static void jpegWriteTerminate (j_compress_ptr cinfo) { JuceJpegDest* const dest = (JuceJpegDest*) cinfo->dest; @@ -290,7 +290,7 @@ static void jpegWriteTerminate (j_compress_ptr cinfo) throw() dest->output->write (dest->buffer, numToWrite); } -static boolean jpegWriteFlush (j_compress_ptr cinfo) throw() +static boolean jpegWriteFlush (j_compress_ptr cinfo) { JuceJpegDest* const dest = (JuceJpegDest*) cinfo->dest; @@ -305,7 +305,7 @@ static boolean jpegWriteFlush (j_compress_ptr cinfo) throw() //============================================================================== bool juce_writeJPEGImageToStream (const Image& image, OutputStream& out, - float quality) throw() + float quality) { if (image.hasAlphaChannel()) { diff --git a/src/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp b/src/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp index 196ebda450..77e76af0f2 100644 --- a/src/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp +++ b/src/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp @@ -109,7 +109,7 @@ using ::malloc; using ::free; //============================================================================== -static void pngReadCallback (png_structp pngReadStruct, png_bytep data, png_size_t length) throw() +static void pngReadCallback (png_structp pngReadStruct, png_bytep data, png_size_t length) { InputStream* const in = (InputStream*) png_get_io_ptr (pngReadStruct); in->read (data, (int) length); @@ -123,7 +123,7 @@ static void pngErrorCallback (png_structp, png_const_charp) } //============================================================================== -Image* juce_loadPNGImageFromStream (InputStream& in) throw() +Image* juce_loadPNGImageFromStream (InputStream& in) { Image* image = 0; @@ -234,7 +234,7 @@ Image* juce_loadPNGImageFromStream (InputStream& in) throw() } //============================================================================== -static void pngWriteDataCallback (png_structp png_ptr, png_bytep data, png_size_t length) throw() +static void pngWriteDataCallback (png_structp png_ptr, png_bytep data, png_size_t length) { OutputStream* const out = (OutputStream*) png_ptr->io_ptr; @@ -244,7 +244,7 @@ static void pngWriteDataCallback (png_structp png_ptr, png_bytep data, png_size_ jassert (ok); } -bool juce_writePNGImageToStream (const Image& image, OutputStream& out) throw() +bool juce_writePNGImageToStream (const Image& image, OutputStream& out) { const int width = image.getWidth(); const int height = image.getHeight(); diff --git a/src/gui/graphics/imaging/juce_CameraDevice.h b/src/gui/graphics/imaging/juce_CameraDevice.h index e05ef65ce4..01219bfda8 100644 --- a/src/gui/graphics/imaging/juce_CameraDevice.h +++ b/src/gui/graphics/imaging/juce_CameraDevice.h @@ -87,7 +87,7 @@ public: //============================================================================== /** Returns the name of this device */ - const String getName() const throw() { return name; } + const String getName() const { return name; } /** Creates a component that can be used to display a preview of the video from this camera. diff --git a/src/gui/graphics/imaging/juce_Image.cpp b/src/gui/graphics/imaging/juce_Image.cpp index 1b50f5a594..382d2399e9 100644 --- a/src/gui/graphics/imaging/juce_Image.cpp +++ b/src/gui/graphics/imaging/juce_Image.cpp @@ -96,7 +96,7 @@ LowLevelGraphicsContext* Image::createLowLevelContext() } //============================================================================== -Image::BitmapData::BitmapData (Image& image, int x, int y, int w, int h, const bool /*makeWritable*/) throw() +Image::BitmapData::BitmapData (Image& image, int x, int y, int w, int h, const bool /*makeWritable*/) : data (image.imageData + image.lineStride * y + image.pixelStride * x), lineStride (image.lineStride), pixelStride (image.pixelStride), @@ -106,7 +106,7 @@ Image::BitmapData::BitmapData (Image& image, int x, int y, int w, int h, const b jassert (x >= 0 && y >= 0 && w > 0 && h > 0 && x + w <= image.getWidth() && y + h <= image.getHeight()); } -Image::BitmapData::BitmapData (const Image& image, int x, int y, int w, int h) throw() +Image::BitmapData::BitmapData (const Image& image, int x, int y, int w, int h) : data (image.imageData + image.lineStride * y + image.pixelStride * x), lineStride (image.lineStride), pixelStride (image.pixelStride), @@ -116,7 +116,7 @@ Image::BitmapData::BitmapData (const Image& image, int x, int y, int w, int h) t jassert (x >= 0 && y >= 0 && w > 0 && h > 0 && x + w <= image.getWidth() && y + h <= image.getHeight()); } -Image::BitmapData::~BitmapData() throw() +Image::BitmapData::~BitmapData() { } diff --git a/src/gui/graphics/imaging/juce_Image.h b/src/gui/graphics/imaging/juce_Image.h index 8239686469..887470d1e9 100644 --- a/src/gui/graphics/imaging/juce_Image.h +++ b/src/gui/graphics/imaging/juce_Image.h @@ -223,21 +223,21 @@ public: class BitmapData { public: - BitmapData (Image& image, int x, int y, int w, int h, const bool needsToBeWritable) throw(); - BitmapData (const Image& image, int x, int y, int w, int h) throw(); - ~BitmapData() throw(); + BitmapData (Image& image, int x, int y, int w, int h, const bool needsToBeWritable); + BitmapData (const Image& image, int x, int y, int w, int h); + ~BitmapData(); /** Returns a pointer to the start of a line in the image. The co-ordinate you provide here isn't checked, so it's the caller's responsibility to make sure it's not out-of-range. */ - inline uint8* getLinePointer (const int y) const throw() { return data + y * lineStride; } + inline uint8* getLinePointer (const int y) const { return data + y * lineStride; } /** Returns a pointer to a pixel in the image. The co-ordinates you give here are not checked, so it's the caller's responsibility to make sure they're not out-of-range. */ - inline uint8* getPixelPointer (const int x, const int y) const throw() { return data + y * lineStride + x * pixelStride; } + inline uint8* getPixelPointer (const int x, const int y) const { return data + y * lineStride + x * pixelStride; } uint8* data; int lineStride, pixelStride, width, height; diff --git a/src/gui/graphics/imaging/juce_ImageCache.cpp b/src/gui/graphics/imaging/juce_ImageCache.cpp index 59647e9466..d45836a792 100644 --- a/src/gui/graphics/imaging/juce_ImageCache.cpp +++ b/src/gui/graphics/imaging/juce_ImageCache.cpp @@ -48,7 +48,7 @@ static ImageCache* instance = 0; static int cacheTimeout = 5000; -ImageCache::ImageCache() throw() +ImageCache::ImageCache() : images (4) { } diff --git a/src/gui/graphics/imaging/juce_ImageCache.h b/src/gui/graphics/imaging/juce_ImageCache.h index 9a3a6aa925..061c13a99c 100644 --- a/src/gui/graphics/imaging/juce_ImageCache.h +++ b/src/gui/graphics/imaging/juce_ImageCache.h @@ -165,7 +165,7 @@ private: CriticalSection lock; OwnedArray images; - ImageCache() throw(); + ImageCache(); ImageCache (const ImageCache&); const ImageCache& operator= (const ImageCache&); ~ImageCache(); diff --git a/src/gui/graphics/imaging/juce_ImageConvolutionKernel.cpp b/src/gui/graphics/imaging/juce_ImageConvolutionKernel.cpp index 76de49d054..01851c3186 100644 --- a/src/gui/graphics/imaging/juce_ImageConvolutionKernel.cpp +++ b/src/gui/graphics/imaging/juce_ImageConvolutionKernel.cpp @@ -31,21 +31,21 @@ BEGIN_JUCE_NAMESPACE //============================================================================== -ImageConvolutionKernel::ImageConvolutionKernel (const int size_) throw() +ImageConvolutionKernel::ImageConvolutionKernel (const int size_) : values (size_ * size_), size (size_) { clear(); } -ImageConvolutionKernel::~ImageConvolutionKernel() throw() +ImageConvolutionKernel::~ImageConvolutionKernel() { } //============================================================================== void ImageConvolutionKernel::setKernelValue (const int x, const int y, - const float value) throw() + const float value) { if (((unsigned int) x) < (unsigned int) size && ((unsigned int) y) < (unsigned int) size) @@ -58,13 +58,13 @@ void ImageConvolutionKernel::setKernelValue (const int x, } } -void ImageConvolutionKernel::clear() throw() +void ImageConvolutionKernel::clear() { for (int i = size * size; --i >= 0;) values[i] = 0; } -void ImageConvolutionKernel::setOverallSum (const float desiredTotalSum) throw() +void ImageConvolutionKernel::setOverallSum (const float desiredTotalSum) { double currentTotal = 0.0; @@ -74,14 +74,14 @@ void ImageConvolutionKernel::setOverallSum (const float desiredTotalSum) throw() rescaleAllValues ((float) (desiredTotalSum / currentTotal)); } -void ImageConvolutionKernel::rescaleAllValues (const float multiplier) throw() +void ImageConvolutionKernel::rescaleAllValues (const float multiplier) { for (int i = size * size; --i >= 0;) values[i] *= multiplier; } //============================================================================== -void ImageConvolutionKernel::createGaussianBlur (const float radius) throw() +void ImageConvolutionKernel::createGaussianBlur (const float radius) { const double radiusFactor = -1.0 / (radius * radius * 2); const int centre = size >> 1; diff --git a/src/gui/graphics/imaging/juce_ImageConvolutionKernel.h b/src/gui/graphics/imaging/juce_ImageConvolutionKernel.h index 65f6e24797..3e34665fc0 100644 --- a/src/gui/graphics/imaging/juce_ImageConvolutionKernel.h +++ b/src/gui/graphics/imaging/juce_ImageConvolutionKernel.h @@ -44,15 +44,15 @@ public: @param size the length of each dimension of the kernel, so e.g. if the size is 5, it will create a 5x5 kernel */ - ImageConvolutionKernel (const int size) throw(); + ImageConvolutionKernel (const int size); /** Destructor. */ - ~ImageConvolutionKernel() throw(); + ~ImageConvolutionKernel(); //============================================================================== /** Resets all values in the kernel to zero. */ - void clear() throw(); + void clear(); /** Sets the value of a specific cell in the kernel. @@ -62,16 +62,16 @@ public: */ void setKernelValue (const int x, const int y, - const float value) throw(); + const float value); /** Rescales all values in the kernel to make the total add up to a fixed value. This will multiply all values in the kernel by (desiredTotalSum / currentTotalSum). */ - void setOverallSum (const float desiredTotalSum) throw(); + void setOverallSum (const float desiredTotalSum); /** Multiplies all values in the kernel by a value. */ - void rescaleAllValues (const float multiplier) throw(); + void rescaleAllValues (const float multiplier); /** Intialises the kernel for a gaussian blur. @@ -80,20 +80,20 @@ public: edges. Ideally the kernel should be just larger than (blurRadius * 2). */ - void createGaussianBlur (const float blurRadius) throw(); + void createGaussianBlur (const float blurRadius); //============================================================================== /** Returns the size of the kernel. E.g. if it's a 3x3 kernel, this returns 3. */ - int getKernelSize() const throw() { return size; } + int getKernelSize() const { return size; } /** Returns a 2-dimensional array of the kernel's values. The size of each dimension of the array will be getKernelSize(). */ - float** getValues() const throw() { return values; } + float** getValues() const { return values; } //============================================================================== /** Applies the kernel to an image. diff --git a/src/gui/graphics/imaging/juce_ImageFileFormat.cpp b/src/gui/graphics/imaging/juce_ImageFileFormat.cpp index 0815a942d2..59ff16214f 100644 --- a/src/gui/graphics/imaging/juce_ImageFileFormat.cpp +++ b/src/gui/graphics/imaging/juce_ImageFileFormat.cpp @@ -34,11 +34,11 @@ BEGIN_JUCE_NAMESPACE #include "image_file_formats/juce_GIFLoader.h" //============================================================================== -Image* juce_loadPNGImageFromStream (InputStream& inputStream) throw(); -bool juce_writePNGImageToStream (const Image& image, OutputStream& out) throw(); +Image* juce_loadPNGImageFromStream (InputStream& inputStream); +bool juce_writePNGImageToStream (const Image& image, OutputStream& out); -PNGImageFormat::PNGImageFormat() throw() {} -PNGImageFormat::~PNGImageFormat() throw() {} +PNGImageFormat::PNGImageFormat() {} +PNGImageFormat::~PNGImageFormat() {} const String PNGImageFormat::getFormatName() { @@ -68,15 +68,15 @@ bool PNGImageFormat::writeImageToStream (const Image& sourceImage, } //============================================================================== -Image* juce_loadJPEGImageFromStream (InputStream& inputStream) throw(); -bool juce_writeJPEGImageToStream (const Image& image, OutputStream& out, float quality) throw(); +Image* juce_loadJPEGImageFromStream (InputStream& inputStream); +bool juce_writeJPEGImageToStream (const Image& image, OutputStream& out, float quality); -JPEGImageFormat::JPEGImageFormat() throw() +JPEGImageFormat::JPEGImageFormat() : quality (-1.0f) { } -JPEGImageFormat::~JPEGImageFormat() throw() {} +JPEGImageFormat::~JPEGImageFormat() {} void JPEGImageFormat::setQuality (const float newQuality) { @@ -120,8 +120,8 @@ bool JPEGImageFormat::writeImageToStream (const Image& sourceImage, class GIFImageFormat : public ImageFileFormat { public: - GIFImageFormat() throw() {} - ~GIFImageFormat() throw() {} + GIFImageFormat() {} + ~GIFImageFormat() {} const String getFormatName() { diff --git a/src/gui/graphics/imaging/juce_ImageFileFormat.h b/src/gui/graphics/imaging/juce_ImageFileFormat.h index 8a289108af..4d2ba3310c 100644 --- a/src/gui/graphics/imaging/juce_ImageFileFormat.h +++ b/src/gui/graphics/imaging/juce_ImageFileFormat.h @@ -47,11 +47,11 @@ class JUCE_API ImageFileFormat protected: //============================================================================== /** Creates an ImageFormat. */ - ImageFileFormat() throw() {} + ImageFileFormat() {} public: /** Destructor. */ - virtual ~ImageFileFormat() throw() {} + virtual ~ImageFileFormat() {} //============================================================================== /** Returns a description of this file format. @@ -150,8 +150,8 @@ class JUCE_API PNGImageFormat : public ImageFileFormat { public: //============================================================================== - PNGImageFormat() throw(); - ~PNGImageFormat() throw(); + PNGImageFormat(); + ~PNGImageFormat(); //============================================================================== const String getFormatName(); @@ -173,8 +173,8 @@ class JUCE_API JPEGImageFormat : public ImageFileFormat { public: //============================================================================== - JPEGImageFormat() throw(); - ~JPEGImageFormat() throw(); + JPEGImageFormat(); + ~JPEGImageFormat(); //============================================================================== /** Specifies the quality to be used when writing a JPEG file. diff --git a/src/io/files/juce_DirectoryIterator.cpp b/src/io/files/juce_DirectoryIterator.cpp index 4a3b6b4368..1d3740c029 100644 --- a/src/io/files/juce_DirectoryIterator.cpp +++ b/src/io/files/juce_DirectoryIterator.cpp @@ -32,18 +32,18 @@ BEGIN_JUCE_NAMESPACE void* juce_findFileStart (const String& directory, const String& wildCard, String& firstResultFile, bool* isDirectory, bool* isHidden, int64* fileSize, - Time* modTime, Time* creationTime, bool* isReadOnly) throw(); + Time* modTime, Time* creationTime, bool* isReadOnly); bool juce_findFileNext (void* handle, String& resultFile, bool* isDirectory, bool* isHidden, int64* fileSize, - Time* modTime, Time* creationTime, bool* isReadOnly) throw(); -void juce_findFileClose (void* handle) throw(); + Time* modTime, Time* creationTime, bool* isReadOnly); +void juce_findFileClose (void* handle); //============================================================================== DirectoryIterator::DirectoryIterator (const File& directory, bool isRecursive, const String& wc, - const int whatToLookFor_) throw() + const int whatToLookFor_) : wildCard (wc), index (-1), whatToLookFor (whatToLookFor_) @@ -105,11 +105,11 @@ DirectoryIterator::DirectoryIterator (const File& directory, } } -DirectoryIterator::~DirectoryIterator() throw() +DirectoryIterator::~DirectoryIterator() { } -bool DirectoryIterator::next() throw() +bool DirectoryIterator::next() { if (subIterator != 0) { @@ -134,7 +134,7 @@ bool DirectoryIterator::next() throw() return true; } -const File DirectoryIterator::getFile() const throw() +const File DirectoryIterator::getFile() const { if (subIterator != 0) return subIterator->getFile(); @@ -145,7 +145,7 @@ const File DirectoryIterator::getFile() const throw() : File::nonexistent; } -float DirectoryIterator::getEstimatedProgress() const throw() +float DirectoryIterator::getEstimatedProgress() const { if (filesFound.size() + dirsFound.size() == 0) { diff --git a/src/io/files/juce_DirectoryIterator.h b/src/io/files/juce_DirectoryIterator.h index 649cb568a6..9bbd8852e7 100644 --- a/src/io/files/juce_DirectoryIterator.h +++ b/src/io/files/juce_DirectoryIterator.h @@ -71,30 +71,30 @@ public: DirectoryIterator (const File& directory, bool isRecursive, const String& wildCard = JUCE_T("*"), - const int whatToLookFor = File::findFiles) throw(); + const int whatToLookFor = File::findFiles); /** Destructor. */ - ~DirectoryIterator() throw(); + ~DirectoryIterator(); /** Call this to move the iterator along to the next file. @returns true if a file was found (you can then use getFile() to see what it was) - or false if there are no more matching files. */ - bool next() throw(); + bool next(); /** Returns the file that the iterator is currently pointing at. The result of this call is only valid after a call to next() has returned true. */ - const File getFile() const throw(); + const File getFile() const; /** Returns a guess of how far through the search the iterator has got. @returns a value 0.0 to 1.0 to show the progress, although this won't be very accurate. */ - float getEstimatedProgress() const throw(); + float getEstimatedProgress() const; //============================================================================== diff --git a/src/io/files/juce_File.cpp b/src/io/files/juce_File.cpp index fc600584fd..07aa002b22 100644 --- a/src/io/files/juce_File.cpp +++ b/src/io/files/juce_File.cpp @@ -47,33 +47,33 @@ BEGIN_JUCE_NAMESPACE #endif //============================================================================== -void* juce_fileOpen (const String& path, bool forWriting) throw(); -void juce_fileClose (void* handle) throw(); -int juce_fileWrite (void* handle, const void* buffer, int size) throw(); -int64 juce_fileGetPosition (void* handle) throw(); -int64 juce_fileSetPosition (void* handle, int64 pos) throw(); -void juce_fileFlush (void* handle) throw(); +void* juce_fileOpen (const String& path, bool forWriting); +void juce_fileClose (void* handle); +int juce_fileWrite (void* handle, const void* buffer, int size); +int64 juce_fileGetPosition (void* handle); +int64 juce_fileSetPosition (void* handle, int64 pos); +void juce_fileFlush (void* handle); -bool juce_fileExists (const String& fileName, const bool dontCountDirectories) throw(); -bool juce_isDirectory (const String& fileName) throw(); -int64 juce_getFileSize (const String& fileName) throw(); -bool juce_canWriteToFile (const String& fileName) throw(); -bool juce_setFileReadOnly (const String& fileName, bool isReadOnly) throw(); +bool juce_fileExists (const String& fileName, const bool dontCountDirectories); +bool juce_isDirectory (const String& fileName); +int64 juce_getFileSize (const String& fileName); +bool juce_canWriteToFile (const String& fileName); +bool juce_setFileReadOnly (const String& fileName, bool isReadOnly); -void juce_getFileTimes (const String& fileName, int64& modificationTime, int64& accessTime, int64& creationTime) throw(); -bool juce_setFileTimes (const String& fileName, int64 modificationTime, int64 accessTime, int64 creationTime) throw(); +void juce_getFileTimes (const String& fileName, int64& modificationTime, int64& accessTime, int64& creationTime); +bool juce_setFileTimes (const String& fileName, int64 modificationTime, int64 accessTime, int64 creationTime); -bool juce_deleteFile (const String& fileName) throw(); -bool juce_copyFile (const String& source, const String& dest) throw(); -bool juce_moveFile (const String& source, const String& dest) throw(); +bool juce_deleteFile (const String& fileName); +bool juce_copyFile (const String& source, const String& dest); +bool juce_moveFile (const String& source, const String& dest); // this must also create all paths involved in the directory. -void juce_createDirectory (const String& fileName) throw(); +void juce_createDirectory (const String& fileName); -bool juce_launchFile (const String& fileName, const String& parameters) throw(); +bool juce_launchFile (const String& fileName, const String& parameters); -const StringArray juce_getFileSystemRoots() throw(); -const String juce_getVolumeLabel (const String& filenameOnVolume, int& volumeSerialNumber) throw(); +const StringArray juce_getFileSystemRoots(); +const String juce_getVolumeLabel (const String& filenameOnVolume, int& volumeSerialNumber); // starts a directory search operation with a wildcard, returning a handle for // use in calls to juce_findFileNext. @@ -81,24 +81,24 @@ const String juce_getVolumeLabel (const String& filenameOnVolume, int& volumeSer // the other pointers, if non-null, are set based on the properties of the file. void* juce_findFileStart (const String& directory, const String& wildCard, String& firstResultFile, bool* isDirectory, bool* isHidden, int64* fileSize, Time* modTime, - Time* creationTime, bool* isReadOnly) throw(); + Time* creationTime, bool* isReadOnly); // returns false when no more files are found bool juce_findFileNext (void* handle, String& resultFile, bool* isDirectory, bool* isHidden, int64* fileSize, - Time* modTime, Time* creationTime, bool* isReadOnly) throw(); + Time* modTime, Time* creationTime, bool* isReadOnly); -void juce_findFileClose (void* handle) throw(); +void juce_findFileClose (void* handle); //============================================================================== -static const String juce_addTrailingSeparator (const String& path) throw() +static const String juce_addTrailingSeparator (const String& path) { return path.endsWithChar (File::separator) ? path : path + File::separator; } //============================================================================== -static const String parseAbsolutePath (String path) throw() +static const String parseAbsolutePath (String path) { if (path.isEmpty()) return String::empty; @@ -194,28 +194,28 @@ const File File::nonexistent; //============================================================================== -File::File (const String& fullPathName) throw() +File::File (const String& fullPathName) : fullPath (parseAbsolutePath (fullPathName)) { } -File::File (const String& path, int) throw() +File::File (const String& path, int) : fullPath (path) { } -File::File (const File& other) throw() +File::File (const File& other) : fullPath (other.fullPath) { } -const File& File::operator= (const String& newPath) throw() +const File& File::operator= (const String& newPath) { fullPath = parseAbsolutePath (newPath); return *this; } -const File& File::operator= (const File& other) throw() +const File& File::operator= (const File& other) { fullPath = other.fullPath; return *this; @@ -235,7 +235,7 @@ bool File::areFileNamesCaseSensitive() #endif } -bool File::operator== (const File& other) const throw() +bool File::operator== (const File& other) const { // case-insensitive on Windows, but not on linux. #if NAMES_ARE_CASE_SENSITIVE @@ -245,28 +245,28 @@ bool File::operator== (const File& other) const throw() #endif } -bool File::operator!= (const File& other) const throw() +bool File::operator!= (const File& other) const { return ! operator== (other); } //============================================================================== -bool File::exists() const throw() +bool File::exists() const { return juce_fileExists (fullPath, false); } -bool File::existsAsFile() const throw() +bool File::existsAsFile() const { return juce_fileExists (fullPath, true); } -bool File::isDirectory() const throw() +bool File::isDirectory() const { return juce_isDirectory (fullPath); } -bool File::hasWriteAccess() const throw() +bool File::hasWriteAccess() const { if (exists()) return juce_canWriteToFile (fullPath); @@ -285,7 +285,7 @@ bool File::hasWriteAccess() const throw() } bool File::setReadOnly (const bool shouldBeReadOnly, - const bool applyRecursively) const throw() + const bool applyRecursively) const { bool worked = true; @@ -301,13 +301,13 @@ bool File::setReadOnly (const bool shouldBeReadOnly, return juce_setFileReadOnly (fullPath, shouldBeReadOnly) && worked; } -bool File::deleteFile() const throw() +bool File::deleteFile() const { return (! exists()) || juce_deleteFile (fullPath); } -bool File::deleteRecursively() const throw() +bool File::deleteRecursively() const { bool worked = true; @@ -323,7 +323,7 @@ bool File::deleteRecursively() const throw() return deleteFile() && worked; } -bool File::moveFileTo (const File& newFile) const throw() +bool File::moveFileTo (const File& newFile) const { if (newFile.fullPath == fullPath) return true; @@ -337,7 +337,7 @@ bool File::moveFileTo (const File& newFile) const throw() return juce_moveFile (fullPath, newFile.fullPath); } -bool File::copyFileTo (const File& newFile) const throw() +bool File::copyFileTo (const File& newFile) const { if (*this == newFile) return true; @@ -348,7 +348,7 @@ bool File::copyFileTo (const File& newFile) const throw() return juce_copyFile (fullPath, newFile.fullPath); } -bool File::copyDirectoryTo (const File& newDirectory) const throw() +bool File::copyDirectoryTo (const File& newDirectory) const { if (isDirectory() && newDirectory.createDirectory()) { @@ -374,7 +374,7 @@ bool File::copyDirectoryTo (const File& newDirectory) const throw() } //============================================================================== -const String File::getPathUpToLastSlash() const throw() +const String File::getPathUpToLastSlash() const { const int lastSlash = fullPath.lastIndexOfChar (separator); @@ -386,28 +386,28 @@ const String File::getPathUpToLastSlash() const throw() return fullPath; } -const File File::getParentDirectory() const throw() +const File File::getParentDirectory() const { return File (getPathUpToLastSlash()); } //============================================================================== -const String File::getFileName() const throw() +const String File::getFileName() const { return fullPath.substring (fullPath.lastIndexOfChar (separator) + 1); } -int File::hashCode() const throw() +int File::hashCode() const { return fullPath.hashCode(); } -int64 File::hashCode64() const throw() +int64 File::hashCode64() const { return fullPath.hashCode64(); } -const String File::getFileNameWithoutExtension() const throw() +const String File::getFileNameWithoutExtension() const { const int lastSlash = fullPath.lastIndexOfChar (separator) + 1; const int lastDot = fullPath.lastIndexOfChar (T('.')); @@ -418,7 +418,7 @@ const String File::getFileNameWithoutExtension() const throw() return fullPath.substring (lastSlash); } -bool File::isAChildOf (const File& potentialParent) const throw() +bool File::isAChildOf (const File& potentialParent) const { const String ourPath (getPathUpToLastSlash()); @@ -441,7 +441,7 @@ bool File::isAChildOf (const File& potentialParent) const throw() } //============================================================================== -bool File::isAbsolutePath (const String& path) throw() +bool File::isAbsolutePath (const String& path) { return path.startsWithChar (T('/')) || path.startsWithChar (T('\\')) #if JUCE_WINDOWS @@ -451,7 +451,7 @@ bool File::isAbsolutePath (const String& path) throw() #endif } -const File File::getChildFile (String relativePath) const throw() +const File File::getChildFile (String relativePath) const { if (isAbsolutePath (relativePath)) { @@ -502,13 +502,13 @@ const File File::getChildFile (String relativePath) const throw() } } -const File File::getSiblingFile (const String& fileName) const throw() +const File File::getSiblingFile (const String& fileName) const { return getParentDirectory().getChildFile (fileName); } //============================================================================== -int64 File::getSize() const throw() +int64 File::getSize() const { return juce_getFileSize (fullPath); } @@ -538,7 +538,7 @@ const String File::descriptionOfSizeInBytes (const int64 bytes) } //============================================================================== -bool File::create() const throw() +bool File::create() const { if (! exists()) { @@ -558,7 +558,7 @@ bool File::create() const throw() return true; } -bool File::createDirectory() const throw() +bool File::createDirectory() const { if (! isDirectory()) { @@ -581,44 +581,44 @@ bool File::createDirectory() const throw() } //============================================================================== -const Time File::getCreationTime() const throw() +const Time File::getCreationTime() const { int64 m, a, c; juce_getFileTimes (fullPath, m, a, c); return Time (c); } -bool File::setCreationTime (const Time& t) const throw() +bool File::setCreationTime (const Time& t) const { return juce_setFileTimes (fullPath, 0, 0, t.toMilliseconds()); } -const Time File::getLastModificationTime() const throw() +const Time File::getLastModificationTime() const { int64 m, a, c; juce_getFileTimes (fullPath, m, a, c); return Time (m); } -bool File::setLastModificationTime (const Time& t) const throw() +bool File::setLastModificationTime (const Time& t) const { return juce_setFileTimes (fullPath, t.toMilliseconds(), 0, 0); } -const Time File::getLastAccessTime() const throw() +const Time File::getLastAccessTime() const { int64 m, a, c; juce_getFileTimes (fullPath, m, a, c); return Time (a); } -bool File::setLastAccessTime (const Time& t) const throw() +bool File::setLastAccessTime (const Time& t) const { return juce_setFileTimes (fullPath, 0, t.toMilliseconds(), 0); } //============================================================================== -bool File::loadFileAsData (MemoryBlock& destBlock) const throw() +bool File::loadFileAsData (MemoryBlock& destBlock) const { if (! existsAsFile()) return false; @@ -627,7 +627,7 @@ bool File::loadFileAsData (MemoryBlock& destBlock) const throw() return getSize() == in.readIntoMemoryBlock (destBlock); } -const String File::loadFileAsString() const throw() +const String File::loadFileAsString() const { if (! existsAsFile()) return String::empty; @@ -650,7 +650,7 @@ static inline bool fileTypeMatches (const int whatToLookFor, int File::findChildFiles (OwnedArray& results, const int whatToLookFor, const bool searchRecursively, - const String& wildCardPattern) const throw() + const String& wildCardPattern) const { // you have to specify the type of files you're looking for! jassert ((whatToLookFor & (findFiles | findDirectories)) != 0); @@ -711,7 +711,7 @@ int File::findChildFiles (OwnedArray& results, } int File::getNumberOfChildFiles (const int whatToLookFor, - const String& wildCardPattern) const throw() + const String& wildCardPattern) const { // you have to specify the type of files you're looking for! jassert (whatToLookFor > 0 && whatToLookFor <= 3); @@ -751,7 +751,7 @@ int File::getNumberOfChildFiles (const int whatToLookFor, return count; } -bool File::containsSubDirectories() const throw() +bool File::containsSubDirectories() const { bool result = false; @@ -785,7 +785,7 @@ bool File::containsSubDirectories() const throw() //============================================================================== const File File::getNonexistentChildFile (const String& prefix_, const String& suffix, - bool putNumbersInBrackets) const throw() + bool putNumbersInBrackets) const { File f (getChildFile (prefix_ + suffix)); @@ -828,7 +828,7 @@ const File File::getNonexistentChildFile (const String& prefix_, return f; } -const File File::getNonexistentSibling (const bool putNumbersInBrackets) const throw() +const File File::getNonexistentSibling (const bool putNumbersInBrackets) const { if (exists()) { @@ -844,7 +844,7 @@ const File File::getNonexistentSibling (const bool putNumbersInBrackets) const t } //============================================================================== -const String File::getFileExtension() const throw() +const String File::getFileExtension() const { String ext; @@ -859,7 +859,7 @@ const String File::getFileExtension() const throw() return ext; } -bool File::hasFileExtension (const String& possibleSuffix) const throw() +bool File::hasFileExtension (const String& possibleSuffix) const { if (possibleSuffix.isEmpty()) return fullPath.lastIndexOfChar (T('.')) <= fullPath.lastIndexOfChar (separator); @@ -888,7 +888,7 @@ bool File::hasFileExtension (const String& possibleSuffix) const throw() return false; } -const File File::withFileExtension (const String& newExtension) const throw() +const File File::withFileExtension (const String& newExtension) const { if (fullPath.isEmpty()) return File::nonexistent; @@ -908,14 +908,14 @@ const File File::withFileExtension (const String& newExtension) const throw() } //============================================================================== -bool File::startAsProcess (const String& parameters) const throw() +bool File::startAsProcess (const String& parameters) const { return exists() && juce_launchFile (fullPath, parameters); } //============================================================================== -FileInputStream* File::createInputStream() const throw() +FileInputStream* File::createInputStream() const { if (existsAsFile()) return new FileInputStream (*this); @@ -923,7 +923,7 @@ FileInputStream* File::createInputStream() const throw() return 0; } -FileOutputStream* File::createOutputStream (const int bufferSize) const throw() +FileOutputStream* File::createOutputStream (const int bufferSize) const { ScopedPointer out (new FileOutputStream (*this, bufferSize)); @@ -935,7 +935,7 @@ FileOutputStream* File::createOutputStream (const int bufferSize) const throw() //============================================================================== bool File::appendData (const void* const dataToAppend, - const int numberOfBytes) const throw() + const int numberOfBytes) const { if (numberOfBytes > 0) { @@ -951,7 +951,7 @@ bool File::appendData (const void* const dataToAppend, } bool File::replaceWithData (const void* const dataToWrite, - const int numberOfBytes) const throw() + const int numberOfBytes) const { jassert (numberOfBytes >= 0); // a negative number of bytes?? @@ -972,7 +972,7 @@ bool File::replaceWithData (const void* const dataToWrite, bool File::appendText (const String& text, const bool asUnicode, - const bool writeUnicodeHeaderBytes) const throw() + const bool writeUnicodeHeaderBytes) const { const ScopedPointer out (createOutputStream()); @@ -985,7 +985,7 @@ bool File::appendText (const String& text, return false; } -bool File::printf (const tchar* pf, ...) const throw() +bool File::printf (const tchar* pf, ...) const { va_list list; va_start (list, pf); @@ -998,7 +998,7 @@ bool File::printf (const tchar* pf, ...) const throw() bool File::replaceWithText (const String& textToWrite, const bool asUnicode, - const bool writeUnicodeHeaderBytes) const throw() + const bool writeUnicodeHeaderBytes) const { const File tempFile (getSiblingFile (T(".") + getFileName()).getNonexistentSibling (false)); @@ -1013,7 +1013,7 @@ bool File::replaceWithText (const String& textToWrite, } //============================================================================== -const String File::createLegalPathName (const String& original) throw() +const String File::createLegalPathName (const String& original) { String s (original); String start; @@ -1028,7 +1028,7 @@ const String File::createLegalPathName (const String& original) throw() .substring (0, 1024); } -const String File::createLegalFileName (const String& original) throw() +const String File::createLegalFileName (const String& original) { String s (original.removeCharacters (T("\"#@,;:<>*^|?\\/"))); @@ -1054,7 +1054,7 @@ const String File::createLegalFileName (const String& original) throw() } //============================================================================== -const String File::getRelativePathFrom (const File& dir) const throw() +const String File::getRelativePathFrom (const File& dir) const { String thisPath (fullPath); @@ -1116,7 +1116,7 @@ const String File::getRelativePathFrom (const File& dir) const throw() } //============================================================================== -void File::findFileSystemRoots (OwnedArray& destArray) throw() +void File::findFileSystemRoots (OwnedArray& destArray) { const StringArray roots (juce_getFileSystemRoots()); @@ -1124,13 +1124,13 @@ void File::findFileSystemRoots (OwnedArray& destArray) throw() destArray.add (new File (roots[i])); } -const String File::getVolumeLabel() const throw() +const String File::getVolumeLabel() const { int serialNum; return juce_getVolumeLabel (fullPath, serialNum); } -int File::getVolumeSerialNumber() const throw() +int File::getVolumeSerialNumber() const { int serialNum; juce_getVolumeLabel (fullPath, serialNum); @@ -1139,7 +1139,7 @@ int File::getVolumeSerialNumber() const throw() } //============================================================================== -const File File::createTempFile (const String& fileNameEnding) throw() +const File File::createTempFile (const String& fileNameEnding) { String tempName (T("temp")); static int tempNum = 0; diff --git a/src/io/files/juce_File.h b/src/io/files/juce_File.h index bdf47f51f5..d99feb18dc 100644 --- a/src/io/files/juce_File.h +++ b/src/io/files/juce_File.h @@ -58,7 +58,7 @@ public: You can use its operator= method to point it at a proper file. */ - File() throw() {} + File() {} /** Creates a file from an absolute path. @@ -70,13 +70,13 @@ public: On the Mac/Linux, the path can include "~" notation for referring to user home directories. */ - File (const String& path) throw(); + File (const String& path); /** Creates a copy of another file object. */ - File (const File& other) throw(); + File (const File& other); /** Destructor. */ - ~File() throw() {} + ~File() {} /** Sets the file based on an absolute pathname. @@ -88,10 +88,10 @@ public: On the Mac/Linux, the path can include "~" notation for referring to user home directories. */ - const File& operator= (const String& newFilePath) throw(); + const File& operator= (const String& newFilePath); /** Copies from another file object. */ - const File& operator= (const File& otherFile) throw(); + const File& operator= (const File& otherFile); //============================================================================== /** This static constant is used for referring to an 'invalid' file. */ @@ -103,7 +103,7 @@ public: @returns true if the file exists, either as a file or a directory. @see existsAsFile, isDirectory */ - bool exists() const throw(); + bool exists() const; /** Checks whether the file exists and is a file rather than a directory. @@ -111,7 +111,7 @@ public: or doesn't exist @see exists, isDirectory */ - bool existsAsFile() const throw(); + bool existsAsFile() const; /** Checks whether the file is a directory that exists. @@ -119,13 +119,13 @@ public: false if it's a file or doesn't exist at all @see exists, existsAsFile */ - bool isDirectory() const throw(); + bool isDirectory() const; /** Returns the size of the file in bytes. @returns the number of bytes in the file, or 0 if it doesn't exist. */ - int64 getSize() const throw(); + int64 getSize() const; /** Utility function to convert a file size in bytes to a neat string description. @@ -146,7 +146,7 @@ public: @see getFileName, getRelativePathFrom */ - const String& getFullPathName() const throw() { return fullPath; } + const String& getFullPathName() const { return fullPath; } /** Returns the last section of the pathname. @@ -161,7 +161,7 @@ public: @see getFullPathName, getFileNameWithoutExtension */ - const String getFileName() const throw(); + const String getFileName() const; /** Creates a relative path that refers to a file relatively to a given directory. @@ -178,7 +178,7 @@ public: If it doesn't exist, it's assumed to be a directory. @see getChildFile, isAbsolutePath */ - const String getRelativePathFrom (const File& directoryToBeRelativeTo) const throw(); + const String getRelativePathFrom (const File& directoryToBeRelativeTo) const; //============================================================================== /** Returns the file's extension. @@ -189,7 +189,7 @@ public: @see hasFileExtension, withFileExtension, getFileNameWithoutExtension */ - const String getFileExtension() const throw(); + const String getFileExtension() const; /** Checks whether the file has a given extension. @@ -203,7 +203,7 @@ public: @see getFileExtension, withFileExtension, getFileNameWithoutExtension */ - bool hasFileExtension (const String& extensionToTest) const throw(); + bool hasFileExtension (const String& extensionToTest) const; /** Returns a version of this file with a different file extension. @@ -215,7 +215,7 @@ public: @see getFileName, getFileExtension, hasFileExtension, getFileNameWithoutExtension */ - const File withFileExtension (const String& newExtension) const throw(); + const File withFileExtension (const String& newExtension) const; /** Returns the last part of the filename, without its file extension. @@ -223,7 +223,7 @@ public: @see getFileName, getFileExtension, hasFileExtension, withFileExtension */ - const String getFileNameWithoutExtension() const throw(); + const String getFileNameWithoutExtension() const; //============================================================================== /** Returns a 32-bit hash-code that identifies this file. @@ -231,14 +231,14 @@ public: This is based on the filename. Obviously it's possible, although unlikely, that two files will have the same hash-code. */ - int hashCode() const throw(); + int hashCode() const; /** Returns a 64-bit hash-code that identifies this file. This is based on the filename. Obviously it's possible, although unlikely, that two files will have the same hash-code. */ - int64 hashCode64() const throw(); + int64 hashCode64() const; //============================================================================== /** Returns a file based on a relative path. @@ -254,7 +254,7 @@ public: @see getSiblingFile, getParentDirectory, getRelativePathFrom, isAChildOf */ - const File getChildFile (String relativePath) const throw(); + const File getChildFile (String relativePath) const; /** Returns a file which is in the same directory as this one. @@ -262,14 +262,14 @@ public: @see getChildFile, getParentDirectory */ - const File getSiblingFile (const String& siblingFileName) const throw(); + const File getSiblingFile (const String& siblingFileName) const; //============================================================================== /** Returns the directory that contains this file or directory. e.g. for "/moose/fish/foo.txt" this will return "/moose/fish". */ - const File getParentDirectory() const throw(); + const File getParentDirectory() const; /** Checks whether a file is somewhere inside a directory. @@ -280,7 +280,7 @@ public: e.g. File ("/moose/fish/foo.txt").isAChildOf ("/moose") is true. File ("/moose/fish/foo.txt").isAChildOf ("/moose/fish") is also true. */ - bool isAChildOf (const File& potentialParentDirectory) const throw(); + bool isAChildOf (const File& potentialParentDirectory) const; //============================================================================== /** Chooses a filename relative to this one that doesn't already exist. @@ -302,7 +302,7 @@ public: */ const File getNonexistentChildFile (const String& prefix, const String& suffix, - bool putNumbersInBrackets = true) const throw(); + bool putNumbersInBrackets = true) const; /** Chooses a filename for a sibling file to this one that doesn't already exist. @@ -313,13 +313,13 @@ public: @param putNumbersInBrackets whether to add brackets around the numbers that get appended to the new filename. */ - const File getNonexistentSibling (const bool putNumbersInBrackets = true) const throw(); + const File getNonexistentSibling (const bool putNumbersInBrackets = true) const; //============================================================================== /** Compares the pathnames for two files. */ - bool operator== (const File& otherFile) const throw(); + bool operator== (const File& otherFile) const; /** Compares the pathnames for two files. */ - bool operator!= (const File& otherFile) const throw(); + bool operator!= (const File& otherFile) const; //============================================================================== /** Checks whether a file can be created or written to. @@ -329,7 +329,7 @@ public: see if writing is allowed. @see setReadOnly */ - bool hasWriteAccess() const throw(); + bool hasWriteAccess() const; /** Changes the write-permission of a file or directory. @@ -341,19 +341,19 @@ public: @see hasWriteAccess */ bool setReadOnly (const bool shouldBeReadOnly, - const bool applyRecursively = false) const throw(); + const bool applyRecursively = false) const; /** Returns true if this file is a hidden or system file. The criteria for deciding whether a file is hidden are platform-dependent. */ - bool isHidden() const throw(); + bool isHidden() const; /** If this file is a link, this returns the file that it points to. If this file isn't actually link, it'll just return itself. */ - const File getLinkedTarget() const throw(); + const File getLinkedTarget() const; //============================================================================== /** Returns the last modification time of this file. @@ -361,21 +361,21 @@ public: @returns the time, or an invalid time if the file doesn't exist. @see setLastModificationTime, getLastAccessTime, getCreationTime */ - const Time getLastModificationTime() const throw(); + const Time getLastModificationTime() const; /** Returns the last time this file was accessed. @returns the time, or an invalid time if the file doesn't exist. @see setLastAccessTime, getLastModificationTime, getCreationTime */ - const Time getLastAccessTime() const throw(); + const Time getLastAccessTime() const; /** Returns the time that this file was created. @returns the time, or an invalid time if the file doesn't exist. @see getLastModificationTime, getLastAccessTime */ - const Time getCreationTime() const throw(); + const Time getCreationTime() const; /** Changes the modification time for this file. @@ -383,7 +383,7 @@ public: @returns true if it manages to change the file's time. @see getLastModificationTime, setLastAccessTime, setCreationTime */ - bool setLastModificationTime (const Time& newTime) const throw(); + bool setLastModificationTime (const Time& newTime) const; /** Changes the last-access time for this file. @@ -391,7 +391,7 @@ public: @returns true if it manages to change the file's time. @see getLastAccessTime, setLastModificationTime, setCreationTime */ - bool setLastAccessTime (const Time& newTime) const throw(); + bool setLastAccessTime (const Time& newTime) const; /** Changes the creation date for this file. @@ -399,7 +399,7 @@ public: @returns true if it manages to change the file's time. @see getCreationTime, setLastModificationTime, setLastAccessTime */ - bool setCreationTime (const Time& newTime) const throw(); + bool setCreationTime (const Time& newTime) const; /** If possible, this will try to create a version string for the given file. @@ -407,7 +407,7 @@ public: executables, bundles, dlls, etc. If no version is available, this will return an empty string. */ - const String getVersion() const throw(); + const String getVersion() const; //============================================================================== /** Creates an empty file if it doesn't already exist. @@ -420,7 +420,7 @@ public: @returns true if the file has been created (or if it already existed). @see createDirectory */ - bool create() const throw(); + bool create() const; /** Creates a new directory for this filename. @@ -431,7 +431,7 @@ public: already existed beforehand). @see create */ - bool createDirectory() const throw(); + bool createDirectory() const; /** Deletes a file. @@ -442,7 +442,7 @@ public: begin with). @see deleteRecursively */ - bool deleteFile() const throw(); + bool deleteFile() const; /** Deletes a file or directory and all its subdirectories. @@ -453,7 +453,7 @@ public: (or if it didn't exist to begin with). @see deleteFile */ - bool deleteRecursively() const throw(); + bool deleteRecursively() const; /** Moves this file or folder to the trash. @@ -461,7 +461,7 @@ public: if the file is write-protected, so you should check the return value and act appropriately. */ - bool moveToTrash() const throw(); + bool moveToTrash() const; /** Moves or renames a file. @@ -474,7 +474,7 @@ public: @returns true if the operation succeeds */ - bool moveFileTo (const File& targetLocation) const throw(); + bool moveFileTo (const File& targetLocation) const; /** Copies a file. @@ -484,7 +484,7 @@ public: @returns true if the operation succeeds */ - bool copyFileTo (const File& targetLocation) const throw(); + bool copyFileTo (const File& targetLocation) const; /** Copies a directory. @@ -499,7 +499,7 @@ public: write privileges to create it if it doesn't exist. Any files inside it will be overwritten by similarly named ones that are copied. */ - bool copyDirectoryTo (const File& newDirectory) const throw(); + bool copyDirectoryTo (const File& newDirectory) const; //============================================================================== /** Used in file searching, to specify whether to return files, directories, or both. @@ -532,7 +532,7 @@ public: int findChildFiles (OwnedArray& results, const int whatToLookFor, const bool searchRecursively, - const String& wildCardPattern = JUCE_T("*")) const throw(); + const String& wildCardPattern = JUCE_T("*")) const; /** Searches inside a directory and counts how many files match a wildcard pattern. @@ -551,12 +551,12 @@ public: @see findChildFiles, DirectoryIterator */ int getNumberOfChildFiles (const int whatToLookFor, - const String& wildCardPattern = JUCE_T("*")) const throw(); + const String& wildCardPattern = JUCE_T("*")) const; /** Returns true if this file is a directory that contains one or more subdirectories. @see isDirectory, findChildFiles */ - bool containsSubDirectories() const throw(); + bool containsSubDirectories() const; //============================================================================== /** Creates a stream to read from this file. @@ -565,7 +565,7 @@ public: start of the file), or 0 if the file can't be opened for some reason @see createOutputStream, loadFileAsData */ - FileInputStream* createInputStream() const throw(); + FileInputStream* createInputStream() const; /** Creates a stream to write to this file. @@ -577,7 +577,7 @@ public: end of the file), or 0 if the file can't be opened for some reason @see createInputStream, printf, appendData, appendText */ - FileOutputStream* createOutputStream (const int bufferSize = 0x8000) const throw(); + FileOutputStream* createOutputStream (const int bufferSize = 0x8000) const; //============================================================================== /** Loads a file's contents into memory as a block of binary data. @@ -590,7 +590,7 @@ public: might want to clear it first @returns true if the file could all be read into memory */ - bool loadFileAsData (MemoryBlock& result) const throw(); + bool loadFileAsData (MemoryBlock& result) const; /** Reads a file into memory as a string. @@ -599,7 +599,7 @@ public: This makes use of InputStream::readEntireStreamAsString, which should automatically cope with unicode/acsii file formats. */ - const String loadFileAsString() const throw(); + const String loadFileAsString() const; //============================================================================== /** Writes text to the end of the file. @@ -608,7 +608,7 @@ public: @returns false if it can't write to the file for some reason */ - bool printf (const tchar* format, ...) const throw(); + bool printf (const tchar* format, ...) const; /** Appends a block of binary data to the end of the file. @@ -617,7 +617,7 @@ public: @returns false if it can't write to the file for some reason */ bool appendData (const void* const dataToAppend, - const int numberOfBytes) const throw(); + const int numberOfBytes) const; /** Replaces this file's contents with a given block of data. @@ -634,7 +634,7 @@ public: @see appendText */ bool replaceWithData (const void* const dataToWrite, - const int numberOfBytes) const throw(); + const int numberOfBytes) const; /** Appends a string to the end of the file. @@ -650,7 +650,7 @@ public: */ bool appendText (const String& textToAppend, const bool asUnicode = false, - const bool writeUnicodeHeaderBytes = false) const throw(); + const bool writeUnicodeHeaderBytes = false) const; /** Replaces this file's contents with a given text string. @@ -670,7 +670,7 @@ public: */ bool replaceWithText (const String& textToWrite, const bool asUnicode = false, - const bool writeUnicodeHeaderBytes = false) const throw(); + const bool writeUnicodeHeaderBytes = false) const; //============================================================================== /** Creates a set of files to represent each file root. @@ -679,49 +679,49 @@ public: to which ones are available. On the Mac/Linux, this will probably just add a single entry for "/". */ - static void findFileSystemRoots (OwnedArray& results) throw(); + static void findFileSystemRoots (OwnedArray& results); /** Finds the name of the drive on which this file lives. @returns the volume label of the drive, or an empty string if this isn't possible */ - const String getVolumeLabel() const throw(); + const String getVolumeLabel() const; /** Returns the serial number of the volume on which this file lives. @returns the serial number, or zero if there's a problem doing this */ - int getVolumeSerialNumber() const throw(); + int getVolumeSerialNumber() const; /** Returns the number of bytes free on the drive that this file lives on. @returns the number of bytes free, or 0 if there's a problem finding this out @see getVolumeTotalSize */ - int64 getBytesFreeOnVolume() const throw(); + int64 getBytesFreeOnVolume() const; /** Returns the total size of the drive that contains this file. @returns the total number of bytes that the volume can hold @see getBytesFreeOnVolume */ - int64 getVolumeTotalSize() const throw(); + int64 getVolumeTotalSize() const; /** Returns true if this file is on a CD or DVD drive. */ - bool isOnCDRomDrive() const throw(); + bool isOnCDRomDrive() const; /** Returns true if this file is on a hard disk. This will fail if it's a network drive, but will still be true for removable hard-disks. */ - bool isOnHardDisk() const throw(); + bool isOnHardDisk() const; /** Returns true if this file is on a removable disk drive. This might be a usb-drive, a CD-rom, or maybe a network drive. */ - bool isOnRemovableDrive() const throw(); + bool isOnRemovableDrive() const; //============================================================================== /** Launches the file as a process. @@ -735,12 +735,12 @@ public: @see revealToUser */ - bool startAsProcess (const String& parameters = String::empty) const throw(); + bool startAsProcess (const String& parameters = String::empty) const; /** Opens Finder, Explorer, or whatever the OS uses, to show the user this file's location. @see startAsProcess */ - void revealToUser() const throw(); + void revealToUser() const; //============================================================================== /** A set of types of location that can be passed to the getSpecialLocation() method. @@ -842,7 +842,7 @@ public: To get the temp folder, you can use getSpecialLocation (File::tempDirectory). */ - static const File createTempFile (const String& fileNameEnding) throw(); + static const File createTempFile (const String& fileNameEnding); //============================================================================== @@ -850,7 +850,7 @@ public: @see setAsCurrentWorkingDirectory */ - static const File getCurrentWorkingDirectory() throw(); + static const File getCurrentWorkingDirectory(); /** Sets the current working directory to be this file. @@ -859,7 +859,7 @@ public: @returns true if the current directory has been changed. @see getCurrentWorkingDirectory */ - bool setAsCurrentWorkingDirectory() const throw(); + bool setAsCurrentWorkingDirectory() const; //============================================================================== /** The system-specific file separator character. @@ -885,7 +885,7 @@ public: @see createLegalPathName */ - static const String createLegalFileName (const String& fileNameToFix) throw(); + static const String createLegalFileName (const String& fileNameToFix); /** Removes illegal characters from a pathname. @@ -894,7 +894,7 @@ public: @see createLegalFileName */ - static const String createLegalPathName (const String& pathNameToFix) throw(); + static const String createLegalPathName (const String& pathNameToFix); /** Indicates whether filenames are case-sensitive on the current operating system. */ @@ -902,7 +902,7 @@ public: /** Returns true if the string seems to be a fully-specified absolute path. */ - static bool isAbsolutePath (const String& path) throw(); + static bool isAbsolutePath (const String& path); //============================================================================== juce_UseDebuggingNewOperator @@ -913,8 +913,8 @@ private: // internal way of contructing a file without checking the path friend class DirectoryIterator; - File (const String&, int) throw(); - const String getPathUpToLastSlash() const throw(); + File (const String&, int); + const String getPathUpToLastSlash() const; }; #endif // __JUCE_FILE_JUCEHEADER__ diff --git a/src/io/files/juce_FileInputStream.cpp b/src/io/files/juce_FileInputStream.cpp index aea0e7b401..ef8b6cd31a 100644 --- a/src/io/files/juce_FileInputStream.cpp +++ b/src/io/files/juce_FileInputStream.cpp @@ -31,10 +31,10 @@ BEGIN_JUCE_NAMESPACE //============================================================================== -void* juce_fileOpen (const String& path, bool forWriting) throw(); -void juce_fileClose (void* handle) throw(); -int juce_fileRead (void* handle, void* buffer, int size) throw(); -int64 juce_fileSetPosition (void* handle, int64 pos) throw(); +void* juce_fileOpen (const String& path, bool forWriting); +void juce_fileClose (void* handle); +int juce_fileRead (void* handle, void* buffer, int size); +int64 juce_fileSetPosition (void* handle, int64 pos); //============================================================================== diff --git a/src/io/files/juce_FileOutputStream.cpp b/src/io/files/juce_FileOutputStream.cpp index 9bfa20bf4f..70c94d25fc 100644 --- a/src/io/files/juce_FileOutputStream.cpp +++ b/src/io/files/juce_FileOutputStream.cpp @@ -29,12 +29,12 @@ BEGIN_JUCE_NAMESPACE #include "juce_FileOutputStream.h" -void* juce_fileOpen (const String& path, bool forWriting) throw(); -void juce_fileClose (void* handle) throw(); -int juce_fileWrite (void* handle, const void* buffer, int size) throw(); -void juce_fileFlush (void* handle) throw(); -int64 juce_fileGetPosition (void* handle) throw(); -int64 juce_fileSetPosition (void* handle, int64 pos) throw(); +void* juce_fileOpen (const String& path, bool forWriting); +void juce_fileClose (void* handle); +int juce_fileWrite (void* handle, const void* buffer, int size); +void juce_fileFlush (void* handle); +int64 juce_fileGetPosition (void* handle); +int64 juce_fileSetPosition (void* handle, int64 pos); //============================================================================== diff --git a/src/io/files/juce_FileOutputStream.h b/src/io/files/juce_FileOutputStream.h index 56f24633e1..b55508c54a 100644 --- a/src/io/files/juce_FileOutputStream.h +++ b/src/io/files/juce_FileOutputStream.h @@ -63,11 +63,11 @@ public: //============================================================================== /** Returns the file that this stream is writing to. */ - const File& getFile() const throw() { return file; } + const File& getFile() const { return file; } /** Returns true if the stream couldn't be opened for some reason. */ - bool failedToOpen() const throw() { return fileHandle == 0; } + bool failedToOpen() const { return fileHandle == 0; } //============================================================================== void flush(); diff --git a/src/io/files/juce_NamedPipe.cpp b/src/io/files/juce_NamedPipe.cpp index 1003e6842d..9b34ad167d 100644 --- a/src/io/files/juce_NamedPipe.cpp +++ b/src/io/files/juce_NamedPipe.cpp @@ -54,12 +54,12 @@ bool NamedPipe::createNewPipe (const String& pipeName) return openInternal (pipeName, true); } -bool NamedPipe::isOpen() const throw() +bool NamedPipe::isOpen() const { return internal != 0; } -const String NamedPipe::getName() const throw() +const String NamedPipe::getName() const { return currentPipeName; } diff --git a/src/io/files/juce_NamedPipe.h b/src/io/files/juce_NamedPipe.h index d35e701288..4332d19379 100644 --- a/src/io/files/juce_NamedPipe.h +++ b/src/io/files/juce_NamedPipe.h @@ -65,10 +65,10 @@ public: void close(); /** True if the pipe is currently open. */ - bool isOpen() const throw(); + bool isOpen() const; /** Returns the last name that was used to try to open this pipe. */ - const String getName() const throw(); + const String getName() const; //============================================================================== /** Reads data from the pipe. diff --git a/src/io/network/juce_URL.cpp b/src/io/network/juce_URL.cpp index 9ce5793c86..4ff4c66905 100644 --- a/src/io/network/juce_URL.cpp +++ b/src/io/network/juce_URL.cpp @@ -34,7 +34,7 @@ BEGIN_JUCE_NAMESPACE //============================================================================== -URL::URL() throw() +URL::URL() { } @@ -92,7 +92,7 @@ const URL& URL::operator= (const URL& other) return *this; } -URL::~URL() throw() +URL::~URL() { } @@ -282,7 +282,7 @@ public: juce_closeInternetFile (handle); } - bool isError() const throw() + bool isError() const { return handle == 0; } @@ -436,7 +436,7 @@ private: } } - void appendUTF8ToPostData (const String& text) throw() + void appendUTF8ToPostData (const String& text) { postData.append (text.toUTF8(), (int) strlen (text.toUTF8())); @@ -519,17 +519,17 @@ const URL URL::withPOSTData (const String& postData_) const return u; } -const StringPairArray& URL::getParameters() const throw() +const StringPairArray& URL::getParameters() const { return parameters; } -const StringPairArray& URL::getFilesToUpload() const throw() +const StringPairArray& URL::getFilesToUpload() const { return filesToUpload; } -const StringPairArray& URL::getMimeTypesOfUploadFiles() const throw() +const StringPairArray& URL::getMimeTypesOfUploadFiles() const { return mimeTypes; } @@ -597,8 +597,7 @@ const String URL::addEscapeChars (const String& s, const bool isParameter) } //============================================================================== -extern bool juce_launchFile (const String& fileName, - const String& parameters) throw(); +extern bool juce_launchFile (const String& fileName, const String& parameters); bool URL::launchInDefaultBrowser() const { diff --git a/src/io/network/juce_URL.h b/src/io/network/juce_URL.h index 33af4c726a..3598fd93f5 100644 --- a/src/io/network/juce_URL.h +++ b/src/io/network/juce_URL.h @@ -43,7 +43,7 @@ class JUCE_API URL public: //============================================================================== /** Creates an empty URL. */ - URL() throw(); + URL(); /** Creates a URL from a string. */ URL (const String& url); @@ -52,7 +52,7 @@ public: URL (const URL& other); /** Destructor. */ - ~URL() throw(); + ~URL(); /** Copies this URL from another one. */ const URL& operator= (const URL& other); @@ -128,18 +128,18 @@ public: @see getNamedParameter, withParameter */ - const StringPairArray& getParameters() const throw(); + const StringPairArray& getParameters() const; /** Returns the set of files that should be uploaded as part of a POST operation. This is the set of files that were added to the URL with the withFileToUpload() method. */ - const StringPairArray& getFilesToUpload() const throw(); + const StringPairArray& getFilesToUpload() const; /** Returns the set of mime types associated with each of the upload files. */ - const StringPairArray& getMimeTypesOfUploadFiles() const throw(); + const StringPairArray& getMimeTypesOfUploadFiles() const; /** Returns a copy of this URL, with a block of data to send as the POST data. @@ -157,7 +157,7 @@ public: /** Returns the data that was set using withPOSTData(). */ - const String getPostData() const throw() { return postData; } + const String getPostData() const { return postData; } //============================================================================== /** Tries to launch the system's default browser to open the URL. diff --git a/src/io/streams/juce_BufferedInputStream.cpp b/src/io/streams/juce_BufferedInputStream.cpp index 3d78276385..f8e17ff80c 100644 --- a/src/io/streams/juce_BufferedInputStream.cpp +++ b/src/io/streams/juce_BufferedInputStream.cpp @@ -34,7 +34,7 @@ BEGIN_JUCE_NAMESPACE //============================================================================== BufferedInputStream::BufferedInputStream (InputStream* const source_, const int bufferSize_, - const bool deleteSourceWhenDestroyed) throw() + const bool deleteSourceWhenDestroyed) : source (source_), sourceToDelete (deleteSourceWhenDestroyed ? source_ : 0), bufferSize (jmax (256, bufferSize_)), @@ -50,7 +50,7 @@ BufferedInputStream::BufferedInputStream (InputStream* const source_, buffer.malloc (bufferSize); } -BufferedInputStream::~BufferedInputStream() throw() +BufferedInputStream::~BufferedInputStream() { } diff --git a/src/io/streams/juce_BufferedInputStream.h b/src/io/streams/juce_BufferedInputStream.h index 6a08cc5783..56128355d6 100644 --- a/src/io/streams/juce_BufferedInputStream.h +++ b/src/io/streams/juce_BufferedInputStream.h @@ -51,14 +51,14 @@ public: */ BufferedInputStream (InputStream* const sourceStream, const int bufferSize, - const bool deleteSourceWhenDestroyed) throw(); + const bool deleteSourceWhenDestroyed); /** Destructor. This may also delete the source stream, if that option was chosen when the buffered stream was created. */ - ~BufferedInputStream() throw(); + ~BufferedInputStream(); //============================================================================== diff --git a/src/io/streams/juce_FileInputSource.cpp b/src/io/streams/juce_FileInputSource.cpp index e6ae5624ab..b8a62bd448 100644 --- a/src/io/streams/juce_FileInputSource.cpp +++ b/src/io/streams/juce_FileInputSource.cpp @@ -32,7 +32,7 @@ BEGIN_JUCE_NAMESPACE //============================================================================== -FileInputSource::FileInputSource (const File& file_) throw() +FileInputSource::FileInputSource (const File& file_) : file (file_) { } diff --git a/src/io/streams/juce_FileInputSource.h b/src/io/streams/juce_FileInputSource.h index f96f1b0a11..6ace7716f0 100644 --- a/src/io/streams/juce_FileInputSource.h +++ b/src/io/streams/juce_FileInputSource.h @@ -40,7 +40,7 @@ class JUCE_API FileInputSource : public InputSource { public: //============================================================================== - FileInputSource (const File& file) throw(); + FileInputSource (const File& file); ~FileInputSource(); InputStream* createInputStream(); diff --git a/src/io/streams/juce_MemoryInputStream.cpp b/src/io/streams/juce_MemoryInputStream.cpp index 1f5a4a3052..50a86eaba7 100644 --- a/src/io/streams/juce_MemoryInputStream.cpp +++ b/src/io/streams/juce_MemoryInputStream.cpp @@ -34,7 +34,7 @@ BEGIN_JUCE_NAMESPACE //============================================================================== MemoryInputStream::MemoryInputStream (const void* const sourceData, const int sourceDataSize, - const bool keepInternalCopy) throw() + const bool keepInternalCopy) : data ((const char*) sourceData), dataSize (sourceDataSize), position (0) @@ -46,7 +46,7 @@ MemoryInputStream::MemoryInputStream (const void* const sourceData, } } -MemoryInputStream::~MemoryInputStream() throw() +MemoryInputStream::~MemoryInputStream() { } diff --git a/src/io/streams/juce_MemoryInputStream.h b/src/io/streams/juce_MemoryInputStream.h index 2592c2f14a..243cc8bb78 100644 --- a/src/io/streams/juce_MemoryInputStream.h +++ b/src/io/streams/juce_MemoryInputStream.h @@ -52,10 +52,10 @@ public: */ MemoryInputStream (const void* const sourceData, const int sourceDataSize, - const bool keepInternalCopyOfData) throw(); + const bool keepInternalCopyOfData); /** Destructor. */ - ~MemoryInputStream() throw(); + ~MemoryInputStream(); //============================================================================== int64 getPosition(); diff --git a/src/native/common/juce_posix_SharedCode.h b/src/native/common/juce_posix_SharedCode.h index b2fe9c821b..f325a6cdc8 100644 --- a/src/native/common/juce_posix_SharedCode.h +++ b/src/native/common/juce_posix_SharedCode.h @@ -149,7 +149,7 @@ void WaitableEvent::reset() const throw() } //============================================================================== -void JUCE_CALLTYPE Thread::sleep (int millisecs) throw() +void JUCE_CALLTYPE Thread::sleep (int millisecs) { struct timespec time; time.tv_sec = millisecs / 1000; @@ -164,15 +164,15 @@ const tchar* File::separatorString = T("/"); //============================================================================== -bool juce_copyFile (const String& s, const String& d) throw(); +bool juce_copyFile (const String& s, const String& d); -static bool juce_stat (const String& fileName, struct stat& info) throw() +static bool juce_stat (const String& fileName, struct stat& info) { return fileName.isNotEmpty() && (stat (fileName.toUTF8(), &info) == 0); } -bool juce_isDirectory (const String& fileName) throw() +bool juce_isDirectory (const String& fileName) { struct stat info; @@ -181,7 +181,7 @@ bool juce_isDirectory (const String& fileName) throw() && ((info.st_mode & S_IFDIR) != 0)); } -bool juce_fileExists (const String& fileName, const bool dontCountDirectories) throw() +bool juce_fileExists (const String& fileName, const bool dontCountDirectories) { if (fileName.isEmpty()) return false; @@ -201,19 +201,19 @@ bool juce_fileExists (const String& fileName, const bool dontCountDirectories) t return exists; } -int64 juce_getFileSize (const String& fileName) throw() +int64 juce_getFileSize (const String& fileName) { struct stat info; return juce_stat (fileName, info) ? info.st_size : 0; } //============================================================================== -bool juce_canWriteToFile (const String& fileName) throw() +bool juce_canWriteToFile (const String& fileName) { return access (fileName.toUTF8(), W_OK) == 0; } -bool juce_deleteFile (const String& fileName) throw() +bool juce_deleteFile (const String& fileName) { if (juce_isDirectory (fileName)) return rmdir ((const char*) fileName.toUTF8()) == 0; @@ -221,7 +221,7 @@ bool juce_deleteFile (const String& fileName) throw() return remove ((const char*) fileName.toUTF8()) == 0; } -bool juce_moveFile (const String& source, const String& dest) throw() +bool juce_moveFile (const String& source, const String& dest) { if (rename (source.toUTF8(), dest.toUTF8()) == 0) return true; @@ -238,12 +238,12 @@ bool juce_moveFile (const String& source, const String& dest) throw() return false; } -void juce_createDirectory (const String& fileName) throw() +void juce_createDirectory (const String& fileName) { mkdir (fileName.toUTF8(), 0777); } -void* juce_fileOpen (const String& fileName, bool forWriting) throw() +void* juce_fileOpen (const String& fileName, bool forWriting) { int flags = O_RDONLY; @@ -267,13 +267,13 @@ void* juce_fileOpen (const String& fileName, bool forWriting) throw() return (void*) open ((const char*) fileName.toUTF8(), flags, 00644); } -void juce_fileClose (void* handle) throw() +void juce_fileClose (void* handle) { if (handle != 0) close ((int) (pointer_sized_int) handle); } -int juce_fileRead (void* handle, void* buffer, int size) throw() +int juce_fileRead (void* handle, void* buffer, int size) { if (handle != 0) return read ((int) (pointer_sized_int) handle, buffer, size); @@ -281,7 +281,7 @@ int juce_fileRead (void* handle, void* buffer, int size) throw() return 0; } -int juce_fileWrite (void* handle, const void* buffer, int size) throw() +int juce_fileWrite (void* handle, const void* buffer, int size) { if (handle != 0) return write ((int) (pointer_sized_int) handle, buffer, size); @@ -289,7 +289,7 @@ int juce_fileWrite (void* handle, const void* buffer, int size) throw() return 0; } -int64 juce_fileSetPosition (void* handle, int64 pos) throw() +int64 juce_fileSetPosition (void* handle, int64 pos) { if (handle != 0 && lseek ((int) (pointer_sized_int) handle, pos, SEEK_SET) == pos) return pos; @@ -297,7 +297,7 @@ int64 juce_fileSetPosition (void* handle, int64 pos) throw() return -1; } -int64 juce_fileGetPosition (void* handle) throw() +int64 juce_fileGetPosition (void* handle) { if (handle != 0) return lseek ((int) (pointer_sized_int) handle, 0, SEEK_CUR); @@ -305,7 +305,7 @@ int64 juce_fileGetPosition (void* handle) throw() return -1; } -void juce_fileFlush (void* handle) throw() +void juce_fileFlush (void* handle) { if (handle != 0) fsync ((int) (pointer_sized_int) handle); @@ -320,7 +320,7 @@ const File juce_getExecutableFile() //============================================================================== // if this file doesn't exist, find a parent of it that does.. -static bool doStatFS (const File* file, struct statfs& result) throw() +static bool doStatFS (const File* file, struct statfs& result) { File f (*file); @@ -335,7 +335,7 @@ static bool doStatFS (const File* file, struct statfs& result) throw() return statfs (f.getFullPathName().toUTF8(), &result) == 0; } -int64 File::getBytesFreeOnVolume() const throw() +int64 File::getBytesFreeOnVolume() const { struct statfs buf; if (doStatFS (this, buf)) @@ -344,7 +344,7 @@ int64 File::getBytesFreeOnVolume() const throw() return 0; } -int64 File::getVolumeTotalSize() const throw() +int64 File::getVolumeTotalSize() const { struct statfs buf; if (doStatFS (this, buf)) @@ -354,7 +354,7 @@ int64 File::getVolumeTotalSize() const throw() } const String juce_getVolumeLabel (const String& filenameOnVolume, - int& volumeSerialNumber) throw() + int& volumeSerialNumber) { volumeSerialNumber = 0; @@ -422,7 +422,7 @@ const String juce_getOutputFromCommand (const String& command) #define filedesc ((int) internal) #endif -InterProcessLock::InterProcessLock (const String& name_) throw() +InterProcessLock::InterProcessLock (const String& name_) : internal (0), name (name_), reentrancyLevel (0) @@ -439,7 +439,7 @@ InterProcessLock::InterProcessLock (const String& name_) throw() internal = (void*) open (temp.getFullPathName().toUTF8(), O_RDWR); } -InterProcessLock::~InterProcessLock() throw() +InterProcessLock::~InterProcessLock() { while (reentrancyLevel > 0) this->exit(); @@ -447,7 +447,7 @@ InterProcessLock::~InterProcessLock() throw() close (filedesc); } -bool InterProcessLock::enter (const int timeOutMillisecs) throw() +bool InterProcessLock::enter (const int timeOutMillisecs) { if (internal == 0) return false; @@ -485,7 +485,7 @@ bool InterProcessLock::enter (const int timeOutMillisecs) throw() return false; } -void InterProcessLock::exit() throw() +void InterProcessLock::exit() { if (reentrancyLevel > 0 && internal != 0) { diff --git a/src/native/linux/juce_linux_Files.cpp b/src/native/linux/juce_linux_Files.cpp index c7f16d9ebd..925f09312e 100644 --- a/src/native/linux/juce_linux_Files.cpp +++ b/src/native/linux/juce_linux_Files.cpp @@ -37,7 +37,7 @@ void juce_getFileTimes (const String& fileName, int64& modificationTime, int64& accessTime, - int64& creationTime) throw() + int64& creationTime) { modificationTime = 0; accessTime = 0; @@ -56,7 +56,7 @@ void juce_getFileTimes (const String& fileName, bool juce_setFileTimes (const String& fileName, int64 modificationTime, int64 accessTime, - int64 creationTime) throw() + int64 creationTime) { struct utimbuf times; times.actime = (time_t) (accessTime / 1000); @@ -65,7 +65,7 @@ bool juce_setFileTimes (const String& fileName, return utime (fileName.toUTF8(), ×) == 0; } -bool juce_setFileReadOnly (const String& fileName, bool isReadOnly) throw() +bool juce_setFileReadOnly (const String& fileName, bool isReadOnly) { struct stat info; const int res = stat (fileName.toUTF8(), &info); @@ -83,7 +83,7 @@ bool juce_setFileReadOnly (const String& fileName, bool isReadOnly) throw() return chmod (fileName.toUTF8(), info.st_mode) == 0; } -bool juce_copyFile (const String& s, const String& d) throw() +bool juce_copyFile (const String& s, const String& d) { const File source (s), dest (d); @@ -114,7 +114,7 @@ bool juce_copyFile (const String& s, const String& d) throw() return ok; } -const StringArray juce_getFileSystemRoots() throw() +const StringArray juce_getFileSystemRoots() { StringArray s; s.add (T("/")); @@ -122,7 +122,7 @@ const StringArray juce_getFileSystemRoots() throw() } //============================================================================== -bool File::isOnCDRomDrive() const throw() +bool File::isOnCDRomDrive() const { struct statfs buf; @@ -133,7 +133,7 @@ bool File::isOnCDRomDrive() const throw() return false; } -bool File::isOnHardDisk() const throw() +bool File::isOnHardDisk() const { struct statfs buf; @@ -159,13 +159,13 @@ bool File::isOnHardDisk() const throw() return true; } -bool File::isOnRemovableDrive() const throw() +bool File::isOnRemovableDrive() const { jassertfalse // xxx not implemented for linux! return false; } -bool File::isHidden() const throw() +bool File::isHidden() const { return getFileName().startsWithChar (T('.')); } @@ -240,25 +240,25 @@ const File File::getSpecialLocation (const SpecialLocationType type) //============================================================================== -const File File::getCurrentWorkingDirectory() throw() +const File File::getCurrentWorkingDirectory() { char buf [2048]; return File (String::fromUTF8 ((const uint8*) getcwd (buf, sizeof (buf)))); } -bool File::setAsCurrentWorkingDirectory() const throw() +bool File::setAsCurrentWorkingDirectory() const { return chdir (getFullPathName().toUTF8()) == 0; } //============================================================================== -const String File::getVersion() const throw() +const String File::getVersion() const { return String::empty; // xxx not yet implemented } //============================================================================== -const File File::getLinkedTarget() const throw() +const File File::getLinkedTarget() const { char buffer [4096]; size_t numChars = readlink ((const char*) getFullPathName().toUTF8(), @@ -271,7 +271,7 @@ const File File::getLinkedTarget() const throw() } //============================================================================== -bool File::moveToTrash() const throw() +bool File::moveToTrash() const { if (! exists()) return true; @@ -295,7 +295,7 @@ struct FindFileStruct DIR* dir; bool getNextMatch (String& result, bool* const isDir, bool* const isHidden, int64* const fileSize, - Time* const modTime, Time* const creationTime, bool* const isReadOnly) throw() + Time* const modTime, Time* const creationTime, bool* const isReadOnly) { const char* const wildcardUTF8 = wildCard.toUTF8(); @@ -353,7 +353,7 @@ struct FindFileStruct // returns 0 on failure void* juce_findFileStart (const String& directory, const String& wildCard, String& firstResultFile, bool* isDir, bool* isHidden, int64* fileSize, Time* modTime, - Time* creationTime, bool* isReadOnly) throw() + Time* creationTime, bool* isReadOnly) { DIR* d = opendir (directory.toUTF8()); @@ -389,7 +389,7 @@ void* juce_findFileStart (const String& directory, const String& wildCard, Strin } bool juce_findFileNext (void* handle, String& resultFile, - bool* isDir, bool* isHidden, int64* fileSize, Time* modTime, Time* creationTime, bool* isReadOnly) throw() + bool* isDir, bool* isHidden, int64* fileSize, Time* modTime, Time* creationTime, bool* isReadOnly) { FindFileStruct* const ff = (FindFileStruct*) handle; @@ -399,7 +399,7 @@ bool juce_findFileNext (void* handle, String& resultFile, return false; } -void juce_findFileClose (void* handle) throw() +void juce_findFileClose (void* handle) { FindFileStruct* const ff = (FindFileStruct*) handle; @@ -411,7 +411,7 @@ void juce_findFileClose (void* handle) throw() } bool juce_launchFile (const String& fileName, - const String& parameters) throw() + const String& parameters) { String cmdString (fileName); cmdString << " " << parameters; @@ -447,7 +447,7 @@ bool juce_launchFile (const String& fileName, return cpid >= 0; } -void File::revealToUser() const throw() +void File::revealToUser() const { if (isDirectory()) startAsProcess(); diff --git a/src/native/linux/juce_linux_Threads.cpp b/src/native/linux/juce_linux_Threads.cpp index 1e4986b63a..31cb2a487d 100644 --- a/src/native/linux/juce_linux_Threads.cpp +++ b/src/native/linux/juce_linux_Threads.cpp @@ -35,7 +35,7 @@ //============================================================================== void JUCE_API juce_threadEntryPoint (void*); -void* threadEntryProc (void* value) throw() +void* threadEntryProc (void* value) { // New threads start off as root when running suid Process::lowerPrivilege(); @@ -44,7 +44,7 @@ void* threadEntryProc (void* value) throw() return 0; } -void* juce_createThread (void* userData) throw() +void* juce_createThread (void* userData) { pthread_t handle = 0; @@ -57,17 +57,17 @@ void* juce_createThread (void* userData) throw() return 0; } -void juce_killThread (void* handle) throw() +void juce_killThread (void* handle) { if (handle != 0) pthread_cancel ((pthread_t)handle); } -void juce_setCurrentThreadName (const String& /*name*/) throw() +void juce_setCurrentThreadName (const String& /*name*/) { } -Thread::ThreadID Thread::getCurrentThreadId() throw() +Thread::ThreadID Thread::getCurrentThreadId() { return (ThreadID) pthread_self(); } @@ -88,7 +88,7 @@ Thread::ThreadID Thread::getCurrentThreadId() throw() // priority 1 to 10 where 5=normal, 1=low. If the handle is 0, sets the // priority of the current thread -bool juce_setThreadPriority (void* handle, int priority) throw() +bool juce_setThreadPriority (void* handle, int priority) { struct sched_param param; int policy, maxp, minp, pri; @@ -119,7 +119,7 @@ bool juce_setThreadPriority (void* handle, int priority) throw() return false; } -void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask) throw() +void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask) { #if SUPPORT_AFFINITIES cpu_set_t affinity; @@ -148,7 +148,7 @@ void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask) throw() #endif } -void Thread::yield() throw() +void Thread::yield() { sched_yield(); } @@ -188,7 +188,7 @@ void Process::terminate() exit (0); } -bool JUCE_CALLTYPE juce_isRunningUnderDebugger() throw() +bool JUCE_CALLTYPE juce_isRunningUnderDebugger() { static char testResult = 0; @@ -206,7 +206,7 @@ bool JUCE_CALLTYPE juce_isRunningUnderDebugger() throw() return testResult < 0; } -bool JUCE_CALLTYPE Process::isRunningUnderDebugger() throw() +bool JUCE_CALLTYPE Process::isRunningUnderDebugger() { return juce_isRunningUnderDebugger(); } diff --git a/src/native/linux/juce_linux_Windowing.cpp b/src/native/linux/juce_linux_Windowing.cpp index d1beb0e7de..9c9afbfa3d 100644 --- a/src/native/linux/juce_linux_Windowing.cpp +++ b/src/native/linux/juce_linux_Windowing.cpp @@ -95,7 +95,7 @@ static bool untrapErrors() //============================================================================== static bool isActiveApplication = false; -bool Process::isForegroundProcess() throw() +bool Process::isForegroundProcess() { return isActiveApplication; } diff --git a/src/native/mac/juce_mac_Debugging.mm b/src/native/mac/juce_mac_Debugging.mm index 1e6e6d0333..cb15246d8a 100644 --- a/src/native/mac/juce_mac_Debugging.mm +++ b/src/native/mac/juce_mac_Debugging.mm @@ -43,7 +43,7 @@ void Logger::outputDebugPrintf (const tchar* format, ...) throw() outputDebugString (text); } -bool JUCE_CALLTYPE juce_isRunningUnderDebugger() throw() +bool JUCE_CALLTYPE juce_isRunningUnderDebugger() { static char testResult = 0; @@ -59,7 +59,7 @@ bool JUCE_CALLTYPE juce_isRunningUnderDebugger() throw() return testResult > 0; } -bool JUCE_CALLTYPE Process::isRunningUnderDebugger() throw() +bool JUCE_CALLTYPE Process::isRunningUnderDebugger() { return juce_isRunningUnderDebugger(); } diff --git a/src/native/mac/juce_mac_Files.mm b/src/native/mac/juce_mac_Files.mm index 64c93c6ac0..925ae45674 100644 --- a/src/native/mac/juce_mac_Files.mm +++ b/src/native/mac/juce_mac_Files.mm @@ -36,7 +36,7 @@ void juce_getFileTimes (const String& fileName, int64& modificationTime, int64& accessTime, - int64& creationTime) throw() + int64& creationTime) { modificationTime = 0; accessTime = 0; @@ -55,7 +55,7 @@ void juce_getFileTimes (const String& fileName, bool juce_setFileTimes (const String& fileName, int64 modificationTime, int64 accessTime, - int64 creationTime) throw() + int64 creationTime) { struct utimbuf times; times.actime = (time_t) (accessTime / 1000); @@ -64,7 +64,7 @@ bool juce_setFileTimes (const String& fileName, return utime (fileName.toUTF8(), ×) == 0; } -bool juce_setFileReadOnly (const String& fileName, bool isReadOnly) throw() +bool juce_setFileReadOnly (const String& fileName, bool isReadOnly) { struct stat info; const int res = stat (fileName.toUTF8(), &info); @@ -82,7 +82,7 @@ bool juce_setFileReadOnly (const String& fileName, bool isReadOnly) throw() return chmod (fileName.toUTF8(), info.st_mode) == 0; } -bool juce_copyFile (const String& src, const String& dst) throw() +bool juce_copyFile (const String& src, const String& dst) { const ScopedAutoReleasePool pool; NSFileManager* fm = [NSFileManager defaultManager]; @@ -99,7 +99,7 @@ bool juce_copyFile (const String& src, const String& dst) throw() #endif } -const StringArray juce_getFileSystemRoots() throw() +const StringArray juce_getFileSystemRoots() { StringArray s; s.add (T("/")); @@ -123,21 +123,21 @@ static bool isFileOnDriveType (const File* const f, const char** types) return false; } -bool File::isOnCDRomDrive() const throw() +bool File::isOnCDRomDrive() const { static const char* const cdTypes[] = { "cd9660", "cdfs", "cddafs", "udf", 0 }; return isFileOnDriveType (this, (const char**) cdTypes); } -bool File::isOnHardDisk() const throw() +bool File::isOnHardDisk() const { static const char* const nonHDTypes[] = { "nfs", "smbfs", "ramfs", 0 }; return ! (isOnCDRomDrive() || isFileOnDriveType (this, (const char**) nonHDTypes)); } -bool File::isOnRemovableDrive() const throw() +bool File::isOnRemovableDrive() const { #if JUCE_IPHONE return false; // xxx is this possible? @@ -176,7 +176,7 @@ static bool juce_isHiddenFile (const String& path) #endif } -bool File::isHidden() const throw() +bool File::isHidden() const { return juce_isHiddenFile (getFullPathName()); } @@ -262,7 +262,7 @@ const File File::getSpecialLocation (const SpecialLocationType type) } //============================================================================== -const File File::getCurrentWorkingDirectory() throw() +const File File::getCurrentWorkingDirectory() { char buf [2048]; getcwd (buf, sizeof(buf)); @@ -270,13 +270,13 @@ const File File::getCurrentWorkingDirectory() throw() return File (PlatformUtilities::convertToPrecomposedUnicode (buf)); } -bool File::setAsCurrentWorkingDirectory() const throw() +bool File::setAsCurrentWorkingDirectory() const { return chdir (getFullPathName().toUTF8()) == 0; } //============================================================================== -const String File::getVersion() const throw() +const String File::getVersion() const { const ScopedAutoReleasePool pool; String result; @@ -300,7 +300,7 @@ const String File::getVersion() const throw() } //============================================================================== -const File File::getLinkedTarget() const throw() +const File File::getLinkedTarget() const { #if JUCE_IPHONE || (defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) NSString* dest = [[NSFileManager defaultManager] destinationOfSymbolicLinkAtPath: juceStringToNS (getFullPathName()) error: nil]; @@ -316,7 +316,7 @@ const File File::getLinkedTarget() const throw() } //============================================================================== -bool File::moveToTrash() const throw() +bool File::moveToTrash() const { if (! exists()) return true; @@ -345,7 +345,7 @@ struct FindFileStruct }; bool juce_findFileNext (void* handle, String& resultFile, - bool* isDir, bool* isHidden, int64* fileSize, Time* modTime, Time* creationTime, bool* isReadOnly) throw() + bool* isDir, bool* isHidden, int64* fileSize, Time* modTime, Time* creationTime, bool* isReadOnly) { FindFileStruct* ff = (FindFileStruct*) handle; NSString* file; @@ -400,7 +400,7 @@ bool juce_findFileNext (void* handle, String& resultFile, void* juce_findFileStart (const String& directory, const String& wildCard, String& firstResultFile, bool* isDir, bool* isHidden, int64* fileSize, Time* modTime, - Time* creationTime, bool* isReadOnly) throw() + Time* creationTime, bool* isReadOnly) { NSDirectoryEnumerator* e = [[NSFileManager defaultManager] enumeratorAtPath: juceStringToNS (directory)]; @@ -424,7 +424,7 @@ void* juce_findFileStart (const String& directory, const String& wildCard, Strin return 0; } -void juce_findFileClose (void* handle) throw() +void juce_findFileClose (void* handle) { FindFileStruct* ff = (FindFileStruct*) handle; [ff->enumerator release]; @@ -432,7 +432,7 @@ void juce_findFileClose (void* handle) throw() } //============================================================================== -bool juce_launchExecutable (const String& pathAndArguments) throw() +bool juce_launchExecutable (const String& pathAndArguments) { const char* const argv[4] = { "/bin/sh", "-c", (const char*) pathAndArguments, 0 }; @@ -453,8 +453,7 @@ bool juce_launchExecutable (const String& pathAndArguments) throw() return true; } -bool juce_launchFile (const String& fileName, - const String& parameters) throw() +bool juce_launchFile (const String& fileName, const String& parameters) { #if JUCE_IPHONE return [[UIApplication sharedApplication] openURL: [NSURL fileURLWithPath: juceStringToNS (fileName)]]; @@ -497,7 +496,7 @@ bool juce_launchFile (const String& fileName, #endif } -void File::revealToUser() const throw() +void File::revealToUser() const { #if ! JUCE_IPHONE if (exists()) diff --git a/src/native/mac/juce_mac_Threads.mm b/src/native/mac/juce_mac_Threads.mm index 145609a9af..67feec5316 100644 --- a/src/native/mac/juce_mac_Threads.mm +++ b/src/native/mac/juce_mac_Threads.mm @@ -43,7 +43,7 @@ void* threadEntryProc (void* userData) return 0; } -void* juce_createThread (void* userData) throw() +void* juce_createThread (void* userData) { pthread_t handle = 0; @@ -56,22 +56,22 @@ void* juce_createThread (void* userData) throw() return 0; } -void juce_killThread (void* handle) throw() +void juce_killThread (void* handle) { if (handle != 0) pthread_cancel ((pthread_t) handle); } -void juce_setCurrentThreadName (const String& /*name*/) throw() +void juce_setCurrentThreadName (const String& /*name*/) { } -Thread::ThreadID Thread::getCurrentThreadId() throw() +Thread::ThreadID Thread::getCurrentThreadId() { return (ThreadID) pthread_self(); } -bool juce_setThreadPriority (void* handle, int priority) throw() +bool juce_setThreadPriority (void* handle, int priority) { if (handle == 0) handle = (void*) pthread_self(); @@ -83,19 +83,19 @@ bool juce_setThreadPriority (void* handle, int priority) throw() return pthread_setschedparam ((pthread_t) handle, policy, ¶m) == 0; } -void Thread::yield() throw() +void Thread::yield() { sched_yield(); } -void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask) throw() +void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask) { // xxx jassertfalse } //============================================================================== -bool Process::isForegroundProcess() throw() +bool Process::isForegroundProcess() { #if JUCE_MAC return [NSApp isActive]; diff --git a/src/native/windows/juce_win32_Files.cpp b/src/native/windows/juce_win32_Files.cpp index 184821cfaf..530ac0595a 100644 --- a/src/native/windows/juce_win32_Files.cpp +++ b/src/native/windows/juce_win32_Files.cpp @@ -43,8 +43,7 @@ const tchar* File::separatorString = T("\\"); //============================================================================== -bool juce_fileExists (const String& fileName, - const bool dontCountDirectories) throw() +bool juce_fileExists (const String& fileName, const bool dontCountDirectories) { if (fileName.isEmpty()) return false; @@ -55,7 +54,7 @@ bool juce_fileExists (const String& fileName, : (attr != 0xffffffff); } -bool juce_isDirectory (const String& fileName) throw() +bool juce_isDirectory (const String& fileName) { const DWORD attr = GetFileAttributes (fileName); @@ -63,15 +62,14 @@ bool juce_isDirectory (const String& fileName) throw() && ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0); } -bool juce_canWriteToFile (const String& fileName) throw() +bool juce_canWriteToFile (const String& fileName) { const DWORD attr = GetFileAttributes (fileName); return ((attr & FILE_ATTRIBUTE_READONLY) == 0); } -bool juce_setFileReadOnly (const String& fileName, - bool isReadOnly) throw() +bool juce_setFileReadOnly (const String& fileName, bool isReadOnly) { DWORD attr = GetFileAttributes (fileName); @@ -89,13 +87,13 @@ bool juce_setFileReadOnly (const String& fileName, return SetFileAttributes (fileName, attr) != FALSE; } -bool File::isHidden() const throw() +bool File::isHidden() const { return (GetFileAttributes (getFullPathName()) & FILE_ATTRIBUTE_HIDDEN) != 0; } //============================================================================== -bool juce_deleteFile (const String& fileName) throw() +bool juce_deleteFile (const String& fileName) { if (juce_isDirectory (fileName)) return RemoveDirectory (fileName) != 0; @@ -103,7 +101,7 @@ bool juce_deleteFile (const String& fileName) throw() return DeleteFile (fileName) != 0; } -bool File::moveToTrash() const throw() +bool File::moveToTrash() const { if (! exists()) return true; @@ -126,17 +124,17 @@ bool File::moveToTrash() const throw() return SHFileOperation (&fos) == 0; } -bool juce_moveFile (const String& source, const String& dest) throw() +bool juce_moveFile (const String& source, const String& dest) { return MoveFile (source, dest) != 0; } -bool juce_copyFile (const String& source, const String& dest) throw() +bool juce_copyFile (const String& source, const String& dest) { return CopyFile (source, dest, false) != 0; } -void juce_createDirectory (const String& fileName) throw() +void juce_createDirectory (const String& fileName) { if (! juce_fileExists (fileName, true)) { @@ -146,7 +144,7 @@ void juce_createDirectory (const String& fileName) throw() //============================================================================== // return 0 if not possible -void* juce_fileOpen (const String& fileName, bool forWriting) throw() +void* juce_fileOpen (const String& fileName, bool forWriting) { HANDLE h; @@ -172,20 +170,20 @@ void* juce_fileOpen (const String& fileName, bool forWriting) throw() return (void*) h; } -void juce_fileClose (void* handle) throw() +void juce_fileClose (void* handle) { CloseHandle (handle); } //============================================================================== -int juce_fileRead (void* handle, void* buffer, int size) throw() +int juce_fileRead (void* handle, void* buffer, int size) { DWORD num = 0; ReadFile ((HANDLE) handle, buffer, size, &num, 0); return num; } -int juce_fileWrite (void* handle, const void* buffer, int size) throw() +int juce_fileWrite (void* handle, const void* buffer, int size) { DWORD num; @@ -196,7 +194,7 @@ int juce_fileWrite (void* handle, const void* buffer, int size) throw() return num; } -int64 juce_fileSetPosition (void* handle, int64 pos) throw() +int64 juce_fileSetPosition (void* handle, int64 pos) { LARGE_INTEGER li; li.QuadPart = pos; @@ -208,7 +206,7 @@ int64 juce_fileSetPosition (void* handle, int64 pos) throw() return li.QuadPart; } -int64 juce_fileGetPosition (void* handle) throw() +int64 juce_fileGetPosition (void* handle) { LARGE_INTEGER li; li.QuadPart = 0; @@ -219,12 +217,12 @@ int64 juce_fileGetPosition (void* handle) throw() return jmax ((int64) 0, li.QuadPart); } -void juce_fileFlush (void* handle) throw() +void juce_fileFlush (void* handle) { FlushFileBuffers ((HANDLE) handle); } -int64 juce_getFileSize (const String& fileName) throw() +int64 juce_getFileSize (const String& fileName) { WIN32_FILE_ATTRIBUTE_DATA attributes; @@ -238,7 +236,7 @@ int64 juce_getFileSize (const String& fileName) throw() } //============================================================================== -static int64 fileTimeToTime (const FILETIME* const ft) throw() +static int64 fileTimeToTime (const FILETIME* const ft) { // tell me if this fails! static_jassert (sizeof (ULARGE_INTEGER) == sizeof (FILETIME)); @@ -250,7 +248,7 @@ static int64 fileTimeToTime (const FILETIME* const ft) throw() #endif } -static void timeToFileTime (const int64 time, FILETIME* const ft) throw() +static void timeToFileTime (const int64 time, FILETIME* const ft) { #if JUCE_GCC ((ULARGE_INTEGER*) ft)->QuadPart = time * 10000 + 116444736000000000LL; @@ -262,7 +260,7 @@ static void timeToFileTime (const int64 time, FILETIME* const ft) throw() void juce_getFileTimes (const String& fileName, int64& modificationTime, int64& accessTime, - int64& creationTime) throw() + int64& creationTime) { WIN32_FILE_ATTRIBUTE_DATA attributes; @@ -282,7 +280,7 @@ void juce_getFileTimes (const String& fileName, bool juce_setFileTimes (const String& fileName, int64 modificationTime, int64 accessTime, - int64 creationTime) throw() + int64 creationTime) { FILETIME m, a, c; @@ -312,7 +310,7 @@ bool juce_setFileTimes (const String& fileName, //============================================================================== // return '\0' separated list of strings -const StringArray juce_getFileSystemRoots() throw() +const StringArray juce_getFileSystemRoots() { TCHAR buffer [2048]; buffer[0] = 0; @@ -337,7 +335,7 @@ const StringArray juce_getFileSystemRoots() throw() //============================================================================== const String juce_getVolumeLabel (const String& filenameOnVolume, - int& volumeSerialNumber) throw() + int& volumeSerialNumber) { TCHAR n [4]; n[0] = *(const TCHAR*) filenameOnVolume; @@ -358,7 +356,7 @@ const String juce_getVolumeLabel (const String& filenameOnVolume, return String (dest); } -static int64 getDiskSpaceInfo (String fn, const bool total) throw() +static int64 getDiskSpaceInfo (String fn, const bool total) { if (fn[1] == T(':')) fn = fn.substring (0, 2) + T("\\"); @@ -372,18 +370,18 @@ static int64 getDiskSpaceInfo (String fn, const bool total) throw() return 0; } -int64 File::getBytesFreeOnVolume() const throw() +int64 File::getBytesFreeOnVolume() const { return getDiskSpaceInfo (getFullPathName(), false); } -int64 File::getVolumeTotalSize() const throw() +int64 File::getVolumeTotalSize() const { return getDiskSpaceInfo (getFullPathName(), true); } //============================================================================== -static unsigned int getWindowsDriveType (const String& fileName) throw() +static unsigned int getWindowsDriveType (const String& fileName) { TCHAR n[4]; n[0] = *(const TCHAR*) fileName; @@ -394,12 +392,12 @@ static unsigned int getWindowsDriveType (const String& fileName) throw() return GetDriveType (n); } -bool File::isOnCDRomDrive() const throw() +bool File::isOnCDRomDrive() const { return getWindowsDriveType (getFullPathName()) == DRIVE_CDROM; } -bool File::isOnHardDisk() const throw() +bool File::isOnHardDisk() const { if (fullPath.isEmpty()) return false; @@ -417,7 +415,7 @@ bool File::isOnHardDisk() const throw() } } -bool File::isOnRemovableDrive() const throw() +bool File::isOnRemovableDrive() const { if (fullPath.isEmpty()) return false; @@ -433,7 +431,7 @@ bool File::isOnRemovableDrive() const throw() //============================================================================== #define MAX_PATH_CHARS (MAX_PATH + 256) -static const File juce_getSpecialFolderPath (int type) throw() +static const File juce_getSpecialFolderPath (int type) { WCHAR path [MAX_PATH_CHARS]; @@ -511,7 +509,7 @@ const File JUCE_CALLTYPE File::getSpecialLocation (const SpecialLocationType typ } //============================================================================== -const File File::getCurrentWorkingDirectory() throw() +const File File::getCurrentWorkingDirectory() { WCHAR dest [MAX_PATH_CHARS]; dest[0] = 0; @@ -519,14 +517,14 @@ const File File::getCurrentWorkingDirectory() throw() return File (String (dest)); } -bool File::setAsCurrentWorkingDirectory() const throw() +bool File::setAsCurrentWorkingDirectory() const { return SetCurrentDirectory (getFullPathName()) != FALSE; } //============================================================================== -const String File::getVersion() const throw() +const String File::getVersion() const { String result; @@ -554,7 +552,7 @@ const String File::getVersion() const throw() } //============================================================================== -const File File::getLinkedTarget() const throw() +const File File::getLinkedTarget() const { File result (*this); String p (getFullPathName()); @@ -591,7 +589,7 @@ template static void getFindFileInfo (FindDataType& findData, String& filename, bool* const isDir, bool* const isHidden, int64* const fileSize, Time* const modTime, Time* const creationTime, - bool* const isReadOnly) throw() + bool* const isReadOnly) { filename = findData.cFileName; @@ -617,7 +615,7 @@ static void getFindFileInfo (FindDataType& findData, void* juce_findFileStart (const String& directory, const String& wildCard, String& firstResult, bool* isDir, bool* isHidden, int64* fileSize, - Time* modTime, Time* creationTime, bool* isReadOnly) throw() + Time* modTime, Time* creationTime, bool* isReadOnly) { String wc (directory); @@ -642,7 +640,7 @@ void* juce_findFileStart (const String& directory, const String& wildCard, Strin bool juce_findFileNext (void* handle, String& resultFile, bool* isDir, bool* isHidden, int64* fileSize, - Time* modTime, Time* creationTime, bool* isReadOnly) throw() + Time* modTime, Time* creationTime, bool* isReadOnly) { WIN32_FIND_DATA findData; @@ -657,14 +655,14 @@ bool juce_findFileNext (void* handle, String& resultFile, return false; } -void juce_findFileClose (void* handle) throw() +void juce_findFileClose (void* handle) { FindClose (handle); } //============================================================================== bool juce_launchFile (const String& fileName, - const String& parameters) throw() + const String& parameters) { HINSTANCE hInstance = 0; @@ -677,7 +675,7 @@ bool juce_launchFile (const String& fileName, return hInstance > (HINSTANCE) 32; } -void File::revealToUser() const throw() +void File::revealToUser() const { if (isDirectory()) startAsProcess(); diff --git a/src/native/windows/juce_win32_Threads.cpp b/src/native/windows/juce_win32_Threads.cpp index 8b9a29a127..66eff18e7a 100644 --- a/src/native/windows/juce_win32_Threads.cpp +++ b/src/native/windows/juce_win32_Threads.cpp @@ -94,7 +94,7 @@ void WaitableEvent::reset() const throw() //============================================================================== void JUCE_API juce_threadEntryPoint (void*); -static unsigned int __stdcall threadEntryProc (void* userData) throw() +static unsigned int __stdcall threadEntryProc (void* userData) { #if ! JUCE_ONLY_BUILD_CORE_LIBRARY AttachThreadInput (GetWindowThreadProcessId (juce_messageWindowHandle, 0), @@ -107,12 +107,12 @@ static unsigned int __stdcall threadEntryProc (void* userData) throw() return 0; } -void juce_CloseThreadHandle (void* handle) throw() +void juce_CloseThreadHandle (void* handle) { CloseHandle ((HANDLE) handle); } -void* juce_createThread (void* userData) throw() +void* juce_createThread (void* userData) { unsigned int threadId; @@ -122,7 +122,7 @@ void* juce_createThread (void* userData) throw() 0, &threadId); } -void juce_killThread (void* handle) throw() +void juce_killThread (void* handle) { if (handle != 0) { @@ -133,7 +133,7 @@ void juce_killThread (void* handle) throw() } } -void juce_setCurrentThreadName (const String& name) throw() +void juce_setCurrentThreadName (const String& name) { #if defined (JUCE_DEBUG) && JUCE_MSVC struct @@ -162,13 +162,13 @@ void juce_setCurrentThreadName (const String& name) throw() #endif } -Thread::ThreadID Thread::getCurrentThreadId() throw() +Thread::ThreadID Thread::getCurrentThreadId() { return (ThreadID) (pointer_sized_int) GetCurrentThreadId(); } // priority 1 to 10 where 5=normal, 1=low -bool juce_setThreadPriority (void* threadHandle, int priority) throw() +bool juce_setThreadPriority (void* threadHandle, int priority) { int pri = THREAD_PRIORITY_TIME_CRITICAL; @@ -191,14 +191,14 @@ bool juce_setThreadPriority (void* threadHandle, int priority) throw() return SetThreadPriority (threadHandle, pri) != FALSE; } -void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask) throw() +void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask) { SetThreadAffinityMask (GetCurrentThread(), affinityMask); } static HANDLE sleepEvent = 0; -void juce_initialiseThreadEvents() throw() +void juce_initialiseThreadEvents() { if (sleepEvent == 0) #ifdef JUCE_DEBUG @@ -208,12 +208,12 @@ void juce_initialiseThreadEvents() throw() #endif } -void Thread::yield() throw() +void Thread::yield() { Sleep (0); } -void JUCE_CALLTYPE Thread::sleep (const int millisecs) throw() +void JUCE_CALLTYPE Thread::sleep (const int millisecs) { if (millisecs >= 10) { @@ -235,7 +235,7 @@ static int lastProcessPriority = -1; // called by WindowDriver because Windows does wierd things to process priority // when you swap apps, and this forces an update when the app is brought to the front. -void juce_repeatLastProcessPriority() throw() +void juce_repeatLastProcessPriority() { if (lastProcessPriority >= 0) // (avoid changing this if it's not been explicitly set by the app..) { @@ -277,12 +277,12 @@ void Process::setPriority (ProcessPriority prior) } } -bool JUCE_API JUCE_CALLTYPE juce_isRunningUnderDebugger() throw() +bool JUCE_API JUCE_CALLTYPE juce_isRunningUnderDebugger() { return IsDebuggerPresent() != FALSE; } -bool JUCE_CALLTYPE Process::isRunningUnderDebugger() throw() +bool JUCE_CALLTYPE Process::isRunningUnderDebugger() { return juce_isRunningUnderDebugger(); } @@ -341,19 +341,19 @@ void* PlatformUtilities::getProcedureEntryPoint (void* h, const String& name) //============================================================================== -InterProcessLock::InterProcessLock (const String& name_) throw() +InterProcessLock::InterProcessLock (const String& name_) : internal (0), name (name_), reentrancyLevel (0) { } -InterProcessLock::~InterProcessLock() throw() +InterProcessLock::~InterProcessLock() { exit(); } -bool InterProcessLock::enter (const int timeOutMillisecs) throw() +bool InterProcessLock::enter (const int timeOutMillisecs) { if (reentrancyLevel++ == 0) { @@ -375,7 +375,7 @@ bool InterProcessLock::enter (const int timeOutMillisecs) throw() return (internal != 0); } -void InterProcessLock::exit() throw() +void InterProcessLock::exit() { if (--reentrancyLevel == 0 && internal != 0) { diff --git a/src/native/windows/juce_win32_Windowing.cpp b/src/native/windows/juce_win32_Windowing.cpp index f9e732895d..022e22b634 100644 --- a/src/native/windows/juce_win32_Windowing.cpp +++ b/src/native/windows/juce_win32_Windowing.cpp @@ -2286,7 +2286,7 @@ void juce_setWindowStyleBit (HWND h, const int styleType, const int feature, con //============================================================================== -bool Process::isForegroundProcess() throw() +bool Process::isForegroundProcess() { HWND fg = GetForegroundWindow(); diff --git a/src/threads/juce_InterProcessLock.h b/src/threads/juce_InterProcessLock.h index e9759e36a8..4a68e00644 100644 --- a/src/threads/juce_InterProcessLock.h +++ b/src/threads/juce_InterProcessLock.h @@ -43,13 +43,13 @@ public: @param name a name that processes will use to identify this lock object */ - InterProcessLock (const String& name) throw(); + InterProcessLock (const String& name); /** Destructor. This will also release the lock if it's currently held by this process. */ - ~InterProcessLock() throw(); + ~InterProcessLock(); //============================================================================== /** Attempts to lock the critical section. @@ -61,11 +61,11 @@ public: @returns true if the lock could be gained within the timeout period, or false if the timeout expired. */ - bool enter (int timeOutMillisecs = -1) throw(); + bool enter (int timeOutMillisecs = -1); /** Releases the lock if it's currently held by this process. */ - void exit() throw(); + void exit(); //============================================================================== diff --git a/src/threads/juce_Process.h b/src/threads/juce_Process.h index 32cc799054..13d68c402f 100644 --- a/src/threads/juce_Process.h +++ b/src/threads/juce_Process.h @@ -70,7 +70,7 @@ public: /** Returns true if this application process is the one that the user is currently using. */ - static bool isForegroundProcess() throw(); + static bool isForegroundProcess(); //============================================================================== /** Raises the current process's privilege level. @@ -90,7 +90,7 @@ public: //============================================================================== /** Returns true if this process is being hosted by a debugger. */ - static bool JUCE_CALLTYPE isRunningUnderDebugger() throw(); + static bool JUCE_CALLTYPE isRunningUnderDebugger(); }; diff --git a/src/threads/juce_Thread.cpp b/src/threads/juce_Thread.cpp index 2067128d96..80a48cacfe 100644 --- a/src/threads/juce_Thread.cpp +++ b/src/threads/juce_Thread.cpp @@ -34,12 +34,12 @@ BEGIN_JUCE_NAMESPACE #include "../containers/juce_VoidArray.h" // these functions are implemented in the platform-specific code. -void* juce_createThread (void* userData) throw(); -void juce_killThread (void* handle) throw(); -bool juce_setThreadPriority (void* handle, int priority) throw(); -void juce_setCurrentThreadName (const String& name) throw(); +void* juce_createThread (void* userData); +void juce_killThread (void* handle); +bool juce_setThreadPriority (void* handle, int priority); +void juce_setCurrentThreadName (const String& name); #if JUCE_WIN32 -void juce_CloseThreadHandle (void* handle) throw(); +void juce_CloseThreadHandle (void* handle); #endif //============================================================================== @@ -47,7 +47,7 @@ static VoidArray runningThreads (4); static CriticalSection runningThreadsLock; //============================================================================== -void Thread::threadEntryPoint (Thread* const thread) throw() +void Thread::threadEntryPoint (Thread* const thread) { { const ScopedLock sl (runningThreadsLock); @@ -110,7 +110,7 @@ Thread::~Thread() } //============================================================================== -void Thread::startThread() throw() +void Thread::startThread() { const ScopedLock sl (startStopLock); @@ -124,7 +124,7 @@ void Thread::startThread() throw() } } -void Thread::startThread (const int priority) throw() +void Thread::startThread (const int priority) { const ScopedLock sl (startStopLock); @@ -139,18 +139,18 @@ void Thread::startThread (const int priority) throw() } } -bool Thread::isThreadRunning() const throw() +bool Thread::isThreadRunning() const { return threadHandle_ != 0; } //============================================================================== -void Thread::signalThreadShouldExit() throw() +void Thread::signalThreadShouldExit() { threadShouldExit_ = true; } -bool Thread::waitForThreadToExit (const int timeOutMilliseconds) const throw() +bool Thread::waitForThreadToExit (const int timeOutMilliseconds) const { // Doh! So how exactly do you expect this thread to wait for itself to stop?? jassert (getThreadId() != getCurrentThreadId()); @@ -169,7 +169,7 @@ bool Thread::waitForThreadToExit (const int timeOutMilliseconds) const throw() return true; } -void Thread::stopThread (const int timeOutMilliseconds) throw() +void Thread::stopThread (const int timeOutMilliseconds) { // agh! You can't stop the thread that's calling this method! How on earth // would that work?? @@ -204,7 +204,7 @@ void Thread::stopThread (const int timeOutMilliseconds) throw() } //============================================================================== -bool Thread::setPriority (const int priority) throw() +bool Thread::setPriority (const int priority) { const ScopedLock sl (startStopLock); @@ -216,39 +216,34 @@ bool Thread::setPriority (const int priority) throw() return worked; } -bool Thread::setCurrentThreadPriority (const int priority) throw() +bool Thread::setCurrentThreadPriority (const int priority) { return juce_setThreadPriority (0, priority); } -void Thread::setAffinityMask (const uint32 affinityMask) throw() +void Thread::setAffinityMask (const uint32 affinityMask) { affinityMask_ = affinityMask; } -Thread::ThreadID Thread::getThreadId() const throw() -{ - return threadId_; -} - //============================================================================== -bool Thread::wait (const int timeOutMilliseconds) const throw() +bool Thread::wait (const int timeOutMilliseconds) const { return defaultEvent_.wait (timeOutMilliseconds); } -void Thread::notify() const throw() +void Thread::notify() const { defaultEvent_.signal(); } //============================================================================== -int Thread::getNumRunningThreads() throw() +int Thread::getNumRunningThreads() { return runningThreads.size(); } -Thread* Thread::getCurrentThread() throw() +Thread* Thread::getCurrentThread() { const ThreadID thisId = getCurrentThreadId(); @@ -256,7 +251,7 @@ Thread* Thread::getCurrentThread() throw() for (int i = runningThreads.size(); --i >= 0;) { - Thread* const t = (Thread*) (runningThreads.getUnchecked(i)); + Thread* const t = (Thread*) runningThreads.getUnchecked(i); if (t->threadId_ == thisId) return t; @@ -265,7 +260,7 @@ Thread* Thread::getCurrentThread() throw() return 0; } -void Thread::stopAllThreads (const int timeOutMilliseconds) throw() +void Thread::stopAllThreads (const int timeOutMilliseconds) { { const ScopedLock sl (runningThreadsLock); diff --git a/src/threads/juce_Thread.h b/src/threads/juce_Thread.h index c77f83f0ab..d59b920a19 100644 --- a/src/threads/juce_Thread.h +++ b/src/threads/juce_Thread.h @@ -86,7 +86,7 @@ public: @see stopThread */ - void startThread() throw(); + void startThread(); /** Starts the thread with a given priority. @@ -95,7 +95,7 @@ public: @see startThread, setPriority */ - void startThread (const int priority) throw(); + void startThread (const int priority); /** Attempts to stop the thread running. @@ -115,11 +115,11 @@ public: value in here will wait forever. @see signalThreadShouldExit, threadShouldExit, waitForThreadToExit, isThreadRunning */ - void stopThread (const int timeOutMilliseconds) throw(); + void stopThread (const int timeOutMilliseconds); //============================================================================== /** Returns true if the thread is currently active */ - bool isThreadRunning() const throw(); + bool isThreadRunning() const; /** Sets a flag to tell the thread it should stop. @@ -129,7 +129,7 @@ public: @see threadShouldExit @see waitForThreadToExit */ - void signalThreadShouldExit() throw(); + void signalThreadShouldExit(); /** Checks whether the thread has been told to stop running. @@ -138,7 +138,7 @@ public: @see signalThreadShouldExit */ - inline bool threadShouldExit() const throw() { return threadShouldExit_; } + inline bool threadShouldExit() const { return threadShouldExit_; } /** Waits for the thread to stop. @@ -148,7 +148,7 @@ public: is less than zero, it will wait forever. @returns true if the thread exits, or false if the timeout expires first. */ - bool waitForThreadToExit (const int timeOutMilliseconds) const throw(); + bool waitForThreadToExit (const int timeOutMilliseconds) const; //============================================================================== /** Changes the thread's priority. @@ -157,7 +157,7 @@ public: @param priority the new priority, in the range 0 (lowest) to 10 (highest). A priority of 5 is normal. */ - bool setPriority (const int priority) throw(); + bool setPriority (const int priority); /** Changes the priority of the caller thread. @@ -166,7 +166,7 @@ public: @see setPriority */ - static bool setCurrentThreadPriority (const int priority) throw(); + static bool setCurrentThreadPriority (const int priority); //============================================================================== /** Sets the affinity mask for the thread. @@ -176,7 +176,7 @@ public: @see setCurrentThreadAffinityMask */ - void setAffinityMask (const uint32 affinityMask) throw(); + void setAffinityMask (const uint32 affinityMask); /** Changes the affinity mask for the caller thread. @@ -184,14 +184,14 @@ public: @see setAffinityMask */ - static void setCurrentThreadAffinityMask (const uint32 affinityMask) throw(); + static void setCurrentThreadAffinityMask (const uint32 affinityMask); //============================================================================== // this can be called from any thread that needs to pause.. - static void JUCE_CALLTYPE sleep (int milliseconds) throw(); + static void JUCE_CALLTYPE sleep (int milliseconds); /** Yields the calling thread's current time-slot. */ - static void JUCE_CALLTYPE yield() throw(); + static void JUCE_CALLTYPE yield(); //============================================================================== /** Makes the thread wait for a notification. @@ -201,7 +201,7 @@ public: @returns true if the event has been signalled, false if the timeout expires. */ - bool wait (const int timeOutMilliseconds) const throw(); + bool wait (const int timeOutMilliseconds) const; /** Wakes up the thread. @@ -209,7 +209,7 @@ public: @see wait */ - void notify() const throw(); + void notify() const; //============================================================================== /** A value type used for thread IDs. @@ -224,14 +224,14 @@ public: @returns a unique identifier that identifies the calling thread. @see getThreadId */ - static ThreadID getCurrentThreadId() throw(); + static ThreadID getCurrentThreadId(); /** Finds the thread object that is currently running. Note that the main UI thread (or other non-Juce threads) don't have a Thread object associated with them, so this will return 0. */ - static Thread* getCurrentThread() throw(); + static Thread* getCurrentThread(); /** Returns the ID of this thread. @@ -242,13 +242,13 @@ public: @see getCurrentThreadId */ - ThreadID getThreadId() const throw(); + ThreadID getThreadId() const { return threadId_; } /** Returns the name of the thread. This is the name that gets set in the constructor. */ - const String getThreadName() const throw() { return threadName_; } + const String getThreadName() const { return threadName_; } //============================================================================== /** Returns the number of currently-running threads. @@ -256,13 +256,13 @@ public: @returns the number of Thread objects known to be currently running. @see stopAllThreads */ - static int getNumRunningThreads() throw(); + static int getNumRunningThreads(); /** Tries to stop all currently-running threads. This will attempt to stop all the threads known to be running at the moment. */ - static void stopAllThreads (const int timeoutInMillisecs) throw(); + static void stopAllThreads (const int timeoutInMillisecs); //============================================================================== @@ -280,7 +280,7 @@ private: bool volatile threadShouldExit_; friend void JUCE_API juce_threadEntryPoint (void*); - static void threadEntryPoint (Thread* thread) throw(); + static void threadEntryPoint (Thread* thread); Thread (const Thread&); const Thread& operator= (const Thread&); diff --git a/src/threads/juce_ThreadPool.cpp b/src/threads/juce_ThreadPool.cpp index 39ab22c883..1f197454fc 100644 --- a/src/threads/juce_ThreadPool.cpp +++ b/src/threads/juce_ThreadPool.cpp @@ -49,17 +49,17 @@ ThreadPoolJob::~ThreadPoolJob() jassert (pool == 0 || ! pool->contains (this)); } -const String ThreadPoolJob::getJobName() const throw() +const String ThreadPoolJob::getJobName() const { return jobName; } -void ThreadPoolJob::setJobName (const String& newName) throw() +void ThreadPoolJob::setJobName (const String& newName) { jobName = newName; } -void ThreadPoolJob::signalJobShouldExit() throw() +void ThreadPoolJob::signalJobShouldExit() { shouldStop = true; } @@ -181,18 +181,18 @@ void ThreadPool::addJob (ThreadPoolJob* const job) } } -int ThreadPool::getNumJobs() const throw() +int ThreadPool::getNumJobs() const { return jobs.size(); } -ThreadPoolJob* ThreadPool::getJob (const int index) const throw() +ThreadPoolJob* ThreadPool::getJob (const int index) const { const ScopedLock sl (lock); return (ThreadPoolJob*) jobs [index]; } -bool ThreadPool::contains (const ThreadPoolJob* const job) const throw() +bool ThreadPool::contains (const ThreadPoolJob* const job) const { const ScopedLock sl (lock); return jobs.contains ((void*) job); @@ -308,7 +308,7 @@ bool ThreadPool::removeAllJobs (const bool interruptRunningJobs, return true; } -const StringArray ThreadPool::getNamesOfAllJobs (const bool onlyReturnActiveJobs) const throw() +const StringArray ThreadPool::getNamesOfAllJobs (const bool onlyReturnActiveJobs) const { StringArray s; const ScopedLock sl (lock); diff --git a/src/threads/juce_ThreadPool.h b/src/threads/juce_ThreadPool.h index bf421e0b8a..67d5dc113a 100644 --- a/src/threads/juce_ThreadPool.h +++ b/src/threads/juce_ThreadPool.h @@ -66,12 +66,12 @@ public: /** Returns the name of this job. @see setJobName */ - const String getJobName() const throw(); + const String getJobName() const; /** Changes the job's name. @see getJobName */ - void setJobName (const String& newName) throw(); + void setJobName (const String& newName); //============================================================================== /** These are the values that can be returned by the runJob() method. @@ -107,7 +107,7 @@ public: //============================================================================== /** Returns true if this job is currently running its runJob() method. */ - bool isRunning() const throw() { return isActive; } + bool isRunning() const { return isActive; } /** Returns true if something is trying to interrupt this job and make it stop. @@ -116,14 +116,14 @@ public: @see signalJobShouldExit() */ - bool shouldExit() const throw() { return shouldStop; } + bool shouldExit() const { return shouldStop; } /** Calling this will cause the shouldExit() method to return true, and the job should (if it's been implemented correctly) stop as soon as possible. @see shouldExit() */ - void signalJobShouldExit() throw(); + void signalJobShouldExit(); //============================================================================== juce_UseDebuggingNewOperator @@ -250,20 +250,20 @@ public: /** Returns the number of jobs currently running or queued. */ - int getNumJobs() const throw(); + int getNumJobs() const; /** Returns one of the jobs in the queue. Note that this can be a very volatile list as jobs might be continuously getting shifted around in the list, and this method may return 0 if the index is currently out-of-range. */ - ThreadPoolJob* getJob (const int index) const throw(); + ThreadPoolJob* getJob (const int index) const; /** Returns true if the given job is currently queued or running. @see isJobRunning() */ - bool contains (const ThreadPoolJob* const job) const throw(); + bool contains (const ThreadPoolJob* const job) const; /** Returns true if the given job is currently being run by a thread. */ @@ -284,7 +284,7 @@ public: If onlyReturnActiveJobs is true, only the ones currently running are returned. */ - const StringArray getNamesOfAllJobs (const bool onlyReturnActiveJobs) const throw(); + const StringArray getNamesOfAllJobs (const bool onlyReturnActiveJobs) const; /** Changes the priority of all the threads. diff --git a/src/threads/juce_TimeSliceThread.cpp b/src/threads/juce_TimeSliceThread.cpp index 6668115340..620fbf6204 100644 --- a/src/threads/juce_TimeSliceThread.cpp +++ b/src/threads/juce_TimeSliceThread.cpp @@ -77,12 +77,12 @@ void TimeSliceThread::removeTimeSliceClient (TimeSliceClient* const client) } } -int TimeSliceThread::getNumClients() const throw() +int TimeSliceThread::getNumClients() const { return clients.size(); } -TimeSliceClient* TimeSliceThread::getClient (const int i) const throw() +TimeSliceClient* TimeSliceThread::getClient (const int i) const { const ScopedLock sl (listLock); return clients [i]; diff --git a/src/threads/juce_TimeSliceThread.h b/src/threads/juce_TimeSliceThread.h index 0678a313ee..5309656000 100644 --- a/src/threads/juce_TimeSliceThread.h +++ b/src/threads/juce_TimeSliceThread.h @@ -110,10 +110,10 @@ public: void removeTimeSliceClient (TimeSliceClient* const client); /** Returns the number of registered clients. */ - int getNumClients() const throw(); + int getNumClients() const; /** Returns one of the registered clients. */ - TimeSliceClient* getClient (const int index) const throw(); + TimeSliceClient* getClient (const int index) const; //============================================================================== /** @internal */ diff --git a/src/utilities/juce_DeletedAtShutdown.cpp b/src/utilities/juce_DeletedAtShutdown.cpp index 370640be48..32b78a8e46 100644 --- a/src/utilities/juce_DeletedAtShutdown.cpp +++ b/src/utilities/juce_DeletedAtShutdown.cpp @@ -38,7 +38,7 @@ static VoidArray objectsToDelete (16); static CriticalSection lock; //============================================================================== -DeletedAtShutdown::DeletedAtShutdown() throw() +DeletedAtShutdown::DeletedAtShutdown() { const ScopedLock sl (lock); objectsToDelete.add (this); diff --git a/src/utilities/juce_DeletedAtShutdown.h b/src/utilities/juce_DeletedAtShutdown.h index e665754a8d..ee618c42d9 100644 --- a/src/utilities/juce_DeletedAtShutdown.h +++ b/src/utilities/juce_DeletedAtShutdown.h @@ -44,7 +44,7 @@ class JUCE_API DeletedAtShutdown { protected: /** Creates a DeletedAtShutdown object. */ - DeletedAtShutdown() throw(); + DeletedAtShutdown(); /** Destructor. diff --git a/src/utilities/juce_FileBasedDocument.h b/src/utilities/juce_FileBasedDocument.h index a234602351..a148cc10ea 100644 --- a/src/utilities/juce_FileBasedDocument.h +++ b/src/utilities/juce_FileBasedDocument.h @@ -74,7 +74,7 @@ public: @see resetChangedFlag, changed */ - bool hasChangedSinceSaved() const throw() { return changedSinceSave; } + bool hasChangedSinceSaved() const { return changedSinceSave; } /** Called to indicate that the document has changed and needs saving. @@ -211,7 +211,7 @@ public: It is changed when one of the load or save methods is used, or when setFile() is used to explicitly set it. */ - const File getFile() const throw() { return documentFile; } + const File getFile() const { return documentFile; } /** Sets the file that this document thinks it was loaded from. diff --git a/src/utilities/juce_PropertiesFile.cpp b/src/utilities/juce_PropertiesFile.cpp index 800d797cc6..be43579904 100644 --- a/src/utilities/juce_PropertiesFile.cpp +++ b/src/utilities/juce_PropertiesFile.cpp @@ -49,7 +49,7 @@ static const tchar* const propertyTagName = T("VALUE"); //============================================================================== PropertiesFile::PropertiesFile (const File& f, const int millisecondsBeforeSaving, - const int options_) throw() + const int options_) : PropertySet (ignoreCaseOfKeyNames), file (f), timerInterval (millisecondsBeforeSaving), @@ -136,14 +136,12 @@ PropertiesFile::~PropertiesFile() bool PropertiesFile::saveIfNeeded() { const ScopedLock sl (getLock()); - return (! needsWriting) || save(); } -bool PropertiesFile::needsToBeSaved() const throw() +bool PropertiesFile::needsToBeSaved() const { const ScopedLock sl (getLock()); - return needsWriting; } @@ -247,11 +245,6 @@ void PropertiesFile::propertyChanged() saveIfNeeded(); } -const File PropertiesFile::getFile() const throw() -{ - return file; -} - //============================================================================== const File PropertiesFile::getDefaultAppSettingsFile (const String& applicationName, const String& fileNameSuffix, diff --git a/src/utilities/juce_PropertiesFile.h b/src/utilities/juce_PropertiesFile.h index d17a192a60..b87e6442d3 100644 --- a/src/utilities/juce_PropertiesFile.h +++ b/src/utilities/juce_PropertiesFile.h @@ -79,7 +79,7 @@ public: */ PropertiesFile (const File& file, const int millisecondsBeforeSaving, - const int options) throw(); + const int options); /** Destructor. @@ -111,11 +111,11 @@ public: /** Returns true if the properties have been altered since the last time they were saved. */ - bool needsToBeSaved() const throw(); + bool needsToBeSaved() const; //============================================================================== /** Returns the file that's being used. */ - const File getFile() const throw(); + const File getFile() const { return file; } //============================================================================== /** Handy utility to create a properties file in whatever the standard OS-specific