From 20d9f3e67174e771fb341af3381babf51a49230d Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Mon, 25 Feb 2008 21:35:45 +0000
Subject: [PATCH] renamed piano_widget.{h,cpp} to piano.{h,cpp}

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms-mv@715 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 ChangeLog                       | 8 ++++++++
 Makefile.am                     | 6 +++---
 include/instrument_track.h      | 2 +-
 include/piano.h                 | 7 +++----
 src/core/piano.cpp              | 8 ++++----
 src/core/piano_roll.cpp         | 2 +-
 src/tracks/instrument_track.cpp | 1 -
 7 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6948d7969..ebc283cc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-02-25	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* include/instrument_track.h:
+	* include/piano.h:
+	* src/tracks/instrument_track.cpp:
+	* src/core/piano_roll.cpp:
+	* src/core/piano.cpp:
+	* Makefile.am:
+	renamed piano_widget.{h,cpp} to piano.{h,cpp}
+
 	* include/instrument_view.h:
 	* include/instrument_track.h:
 	* src/widgets/instrument_function_views.cpp:
diff --git a/Makefile.am b/Makefile.am
index ff26fdef2..0884e7991 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,7 +86,7 @@ lmms_MOC =						\
 		./instrument_midi_io.moc		\
 		./pattern.moc				\
 		./piano_roll.moc			\
-		./piano_widget.moc			\
+		./piano.moc				\
 		./pixmap_button.moc			\
 		./plugin_browser.moc			\
 		./project_notes.moc			\
@@ -182,7 +182,7 @@ lmms_SOURCES =								\
 		$(srcdir)/src/core/note.cpp				\
 		$(srcdir)/src/core/note_play_handle.cpp			\
 		$(srcdir)/src/core/piano_roll.cpp			\
-		$(srcdir)/src/core/piano_widget.cpp			\
+		$(srcdir)/src/core/piano.cpp				\
 		$(srcdir)/src/core/plugin.cpp				\
 		$(srcdir)/src/core/plugin_browser.cpp			\
 		$(srcdir)/src/core/preset_preview_play_handle.cpp	\
@@ -285,7 +285,7 @@ lmms_SOURCES =								\
 		$(srcdir)/include/instrument.h				\
 		$(srcdir)/include/instrument_view.h			\
 		$(srcdir)/include/bb_editor.h				\
-		$(srcdir)/include/piano_widget.h			\
+		$(srcdir)/include/piano.h				\
 		$(srcdir)/include/effect_board.h			\
 		$(srcdir)/include/pixmap_button.h			\
 		$(srcdir)/include/rename_dialog.h			\
diff --git a/include/instrument_track.h b/include/instrument_track.h
index 8325c065c..2f7eaa560 100644
--- a/include/instrument_track.h
+++ b/include/instrument_track.h
@@ -37,7 +37,7 @@
 #include "lcd_spinbox.h"
 #include "midi_event_processor.h"
 #include "mixer.h"
-#include "piano_widget.h"
+#include "piano.h"
 #include "effect_chain.h"
 #include "surround_area.h"
 #include "tab_widget.h"
diff --git a/include/piano.h b/include/piano.h
index e3544e8ef..d6d9fcbad 100644
--- a/include/piano.h
+++ b/include/piano.h
@@ -1,6 +1,5 @@
 /*
- * piano_widget.h - declaration of class pianoView, a widget which provides
- *                  an interactive piano/keyboard-widget
+ * piano.h - piano and pianoView, an interactive piano/keyboard-widget
  *
  * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
@@ -24,8 +23,8 @@
  */
 
 
-#ifndef _PIANO_WIDGET_H
-#define _PIANO_WIDGET_H
+#ifndef _PIANO_H
+#define _PIANO_H
 
 #include <QtGui/QWidget>
 #include <QtGui/QPixmap>
diff --git a/src/core/piano.cpp b/src/core/piano.cpp
index 0fe5a7627..a374687d4 100644
--- a/src/core/piano.cpp
+++ b/src/core/piano.cpp
@@ -1,8 +1,8 @@
 #ifndef SINGLE_SOURCE_COMPILE
 
 /*
- * piano_widget.cpp - implementation of piano-widget used in channel-window
- *                    for testing channel
+ * piano.cpp - implementation of piano-widget used in instrument-track-window
+ *             for testing
  *
  * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
@@ -26,7 +26,7 @@
  */
 
 
-#include "piano_widget.h"
+#include "piano.h"
 
 
 #include <QtGui/QCursor>
@@ -709,7 +709,7 @@ bool pianoView::x11Event( XEvent * _xe )
 
 
 
-#include "piano_widget.moc"
+#include "piano.moc"
 
 
 #endif
diff --git a/src/core/piano_roll.cpp b/src/core/piano_roll.cpp
index dcecf533e..f6081ee46 100644
--- a/src/core/piano_roll.cpp
+++ b/src/core/piano_roll.cpp
@@ -60,7 +60,7 @@
 #include "midi.h"
 #include "mmp.h"
 #include "pattern.h"
-#include "piano_widget.h"
+#include "piano.h"
 #include "pixmap_button.h"
 #include "song.h"
 #include "song_editor.h"
diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp
index 483b7d019..b6633d8f4 100644
--- a/src/tracks/instrument_track.cpp
+++ b/src/tracks/instrument_track.cpp
@@ -68,7 +68,6 @@
 #include "mmp.h"
 #include "note_play_handle.h"
 #include "pattern.h"
-#include "piano_widget.h"
 #include "plugin_view.h"
 #include "sample_play_handle.h"
 #include "song.h"