From a52f7f8410ff65b6088f8cd756af1d0ef9468429 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Mon, 8 Aug 2016 09:50:55 -0400 Subject: [PATCH] new -> NEW in comments, so text search for naked new excludes them --- src/AudioIO.cpp | 2 +- src/AudioIO.h | 2 +- src/NoteTrack.cpp | 4 ++-- src/Project.cpp | 2 +- src/Project.h | 2 +- src/TimerRecordDialog.cpp | 2 +- src/Track.h | 4 ++-- src/TrackPanel.cpp | 4 ++-- src/TrackPanelCell.h | 2 +- src/UndoManager.cpp | 2 +- src/effects/Equalization.cpp | 6 +++--- src/effects/Equalization.h | 2 +- src/toolbars/ToolDock.cpp | 6 +++--- src/widgets/Ruler.cpp | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp index d1d46329d..5194eb5f8 100644 --- a/src/AudioIO.cpp +++ b/src/AudioIO.cpp @@ -522,7 +522,7 @@ struct AudioIO::ScrubQueue mDebt += deficit; auto toDiscard = mDebt - mMaxDebt; while (toDiscard > 0 && mMiddleIdx != mLeadingIdx) { - // Cancel some debt (discard some new work) + // Cancel some debt (discard some NEW work) auto &entry = mEntries[mMiddleIdx]; auto &dur = entry.mDuration; if (toDiscard >= dur) { diff --git a/src/AudioIO.h b/src/AudioIO.h index 91a166557..007f47f83 100644 --- a/src/AudioIO.h +++ b/src/AudioIO.h @@ -164,7 +164,7 @@ class AUDACITY_DLL_API AudioIO final { #ifdef EXPERIMENTAL_SCRUBBING_SUPPORT bool IsScrubbing() { return IsBusy() && mScrubQueue != 0; } - /** \brief enqueue a NEW scrub play interval, using the last end as the new start, + /** \brief enqueue a NEW scrub play interval, using the last end as the NEW start, * to be played over the same duration, as between this and the last * enqueuing (or the starting of the stream). Except, we do not exceed maximum * scrub speed, so may need to adjust either the start or the end. diff --git a/src/NoteTrack.cpp b/src/NoteTrack.cpp index 4082a4b85..74ba20476 100644 --- a/src/NoteTrack.cpp +++ b/src/NoteTrack.cpp @@ -547,7 +547,7 @@ bool NoteTrack::Shift(double t) // t is always seconds int m = ROUND(t * tempo / beats_per_measure); // need at least 1 measure, so if we rounded down to zero, fix it if (m == 0) m = 1; - // compute NEW tempo so that m measures at new tempo take t seconds + // compute NEW tempo so that m measures at NEW tempo take t seconds tempo = beats_per_measure * m / t; // in beats per second mSeq->insert_silence(0.0, beats_per_measure * m); mSeq->set_tempo(tempo * 60.0 /* bpm */, 0.0, beats_per_measure * m); @@ -704,7 +704,7 @@ Alg_seq *NoteTrack::MakeExportableSeq(std::unique_ptr &cleanup) // beat double bar = tsp->beat + beats_per_measure * (int(measures) + 1); double bar_offset = bar - beat; - // insert NEW time signature at bar_offset in new sequence + // insert NEW time signature at bar_offset in NEW sequence // It will have the same time signature, but the position will // force a barline to match the barlines in mSeq seq->set_time_sig(bar_offset, tsp->num, tsp->den); diff --git a/src/Project.cpp b/src/Project.cpp index d092c75d3..793e0d8c8 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -5344,7 +5344,7 @@ bool AudacityProject::IsProjectSaved() { } bool AudacityProject::SaveFromTimerRecording(wxFileName fnFile) { - // MY: Will save the project to a new location a-la Save As + // MY: Will save the project to a NEW location a-la Save As // and then tidy up after itself. wxString sNewFileName = fnFile.GetFullPath(); diff --git a/src/Project.h b/src/Project.h index 5b4beb869..8f810295c 100644 --- a/src/Project.h +++ b/src/Project.h @@ -551,7 +551,7 @@ public: // Tags (artist name, song properties, MP3 ID3 info, etc.) // The structure may be shared with undo history entries - // To keep undo working correctly, always replace this with a new duplicate + // To keep undo working correctly, always replace this with a NEW duplicate // BEFORE doing any editing of it! std::shared_ptr mTags; diff --git a/src/TimerRecordDialog.cpp b/src/TimerRecordDialog.cpp index 8d8d585d6..ff0579959 100644 --- a/src/TimerRecordDialog.cpp +++ b/src/TimerRecordDialog.cpp @@ -85,7 +85,7 @@ static double wxDateTime_to_AudacityTime(wxDateTime& dateTime) // By default the msaa state of wxDatePickerCtrl is always normal (0x0), and this causes nvda not // to read the control when the user tabs to it. This class // modifies the state to be focusable + focused (when it's the focus). -// Note that even with this class NVDA still doesn't read the new selected part of the control when left/right +// Note that even with this class NVDA still doesn't read the NEW selected part of the control when left/right // arrow keys are used. #if wxUSE_ACCESSIBILITY diff --git a/src/Track.h b/src/Track.h index e5f0e8084..5e1ed41fd 100644 --- a/src/Track.h +++ b/src/Track.h @@ -212,10 +212,10 @@ class AUDACITY_DLL_API Track /* not final */ : public XMLTagHandler // separate from the Track. DirManager* GetDirManager() const { return mDirManager; } - // Create a new track and modify this track (or return null for failure) + // Create a NEW track and modify this track (or return null for failure) virtual Holder Cut(double WXUNUSED(t0), double WXUNUSED(t1)) { return{}; } - // Create a new track and don't modify this track (or return null for failure) + // Create a NEW track and don't modify this track (or return null for failure) virtual Holder Copy(double WXUNUSED(t0), double WXUNUSED(t1)) const { return{}; } // Return true for success diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index e04c01ae6..14f62dc80 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -146,7 +146,7 @@ is time to refresh some aspect of the screen. Stereo channel grouping. The precise names of the classes are subject to revision. - Have deliberately not created NEW files for the new classes + Have deliberately not created NEW files for the NEW classes such as AdornedRulerPanel and TrackInfo - yet. *//*****************************************************************/ @@ -1091,7 +1091,7 @@ void TrackPanel::OnPaint(wxPaintEvent & /* event */) // Drawing now goes directly to the client area. // DrawOverlays() may need to draw outside the clipped region. - // (Used to make a new, separate wxClientDC, but that risks flashing + // (Used to make a NEW, separate wxClientDC, but that risks flashing // problems on Mac.) dc.DestroyClippingRegion(); DrawOverlays(true, &dc); diff --git a/src/TrackPanelCell.h b/src/TrackPanelCell.h index ca5adcde1..6daaa593b 100644 --- a/src/TrackPanelCell.h +++ b/src/TrackPanelCell.h @@ -11,7 +11,7 @@ Paul Licameli #ifndef __AUDACITY_TRACK_PANEL_CELL__ #define __AUDACITY_TRACK_PANEL_CELL__ -// Future: TrackPanelCell will be generalized to a new abstract base class of Track +// Future: TrackPanelCell will be generalized to a NEW abstract base class of Track // and of other things. class Track; using TrackPanelCell = Track; diff --git a/src/UndoManager.cpp b/src/UndoManager.cpp index 92f81aa7e..19ef54e70 100644 --- a/src/UndoManager.cpp +++ b/src/UndoManager.cpp @@ -265,7 +265,7 @@ void UndoManager::PushState(const TrackList * l, } // Assume tags was duplicted before any changes. - // Just save a new shared_ptr to it. + // Just save a NEW shared_ptr to it. stack.push_back( make_movable (std::move(tracksCopy), diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index 3267eff88..1cca30bf7 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -143,7 +143,7 @@ enum kInterpolations // Increment whenever EQCurves.xml is updated #define EQCURVES_VERSION 1 #define EQCURVES_REVISION 0 -#define UPDATE_ALL 0 // 0 = merge new presets only, 1 = Update all factory presets. +#define UPDATE_ALL 0 // 0 = merge NEW presets only, 1 = Update all factory presets. static const wxString kInterpStrings[kNumInterpolations] = { @@ -1370,7 +1370,7 @@ void EffectEqualization::LoadCurves(const wxString &fileName, bool append) bool needUpdate = (eqCurvesCurrentVersion != eqCurvesInstalledVersion); - // UpdateDefaultCurves allows us to import new factory presets only, + // UpdateDefaultCurves allows us to import NEW factory presets only, // or update all factory preset curves. if (needUpdate) UpdateDefaultCurves( UPDATE_ALL != 0 ); @@ -1506,7 +1506,7 @@ void EffectEqualization::UpdateDefaultCurves(bool updateAll /* false */) } } else { - // Import new factory defaults but retain all user modified curves. + // Import NEW factory defaults but retain all user modified curves. for (int defCurveCount = 0; defCurveCount < numDefaultCurves; defCurveCount++) { bool isUserCurve = false; // Add if the curve is in the user's set (preserve user's copy) diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h index 896e904b8..0b23b9255 100644 --- a/src/effects/Equalization.h +++ b/src/effects/Equalization.h @@ -143,7 +143,7 @@ private: void LoadCurves(const wxString &fileName = wxEmptyString, bool append = false); void SaveCurves(const wxString &fileName = wxEmptyString); - // Merge new curves only or update all factory presets. + // Merge NEW curves only or update all factory presets. void UpdateDefaultCurves( bool updateAll = false); void Select(int sel); void setCurve(int currentCurve); diff --git a/src/toolbars/ToolDock.cpp b/src/toolbars/ToolDock.cpp index af4cdcf33..3d2c20ae2 100644 --- a/src/toolbars/ToolDock.cpp +++ b/src/toolbars/ToolDock.cpp @@ -139,7 +139,7 @@ void ToolBarConfiguration::Insert(ToolBar *bar, Position position) // Adopt the child only if the insertion point specifies that if (adopt && position.adopt) { - // Make new node with one child + // Make NEW node with one child Tree tree; tree.pBar = bar; tree.children.push_back(Tree{}); @@ -580,7 +580,7 @@ void ToolDock::VisitLayout(LayoutVisitor &visitor, } if (visitor.ShouldVisitSpaces()) { - // Visit the fringe where new leaves of the tree could go + // Visit the fringe where NEW leaves of the tree could go // Find the items with leftover spaces const auto end = std::remove_if(layout, layout + ToolBarCount, @@ -622,7 +622,7 @@ void ToolDock::VisitLayout(LayoutVisitor &visitor, } // Report the final bounding box of all the bars, and a position where - // you can insert a new bar at bottom left. + // you can insert a NEW bar at bottom left. ToolBarConfiguration::Position finalPosition { nullptr, lastRoot }; visitor.FinalRect( wxRect { toolbarGap, toolbarGap, main.width, main.y }, finalPosition diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp index dc4a7bb82..72607960b 100644 --- a/src/widgets/Ruler.cpp +++ b/src/widgets/Ruler.cpp @@ -2223,7 +2223,7 @@ void AdornedRulerPanel::OnPaint(wxPaintEvent & WXUNUSED(evt)) // Stroke extras direct to the client area, // maybe outside of the damaged area - // As with TrackPanel, do not make a new wxClientDC or else Mac flashes badly! + // As with TrackPanel, do not make a NEW wxClientDC or else Mac flashes badly! dc.DestroyClippingRegion(); DrawOverlays(true, &dc); }