mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-23 01:44:22 +00:00
Code Activity

Minor fixes and warning removals for VC7.

Browse source
This commit is contained in:
Julian Storer 2010-01-17 22:44:16 +00:00
parent 7381243506
commit 6a4e8f235c
22 changed files with 192 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

4
juce.h
View file

@ -33,6 +33,8 @@
*/
//==============================================================================
#define JUCE_PUBLIC_INCLUDES 1
// (this includes things that need defining outside of the JUCE namespace)
#include "src/core/juce_StandardHeader.h"
@ -49,8 +51,6 @@ BEGIN_JUCE_NAMESPACE
#pragma align=natural
#endif
#define JUCE_PUBLIC_INCLUDES
// this is where all the class header files get brought in..
#include "src/juce_core_includes.h"

159
juce_amalgamated.cpp
View file

@ -7232,8 +7232,7 @@ void TemporaryFile::createTempFile (const File& parentDirectory, String name,
if ((optionFlags & useHiddenFile) != 0)
name = T(".") + name;
temporaryFile = parentDirectory.getNonexistentChildFile (name, targetFile.getFileExtension(),
(optionFlags & putNumbersInBrackets) != 0);
temporaryFile = parentDirectory.getNonexistentChildFile (name, suffix, (optionFlags & putNumbersInBrackets) != 0);
}
TemporaryFile::~TemporaryFile()
@ -16160,7 +16159,7 @@ public:
int getSizeInUnits()
{
return 32; //xxx should be more accurate
return (int) sizeof (*this); //xxx should be more accurate
}
private:
@ -16211,7 +16210,7 @@ public:
int getSizeInUnits()
{
return 32; //xxx should be more accurate
return (int) sizeof (*this); //xxx should be more accurate
}
private:
@ -16260,64 +16259,84 @@ ValueTree::SharedObject::Property::Property (const var::identifier& name_, const
{
}
void ValueTree::deliverPropertyChangeMessage (const var::identifier& property)
void ValueTree::deliverPropertyChangeMessage (ValueTree& tree, const var::identifier& property)
{
ValueTree v (object);
for (int i = listeners.size(); --i >= 0;)
{
ValueTree::Listener* const l = listeners[i];
if (l != 0)
l->valueTreePropertyChanged (v, property);
l->valueTreePropertyChanged (tree, property);
}
}
void ValueTree::SharedObject::sendPropertyChangeMessage (ValueTree& tree, const var::identifier& property)
{
for (int i = valueTreesWithListeners.size(); --i >= 0;)
{
ValueTree* const v = valueTreesWithListeners[i];
if (v != 0)
v->deliverPropertyChangeMessage (tree, property);
}
}
void ValueTree::SharedObject::sendPropertyChangeMessage (const var::identifier& property)
{
for (int i = valueTreesWithListeners.size(); --i >= 0;)
ValueTree tree (this);
ValueTree::SharedObject* t = this;
while (t != 0)
{
ValueTree* const v = valueTreesWithListeners[i];
if (v != 0)
v->deliverPropertyChangeMessage (property);
t->sendPropertyChangeMessage (tree, property);
t = t->parent;
}
}
void ValueTree::deliverChildChangeMessage()
void ValueTree::deliverChildChangeMessage (ValueTree& tree)
{
ValueTree v (object);
for (int i = listeners.size(); --i >= 0;)
{
ValueTree::Listener* const l = listeners[i];
if (l != 0)
l->valueTreeChildrenChanged (v);
l->valueTreeChildrenChanged (tree);
}
}
void ValueTree::SharedObject::sendChildChangeMessage (ValueTree& tree)
{
for (int i = valueTreesWithListeners.size(); --i >= 0;)
{
ValueTree* const v = valueTreesWithListeners[i];
if (v != 0)
v->deliverChildChangeMessage (tree);
}
}
void ValueTree::SharedObject::sendChildChangeMessage()
{
for (int i = valueTreesWithListeners.size(); --i >= 0;)
ValueTree tree (this);
ValueTree::SharedObject* t = this;
while (t != 0)
{
ValueTree* const v = valueTreesWithListeners[i];
if (v != 0)
v->deliverChildChangeMessage();
t->sendChildChangeMessage (tree);
t = t->parent;
}
}
void ValueTree::deliverParentChangeMessage()
void ValueTree::deliverParentChangeMessage (ValueTree& tree)
{
ValueTree v (object);
for (int i = listeners.size(); --i >= 0;)
{
ValueTree::Listener* const l = listeners[i];
if (l != 0)
l->valueTreeParentChanged (v);
l->valueTreeParentChanged (tree);
}
}
void ValueTree::SharedObject::sendParentChangeMessage()
{
ValueTree tree (this);
int i;
for (i = children.size(); --i >= 0;)
{
@ -16330,7 +16349,7 @@ void ValueTree::SharedObject::sendParentChangeMessage()
{
ValueTree* const v = valueTreesWithListeners[i];
if (v != 0)
v->deliverParentChangeMessage();
v->deliverParentChangeMessage (tree);
}
}
@ -16526,7 +16545,7 @@ void ValueTree::SharedObject::removeChild (const int childIndex, UndoManager* co
void ValueTree::SharedObject::removeAllChildren (UndoManager* const undoManager)
{
while (children.size() > 0)
removeChild (children.size() - 1, 0);
removeChild (children.size() - 1, undoManager);
}
ValueTree::ValueTree (const String& type_)
@ -16672,14 +16691,14 @@ public:
tree.setProperty (property, newValue, undoManager);
}
void valueTreePropertyChanged (ValueTree& tree, const var::identifier& changedProperty)
void valueTreePropertyChanged (ValueTree& treeWhosePropertyHasChanged, const var::identifier& changedProperty)
{
if (property == changedProperty)
if (tree == treeWhosePropertyHasChanged && property == changedProperty)
sendChangeMessage (false);
}
void valueTreeChildrenChanged (ValueTree& tree) {}
void valueTreeParentChanged (ValueTree& tree) {}
void valueTreeChildrenChanged (ValueTree&) {}
void valueTreeParentChanged (ValueTree&) {}
private:
ValueTree tree;
@ -36355,7 +36374,13 @@ private:
private:
AudioProcessor* const owner;
const int index;
ParamSlider (const ParamSlider&);
const ParamSlider& operator= (const ParamSlider&);
};
ProcessorParameterPropertyComp (const ProcessorParameterPropertyComp&);
const ProcessorParameterPropertyComp& operator= (const ProcessorParameterPropertyComp&);
};
GenericAudioProcessorEditor::GenericAudioProcessorEditor (AudioProcessor* const owner_)
@ -44856,7 +44881,7 @@ public:
else if (lineNum < document.getNumLines())
{
const CodeDocument::Position pos (&document, lineNum, 0);
createTokens (document, pos.getPosition(), pos.getLineText(),
createTokens (pos.getPosition(), pos.getLineText(),
source, analyser, newTokens);
}
@ -44961,7 +44986,7 @@ private:
OwnedArray <SyntaxToken> tokens;
int highlightColumnStart, highlightColumnEnd;
static void createTokens (CodeDocument& document, int startPosition, const String& lineText,
static void createTokens (int startPosition, const String& lineText,
CodeDocument::Iterator& source,
CodeTokeniser* analyser,
OwnedArray <SyntaxToken>& newTokens)
@ -45741,7 +45766,7 @@ void CodeEditorComponent::mouseDrag (const MouseEvent& e)
moveCaretTo (getPositionAt (e.x, e.y), true);
}
void CodeEditorComponent::mouseUp (const MouseEvent& e)
void CodeEditorComponent::mouseUp (const MouseEvent&)
{
newTransaction();
beginDragAutoRepeat (0);
@ -47289,11 +47314,11 @@ void Label::showEditor()
}
}
void Label::editorShown (TextEditor* editorComponent)
void Label::editorShown (TextEditor* /*editorComponent*/)
{
}
void Label::editorAboutToBeHidden (TextEditor* editorComponent)
void Label::editorAboutToBeHidden (TextEditor* /*editorComponent*/)
{
}
@ -48488,7 +48513,7 @@ const String ListBoxModel::getDragSourceDescription (const SparseSet<int>&)
return String::empty;
}
const String ListBoxModel::getTooltipForRow (int row)
const String ListBoxModel::getTooltipForRow (int)
{
return String::empty;
}
@ -56122,7 +56147,7 @@ void TreeView::handleDrop (const StringArray& files, const String& sourceDescrip
}
}
bool TreeView::isInterestedInFileDrag (const StringArray& files)
bool TreeView::isInterestedInFileDrag (const StringArray&)
{
return true;
}
@ -56137,7 +56162,7 @@ void TreeView::fileDragMove (const StringArray& files, int x, int y)
handleDrag (files, String::empty, 0, x, y);
}
void TreeView::fileDragExit (const StringArray& files)
void TreeView::fileDragExit (const StringArray&)
{
hideDragHighlight();
}
@ -56147,7 +56172,7 @@ void TreeView::filesDropped (const StringArray& files, int x, int y)
handleDrop (files, String::empty, 0, x, y);
}
bool TreeView::isInterestedInDragSource (const String& sourceDescription, Component* sourceComponent)
bool TreeView::isInterestedInDragSource (const String& /*sourceDescription*/, Component* /*sourceComponent*/)
{
return true;
}
@ -56162,7 +56187,7 @@ void TreeView::itemDragMove (const String& sourceDescription, Component* sourceC
handleDrag (StringArray(), sourceDescription, sourceComponent, x, y);
}
void TreeView::itemDragExit (const String& sourceDescription, Component* sourceComponent)
void TreeView::itemDragExit (const String& /*sourceDescription*/, Component* /*sourceComponent*/)
{
hideDragHighlight();
}
@ -56401,21 +56426,21 @@ const String TreeViewItem::getDragSourceDescription()
return String::empty;
}
bool TreeViewItem::isInterestedInFileDrag (const StringArray& files)
bool TreeViewItem::isInterestedInFileDrag (const StringArray&)
{
return false;
}
void TreeViewItem::filesDropped (const StringArray& files, int insertIndex)
void TreeViewItem::filesDropped (const StringArray& /*files*/, int /*insertIndex*/)
{
}
bool TreeViewItem::isInterestedInDragSource (const String& sourceDescription, Component* sourceComponent)
bool TreeViewItem::isInterestedInDragSource (const String& /*sourceDescription*/, Component* /*sourceComponent*/)
{
return false;
}
void TreeViewItem::itemDropped (const String& sourceDescription, Component* sourceComponent, int insertIndex)
void TreeViewItem::itemDropped (const String& /*sourceDescription*/, Component* /*sourceComponent*/, int /*insertIndex*/)
{
}
@ -59376,7 +59401,7 @@ public:
{
}
void paintButton (Graphics& g, bool isOver, bool isDown)
void paintButton (Graphics& g, bool /*isOver*/, bool /*isDown*/)
{
getLookAndFeel().drawKeymapChangeButton (g, getWidth(), getHeight(), *this,
keyNum >= 0 ? getName() : String::empty);
@ -71516,7 +71541,7 @@ SliderPropertyComponent::~SliderPropertyComponent()
deleteAllChildren();
}
void SliderPropertyComponent::setValue (const double newValue)
void SliderPropertyComponent::setValue (const double /*newValue*/)
{
}
@ -78129,7 +78154,7 @@ void TooltipWindow::mouseEnter (const MouseEvent&)
hide();
}
void TooltipWindow::showFor (Component* const c, const String& tip)
void TooltipWindow::showFor (const String& tip)
{
jassert (tip.isNotEmpty());
tipShowing = tip;
@ -78225,7 +78250,7 @@ void TooltipWindow::timerCallback()
}
else if (tipChanged)
{
showFor (newComp, newTip);
showFor (newTip);
}
}
else
@ -78236,7 +78261,7 @@ void TooltipWindow::timerCallback()
&& newTip != tipShowing
&& now > lastCompChangeTime + millisecondsBeforeTipAppears)
{
showFor (newComp, newTip);
showFor (newTip);
}
}
}
@ -81207,7 +81232,7 @@ void LowLevelGraphicsPostScriptRenderer::clipToPath (const Path& path, const Aff
out << "clip\n";
}
void LowLevelGraphicsPostScriptRenderer::clipToImageAlpha (const Image& sourceImage, const Rectangle& srcClip, const AffineTransform& transform)
void LowLevelGraphicsPostScriptRenderer::clipToImageAlpha (const Image& /*sourceImage*/, const Rectangle& /*srcClip*/, const AffineTransform& /*transform*/)
{
needToClip = true;
jassertfalse // xxx
@ -81388,11 +81413,11 @@ void LowLevelGraphicsPostScriptRenderer::setFill (const FillType& fillType)
stateStack.getLast()->fillType = fillType;
}
void LowLevelGraphicsPostScriptRenderer::setOpacity (float opacity)
void LowLevelGraphicsPostScriptRenderer::setOpacity (float /*opacity*/)
{
}
void LowLevelGraphicsPostScriptRenderer::setInterpolationQuality (Graphics::ResamplingQuality quality)
void LowLevelGraphicsPostScriptRenderer::setInterpolationQuality (Graphics::ResamplingQuality /*quality*/)
{
}
@ -81516,7 +81541,7 @@ void LowLevelGraphicsPostScriptRenderer::writeImage (const Image& im,
}
void LowLevelGraphicsPostScriptRenderer::drawImage (const Image& sourceImage, const Rectangle& srcClip,
const AffineTransform& transform, const bool fillEntireClipAsTiles)
const AffineTransform& transform, const bool /*fillEntireClipAsTiles*/)
{
const int w = jmin (sourceImage.getWidth(), srcClip.getRight());
const int h = jmin (sourceImage.getHeight(), srcClip.getBottom());
@ -87265,7 +87290,7 @@ CustomTypefaceGlyphInfo* CustomTypeface::findGlyphSubstituting (const juce_wchar
return glyph;
}
bool CustomTypeface::loadGlyphIfPossible (const juce_wchar characterNeeded)
bool CustomTypeface::loadGlyphIfPossible (const juce_wchar /*characterNeeded*/)
{
return false;
}
@ -218040,7 +218065,7 @@ void FileChooser::showPlatformDialog (OwnedArray<File>& results,
const File& currentFileOrDirectory,
const String& filter,
bool selectsDirectory,
bool selectsFiles,
bool /*selectsFiles*/,
bool isSaveDialogue,
bool warnAboutOverwritingExistingFiles,
bool selectMultipleFiles,
@ -240428,12 +240453,24 @@ public:
void drawVerticalLine (const int x, double top, double bottom)
{
#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_5
CGContextFillRect (context, CGRectMake (x, flipHeight - (float) bottom, 1.0f, (float) (bottom - top)));
#else
// On Leopard, unless both co-ordinates are non-integer, it disables anti-aliasing, so nudge
// the x co-ord slightly to trick it..
CGContextFillRect (context, CGRectMake (x + 1.0f / 256.0f, flipHeight - (float) bottom, 1.0f + 1.0f / 256.0f, (float) (bottom - top)));
#endif
}
void drawHorizontalLine (const int y, double left, double right)
{
#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_5
CGContextFillRect (context, CGRectMake ((float) left, flipHeight - (y + 1.0f), (float) (right - left), 1.0f));
#else
// On Leopard, unless both co-ordinates are non-integer, it disables anti-aliasing, so nudge
// the x co-ord slightly to trick it..
CGContextFillRect (context, CGRectMake ((float) left, flipHeight - (y + (1.0f + 1.0f / 256.0f)), (float) (right - left), 1.0f + 1.0f / 256.0f));
#endif
}
void setFont (const Font& newFont)
@ -244840,12 +244877,24 @@ public:
void drawVerticalLine (const int x, double top, double bottom)
{
#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_5
CGContextFillRect (context, CGRectMake (x, flipHeight - (float) bottom, 1.0f, (float) (bottom - top)));
#else
// On Leopard, unless both co-ordinates are non-integer, it disables anti-aliasing, so nudge
// the x co-ord slightly to trick it..
CGContextFillRect (context, CGRectMake (x + 1.0f / 256.0f, flipHeight - (float) bottom, 1.0f + 1.0f / 256.0f, (float) (bottom - top)));
#endif
}
void drawHorizontalLine (const int y, double left, double right)
{
#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_5
CGContextFillRect (context, CGRectMake ((float) left, flipHeight - (y + 1.0f), (float) (right - left), 1.0f));
#else
// On Leopard, unless both co-ordinates are non-integer, it disables anti-aliasing, so nudge
// the x co-ord slightly to trick it..
CGContextFillRect (context, CGRectMake ((float) left, flipHeight - (y + (1.0f + 1.0f / 256.0f)), (float) (right - left), 1.0f + 1.0f / 256.0f));
#endif
}
void setFont (const Font& newFont)

34
juce_amalgamated.h
View file

@ -8,6 +8,8 @@
#ifndef __JUCE_JUCEHEADER__
#define __JUCE_JUCEHEADER__
#define JUCE_PUBLIC_INCLUDES 1
// (this includes things that need defining outside of the JUCE namespace)
/********* Start of inlined file: juce_StandardHeader.h *********/
@ -495,6 +497,10 @@
#if JUCE_MSVC
#include <malloc.h>
#pragma warning (pop)
#if ! JUCE_PUBLIC_INCLUDES
#pragma warning (4: 4511 4512 4100) // (enable some warnings that are turned off in VC8)
#endif
#endif
// DLL building settings on Win32
@ -1440,8 +1446,6 @@ BEGIN_JUCE_NAMESPACE
#pragma align=natural
#endif
#define JUCE_PUBLIC_INCLUDES
// this is where all the class header files get brought in..
/********* Start of inlined file: juce_core_includes.h *********/
@ -6517,11 +6521,12 @@ public:
public:
virtual ~Listener() {}
virtual void valueTreePropertyChanged (ValueTree& tree, const var::identifier& property) = 0;
virtual void valueTreePropertyChanged (ValueTree& treeWhosePropertyHasChanged,
const var::identifier& property) = 0;
virtual void valueTreeChildrenChanged (ValueTree& tree) = 0;
virtual void valueTreeChildrenChanged (ValueTree& treeWhoseChildHasChanged) = 0;
virtual void valueTreeParentChanged (ValueTree& tree) = 0;
virtual void valueTreeParentChanged (ValueTree& treeWhoseParentHasChanged) = 0;
};
void addListener (Listener* listener);
@ -6556,7 +6561,9 @@ private:
SharedObject* parent;
void sendPropertyChangeMessage (const var::identifier& property);
void sendPropertyChangeMessage (ValueTree& tree, const var::identifier& property);
void sendChildChangeMessage();
void sendChildChangeMessage (ValueTree& tree);
void sendParentChangeMessage();
const var getProperty (const var::identifier& name) const;
void setProperty (const var::identifier& name, const var& newValue, UndoManager* const undoManager);
@ -6584,9 +6591,9 @@ private:
ReferenceCountedObjectPtr <SharedObject> object;
SortedSet <Listener*> listeners;
void deliverPropertyChangeMessage (const var::identifier& property);
void deliverChildChangeMessage();
void deliverParentChangeMessage();
void deliverPropertyChangeMessage (ValueTree& tree, const var::identifier& property);
void deliverChildChangeMessage (ValueTree& tree);
void deliverParentChangeMessage (ValueTree& tree);
ValueTree (SharedObject* const object_);
};
@ -15329,7 +15336,7 @@ private:
void timerCallback();
static const String getTipFor (Component* const c);
void showFor (Component* const c, const String& tip);
void showFor (const String& tip);
void hide();
TooltipWindow (const TooltipWindow&);
@ -18585,6 +18592,9 @@ public:
private:
PropertyPanel* panel;
GenericAudioProcessorEditor (const GenericAudioProcessorEditor&);
const GenericAudioProcessorEditor& operator= (const GenericAudioProcessorEditor&);
};
#endif // __JUCE_GENERICAUDIOPROCESSOREDITOR_JUCEHEADER__
@ -25100,6 +25110,9 @@ private:
void hoverTimerCallback();
void checkJustHoveredCallback();
MouseHoverDetector (const MouseHoverDetector&);
const MouseHoverDetector& operator= (const MouseHoverDetector&);
};
#endif // __JUCE_MOUSEHOVERDETECTOR_JUCEHEADER__
@ -25185,6 +25198,9 @@ public:
private:
TextButton* button;
ButtonPropertyComponent (const ButtonPropertyComponent&);
const ButtonPropertyComponent& operator= (const ButtonPropertyComponent&);
};
#endif // __JUCE_BUTTONPROPERTYCOMPONENT_JUCEHEADER__

6
src/audio/processors/juce_GenericAudioProcessorEditor.cpp
View file

@ -119,7 +119,13 @@ private:
private:
AudioProcessor* const owner;
const int index;
ParamSlider (const ParamSlider&);
const ParamSlider& operator= (const ParamSlider&);
};
ProcessorParameterPropertyComp (const ProcessorParameterPropertyComp&);
const ProcessorParameterPropertyComp& operator= (const ProcessorParameterPropertyComp&);
};

3
src/audio/processors/juce_GenericAudioProcessorEditor.h
View file

@ -57,6 +57,9 @@ public:
private:
PropertyPanel* panel;
GenericAudioProcessorEditor (const GenericAudioProcessorEditor&);
const GenericAudioProcessorEditor& operator= (const GenericAudioProcessorEditor&);
};

6
src/containers/juce_ValueTree.cpp
View file

@ -461,7 +461,7 @@ void ValueTree::SharedObject::removeChild (const int childIndex, UndoManager* co
void ValueTree::SharedObject::removeAllChildren (UndoManager* const undoManager)
{
while (children.size() > 0)
removeChild (children.size() - 1, 0);
removeChild (children.size() - 1, undoManager);
}
@ -616,8 +616,8 @@ public:
sendChangeMessage (false);
}
void valueTreeChildrenChanged (ValueTree& tree) {}
void valueTreeParentChanged (ValueTree& tree) {}
void valueTreeChildrenChanged (ValueTree&) {}
void valueTreeParentChanged (ValueTree&) {}
private:
ValueTree tree;

4
src/core/juce_StandardHeader.h
View file

@ -97,6 +97,10 @@
#if JUCE_MSVC
#include <malloc.h>
#pragma warning (pop)
#if ! JUCE_PUBLIC_INCLUDES
#pragma warning (4: 4511 4512 4100) // (enable some warnings that are turned off in VC8)
#endif
#endif
//==============================================================================

6
src/gui/components/code_editor/juce_CodeEditorComponent.cpp
View file

@ -95,7 +95,7 @@ public:
else if (lineNum < document.getNumLines())
{
const CodeDocument::Position pos (&document, lineNum, 0);
createTokens (document, pos.getPosition(), pos.getLineText(),
createTokens (pos.getPosition(), pos.getLineText(),
source, analyser, newTokens);
}
@ -200,7 +200,7 @@ private:
OwnedArray <SyntaxToken> tokens;
int highlightColumnStart, highlightColumnEnd;
static void createTokens (CodeDocument& document, int startPosition, const String& lineText,
static void createTokens (int startPosition, const String& lineText,
CodeDocument::Iterator& source,
CodeTokeniser* analyser,
OwnedArray <SyntaxToken>& newTokens)
@ -994,7 +994,7 @@ void CodeEditorComponent::mouseDrag (const MouseEvent& e)
moveCaretTo (getPositionAt (e.x, e.y), true);
}
void CodeEditorComponent::mouseUp (const MouseEvent& e)
void CodeEditorComponent::mouseUp (const MouseEvent&)
{
newTransaction();
beginDragAutoRepeat (0);

4
src/gui/components/controls/juce_Label.cpp
View file

@ -220,11 +220,11 @@ void Label::showEditor()
}
}
void Label::editorShown (TextEditor* editorComponent)
void Label::editorShown (TextEditor* /*editorComponent*/)
{
}
void Label::editorAboutToBeHidden (TextEditor* editorComponent)
void Label::editorAboutToBeHidden (TextEditor* /*editorComponent*/)
{
}

2
src/gui/components/controls/juce_ListBox.cpp
View file

@ -998,7 +998,7 @@ const String ListBoxModel::getDragSourceDescription (const SparseSet<int>&)
return String::empty;
}
const String ListBoxModel::getTooltipForRow (int row)
const String ListBoxModel::getTooltipForRow (int)
{
return String::empty;
}

16
src/gui/components/controls/juce_TreeView.cpp
View file

@ -991,7 +991,7 @@ void TreeView::handleDrop (const StringArray& files, const String& sourceDescrip
}
//==============================================================================
bool TreeView::isInterestedInFileDrag (const StringArray& files)
bool TreeView::isInterestedInFileDrag (const StringArray&)
{
return true;
}
@ -1006,7 +1006,7 @@ void TreeView::fileDragMove (const StringArray& files, int x, int y)
handleDrag (files, String::empty, 0, x, y);
}
void TreeView::fileDragExit (const StringArray& files)
void TreeView::fileDragExit (const StringArray&)
{
hideDragHighlight();
}
@ -1016,7 +1016,7 @@ void TreeView::filesDropped (const StringArray& files, int x, int y)
handleDrop (files, String::empty, 0, x, y);
}
bool TreeView::isInterestedInDragSource (const String& sourceDescription, Component* sourceComponent)
bool TreeView::isInterestedInDragSource (const String& /*sourceDescription*/, Component* /*sourceComponent*/)
{
return true;
}
@ -1031,7 +1031,7 @@ void TreeView::itemDragMove (const String& sourceDescription, Component* sourceC
handleDrag (StringArray(), sourceDescription, sourceComponent, x, y);
}
void TreeView::itemDragExit (const String& sourceDescription, Component* sourceComponent)
void TreeView::itemDragExit (const String& /*sourceDescription*/, Component* /*sourceComponent*/)
{
hideDragHighlight();
}
@ -1272,21 +1272,21 @@ const String TreeViewItem::getDragSourceDescription()
return String::empty;
}
bool TreeViewItem::isInterestedInFileDrag (const StringArray& files)
bool TreeViewItem::isInterestedInFileDrag (const StringArray&)
{
return false;
}
void TreeViewItem::filesDropped (const StringArray& files, int insertIndex)
void TreeViewItem::filesDropped (const StringArray& /*files*/, int /*insertIndex*/)
{
}
bool TreeViewItem::isInterestedInDragSource (const String& sourceDescription, Component* sourceComponent)
bool TreeViewItem::isInterestedInDragSource (const String& /*sourceDescription*/, Component* /*sourceComponent*/)
{
return false;
}
void TreeViewItem::itemDropped (const String& sourceDescription, Component* sourceComponent, int insertIndex)
void TreeViewItem::itemDropped (const String& /*sourceDescription*/, Component* /*sourceComponent*/, int /*insertIndex*/)
{
}

2
src/gui/components/keyboard/juce_KeyMappingEditorComponent.cpp
View file

@ -66,7 +66,7 @@ public:
{
}
void paintButton (Graphics& g, bool isOver, bool isDown)
void paintButton (Graphics& g, bool /*isOver*/, bool /*isDown*/)
{
getLookAndFeel().drawKeymapChangeButton (g, getWidth(), getHeight(), *this,
keyNum >= 0 ? getName() : String::empty);

3
src/gui/components/mouse/juce_MouseHoverDetector.h
View file

@ -123,6 +123,9 @@ private:
void hoverTimerCallback();
void checkJustHoveredCallback();
MouseHoverDetector (const MouseHoverDetector&);
const MouseHoverDetector& operator= (const MouseHoverDetector&);
};
#endif // __JUCE_MOUSEHOVERDETECTOR_JUCEHEADER__

3
src/gui/components/properties/juce_ButtonPropertyComponent.h
View file

@ -76,6 +76,9 @@ public:
private:
TextButton* button;
ButtonPropertyComponent (const ButtonPropertyComponent&);
const ButtonPropertyComponent& operator= (const ButtonPropertyComponent&);
};

2
src/gui/components/properties/juce_SliderPropertyComponent.cpp
View file

@ -69,7 +69,7 @@ SliderPropertyComponent::~SliderPropertyComponent()
deleteAllChildren();
}
void SliderPropertyComponent::setValue (const double newValue)
void SliderPropertyComponent::setValue (const double /*newValue*/)
{
}

6
src/gui/components/windows/juce_TooltipWindow.cpp
View file

@ -75,7 +75,7 @@ void TooltipWindow::mouseEnter (const MouseEvent&)
hide();
}
void TooltipWindow::showFor (Component* const c, const String& tip)
void TooltipWindow::showFor (const String& tip)
{
jassert (tip.isNotEmpty());
tipShowing = tip;
@ -171,7 +171,7 @@ void TooltipWindow::timerCallback()
}
else if (tipChanged)
{
showFor (newComp, newTip);
showFor (newTip);
}
}
else
@ -182,7 +182,7 @@ void TooltipWindow::timerCallback()
&& newTip != tipShowing
&& now > lastCompChangeTime + millisecondsBeforeTipAppears)
{
showFor (newComp, newTip);
showFor (newTip);
}
}
}

2
src/gui/components/windows/juce_TooltipWindow.h
View file

@ -111,7 +111,7 @@ private:
void timerCallback();
static const String getTipFor (Component* const c);
void showFor (Component* const c, const String& tip);
void showFor (const String& tip);
void hide();
TooltipWindow (const TooltipWindow&);

8
src/gui/graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.cpp
View file

@ -140,7 +140,7 @@ void LowLevelGraphicsPostScriptRenderer::clipToPath (const Path& path, const Aff
out << "clip\n";
}
void LowLevelGraphicsPostScriptRenderer::clipToImageAlpha (const Image& sourceImage, const Rectangle& srcClip, const AffineTransform& transform)
void LowLevelGraphicsPostScriptRenderer::clipToImageAlpha (const Image& /*sourceImage*/, const Rectangle& /*srcClip*/, const AffineTransform& /*transform*/)
{
needToClip = true;
jassertfalse // xxx
@ -324,11 +324,11 @@ void LowLevelGraphicsPostScriptRenderer::setFill (const FillType& fillType)
stateStack.getLast()->fillType = fillType;
}
void LowLevelGraphicsPostScriptRenderer::setOpacity (float opacity)
void LowLevelGraphicsPostScriptRenderer::setOpacity (float /*opacity*/)
{
}
void LowLevelGraphicsPostScriptRenderer::setInterpolationQuality (Graphics::ResamplingQuality quality)
void LowLevelGraphicsPostScriptRenderer::setInterpolationQuality (Graphics::ResamplingQuality /*quality*/)
{
}
@ -455,7 +455,7 @@ void LowLevelGraphicsPostScriptRenderer::writeImage (const Image& im,
}
void LowLevelGraphicsPostScriptRenderer::drawImage (const Image& sourceImage, const Rectangle& srcClip,
const AffineTransform& transform, const bool fillEntireClipAsTiles)
const AffineTransform& transform, const bool /*fillEntireClipAsTiles*/)
{
const int w = jmin (sourceImage.getWidth(), srcClip.getRight());
const int h = jmin (sourceImage.getHeight(), srcClip.getBottom());

2
src/gui/graphics/fonts/juce_Typeface.cpp
View file

@ -231,7 +231,7 @@ CustomTypefaceGlyphInfo* CustomTypeface::findGlyphSubstituting (const juce_wchar
return glyph;
}
bool CustomTypeface::loadGlyphIfPossible (const juce_wchar characterNeeded)
bool CustomTypeface::loadGlyphIfPossible (const juce_wchar /*characterNeeded*/)
{
return false;
}

3
src/io/files/juce_TemporaryFile.cpp
View file

@ -59,8 +59,7 @@ void TemporaryFile::createTempFile (const File& parentDirectory, String name,
if ((optionFlags & useHiddenFile) != 0)
name = T(".") + name;
temporaryFile = parentDirectory.getNonexistentChildFile (name, targetFile.getFileExtension(),
(optionFlags & putNumbersInBrackets) != 0);
temporaryFile = parentDirectory.getNonexistentChildFile (name, suffix, (optionFlags & putNumbersInBrackets) != 0);
}
TemporaryFile::~TemporaryFile()

12
src/native/mac/juce_mac_CoreGraphicsContext.mm
View file

@ -455,12 +455,24 @@ public:
void drawVerticalLine (const int x, double top, double bottom)
{
#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_5
CGContextFillRect (context, CGRectMake (x, flipHeight - (float) bottom, 1.0f, (float) (bottom - top)));
#else
// On Leopard, unless both co-ordinates are non-integer, it disables anti-aliasing, so nudge
// the x co-ord slightly to trick it..
CGContextFillRect (context, CGRectMake (x + 1.0f / 256.0f, flipHeight - (float) bottom, 1.0f + 1.0f / 256.0f, (float) (bottom - top)));
#endif
}
void drawHorizontalLine (const int y, double left, double right)
{
#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_5
CGContextFillRect (context, CGRectMake ((float) left, flipHeight - (y + 1.0f), (float) (right - left), 1.0f));
#else
// On Leopard, unless both co-ordinates are non-integer, it disables anti-aliasing, so nudge
// the x co-ord slightly to trick it..
CGContextFillRect (context, CGRectMake ((float) left, flipHeight - (y + (1.0f + 1.0f / 256.0f)), (float) (right - left), 1.0f + 1.0f / 256.0f));
#endif
}
void setFont (const Font& newFont)

2
src/native/windows/juce_win32_FileChooser.cpp
View file

@ -148,7 +148,7 @@ void FileChooser::showPlatformDialog (OwnedArray<File>& results,
const File& currentFileOrDirectory,
const String& filter,
bool selectsDirectory,
bool selectsFiles,
bool /*selectsFiles*/,
bool isSaveDialogue,
bool warnAboutOverwritingExistingFiles,
bool selectMultipleFiles,