From d118b13257901335852d5dc66cfb678a1d6a771a Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 6 Oct 2008 18:45:20 +0000 Subject: [PATCH] renamed types.h to lmms_basics.h git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1748 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 7 +++++++ plugins/bit_invader/bit_invader.h | 1 - plugins/vibed/nine_button_selector.h | 1 - plugins/vibed/string_container.h | 1 - plugins/vibed/vibrating_string.h | 2 +- plugins/vst_base/remote_vst_plugin.cpp | 2 +- src/core/base64.cpp | 4 ++-- src/gui/widgets/side_bar_widget.cpp | 15 +++++---------- 8 files changed, 16 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index d93e59e58..068a68a24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,13 @@ * include/panning.h: * include/project_journal.h: * include/play_handle.h: + * plugins/bit_invader/bit_invader.h: + * plugins/vibed/vibrating_string.h: + * plugins/vibed/nine_button_selector.h: + * plugins/vibed/string_container.h: + * plugins/vst_base/remote_vst_plugin.cpp: + * src/core/base64.cpp: + * src/gui/widgets/side_bar_widget.cpp: renamed types.h to lmms_basics.h 2008-10-06 Attila Herman diff --git a/plugins/bit_invader/bit_invader.h b/plugins/bit_invader/bit_invader.h index d0854499a..561347120 100644 --- a/plugins/bit_invader/bit_invader.h +++ b/plugins/bit_invader/bit_invader.h @@ -30,7 +30,6 @@ #include "instrument.h" #include "instrument_view.h" -#include "types.h" #include "graph.h" #include "knob.h" #include "pixmap_button.h" diff --git a/plugins/vibed/nine_button_selector.h b/plugins/vibed/nine_button_selector.h index c8a421dae..3a3605dd1 100644 --- a/plugins/vibed/nine_button_selector.h +++ b/plugins/vibed/nine_button_selector.h @@ -24,7 +24,6 @@ #ifndef _NINE_BUTTON_SELECTOR_H #define _NINE_BUTTON_SELECTOR_H -#include "types.h" #include "pixmap_button.h" diff --git a/plugins/vibed/string_container.h b/plugins/vibed/string_container.h index 47022cebf..8d2c98992 100644 --- a/plugins/vibed/string_container.h +++ b/plugins/vibed/string_container.h @@ -26,7 +26,6 @@ #include -#include "types.h" #include "vibrating_string.h" diff --git a/plugins/vibed/vibrating_string.h b/plugins/vibed/vibrating_string.h index 9efb96437..c509db78e 100644 --- a/plugins/vibed/vibrating_string.h +++ b/plugins/vibed/vibrating_string.h @@ -27,7 +27,7 @@ #include #include -#include "types.h" +#include "lmms_basics.h" class vibratingString { diff --git a/plugins/vst_base/remote_vst_plugin.cpp b/plugins/vst_base/remote_vst_plugin.cpp index 5175c6d0e..a9b83cef3 100644 --- a/plugins/vst_base/remote_vst_plugin.cpp +++ b/plugins/vst_base/remote_vst_plugin.cpp @@ -80,7 +80,7 @@ struct ERect #endif -#include "types.h" +#include "lmms_basics.h" #include "midi.h" #include "communication.h" diff --git a/src/core/base64.cpp b/src/core/base64.cpp index 970634566..5df45ea5e 100644 --- a/src/core/base64.cpp +++ b/src/core/base64.cpp @@ -4,7 +4,7 @@ * base64.cpp - namespace base64 with methods for encoding/decoding binary data * to/from base64 * - * Copyright (c) 2006-2007 Tobias Doerffel + * Copyright (c) 2006-2008 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -28,7 +28,7 @@ #include "base64.h" -#include "types.h" +#include "lmms_basics.h" #include #include diff --git a/src/gui/widgets/side_bar_widget.cpp b/src/gui/widgets/side_bar_widget.cpp index 4d2a8bec1..fea3491b2 100644 --- a/src/gui/widgets/side_bar_widget.cpp +++ b/src/gui/widgets/side_bar_widget.cpp @@ -1,9 +1,7 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * side_bar_widget.cpp - implementation of base-widget for side-bar * - * Copyright (c) 2004-2006 Tobias Doerffel + * Copyright (c) 2004-2008 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -30,7 +28,6 @@ #include #include "side_bar_widget.h" -#include "types.h" #include "gui_templates.h" @@ -59,7 +56,7 @@ sideBarWidget::~sideBarWidget() void sideBarWidget::paintEvent( QPaintEvent * ) { - const Uint16 TITLE_FONT_HEIGHT = 13; + const int TITLE_FONT_HEIGHT = 13; QPainter p( this ); p.fillRect( 0, 0, width(), 27, palette().highlight().color() ); @@ -70,8 +67,8 @@ void sideBarWidget::paintEvent( QPaintEvent * ) p.setPen( palette().highlightedText().color() ); - const Uint16 tx = m_icon.width()+4; - const Uint16 ty = 2+TITLE_FONT_HEIGHT; + const int tx = m_icon.width()+4; + const int ty = 2+TITLE_FONT_HEIGHT; p.drawText( tx, ty, m_title ); p.drawLine( tx, ty+4, width()-4, ty+4 ); @@ -82,7 +79,7 @@ void sideBarWidget::paintEvent( QPaintEvent * ) void sideBarWidget::resizeEvent( QResizeEvent * ) { - const Uint16 MARGIN = 6; + const int MARGIN = 6; m_contents->setGeometry( MARGIN, 40 + MARGIN, width() - MARGIN * 2, height() - MARGIN * 2 - 40 ); } @@ -92,5 +89,3 @@ void sideBarWidget::resizeEvent( QResizeEvent * ) #include "moc_side_bar.cxx" #include "moc_side_bar_widget.cxx" - -#endif