hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix warnings (#3852)

Browse Source 
* Remove register keyword

Register is meaningless in c++, and removed in c++17

* Fix compiler warningsg

Add missing override, remove unused capture, and remove unused local variablees
This commit is contained in:
Dan Williams
2017-10-11 13:10:03 -04:00
committed by Lukas W
parent e0bd797876
commit 4d26654534
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/BBTrackContainer.h
View File

@@ -41,9 +41,9 @@ public:
virtual bool play( MidiTime _start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num = -1 );
virtual void updateAfterTrackAdd();
virtual void updateAfterTrackAdd() override;
inline virtual QString nodeName() const
inline virtual QString nodeName() const override
{
return "bbtrackcontainer";
}

4
plugins/vibed/vibrating_string.h
View File

@@ -183,7 +183,7 @@ private:
* iteration. */
inline void toBridgeUpdate( delayLine * _dl, sample_t _insamp )
{
register sample_t * ptr = _dl->pointer;
sample_t * ptr = _dl->pointer;
*ptr = _insamp * m_stringLoss;
++ptr;
if( ptr > _dl->end )
@@ -202,7 +202,7 @@ private:
inline void fromBridgeUpdate( delayLine * _dl,
sample_t _insamp )
{
register sample_t * ptr = _dl->pointer;
sample_t * ptr = _dl->pointer;
--ptr;
if( ptr < _dl->data )
{

2
src/core/PluginFactory.cpp
View File

@@ -47,7 +47,7 @@ std::unique_ptr<PluginFactory> PluginFactory::s_instance;
PluginFactory::PluginFactory()
{
// Adds a search path relative to the main executable if the path exists.
auto addRelativeIfExists = [this] (const QString& path) {
auto addRelativeIfExists = [](const QString & path) {
QDir dir(qApp->applicationDirPath());
if (!path.isEmpty() && dir.cd(path)) {
QDir::addSearchPath("plugins", dir.absolutePath());

2
src/gui/editors/PianoRoll.cpp
View File

@@ -77,11 +77,9 @@ const int SCROLLBAR_SIZE = 12;
const int PIANO_X = 0;
const int WHITE_KEY_WIDTH = 64;
const int BLACK_KEY_WIDTH = 41;
const int WHITE_KEY_SMALL_HEIGHT = 18;
const int WHITE_KEY_BIG_HEIGHT = 24;
const int BLACK_KEY_HEIGHT = 16;
const int C_KEY_LABEL_X = WHITE_KEY_WIDTH - 19;
const int KEY_LINE_HEIGHT = 12;
const int OCTAVE_HEIGHT = KEY_LINE_HEIGHT * KeysPerOctave; // = 12 * 12;