From 9612e3d9712aabeaf45e9cbd13f8551714d61e4a Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Thu, 19 Oct 2017 13:08:04 -0400 Subject: [PATCH] indentation, final newlines, spelling, remove unused members --- src/HelpText.cpp | 5 ++-- src/PlatformCompatibility.cpp | 2 +- src/ShuttleGui.cpp | 28 ------------------- src/ShuttleGui.h | 5 ---- src/SseMathFuncs.h | 2 +- src/Theme.h | 2 +- src/effects/ChangeTempo.cpp | 2 +- src/effects/Equalization48x.h | 2 +- src/effects/Phaser.cpp | 2 +- src/effects/vamp/LoadVamp.h | 2 +- src/effects/vamp/VampEffect.cpp | 2 +- src/toolbars/SelectionBar.cpp | 2 +- src/toolbars/ToolBar.cpp | 1 - src/toolbars/ToolBar.h | 1 - .../notetrack/ui/NoteTrackControls.cpp | 2 +- src/tracks/ui/TrackVRulerControls.cpp | 2 +- 16 files changed, 13 insertions(+), 49 deletions(-) diff --git a/src/HelpText.cpp b/src/HelpText.cpp index 2a35027eb..9479b58e7 100644 --- a/src/HelpText.cpp +++ b/src/HelpText.cpp @@ -300,16 +300,15 @@ audio CDs]]."), return WrapText(_("The Manual does not appear to be installed. \ Please [[*URL*|view the Manual online]].

\ To always view the Manual online, change \"Location of Manual\" in \ -Interface Preferences to \"From Internet\".") +Interface Preferences to \"From Internet\".")); #else return WrapText(_("The Manual does not appear to be installed. \ Please [[*URL*|view the Manual online]] or \ [[http://manual.audacityteam.org/man/unzipping_the_manual.html| \ download the Manual]].

\ To always view the Manual online, change \"Location of Manual\" in \ -Interface Preferences to \"From Internet\".") +Interface Preferences to \"From Internet\".")); #endif - ); } return wxT(""); } diff --git a/src/PlatformCompatibility.cpp b/src/PlatformCompatibility.cpp index 913b776a8..067679405 100644 --- a/src/PlatformCompatibility.cpp +++ b/src/PlatformCompatibility.cpp @@ -62,4 +62,4 @@ wxString PlatformCompatibility::ConvertSlashInFileName(const wxString& filePath) #else return filePath; #endif -} \ No newline at end of file +} diff --git a/src/ShuttleGui.cpp b/src/ShuttleGui.cpp index 039367d15..77469fd3e 100644 --- a/src/ShuttleGui.cpp +++ b/src/ShuttleGui.cpp @@ -701,7 +701,6 @@ wxMenu * ShuttleGuiBase::AddMenu( const wxString & Title ) wxStaticBox * ShuttleGuiBase::StartStatic(const wxString &Str, int iProp) { UseUpId(); - mBoxName = Str; if( mShuttleMode != eIsCreating ) return NULL; wxStaticBox * pBox = safenew wxStaticBox(GetParent(), miId, @@ -2063,33 +2062,6 @@ GuiWaveTrack * ShuttleGui::AddGuiWaveTrack( const wxString & WXUNUSED(Name)) #endif } -RulerPanel * ShuttleGui::AddRulerVertical(float low, float hi, const wxString & Units ) -{ - UseUpId(); - if( mShuttleMode != eIsCreating ) - return (RulerPanel*)NULL; -// return wxDynamicCast(wxWindow::FindWindowById( miId, mpDlg), RulerPanel); - RulerPanel * pRulerPanel; - miProp=0; - mpWind = pRulerPanel = safenew RulerPanel( - GetParent(), - miId, - wxDefaultPosition, - wxDefaultSize - ); - Ruler & Ruler = pRulerPanel->ruler; - Ruler.SetOrientation(wxVERTICAL); - Ruler.SetBounds(0, 0, 100, 100); // Ruler can't handle small sizes - Ruler.SetRange(low, hi); - Ruler.SetFormat(Ruler::RealFormat); - Ruler.SetUnits(Units); - Ruler.SetLabelEdges(true); - - mpWind->SetMinSize(wxSize(38,50)); - UpdateSizers(); - return pRulerPanel; -} - AttachableScrollBar * ShuttleGui::AddAttachableScrollBar( long style ) { UseUpId(); diff --git a/src/ShuttleGui.h b/src/ShuttleGui.h index 20d9aa653..9f87efa88 100644 --- a/src/ShuttleGui.h +++ b/src/ShuttleGui.h @@ -264,7 +264,6 @@ public: return mpParent; } ShuttleGuiBase & Prop( int iProp ); - int GetId() {return miIdNext;}; void UseUpId(); wxSizer * GetSizer() {return mpSizer;} @@ -284,7 +283,6 @@ protected: wxWindow * mpLastWind; wxWindow * mpDlg; wxSizer * pSizerStack[ nMaxNestedSizers ]; - wxString mBoxName; std::unique_ptr mpShuttle; /*! Controls source/destination of shuttled data. You can leave this NULL if you are shuttling to variables */ @@ -328,7 +326,6 @@ extern void SetIfCreated( wxTextCtrl *&Var, wxTextCtrl * Val ); extern void SetIfCreated( wxStaticText *&Var, wxStaticText * Val ); class GuiWaveTrack; -class RulerPanel; class AttachableScrollBar; class ViewInfo; #include // to get wxSB_HORIZONTAL @@ -376,12 +373,10 @@ public: // Prop() sets the proportion value, defined as in wxSizer::Add(). ShuttleGui & Prop( int iProp ){ ShuttleGuiBase::Prop(iProp); return *this;}; // Has to be here too, to return a ShuttleGui and not a ShuttleGuiBase. GuiWaveTrack * AddGuiWaveTrack( const wxString & Name); - RulerPanel * AddRulerVertical( float low, float hi, const wxString & Units ); AttachableScrollBar * AddAttachableScrollBar( long style = wxSB_HORIZONTAL ); void AddStandardButtons( long buttons = eOkButton | eCancelButton, wxButton *extra = NULL ); wxSizerItem * AddSpace( int width, int height ); wxSizerItem * AddSpace( int size ) { return AddSpace( size, size ); }; - int GetBorder() { return miBorder; }; void SetSizeHints( int minX = -1, int minY = -1 ); void SetSizeHints( const wxArrayString & items ); diff --git a/src/SseMathFuncs.h b/src/SseMathFuncs.h index d5cb91817..c25c530a7 100644 --- a/src/SseMathFuncs.h +++ b/src/SseMathFuncs.h @@ -772,4 +772,4 @@ void sincos_ps(v4sf x, v4sf *s, v4sf *c) { *c = _mm_xor_ps(xmm2, sign_bit_cos); } -#endif \ No newline at end of file +#endif diff --git a/src/Theme.h b/src/Theme.h index 68d5b3f71..47939fae2 100644 --- a/src/Theme.h +++ b/src/Theme.h @@ -123,7 +123,7 @@ public: void WriteImageDefs( ); void WriteImageMap( ); static bool LoadPreferredTheme(); - bool IsUsingSyestemTextColour(){ return bIsUsingSystemTextColour;}; + bool IsUsingSystemTextColour(){ return bIsUsingSystemTextColour;}; void RecolourBitmap( int iIndex, wxColour From, wxColour To ); void RecolourTheme(); diff --git a/src/effects/ChangeTempo.cpp b/src/effects/ChangeTempo.cpp index b23a01328..d2d4e1772 100644 --- a/src/effects/ChangeTempo.cpp +++ b/src/effects/ChangeTempo.cpp @@ -453,4 +453,4 @@ void EffectChangeTempo::Update_Text_ToLength() m_pTextCtrl_ToLength->GetValidator()->TransferToWindow(); } -#endif // USE_SOUNDTOUCH \ No newline at end of file +#endif // USE_SOUNDTOUCH diff --git a/src/effects/Equalization48x.h b/src/effects/Equalization48x.h index 746734b15..64d6c2172 100644 --- a/src/effects/Equalization48x.h +++ b/src/effects/Equalization48x.h @@ -173,4 +173,4 @@ private: #endif -#endif \ No newline at end of file +#endif diff --git a/src/effects/Phaser.cpp b/src/effects/Phaser.cpp index c93890b9c..fcff44219 100644 --- a/src/effects/Phaser.cpp +++ b/src/effects/Phaser.cpp @@ -553,4 +553,4 @@ void EffectPhaser::OnGainText(wxCommandEvent & WXUNUSED(evt)) } mOutGainS->SetValue((int) (mOutGain * SCL_OutGain)); -} \ No newline at end of file +} diff --git a/src/effects/vamp/LoadVamp.h b/src/effects/vamp/LoadVamp.h index 5df491a72..eb5d01ba7 100644 --- a/src/effects/vamp/LoadVamp.h +++ b/src/effects/vamp/LoadVamp.h @@ -63,4 +63,4 @@ private: wxString mPath; }; -#endif \ No newline at end of file +#endif diff --git a/src/effects/vamp/VampEffect.cpp b/src/effects/vamp/VampEffect.cpp index b403f9388..bb5a0185f 100644 --- a/src/effects/vamp/VampEffect.cpp +++ b/src/effects/vamp/VampEffect.cpp @@ -890,4 +890,4 @@ void VampEffect::OnTextCtrl(wxCommandEvent & evt) mSliders[p]->SetValue((int)(((val - lower) / range) * 1000.0 + 0.5)); } -#endif \ No newline at end of file +#endif diff --git a/src/toolbars/SelectionBar.cpp b/src/toolbars/SelectionBar.cpp index f9cd166aa..e446053aa 100644 --- a/src/toolbars/SelectionBar.cpp +++ b/src/toolbars/SelectionBar.cpp @@ -187,7 +187,7 @@ void SelectionBar::Create(wxWindow * parent) wxRadioButton * SelectionBar::AddRadioButton( const wxString & Name, int id, wxSizer *pSizer, long style ) { - bool bUseNativeRadioButton = theTheme.IsUsingSyestemTextColour(); + bool bUseNativeRadioButton = theTheme.IsUsingSystemTextColour(); wxRadioButton * pBtn; // Safenew because the button is being create dinto this window. pBtn = safenew wxRadioButton(this, id,bUseNativeRadioButton ? Name : wxT(""), diff --git a/src/toolbars/ToolBar.cpp b/src/toolbars/ToolBar.cpp index d34babd62..c8be935eb 100644 --- a/src/toolbars/ToolBar.cpp +++ b/src/toolbars/ToolBar.cpp @@ -324,7 +324,6 @@ ToolBar::ToolBar( int type, // Initialize everything mParent = NULL; mHSizer = NULL; - mSpacer = NULL; mVisible = false; mPositioned = false; diff --git a/src/toolbars/ToolBar.h b/src/toolbars/ToolBar.h index ba6cd5bcd..81d3ede4c 100644 --- a/src/toolbars/ToolBar.h +++ b/src/toolbars/ToolBar.h @@ -224,7 +224,6 @@ class ToolBar /* not final */ : public wxPanelWrapper ToolBarResizer *mResizer; wxBoxSizer *mHSizer; - wxSizerItem *mSpacer; bool mVisible; bool mResizable; diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp index a7ee0b8bc..6aa70767c 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp @@ -137,4 +137,4 @@ PopupMenuTable *NoteTrackControls::GetMenuExtension(Track *) #endif } -#endif \ No newline at end of file +#endif diff --git a/src/tracks/ui/TrackVRulerControls.cpp b/src/tracks/ui/TrackVRulerControls.cpp index 61e96918f..e8f6a3f53 100644 --- a/src/tracks/ui/TrackVRulerControls.cpp +++ b/src/tracks/ui/TrackVRulerControls.cpp @@ -58,4 +58,4 @@ void TrackVRulerControls::DrawZooming rect.SetRight(panelRect.GetWidth() - kRightMargin); dc->DrawRectangle(rect); -} \ No newline at end of file +}