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

qt4- and other fixes

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@128 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2006-04-11 08:41:16 +00:00
parent 00635d1eef
commit 8310422d75
80 changed files with 411 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio/audio_alsa.cpp
View File

@@ -30,8 +30,8 @@
#ifdef QT4
#include <QLineEdit>
#include <QLabel>
#include <QtGui/QLineEdit>
#include <QtGui/QLabel>
#else

2
src/audio/audio_file_device.cpp
View File

@@ -30,7 +30,7 @@
#ifdef QT4
#include <QMessageBox>
#include <QtGui/QMessageBox>
#else

6
src/audio/audio_jack.cpp
View File

@@ -32,9 +32,9 @@
#ifdef QT4
#include <QLineEdit>
#include <QLabel>
#include <QMessageBox>
#include <QtGui/QLineEdit>
#include <QtGui/QLabel>
#include <QtGui/QMessageBox>
#else

6
src/audio/audio_oss.cpp
View File

@@ -34,9 +34,9 @@
#ifdef QT4
#include <QFileInfo>
#include <QLineEdit>
#include <QLabel>
#include <QtCore/QFileInfo>
#include <QtGui/QLabel>
#include <QtGui/QLineEdit>
#else

4
src/audio/audio_sdl.cpp
View File

@@ -32,8 +32,8 @@
#ifdef QT4
#include <QLineEdit>
#include <QLabel>
#include <QtGui/QLabel>
#include <QtGui/QLineEdit>
#else

10
src/core/about_dialog.cpp
View File

@@ -29,11 +29,11 @@
#ifdef QT4
#include <QTextEdit>
#include <QTabWidget>
#include <QLabel>
#include <QPushButton>
#include <QResizeEvent>
#include <QtGui/QLabel>
#include <QtGui/QPushButton>
#include <QtGui/QResizeEvent>
#include <QtGui/QTabWidget>
#include <QtGui/QTextEdit>
#else

2
src/core/arp_and_chords_tab_widget.cpp
View File

@@ -31,7 +31,7 @@
#ifdef QT4
#include <Qt/QtXml>
#include <QLabel>
#include <QtGui/QLabel>
#else

18
src/core/bb_editor.cpp
View File

@@ -29,10 +29,10 @@
#ifdef QT4
#include <QPainter>
#include <QKeyEvent>
#include <QCloseEvent>
#include <QLayout>
#include <QtGui/QPainter>
#include <QtGui/QKeyEvent>
#include <QtGui/QCloseEvent>
#include <QtGui/QLayout>
#else
@@ -71,7 +71,7 @@ bbEditor::bbEditor( engine * _engine ) :
m_toolBar->move( 0, 0 );
#ifdef QT4
QPalette pal;
pal.setBrush( m_toolBar->backgroundRole(), QBrush(
pal.setBrush( QPalette::Background, QBrush(
embed::getIconPixmap( "toolbar_bg" ) ) );
m_toolBar->setPalette( pal );
#else
@@ -88,13 +88,17 @@ bbEditor::bbEditor( engine * _engine ) :
setMinimumWidth( TRACK_OP_WIDTH + DEFAULT_SETTINGS_WIDGET_WIDTH +
BBE_PPT + 2 * TCO_BORDER_WIDTH +
DEFAULT_SCROLLBAR_SIZE );
QWidget * w = ( parentWidget() != NULL ) ? parentWidget() : this;
if( eng()->getMainWindow()->workspace() != NULL )
{
setGeometry( 10, 340, minimumWidth(), 300 );
resize( minimumWidth(), 300 );
w->move( 10, 340 );
}
else
{
setGeometry( 210, 340, minimumWidth(), 300 );
resize( minimumWidth(), 300 );
w->move( 210, 340 );
}
containerWidget()->move( 0, 32 );

22
src/core/config_mgr.cpp
View File

@@ -33,18 +33,18 @@
#ifdef QT4
#include <QDir>
#include <Qt/QtXml>
#include <QFile>
#include <QMessageBox>
#include <QLabel>
#include <QLayout>
#include <QLineEdit>
#include <QPushButton>
#include <QFileDialog>
#include <QRadioButton>
#include <QButtonGroup>
#include <QApplication>
#include <QtCore/QDir>
#include <QtCore/QFile>
#include <QtGui/QMessageBox>
#include <QtGui/QLabel>
#include <QtGui/QLayout>
#include <QtGui/QLineEdit>
#include <QtGui/QPushButton>
#include <QtGui/QFileDialog>
#include <QtGui/QRadioButton>
#include <QtGui/QButtonGroup>
#include <QtGui/QApplication>
#else

7
src/core/envelope_and_lfo_widget.cpp
View File

@@ -30,11 +30,10 @@
#ifdef QT4
#include <QPainter>
#include <QPaintEvent>
#include <QWhatsThis>
#include <QtGui/QPainter>
#include <QtGui/QPaintEvent>
#include <Qt/QtXml>
#include <QLabel>
#include <QtGui/QLabel>
#else

1
src/core/envelope_tab_widget.cpp
View File

@@ -31,7 +31,6 @@
#ifdef QT4
#include <Qt/QtXml>
#include <QWhatsThis>
#else

14
src/core/export_project_dialog.cpp
View File

@@ -29,13 +29,13 @@
#ifdef QT4
#include <QFileDialog>
#include <QMessageBox>
#include <QProgressBar>
#include <QLabel>
#include <QPushButton>
#include <QCloseEvent>
#include <QApplication>
#include <QtGui/QFileDialog>
#include <QtGui/QMessageBox>
#include <QtGui/QProgressBar>
#include <QtGui/QLabel>
#include <QtGui/QPushButton>
#include <QtGui/QCloseEvent>
#include <QtGui/QApplication>
#else

14
src/core/file_browser.cpp
View File

@@ -30,11 +30,11 @@
#ifdef QT4
#include <QPushButton>
#include <QKeyEvent>
#include <QMenu>
#include <Q3Header>
#include <QCursor>
#include <QtGui/QPushButton>
#include <QtGui/QKeyEvent>
#include <QtGui/QMenu>
#include <QtGui/QCursor>
#include <Qt3Support/Q3Header>
#else
@@ -113,7 +113,11 @@ fileBrowser::~fileBrowser()
void fileBrowser::reloadTree( void )
{
m_l->clear();
#ifndef QT3
QStringList paths = m_directories.split( '*' );
#else
QStringList paths = QStringList::split( '*', m_directories );
#endif
for( QStringList::iterator it = paths.begin(); it != paths.end(); ++it )
{
addItems( *it );

2
src/core/import_filter.cpp
View File

@@ -31,7 +31,7 @@
#ifdef QT4
#include <QMessageBox>
#include <QtGui/QMessageBox>
#else

8
src/core/main.cpp
View File

@@ -29,10 +29,10 @@
#ifdef QT4
#include <QApplication>
#include <QLocale>
#include <QSplashScreen>
#include <QTranslator>
#include <QtCore/QLocale>
#include <QtCore/QTranslator>
#include <QtGui/QApplication>
#include <QtGui/QSplashScreen>
#else

19
src/core/main_window.cpp
View File

@@ -29,13 +29,13 @@
#ifdef QT4
#include <QApplication>
#include <QFileDialog>
#include <QCloseEvent>
#include <QSplitter>
#include <QSplashScreen>
#include <QMessageBox>
#include <QMenuBar>
#include <QtGui/QApplication>
#include <QtGui/QFileDialog>
#include <QtGui/QCloseEvent>
#include <QtGui/QSplitter>
#include <QtGui/QSplashScreen>
#include <QtGui/QMessageBox>
#include <QtGui/QMenuBar>
#include <Qt/QtXml>
#else
@@ -246,7 +246,6 @@ void mainWindow::finalize( void )
Qt::white );
}
#endif
eng()->getSongEditor();
#if QT_VERSION >= 0x030200
@@ -634,7 +633,7 @@ void mainWindow::restoreWidgetState( QWidget * _w, const QDomElement & _de )
QRect r( _de.attribute( "x" ).toInt(), _de.attribute( "y" ).toInt(),
_de.attribute( "width" ).toInt(),
_de.attribute( "height" ).toInt() );
if( !r.isNull() )
if( !r.isNull() && _w->parentWidget() != NULL )
{
_w->show();
if( _w->parentWidget() != NULL )
@@ -666,7 +665,7 @@ void mainWindow::createNewProjectFromTemplate( int _idx )
// TODO!!!
#else
if( m_templatesMenu != NULL &&
eng()->getSongEditor()->mayChangeProject() == TRUE )
eng()->getSongEditor()->mayChangeProject() == TRUE )
{
eng()->getSongEditor()->createNewProjectFromTemplate(
configManager::inst()->projectsDir() + "templates/" +

4
src/core/midi_tab_widget.cpp
View File

@@ -31,8 +31,8 @@
#ifdef QT4
#include <Qt/QtXml>
#include <QMenu>
#include <QToolButton>
#include <QtGui/QMenu>
#include <QtGui/QToolButton>
#else

6
src/core/name_label.cpp
View File

@@ -30,9 +30,9 @@
#ifdef QT4
#include <QPainter>
#include <QMouseEvent>
#include <QFileDialog>
#include <QtGui/QFileDialog>
#include <QtGui/QMouseEvent>
#include <QtGui/QPainter>
#else

23
src/core/piano_roll.cpp
View File

@@ -30,14 +30,14 @@
#ifdef QT4
#include <QApplication>
#include <QButtonGroup>
#include <QPainter>
#include <QKeyEvent>
#include <QWheelEvent>
#include <QLayout>
#include <QLabel>
#include <Qt/QtXml>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QPainter>
#include <QtGui/QKeyEvent>
#include <QtGui/QWheelEvent>
#include <QtGui/QLayout>
#include <QtGui/QLabel>
#else
@@ -438,7 +438,14 @@ pianoRoll::pianoRoll( engine * _engine ) :
{
m_noteLenComboBox->addItem( "1/" + QString::number(
static_cast<int>( powf( 2.0f, i ) ) ),
embed::getIconPixmap( "note_" + pixmaps[i] ) );
embed::getIconPixmap(
QString( "note_" + pixmaps[i] ).
#ifndef QT3
toAscii().constData()
#else
ascii()
#endif
) );
}
m_noteLenComboBox->setValue( 0 );

6
src/core/piano_widget.cpp
View File

@@ -30,9 +30,9 @@
#ifdef QT4
#include <QPainter>
#include <QMouseEvent>
#include <QKeyEvent>
#include <QtGui/QKeyEvent>
#include <QtGui/QMouseEvent>
#include <QtGui/QPainter>
#else

6
src/core/plugin.cpp
View File

@@ -29,9 +29,9 @@
#ifdef QT4
#include <QMessageBox>
#include <QDir>
#include <QLibrary>
#include <QtCore/QDir>
#include <QtCore/QLibrary>
#include <QtGui/QMessageBox>
#else

21
src/core/plugin_browser.cpp
View File

@@ -29,10 +29,10 @@
#ifdef QT4
#include <QLabel>
#include <QPainter>
#include <QCursor>
#include <QMouseEvent>
#include <QtGui/QLabel>
#include <QtGui/QPainter>
#include <QtGui/QCursor>
#include <QtGui/QMouseEvent>
#else
@@ -171,7 +171,7 @@ void pluginDescWidget::paintEvent( QPaintEvent * )
QImage::ScaleMin ) );
#endif
p.setPen( QColor( 64, 64, 64 ) );
p.drawRect( rect() );
p.drawRect( 0, 0, rect().right(), rect().bottom() );
p.drawPixmap( 4, 4, logo );
QFont f = pointSize<8>( p.font() );
@@ -186,9 +186,16 @@ void pluginDescWidget::paintEvent( QPaintEvent * )
p.setFont( pointSize<7>( f ) );
QRect br;
p.drawText( 10 + logo_size.width(), 20, width() - 58 - 5, 999,
Qt::WordBreak,
#ifndef QT3
Qt::TextWordWrap,
#else
Qt::WordBreak,
#endif
pluginBrowser::tr( m_pluginDescriptor.description ),
-1, &br );
#ifdef QT3
-1,
#endif
&br );
if( m_mouseOver )
{
m_targetHeight = tMax( 60, 25 + br.height() );

4
src/core/preset_preview_play_handle.cpp
View File

@@ -29,8 +29,8 @@
#ifdef QT4
#include <QMutex>
#include <QMutexLocker>
#include <QtCore/QMutex>
#include <QtCore/QMutexLocker>
#else

16
src/core/setup_dialog.cpp
View File

@@ -29,14 +29,14 @@
#ifdef QT4
#include <QLayout>
#include <QLabel>
#include <QSlider>
#include <QWhatsThis>
#include <QComboBox>
#include <QMessageBox>
#include <QLineEdit>
#include <QFileDialog>
#include <QtGui/QComboBox>
#include <QtGui/QFileDialog>
#include <QtGui/QLabel>
#include <QtGui/QLayout>
#include <QtGui/QLineEdit>
#include <QtGui/QMessageBox>
#include <QtGui/QSlider>
#include <QtGui/QWhatsThis>
#else

45
src/core/song_editor.cpp
View File

@@ -37,18 +37,18 @@
#ifdef QT4
#include <Qt/QtXml>
#include <QApplication>
#include <QFile>
#include <QMessageBox>
#include <QFileInfo>
#include <QFileDialog>
#include <QSlider>
#include <QKeyEvent>
#include <QLabel>
#include <QStatusBar>
#include <QAction>
#include <QLayout>
#include <QButtonGroup>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QFileDialog>
#include <QtGui/QKeyEvent>
#include <QtGui/QLabel>
#include <QtGui/QLayout>
#include <QtGui/QMessageBox>
#include <QtGui/QSlider>
#include <QtGui/QStatusBar>
#else
@@ -118,13 +118,17 @@ songEditor::songEditor( engine * _engine ) :
{
setWindowTitle( tr( "Song-Editor" ) );
setWindowIcon( embed::getIconPixmap( "songeditor" ) );
QWidget * w = ( parentWidget() != NULL ) ? parentWidget() : this;
if( eng()->getMainWindow()->workspace() != NULL )
{
setGeometry( 10, 10, 680, 300 );
resize( 680, 300 );
w->move( 10, 10 );
}
else
{
setGeometry( 210, 10, 580, 300 );
resize( 580, 300 );
w->move( 210, 10 );
}
#ifdef QT4
@@ -1506,7 +1510,8 @@ void FASTCALL songEditor::loadProject( const QString & _file_name )
{
if( node.nodeName() == "trackcontainer" )
{
restoreState( node.toElement() );
( (journallingObject *)( this ) )->
restoreState( node.toElement() );
}
else if( node.nodeName() ==
eng()->getPianoRoll()->nodeName() )
@@ -1517,8 +1522,9 @@ void FASTCALL songEditor::loadProject( const QString & _file_name )
else if( node.nodeName() ==
eng()->getProjectNotes()->nodeName() )
{
eng()->getProjectNotes()->restoreState(
node.toElement() );
( (journallingObject *)( eng()->
getProjectNotes() ) )->
restoreState( node.toElement() );
}
else if( node.nodeName() ==
m_playPos[PLAY_SONG].m_timeLine->nodeName() )
@@ -1561,10 +1567,11 @@ bool songEditor::saveProject( void )
mmp.head().appendChild( mp );
saveState( mmp, mmp.content() );
( (journallingObject *)( this ) )->saveState( mmp, mmp.content() );
eng()->getPianoRoll()->saveState( mmp, mmp.content() );
eng()->getProjectNotes()->saveState( mmp, mmp.content() );
( (journallingObject *)( eng()->getProjectNotes() ) )->saveState( mmp,
mmp.content() );
m_playPos[PLAY_SONG].m_timeLine->saveState( mmp, mmp.content() );
if( mmp.writeFile( m_fileName, m_oldFileName == "" ||

12
src/core/surround_area.cpp
View File

@@ -4,7 +4,7 @@
* surround_area.cpp - a widget for setting position of a channel +
* calculation of volume for each speaker
*
* Copyright (c) 2004-2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -30,18 +30,16 @@
#ifdef QT4
#include <QApplication>
#include <QPainter>
#include <QCursor>
#include <QMouseEvent>
#include <QImage>
#include <QtGui/QApplication>
#include <QtGui/QCursor>
#include <QtGui/QMouseEvent>
#include <QtGui/QPainter>
#else
#include <qapplication.h>
#include <qpainter.h>
#include <qcursor.h>
#include <qimage.h>
#endif

10
src/core/timeline.cpp
View File

@@ -29,12 +29,12 @@
#ifdef QT4
#include <QPainter>
#include <QApplication>
#include <QMouseEvent>
#include <QLayout>
#include <QTimer>
#include <Qt/QtXml>
#include <QtCore/QTimer>
#include <QtGui/QApplication>
#include <QtGui/QLayout>
#include <QtGui/QMouseEvent>
#include <QtGui/QPainter>
#else

10
src/core/track.cpp
View File

@@ -30,11 +30,11 @@
#ifdef QT4
#include <QApplication>
#include <Qt/QtXml>
#include <QMouseEvent>
#include <QMenu>
#include <QLayout>
#include <QtGui/QApplication>
#include <QtGui/QLayout>
#include <QtGui/QMenu>
#include <QtGui/QMouseEvent>
#else
@@ -1097,7 +1097,7 @@ void trackOperationsWidget::removeTrack( void )
#ifdef QT3
QTimer::singleShot( 10, this, SLOT( removeTrackTimer() ) );
#else
#warning fixme
//#warning fixme
removeTrackTimer();
#endif
}

6
src/core/track_container.cpp
View File

@@ -31,9 +31,9 @@
#ifdef QT4
#include <Qt/QtXml>
#include <QApplication>
#include <QProgressDialog>
#include <QWheelEvent>
#include <QtGui/QApplication>
#include <QtGui/QProgressDialog>
#include <QtGui/QWheelEvent>
#else

4
src/lib/base64.cpp
View File

@@ -32,8 +32,8 @@
#ifndef QT3
#include <QVariant>
#include <QBuffer>
#include <QtCore/QBuffer>
#include <QtCore/QVariant>
#else

6
src/lib/buffer_allocator.cpp
View File

@@ -30,8 +30,8 @@
#ifdef QT4
#include <QList>
#include <QMutex>
#include <QtCore/QList>
#include <QtCore/QMutex>
#else
@@ -151,7 +151,7 @@ void bufferAllocator::free( void * _buf )
}
// do clean-up if neccessary
static const Uint32 CLEANUP_LEVEL = static_cast<Uint32>( 768 / ( logf(
static const csize CLEANUP_LEVEL = static_cast<csize>( 768 / ( logf(
/*mixer::inst()->framesPerAudioBuffer()*/
128 ) /
logf( 2 ) ) );

6
src/lib/ladspa_manager.cpp
View File

@@ -33,9 +33,9 @@
#ifdef QT4
#include <QDir>
#include <QFileInfo>
#include <QLibrary>
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
#include <QtCore/QLibrary>
#else

4
src/lib/mmp.cpp
View File

@@ -29,8 +29,8 @@
#ifdef QT4
#include <QFile>
#include <QMessageBox>
#include <QtCore/QFile>
#include <QtGui/QMessageBox>
#else

17
src/lib/project_journal.cpp
View File

@@ -31,6 +31,10 @@
#include "journalling_object.h"
#include "song_editor.h"
#ifdef QT3
#define value data
#endif
projectJournal::projectJournal( engine * _engine ) :
@@ -80,7 +84,7 @@ void projectJournal::redo( void )
journallingObject * jo;
printf("%d\n", m_joIDs[*(m_currentJournalEntry+1)] );
//printf("%d\n", m_joIDs[*(m_currentJournalEntry+1)] );
if( m_currentJournalEntry < m_journalEntries.end() &&
( jo = m_joIDs[*m_currentJournalEntry++] ) != NULL )
{
@@ -146,7 +150,7 @@ void projectJournal::forgetAboutID( const jo_id_t _id )
}
m_journalEntries.erase( it );
}
m_joIDs.erase( _id );
m_joIDs.remove( _id );
}
@@ -154,10 +158,9 @@ void projectJournal::forgetAboutID( const jo_id_t _id )
void projectJournal::clearInvalidJournallingObjects( void )
{
vlist<journallingObject *>::const_iterator it;
for( joIDMap::iterator it = m_joIDs.begin(); it != m_joIDs.end(); )
{
if( it.data() == NULL )
if( it.value() == NULL )
{
forgetAboutID( it.key() );
it = m_joIDs.begin();
@@ -171,4 +174,10 @@ void projectJournal::clearInvalidJournallingObjects( void )
}
#ifdef QT3
#undef value
#endif
#endif

14
src/lib/sample_buffer.cpp
View File

@@ -33,13 +33,13 @@
#ifdef QT4
#include <QPainter>
#include <QMutex>
#include <QMessageBox>
#include <QFileDialog>
#include <QFileInfo>
#include <QFile>
#include <QBuffer>
#include <QtCore/QBuffer>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtCore/QMutex>
#include <QtGui/QFileDialog>
#include <QtGui/QMessageBox>
#include <QtGui/QPainter>
#else

6
src/lib/string_pair_drag.cpp
View File

@@ -32,9 +32,9 @@
#ifdef QT4
#include <QMimeData>
#include <QDragEnterEvent>
#include <QDropEvent>
#include <QtCore/QMimeData>
#include <QtGui/QDragEnterEvent>
#include <QtGui/QDropEvent>
#endif

4
src/midi/midi_alsa_raw.cpp
View File

@@ -29,8 +29,8 @@
#ifdef QT4
#include <QLineEdit>
#include <QLabel>
#include <QtGui/QLabel>
#include <QtGui/QLineEdit>
#else

4
src/midi/midi_alsa_seq.cpp
View File

@@ -29,8 +29,8 @@
#ifdef QT4
#include <QLineEdit>
#include <QLabel>
#include <QtGui/QLabel>
#include <QtGui/QLineEdit>
#else

2
src/midi/midi_mapper.cpp
View File

@@ -30,7 +30,7 @@
#ifdef QT4
#include <QRegExp>
#include <QtCore/QRegExp>
#else

4
src/midi/midi_oss.cpp
View File

@@ -34,8 +34,8 @@
#ifdef QT4
#include <QLineEdit>
#include <QLabel>
#include <QtGui/QLabel>
#include <QtGui/QLineEdit>
#else

22
src/tracks/bb_track.cpp
View File

@@ -30,9 +30,9 @@
#ifdef QT4
#include <Qt/QtXml>
#include <QPainter>
#include <QColorDialog>
#include <QMenu>
#include <QtGui/QColorDialog>
#include <QtGui/QMenu>
#include <QtGui/QPainter>
#else
@@ -146,8 +146,11 @@ void bbTCO::paintEvent( QPaintEvent * )
}
#ifdef QT4
QPainter p( this );
// TODO: set according brush/pen for gradient!
p.fillRect( rect(), col );
QLinearGradient lingrad( 0, 0, 0, height() );
lingrad.setColorAt( 0, col.light( 130 ) );
lingrad.setColorAt( 1, col.light( 70 ) );
p.fillRect( rect(), lingrad );
#else
// create pixmap for whole widget
QPixmap pm( rect().size() );
@@ -167,7 +170,7 @@ void bbTCO::paintEvent( QPaintEvent * )
if( length() > 64 && t > 0 )
{
for( int x = static_cast<int>( t * pixelsPerTact() );
x < width();
x < width()-2;
x += static_cast<int>( t * pixelsPerTact() ) )
{
p.setPen( col.light( 80 ) );
@@ -178,7 +181,7 @@ void bbTCO::paintEvent( QPaintEvent * )
}
p.setPen( col.dark() );
p.drawRect( 0, 0, width(), height() );
p.drawRect( 0, 0, rect().right(), rect().bottom() );
p.setFont( pointSize<7>( p.font() ) );
p.setPen( QColor( 0, 0, 0 ) );
@@ -428,7 +431,8 @@ void bbTrack::saveTrackSpecificSettings( QDomDocument & _doc,
_this.parentNode().nodeName() != "clone" &&
_this.parentNode().nodeName() != "journaldata" )
{
eng()->getBBEditor()->saveState( _doc, _this );
( (journallingObject *)( eng()->getBBEditor() ) )->saveState(
_doc, _this );
}
}
@@ -444,7 +448,7 @@ void bbTrack::loadTrackSpecificSettings( const QDomElement & _this )
}
if( _this.firstChild().isElement() )
{
eng()->getBBEditor()->restoreState(
( (journallingObject *)( eng()->getBBEditor() ) )->restoreState(
_this.firstChild().toElement() );
}
/* doesn't work yet because bbTrack-ctor also sets current bb so if

18
src/tracks/instrument_track.cpp
View File

@@ -30,16 +30,16 @@
#ifdef QT4
#include <QFileDialog>
#include <QDir>
#include <QFile>
#include <QApplication>
#include <Qt/QtXml>
#include <QLineEdit>
#include <QCloseEvent>
#include <QLayout>
#include <QLabel>
#include <QMenu>
#include <QtCore/QDir>
#include <QtCore/QFile>
#include <QtGui/QApplication>
#include <QtGui/QCloseEvent>
#include <QtGui/QFileDialog>
#include <QtGui/QLabel>
#include <QtGui/QLayout>
#include <QtGui/QLineEdit>
#include <QtGui/QMenu>
#else

23
src/tracks/pattern.cpp
View File

@@ -31,13 +31,12 @@
#ifdef QT4
#include <Qt/QtXml>
#include <QMenu>
#include <QProgressBar>
#include <QPushButton>
#include <QMessageBox>
#include <QImage>
#include <QMouseEvent>
#include <QTimer>
#include <QtCore/QTimer>
#include <QtGui/QMenu>
#include <QtGui/QMessageBox>
#include <QtGui/QMouseEvent>
#include <QtGui/QProgressBar>
#include <QtGui/QPushButton>
#else
@@ -193,7 +192,7 @@ void pattern::init( void )
changeLength( length() );
restoreJournallingState();
#ifndef QT4
#ifdef QT3
// set background-mode for flicker-free redraw
setBackgroundMode( Qt::NoBackground );
#endif
@@ -914,7 +913,13 @@ void pattern::paintEvent( QPaintEvent * )
QPainter p( &m_paintPixmap );
#ifdef QT4
// TODO: gradient!
QLinearGradient lingrad( 0, 0, 0, height() );
const QColor c = isSelected() ? QColor( 0, 0, 224 ) :
QColor( 96, 96, 96 );
lingrad.setColorAt( 0, c );
lingrad.setColorAt( 0.5, Qt::black );
lingrad.setColorAt( 1, c );
p.fillRect( QRect( 1, 1, width() - 2, height() - 2 ), lingrad );
#else
for( int y = 1; y < height() / 2; ++y )
{

6
src/tracks/sample_track.cpp
View File

@@ -30,10 +30,10 @@
#ifdef QT4
#include <QPushButton>
#include <QPainter>
#include <Qt/QtXml>
#include <QDropEvent>
#include <QtGui/QDropEvent>
#include <QtGui/QPainter>
#include <QtGui/QPushButton>
#else

19
src/widgets/automatable_button.cpp
View File

@@ -28,6 +28,17 @@
#include "automatable_button.h"
#ifndef QT3
#include <QtGui/QMouseEvent>
#else
#define indexOf findIndex
#endif
automatableButton::automatableButton( QWidget * _parent, engine * _engine ) :
QWidget( _parent ),
@@ -173,9 +184,9 @@ void automatableButtonGroup::removeButton( automatableButton * _btn )
void automatableButtonGroup::activateButton( automatableButton * _btn )
{
if( _btn != m_buttons[value()] && m_buttons.findIndex( _btn ) != -1 )
if( _btn != m_buttons[value()] && m_buttons.indexOf( _btn ) != -1 )
{
setValue( m_buttons.findIndex( _btn ) );
setValue( m_buttons.indexOf( _btn ) );
}
}
@@ -199,6 +210,10 @@ void automatableButtonGroup::setValue( const int _value )
}
#ifdef QT3
#undef findIndex
#endif
#include "automatable_button.moc"

10
src/widgets/combobox.cpp
View File

@@ -32,11 +32,11 @@
#ifndef QT3
#include <QPainter>
#include <QPixmap>
#include <QApplication>
#include <QDesktopWidget>
#include <QMouseEvent>
#include <QtGui/QApplication>
#include <QtGui/QDesktopWidget>
#include <QtGui/QMouseEvent>
#include <QtGui/QPainter>
#include <QtGui/QPixmap>
#else

2
src/widgets/cpuload_widget.cpp
View File

@@ -30,7 +30,7 @@
#ifdef QT4
#include <QPainter>
#include <QtGui/QPainter>
#else

9
src/widgets/fade_button.cpp
View File

@@ -29,9 +29,9 @@
#ifdef QT4
#include <QTimer>
#include <QPainter>
#include <QPixmap>
#include <QtCore/QTimer>
#include <QtGui/QPainter>
#include <QtGui/QPixmap>
#else
@@ -108,6 +108,7 @@ void fadeButton::paintEvent( QPaintEvent * _pe )
}
#ifdef QT4
QPainter p( this );
p.fillRect( rect(), col );
#else
QPixmap draw_pm( rect().size() );
draw_pm.fill( col );
@@ -115,7 +116,7 @@ void fadeButton::paintEvent( QPaintEvent * _pe )
QPainter p( &draw_pm, this );
#endif
p.setPen( QColor( 0, 0, 0 ) );
p.drawRect( 0, 0, width(), height() );
p.drawRect( 0, 0, rect().right(), rect().bottom() );
#ifndef QT4
// and blit all the drawn stuff on the screen...
bitBlt( this, rect().topLeft(), &draw_pm );

15
src/widgets/group_box.cpp
View File

@@ -29,9 +29,9 @@
#ifdef QT4
#include <QPainter>
#include <QTimer>
#include <QMouseEvent>
#include <QtCore/QTimer>
#include <QtGui/QPainter>
#include <QtGui/QMouseEvent>
#else
@@ -192,7 +192,12 @@ void groupBox::animate( void )
void groupBox::updatePixmap( void )
{
#ifndef QT3
QColor bg_color = QApplication::palette().color( QPalette::Active,
QPalette::Background );
#else
QColor bg_color = QApplication::palette().active().background();
#endif
QPixmap pm( size() );
pm.fill( bg_color.dark( 132 ) );
@@ -222,7 +227,11 @@ void groupBox::updatePixmap( void )
//p.setPen( QColor( 255, 255, 255 ) );
#ifndef QT3
p.setPen( palette().color( QPalette::Active, QPalette::ButtonText ) );
#else
p.setPen( colorGroup().buttonText() );
#endif
p.setFont( pointSize<7>( font() ) );
p.drawText( 22, 10, m_caption );

16
src/widgets/kmultitabbar.cpp
View File

@@ -9,14 +9,14 @@
#include "kmultitabbar.h"
#include <QEvent>
#include <QLayout>
#include <QPainter>
#include <QFontMetrics>
#include <QStyle>
#include <QStyleOptionButton>
#include <QApplication>
#include <QFrame>
#include <QtCore/QEvent>
#include <QtGui/QApplication>
#include <QtGui/QFontMetrics>
#include <QtGui/QFrame>
#include <QtGui/QLayout>
#include <QtGui/QPainter>
#include <QtGui/QStyle>
#include <QtGui/QStyleOptionButton>
#include <math.h>

20
src/widgets/knob.cpp
View File

@@ -32,17 +32,15 @@
#ifdef QT4
#include <QPainter>
#include <QPalette>
#include <QBitmap>
#include <QLabel>
#include <QStatusBar>
#include <QMouseEvent>
#include <QMenu>
#include <QStatusBar>
#include <QFontMetrics>
#include <QApplication>
#include <QInputDialog>
#include <QtGui/QApplication>
#include <QtGui/QBitmap>
#include <QtGui/QFontMetrics>
#include <QtGui/QInputDialog>
#include <QtGui/QLabel>
#include <QtGui/QMenu>
#include <QtGui/QMouseEvent>
#include <QtGui/QPainter>
#include <QtGui/QPalette>
#else

8
src/widgets/lcd_spinbox.cpp
View File

@@ -29,10 +29,10 @@
#ifdef QT4
#include <QApplication>
#include <QMouseEvent>
#include <QCursor>
#include <QLabel>
#include <QtGui/QApplication>
#include <QtGui/QCursor>
#include <QtGui/QLabel>
#include <QtGui/QMouseEvent>
#else

6
src/widgets/led_checkbox.cpp
View File

@@ -29,9 +29,9 @@
#ifdef QT4
#include <QPaintEvent>
#include <QFontMetrics>
#include <QPainter>
#include <QtGui/QFontMetrics>
#include <QtGui/QPainter>
#include <QtGui/QPaintEvent>
#else

4
src/widgets/nstate_button.cpp
View File

@@ -3,7 +3,7 @@
/*
* nstate_button.cpp - implementation of n-state-button
*
* Copyright (c) 2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -29,7 +29,7 @@
#ifdef QT4
#include <QMouseEvent>
#include <QtGui/QMouseEvent>
#endif

4
src/widgets/pixmap_button.cpp
View File

@@ -30,8 +30,8 @@
#ifdef QT4
#include <QPainter>
#include <QMouseEvent>
#include <QtGui/QMouseEvent>
#include <QtGui/QPainter>
#else

26
src/widgets/project_notes.cpp
View File

@@ -30,15 +30,15 @@
#ifdef QT4
#include <Qt/QtXml>
#include <QApplication>
#include <QTextEdit>
#include <QLineEdit>
#include <QAction>
#include <QToolBar>
#include <QFontDatabase>
#include <QComboBox>
#include <QColorDialog>
#include <QTextCursor>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QColorDialog>
#include <QtGui/QComboBox>
#include <QtGui/QFontDatabase>
#include <QtGui/QLineEdit>
#include <QtGui/QTextCursor>
#include <QtGui/QTextEdit>
#include <QtGui/QToolBar>
#else
@@ -112,16 +112,18 @@ projectNotes::projectNotes( engine * _engine) :
setWindowIcon( embed::getIconPixmap( "project_notes" ) );
resize( 300, 200 );
QWidget * w = ( parentWidget() != NULL ) ? parentWidget() : this;
if( eng()->getMainWindow()->workspace() != NULL )
{
move( 700, 10 );
w->move( 700, 10 );
}
else
{
move( 800, 10 );
w->move( 800, 10 );
}
show();
//show();
}

6
src/widgets/rename_dialog.cpp
View File

@@ -3,7 +3,7 @@
/*
* rename_dialog.cpp - implementation of dialog for renaming something
*
* Copyright (c) 2004-2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -29,8 +29,8 @@
#ifdef QT4
#include <QLineEdit>
#include <QKeyEvent>
#include <QtGui/QKeyEvent>
#include <QtGui/QLineEdit>
#else

6
src/widgets/side_bar_widget.cpp
View File

@@ -29,9 +29,9 @@
#ifdef QT4
#include <QApplication>
#include <QPainter>
#include <QFontMetrics>
#include <QtGui/QApplication>
#include <QtGui/QFontMetrics>
#include <QtGui/QPainter>
#else

21
src/widgets/tab_widget.cpp
View File

@@ -1,9 +1,9 @@
#ifndef SINGLE_SOURCE_COMPILE
/*
* tabwidget.cpp - tabwidget for LMMS
* tab_widget.cpp - tabwidget for LMMS
*
* Copyright (c) 2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -29,10 +29,10 @@
#ifdef QT4
#include <QPainter>
#include <QPixmap>
#include <QMouseEvent>
#include <QWheelEvent>
#include <QtGui/QMouseEvent>
#include <QtGui/QPainter>
#include <QtGui/QPixmap>
#include <QtGui/QWheelEvent>
#else
@@ -62,13 +62,16 @@ tabWidget::tabWidget( const QString & _caption, QWidget * _parent ) :
setPaletteBackgroundColor( QColor( 96, 96, 96 ) );
setBackgroundMode( Qt::NoBackground );
#endif*/
QColor bg_color = QApplication::palette().active().background().dark(
132 );
#ifdef QT4
#ifndef QT3
QColor bg_color = QApplication::palette().color( QPalette::Active,
QPalette::Background ).
dark( 132 );
QPalette pal = palette();
pal.setColor( QPalette::Background, bg_color );
setPalette( pal );
#else
QColor bg_color = QApplication::palette().active().background().dark(
132 );
setPaletteBackgroundColor( bg_color );
#endif
}

6
src/widgets/tempo_sync_knob.cpp
View File

@@ -30,9 +30,9 @@
#ifdef QT4
#include <QLabel>
#include <QMouseEvent>
#include <QMenu>
#include <QtGui/QLabel>
#include <QtGui/QMenu>
#include <QtGui/QMouseEvent>
#else

4
src/widgets/text_float.cpp
View File

@@ -29,8 +29,8 @@
#ifdef QT4
#include <QPainter>
#include <QTimer>
#include <QtCore/QTimer>
#include <QtGui/QPainter>
#else

4
src/widgets/tooltip.cpp
View File

@@ -3,7 +3,7 @@
/*
* tooltip.cpp - namespace toolTip, a tooltip-wrapper for LMMS
*
* Copyright (c) 2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -29,7 +29,7 @@
#ifdef QT4
#include <QToolTip>
#include <QtGui/QToolTip>
#else

8
src/widgets/visualization_widget.cpp
View File

@@ -29,10 +29,10 @@
#ifdef QT4
#include <QPainter>
#include <QPixmap>
#include <QTimer>
#include <QMouseEvent>
#include <QtCore/QTimer>
#include <QtGui/QMouseEvent>
#include <QtGui/QPainter>
#include <QtGui/QPixmap>
#else