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
This commit is contained in:
@@ -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 <attila589/at/gmail/dot/com>
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
|
||||
#include "instrument.h"
|
||||
#include "instrument_view.h"
|
||||
#include "types.h"
|
||||
#include "graph.h"
|
||||
#include "knob.h"
|
||||
#include "pixmap_button.h"
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
#ifndef _NINE_BUTTON_SELECTOR_H
|
||||
#define _NINE_BUTTON_SELECTOR_H
|
||||
|
||||
#include "types.h"
|
||||
#include "pixmap_button.h"
|
||||
|
||||
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
|
||||
#include <QtCore/QVector>
|
||||
|
||||
#include "types.h"
|
||||
#include "vibrating_string.h"
|
||||
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "types.h"
|
||||
#include "lmms_basics.h"
|
||||
|
||||
class vibratingString
|
||||
{
|
||||
|
||||
@@ -80,7 +80,7 @@ struct ERect
|
||||
#endif
|
||||
|
||||
|
||||
#include "types.h"
|
||||
#include "lmms_basics.h"
|
||||
#include "midi.h"
|
||||
#include "communication.h"
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* base64.cpp - namespace base64 with methods for encoding/decoding binary data
|
||||
* to/from base64
|
||||
*
|
||||
* Copyright (c) 2006-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
* Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
*
|
||||
* 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 <QtCore/QBuffer>
|
||||
#include <QtCore/QVariant>
|
||||
|
||||
@@ -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 <tobydox/at/users.sourceforge.net>
|
||||
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
*
|
||||
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
|
||||
*
|
||||
@@ -30,7 +28,6 @@
|
||||
#include <QtGui/QPainter>
|
||||
|
||||
#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
|
||||
|
||||
Reference in New Issue
Block a user