From 2e111129bd7582ad56d0c980d3b0b10f5cf40b30 Mon Sep 17 00:00:00 2001 From: Colin Wallace Date: Sun, 6 Sep 2015 15:11:25 -0700 Subject: [PATCH] Remove unnecessary 'inline' attributes; 'inline' is only needed when a function is defined in the header, as a way to avoid multiple definitions error when linking. It is otherwise useless --- include/PianoRoll.h | 14 +++++++------- src/gui/editors/PianoRoll.cpp | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/PianoRoll.h b/include/PianoRoll.h index f874ec2f5..e3a5fa696 100644 --- a/include/PianoRoll.h +++ b/include/PianoRoll.h @@ -125,7 +125,7 @@ protected: virtual void focusOutEvent( QFocusEvent * ); int getKey( int y ) const; - static inline void drawNoteRect( QPainter & p, int x, int y, + static void drawNoteRect( QPainter & p, int x, int y, int width, const Note * n, const QColor & noteCol ); void removeSelection(); void selectAll(); @@ -230,12 +230,12 @@ private: void testPlayKey( int _key, int _vol, int _pan ); void pauseTestNotes(bool pause = true ); - inline int noteEditTop() const; - inline int keyAreaBottom() const; - inline int noteEditBottom() const; - inline int keyAreaTop() const; - inline int noteEditRight() const; - inline int noteEditLeft() const; + int noteEditTop() const; + int keyAreaBottom() const; + int noteEditBottom() const; + int keyAreaTop() const; + int noteEditRight() const; + int noteEditLeft() const; void dragNotes( int x, int y, bool alt, bool shift, bool ctrl ); diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp index 9816a7305..3cdef8f74 100644 --- a/src/gui/editors/PianoRoll.cpp +++ b/src/gui/editors/PianoRoll.cpp @@ -701,7 +701,7 @@ void PianoRoll::setBarColor( const QColor & c ) -inline void PianoRoll::drawNoteRect(QPainter & p, int x, int y, +void PianoRoll::drawNoteRect(QPainter & p, int x, int y, int width, const Note * n, const QColor & noteCol ) { ++x; @@ -770,7 +770,7 @@ inline void PianoRoll::drawNoteRect(QPainter & p, int x, int y, -inline void PianoRoll::drawDetuningInfo( QPainter & _p, const Note * _n, int _x, +void PianoRoll::drawDetuningInfo( QPainter & _p, const Note * _n, int _x, int _y ) const { int middle_y = _y + KEY_LINE_HEIGHT / 2; @@ -1179,7 +1179,7 @@ void PianoRoll::leaveEvent(QEvent * e ) -inline int PianoRoll::noteEditTop() const +int PianoRoll::noteEditTop() const { return height() - PR_BOTTOM_MARGIN - m_notesEditHeight + NOTE_EDIT_RESIZE_BAR; @@ -1188,7 +1188,7 @@ inline int PianoRoll::noteEditTop() const -inline int PianoRoll::noteEditBottom() const +int PianoRoll::noteEditBottom() const { return height() - PR_BOTTOM_MARGIN; } @@ -1196,7 +1196,7 @@ inline int PianoRoll::noteEditBottom() const -inline int PianoRoll::noteEditRight() const +int PianoRoll::noteEditRight() const { return width() - PR_RIGHT_MARGIN; } @@ -1204,7 +1204,7 @@ inline int PianoRoll::noteEditRight() const -inline int PianoRoll::noteEditLeft() const +int PianoRoll::noteEditLeft() const { return WHITE_KEY_WIDTH; } @@ -1212,7 +1212,7 @@ inline int PianoRoll::noteEditLeft() const -inline int PianoRoll::keyAreaTop() const +int PianoRoll::keyAreaTop() const { return PR_TOP_MARGIN; } @@ -1220,7 +1220,7 @@ inline int PianoRoll::keyAreaTop() const -inline int PianoRoll::keyAreaBottom() const +int PianoRoll::keyAreaBottom() const { return height() - PR_BOTTOM_MARGIN - m_notesEditHeight; }