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

Added initial Qt5 support

Browse Source 
LMMS now properly builds and runs with Qt5. Various deprecated functions
had to be replaced like QString::toAscii()/fromAscii(). Also occurences
of FALSE/TRUE have been replaced with false/true.

LmmsStyle now derives from QProxyStyle and sets a style instance as base
style (Plastique for Qt4, Fusion for Qt5).

MOC files are not included anymore but added as regular source files.

What's missing is support for embedding VST plugins into a subwindow
inside LMMS on Linux/X11 due to missing QX11EmbedContainer class in Qt5.

Build instructions can be found in INSTALL.Qt5

Minimum version requirement for Qt4 has been raised to 4.6.0 for best
API compatibility between Qt4 and Qt5.
This commit is contained in:
Tobias Doerffel
2014-08-14 17:26:05 +02:00
parent dea2631035
commit 4cee046909
284 changed files with 1043 additions and 966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Amplifier/AmplifierControlDialog.cpp
View File

@@ -23,7 +23,7 @@
*
*/
#include <QtGui/QLayout>
#include <QLayout>
#include "AmplifierControlDialog.h"
#include "AmplifierControls.h"

4
plugins/Amplifier/AmplifierControls.cpp
View File

@@ -24,7 +24,7 @@
*/
#include <QtXml/QDomElement>
#include <QDomElement>
#include "AmplifierControls.h"
#include "Amplifier.h"
@@ -78,5 +78,5 @@ void AmplifierControls::saveSettings( QDomDocument& doc, QDomElement& _this )
#include "moc_AmplifierControls.cxx"

2
plugins/BassBooster/BassBoosterControlDialog.cpp
View File

@@ -22,7 +22,7 @@
*
*/
#include <QtGui/QLayout>
#include <QLayout>
#include "BassBoosterControlDialog.h"
#include "BassBoosterControls.h"

4
plugins/BassBooster/BassBoosterControls.cpp
View File

@@ -23,7 +23,7 @@
*/
#include <QtXml/QDomElement>
#include <QDomElement>
#include "BassBoosterControls.h"
#include "BassBooster.h"
@@ -98,5 +98,5 @@ void BassBoosterControls::saveSettings( QDomDocument& doc, QDomElement& _this )
#include "moc_BassBoosterControls.cxx"

2
plugins/DualFilter/DualFilterControlDialog.cpp
View File

@@ -23,7 +23,7 @@
*
*/
#include <QtGui/QLayout>
#include <QLayout>
#include "DualFilterControlDialog.h"
#include "DualFilterControls.h"

4
plugins/DualFilter/DualFilterControls.cpp
View File

@@ -24,7 +24,7 @@
*/
#include <QtXml/QDomElement>
#include <QDomElement>
#include "DualFilterControls.h"
#include "DualFilter.h"
@@ -163,5 +163,5 @@ void DualFilterControls::saveSettings( QDomDocument& _doc, QDomElement& _this )
#include "moc_DualFilterControls.cxx"

10
plugins/HydrogenImport/HydrogenImport.cpp
View File

@@ -1,8 +1,8 @@
#include <QtXml/QDomDocument>
#include <QtCore/QDir>
#include <QtGui/QApplication>
#include <QtGui/QMessageBox>
#include <QtGui/QProgressDialog>
#include <QDomDocument>
#include <QDir>
#include <QApplication>
#include <QMessageBox>
#include <QProgressDialog>
#include <QTextStream>
#include <stdlib.h>

6
plugins/HydrogenImport/HydrogenImport.h
View File

@@ -1,9 +1,9 @@
#ifndef _HYDROGEN_IMPORT_H
#define _HYDROGEN_IMPORT_H
#include <QtCore/QString>
#include <QtCore/QPair>
#include <QtCore/QVector>
#include <QString>
#include <QPair>
#include <QVector>
#include "ImportFilter.h"

6
plugins/LadspaEffect/LadspaControlDialog.cpp
View File

@@ -25,8 +25,8 @@
*/
#include <QtGui/QGroupBox>
#include <QtGui/QLayout>
#include <QGroupBox>
#include <QLayout>
#include "LadspaEffect.h"
#include "LadspaControlDialog.h"
@@ -143,5 +143,5 @@ void LadspaControlDialog::updateEffectView( LadspaControls * _ctl )
}
#include "moc_LadspaControlDialog.cxx"

4
plugins/LadspaEffect/LadspaControls.cpp
View File

@@ -22,7 +22,7 @@
*
*/
#include <QtXml/QDomElement>
#include <QDomElement>
#include "LadspaEffect.h"
@@ -183,5 +183,5 @@ void LadspaControls::updateLinkStatesFromGlobal()
}
#include "moc_LadspaControls.cxx"

16
plugins/LadspaEffect/LadspaEffect.cpp
View File

@@ -24,7 +24,7 @@
*/
#include <QtGui/QMessageBox>
#include <QMessageBox>
#include "LadspaEffect.h"
#include "DataFile.h"
@@ -79,7 +79,7 @@ LadspaEffect::LadspaEffect( Model * _parent,
arg( m_key.second ),
QMessageBox::Ok, QMessageBox::NoButton );
}
setOkay( FALSE );
setOkay( false );
return;
}
@@ -138,7 +138,7 @@ bool LadspaEffect::processAudioBuffer( sampleFrame * _buf,
if( !isOkay() || dontRun() || !isRunning() || !isEnabled() )
{
m_pluginMutex.unlock();
return( FALSE );
return( false );
}
int frames = _frames;
@@ -453,7 +453,7 @@ void LadspaEffect::pluginInstantiation()
QMessageBox::warning( 0, "Effect",
"Can't get LADSPA descriptor function: " + m_key.second,
QMessageBox::Ok, QMessageBox::NoButton );
setOkay( FALSE );
setOkay( false );
return;
}
if( m_descriptor->run == NULL )
@@ -461,7 +461,7 @@ void LadspaEffect::pluginInstantiation()
QMessageBox::warning( 0, "Effect",
"Plugin has no processor: " + m_key.second,
QMessageBox::Ok, QMessageBox::NoButton );
setDontRun( TRUE );
setDontRun( true );
}
for( ch_cnt_t proc = 0; proc < processorCount(); proc++ )
{
@@ -472,7 +472,7 @@ void LadspaEffect::pluginInstantiation()
QMessageBox::warning( 0, "Effect",
"Can't get LADSPA instance: " + m_key.second,
QMessageBox::Ok, QMessageBox::NoButton );
setOkay( FALSE );
setOkay( false );
return;
}
m_handles.append( effect );
@@ -492,7 +492,7 @@ void LadspaEffect::pluginInstantiation()
QMessageBox::warning( 0, "Effect",
"Failed to connect port: " + m_key.second,
QMessageBox::Ok, QMessageBox::NoButton );
setDontRun( TRUE );
setDontRun( true );
return;
}
}
@@ -577,5 +577,5 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model * _parent, void * _data )
}
#include "moc_LadspaEffect.cxx"

2
plugins/LadspaEffect/LadspaEffect.h
View File

@@ -26,7 +26,7 @@
#ifndef _LADSPA_EFFECT_H
#define _LADSPA_EFFECT_H
#include <QtCore/QMutex>
#include <QMutex>
#include "Effect.h"
#include "LadspaBase.h"

4
plugins/LadspaEffect/LadspaSubPluginFeatures.cpp
View File

@@ -25,8 +25,8 @@
*
*/
#include <QtGui/QHBoxLayout>
#include <QtGui/QLabel>
#include <QHBoxLayout>
#include <QLabel>
#include "LadspaSubPluginFeatures.h"
#include "AudioDevice.h"

4
plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp
View File

@@ -22,8 +22,8 @@
*
*/
#include <QtGui/QLayout>
#include <QtGui/QPainter>
#include <QLayout>
#include <QPainter>
#include "SpectrumAnalyzer.h"
#include "MainWindow.h"

2
plugins/SpectrumAnalyzer/SpectrumAnalyzerControls.cpp
View File

@@ -57,5 +57,5 @@ void SpectrumAnalyzerControls::saveSettings( QDomDocument & _doc,
#include "moc_SpectrumAnalyzerControls.cxx"

2
plugins/VstEffect/VstEffect.cpp
View File

@@ -22,7 +22,7 @@
*
*/
#include <QtGui/QMessageBox>
#include <QMessageBox>
#include "VstEffect.h"
#include "song.h"

2
plugins/VstEffect/VstEffect.h
View File

@@ -25,7 +25,7 @@
#ifndef _VST_EFFECT_H
#define _VST_EFFECT_H
#include <QtCore/QMutex>
#include <QMutex>
#include "Effect.h"
#include "VstPlugin.h"

14
plugins/VstEffect/VstEffectControlDialog.cpp
View File

@@ -22,10 +22,10 @@
*
*/
#include <QtGui/QLayout>
#include <QtGui/QMdiArea>
#include <QtGui/QMenu>
#include <QtGui/QPushButton>
#include <QLayout>
#include <QMdiArea>
#include <QMenu>
#include <QPushButton>
#include "VstEffectControlDialog.h"
#include "VstEffect.h"
@@ -35,10 +35,10 @@
#include "tooltip.h"
#include <QObject>
#include <QtGui/QPainter>
#include <QPainter>
#include "gui_templates.h"
#include <QtGui/QToolBar>
#include <QtGui/QLabel>
#include <QToolBar>
#include <QLabel>
VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) :

2
plugins/VstEffect/VstEffectControlDialog.h
View File

@@ -30,7 +30,7 @@
#include <QObject>
#include <QPainter>
#include <QtGui/QLabel>
#include <QLabel>
class VstEffectControls;

8
plugins/VstEffect/VstEffectControls.cpp
View File

@@ -22,13 +22,13 @@
*
*/
#include <QtXml/QDomElement>
#include <QDomElement>
#include "VstEffectControls.h"
#include "VstEffect.h"
#include "MainWindow.h"
#include <QtGui/QMdiArea>
#include <QMdiArea>
#include <QApplication>
@@ -161,7 +161,7 @@ void VstEffectControls::managePlugin( void )
manageVSTEffectView * tt = new manageVSTEffectView( m_effect, this);
ctrHandle = (QObject *)tt;
} else if (m_subWindow != NULL) {
if (m_subWindow->widget()->isVisible() == FALSE) {
if (m_subWindow->widget()->isVisible() == false ) {
m_scrollArea->show();
m_subWindow->show();
} else {
@@ -541,5 +541,5 @@ manageVSTEffectView::~manageVSTEffectView()
#include "moc_VstEffectControls.cxx"

10
plugins/VstEffect/VstEffectControls.h
View File

@@ -28,14 +28,14 @@
#include "EffectControls.h"
#include "VstEffectControlDialog.h"
#include <QtGui/QMenu>
#include <QMenu>
#include "embed.h"
#include <QtGui/QPushButton>
#include <QPushButton>
#include <QtGui/QMdiSubWindow>
#include <QtGui/QScrollArea>
#include <QMdiSubWindow>
#include <QScrollArea>
#include "knob.h"
#include <QtGui/QLayout>
#include <QLayout>
#include <QPainter>
#include <QObject>

4
plugins/VstEffect/VstSubPluginFeatures.cpp
View File

@@ -24,8 +24,8 @@
*
*/
#include <QtCore/QDir>
#include <QtGui/QLabel>
#include <QDir>
#include <QLabel>
#include "VstSubPluginFeatures.h"
#include "config_mgr.h"

26
plugins/audio_file_processor/audio_file_processor.cpp
View File

@@ -23,11 +23,11 @@
*/
#include <QtGui/QPainter>
#include <QtGui/QBitmap>
#include <QtXml/QDomDocument>
#include <QtCore/QFileInfo>
#include <QtGui/QDropEvent>
#include <QPainter>
#include <QBitmap>
#include <QDomDocument>
#include <QFileInfo>
#include <QDropEvent>
#include <samplerate.h>
@@ -232,7 +232,7 @@ void audioFileProcessor::loadSettings( const QDomElement & _this )
{
if( _this.attribute( "src" ) != "" )
{
setAudioFile( _this.attribute( "src" ), FALSE );
setAudioFile( _this.attribute( "src" ), false );
}
else if( _this.attribute( "sampledata" ) != "" )
{
@@ -432,7 +432,7 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument,
"sound like the original sample.") );
m_reverseButton = new pixmapButton( this );
m_reverseButton->setCheckable( TRUE );
m_reverseButton->setCheckable( true );
m_reverseButton->move( 164, 105 );
m_reverseButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap(
"reverse_on" ) );
@@ -447,7 +447,7 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument,
// loop button group
pixmapButton * m_loopOffButton = new pixmapButton( this );
m_loopOffButton->setCheckable( TRUE );
m_loopOffButton->setCheckable( true );
m_loopOffButton->move( 190, 105 );
m_loopOffButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap(
"loop_off_on" ) );
@@ -460,7 +460,7 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument,
pixmapButton * m_loopOnButton = new pixmapButton( this );
m_loopOnButton->setCheckable( TRUE );
m_loopOnButton->setCheckable( true );
m_loopOnButton->move( 190, 124 );
m_loopOnButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap(
"loop_on_on" ) );
@@ -472,7 +472,7 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument,
"The sample loops between the end point and the loop point." ) );
pixmapButton * m_loopPingPongButton = new pixmapButton( this );
m_loopPingPongButton->setCheckable( TRUE );
m_loopPingPongButton->setCheckable( true );
m_loopPingPongButton->move( 216, 124 );
m_loopPingPongButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap(
"loop_pingpong_on" ) );
@@ -507,7 +507,7 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument,
"of the keyboard (< 20 Hz)") );
m_ampKnob = new knob( knobBright_26, this );
m_ampKnob->setVolumeKnob( TRUE );
m_ampKnob->setVolumeKnob( true );
m_ampKnob->move( 5, 108 );
m_ampKnob->setHintText( tr( "Amplify:" )+" ", "%" );
m_ampKnob->setWhatsThis(
@@ -556,7 +556,7 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument,
qRegisterMetaType<f_cnt_t>( "f_cnt_t" );
setAcceptDrops( TRUE );
setAcceptDrops( true );
}
@@ -1262,5 +1262,5 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
}
#include "moc_audio_file_processor.cxx"

2
plugins/audio_file_processor/audio_file_processor.h
View File

@@ -27,7 +27,7 @@
#ifndef AUDIO_FILE_PROCESSOR_H
#define AUDIO_FILE_PROCESSOR_H
#include <QtGui/QPixmap>
#include <QPixmap>
#include "Instrument.h"
#include "InstrumentView.h"

4
plugins/bit_invader/bit_invader.cpp
View File

@@ -23,7 +23,7 @@
*/
#include <QtXml/QDomElement>
#include <QDomElement>
#include "bit_invader.h"
#include "engine.h"
@@ -590,4 +590,4 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
#include "moc_bit_invader.cxx"

2
plugins/dynamics_processor/dynamics_processor_control_dialog.cpp
View File

@@ -24,7 +24,7 @@
*/
#include <QtGui/QLayout>
#include <QLayout>
#include "dynamics_processor_control_dialog.h"
#include "dynamics_processor_controls.h"

4
plugins/dynamics_processor/dynamics_processor_controls.cpp
View File

@@ -24,7 +24,7 @@
*/
#include <QtXml/QDomElement>
#include <QDomElement>
#include "dynamics_processor_controls.h"
#include "dynamics_processor.h"
@@ -168,5 +168,5 @@ void dynProcControls::subOneClicked()
}
#include "moc_dynamics_processor_controls.cxx"

12
plugins/flp_import/FlpImport.cpp
View File

@@ -22,12 +22,12 @@
*
*/
#include <QtXml/QDomDocument>
#include <QtGui/QApplication>
#include <QtGui/QProgressDialog>
#include <QtCore/QDir>
#include <QtCore/QBuffer>
#include <QtCore/QDebug>
#include <QDomDocument>
#include <QApplication>
#include <QProgressDialog>
#include <QDir>
#include <QBuffer>
#include <QDebug>
#include "FlpImport.h"
#include "NotePlayHandle.h"

6
plugins/flp_import/FlpImport.h
View File

@@ -25,9 +25,9 @@
#ifndef _FLP_IMPORT_H
#define _FLP_IMPORT_H
#include <QtCore/QString>
#include <QtCore/QPair>
#include <QtCore/QVector>
#include <QString>
#include <QPair>
#include <QVector>
#include "ImportFilter.h"
#include "note.h"

4
plugins/flp_import/unrtf.cpp
View File

@@ -25,8 +25,8 @@
#include "lmmsconfig.h"
#include <QtCore/QString>
#include <QtCore/QBuffer>
#include <QString>
#include <QBuffer>
#include <cstdio>

6
plugins/kicker/kicker.cpp
View File

@@ -24,8 +24,8 @@
*/
#include <QtXml/QDomDocument>
#include <QtGui/QPainter>
#include <QDomDocument>
#include <QPainter>
#include "kicker.h"
#include "engine.h"
@@ -375,5 +375,5 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
}
#include "moc_kicker.cxx"

2
plugins/kicker/kicker.h
View File

@@ -27,7 +27,7 @@
#ifndef KICKER_H
#define KICKER_H
#include <QtCore/QObject>
#include <QObject>
#include "Instrument.h"
#include "InstrumentView.h"
#include "knob.h"

6
plugins/ladspa_browser/ladspa_browser.cpp
View File

@@ -28,8 +28,8 @@
#include "ladspa_browser.h"
#include <QtGui/QHBoxLayout>
#include <QtGui/QLabel>
#include <QHBoxLayout>
#include <QLabel>
#include "gui_templates.h"
@@ -235,4 +235,4 @@ void ladspaBrowserView::showPorts( const ladspa_key_t & _key )
#include "moc_ladspa_browser.cxx"

12
plugins/ladspa_browser/ladspa_description.cpp
View File

@@ -24,11 +24,11 @@
#include "ladspa_description.h"
#include <QtGui/QGroupBox>
#include <QtGui/QLabel>
#include <QtGui/QListWidget>
#include <QtGui/QScrollArea>
#include <QtGui/QVBoxLayout>
#include <QGroupBox>
#include <QLabel>
#include <QListWidget>
#include <QScrollArea>
#include <QVBoxLayout>
#include "AudioDevice.h"
#include "engine.h"
@@ -217,4 +217,4 @@ void ladspaDescription::onDoubleClicked( QListWidgetItem * _item )
#include "moc_ladspa_description.cxx"

2
plugins/ladspa_browser/ladspa_description.h
View File

@@ -27,7 +27,7 @@
#define _LADSPA_DESCRIPTION_H
#include <QtGui/QWidget>
#include <QWidget>
#include "ladspa_manager.h"

5
plugins/ladspa_browser/ladspa_port_dialog.cpp
View File

@@ -25,8 +25,8 @@
#include "ladspa_port_dialog.h"
#include <QtGui/QLayout>
#include <QtGui/QTableWidget>
#include <QLayout>
#include <QTableWidget>
#include "embed.h"
#include "engine.h"
@@ -172,5 +172,4 @@ ladspaPortDialog::~ladspaPortDialog()
#include "moc_ladspa_port_dialog.cxx"

2
plugins/ladspa_browser/ladspa_port_dialog.h
View File

@@ -27,7 +27,7 @@
#define _LADSPA_PORT_DIALOG_H
#include <QtGui/QDialog>
#include <QDialog>
#include "ladspa_manager.h"

10
plugins/lb302/lb302.cpp
View File

@@ -42,7 +42,7 @@
#include "BandLimitedWave.h"
#include "embed.cpp"
#include "moc_lb302.cxx"
// Envelope Recalculation period
#define ENVINC 64
@@ -439,7 +439,11 @@ QString lb302Synth::nodeName() const
// OBSOLETE. Break apart once we get Q_OBJECT to work. >:[
void lb302Synth::recalcFilter()
{
#if QT_VERSION >= 0x050000
vcf.load()->recalc();
#else
vcf->recalc();
#endif
// THIS IS OLD 3pole/24dB code, I may reintegrate it. Don't need it
// right now. Should be toggled by LB_24_RES_TRICK at the moment.
@@ -693,7 +697,11 @@ void lb302Synth::initNote( lb302Note *n)
if(n->dead ==0){
// Swap next two blocks??
#if QT_VERSION >= 0x050000
vcf.load()->playNote();
#else
vcf->playNote();
#endif
// Ensure envelope is recalculated
vcf_envpos = ENVINC;

4
plugins/lb303/lb303.cpp
View File

@@ -29,7 +29,7 @@
*/
#include <QtXml/QDomDocument>
#include <QDomDocument>
#include "lb303.h"
#include "engine.h"
@@ -41,7 +41,7 @@
#include "audio_port.h"
#include "embed.cpp"
#include "moc_lb303.cxx"
// Envelope Recalculation period

10
plugins/midi_import/MidiImport.cpp
View File

@@ -23,11 +23,11 @@
*/
#include <QtXml/QDomDocument>
#include <QtCore/QDir>
#include <QtGui/QApplication>
#include <QtGui/QMessageBox>
#include <QtGui/QProgressDialog>
#include <QDomDocument>
#include <QDir>
#include <QApplication>
#include <QMessageBox>
#include <QProgressDialog>
#include "MidiImport.h"
#include "TrackContainer.h"

6
plugins/midi_import/MidiImport.h
View File

@@ -25,9 +25,9 @@
#ifndef _MIDI_IMPORT_H
#define _MIDI_IMPORT_H
#include <QtCore/QString>
#include <QtCore/QPair>
#include <QtCore/QVector>
#include <QString>
#include <QPair>
#include <QVector>
#include "MidiEvent.h"
#include "ImportFilter.h"

6
plugins/monstro/Monstro.cpp
View File

@@ -23,7 +23,7 @@
*/
#include <QtXml/QDomElement>
#include <QDomElement>
#include "Monstro.h"
#include "engine.h"
@@ -1597,7 +1597,7 @@ void MonstroView::setWidgetBackground( QWidget * _widget, const QString & _pic )
_widget->setAutoFillBackground( true );
QPalette pal;
pal.setBrush( _widget->backgroundRole(),
PLUGIN_NAME::getIconPixmap( _pic.toAscii().constData() ) );
PLUGIN_NAME::getIconPixmap( _pic.toLatin1().constData() ) );
_widget->setPalette( pal );
}
@@ -1925,4 +1925,4 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
#include "moc_Monstro.cxx"

4
plugins/nes/Nes.cpp
View File

@@ -23,7 +23,7 @@
*/
#include <QtXml/QDomElement>
#include <QDomElement>
#include "Nes.h"
#include "engine.h"
@@ -927,4 +927,4 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
}
#include "moc_Nes.cxx"

4
plugins/opl2/opl2instrument.cpp
View File

@@ -49,7 +49,7 @@
#include "InstrumentPlayHandle.h"
#include "InstrumentTrack.h"
#include <QtXml/QDomDocument>
#include <QDomDocument>
#include "opl.h"
#include "temuopl.h"
@@ -713,4 +713,4 @@ void opl2instrumentView::modelChanged()
}
#include "moc_opl2instrument.cxx"

6
plugins/organic/organic.cpp
View File

@@ -26,8 +26,8 @@
#include "organic.h"
#include <QtXml/QDomElement>
#include <QtGui/QPainter>
#include <QDomElement>
#include <QPainter>
#include "engine.h"
@@ -661,4 +661,4 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
#include "moc_organic.cxx"

6
plugins/papu/papu_instrument.cpp
View File

@@ -24,8 +24,8 @@
*/
#include <QtGui/QPainter>
#include <QtXml/QDomElement>
#include <QPainter>
#include <QDomElement>
#include "Basic_Gb_Apu.h"
#include "papu_instrument.h"
@@ -744,4 +744,4 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
}
#include "moc_papu_instrument.cxx"

2
plugins/papu/papu_instrument.h
View File

@@ -26,7 +26,7 @@
#ifndef _PAPU_H
#define _PAPU_H
#include <QtCore/QObject>
#include <QObject>
#include "Instrument.h"
#include "InstrumentView.h"
#include "knob.h"

22
plugins/patman/patman.cpp
View File

@@ -25,9 +25,9 @@
#include "patman.h"
#include <QtGui/QDragEnterEvent>
#include <QtGui/QPainter>
#include <QtXml/QDomElement>
#include <QDragEnterEvent>
#include <QPainter>
#include <QDomElement>
#include "endian_handling.h"
#include "engine.h"
@@ -105,7 +105,7 @@ void patmanInstrument::saveSettings( QDomDocument & _doc, QDomElement & _this )
void patmanInstrument::loadSettings( const QDomElement & _this )
{
setFile( _this.attribute( "src" ), FALSE );
setFile( _this.attribute( "src" ), false );
m_loopedModel.loadSettings( _this, "looped" );
m_tunedModel.loadSettings( _this, "tuned" );
}
@@ -441,7 +441,7 @@ PatmanView::PatmanView( Instrument * _instrument, QWidget * _parent ) :
InstrumentView( _instrument, _parent ),
m_pi( NULL )
{
setAutoFillBackground( TRUE );
setAutoFillBackground( true );
QPalette pal;
pal.setBrush( backgroundRole(),
PLUGIN_NAME::getIconPixmap( "artwork" ) );
@@ -466,7 +466,7 @@ PatmanView::PatmanView( Instrument * _instrument, QWidget * _parent ) :
m_loopButton = new pixmapButton( this, tr( "Loop" ) );
m_loopButton->setObjectName("loopButton");
m_loopButton->setCheckable( TRUE );
m_loopButton->setCheckable( true );
m_loopButton->move( 195, 138 );
m_loopButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap(
"loop_on" ) );
@@ -480,7 +480,7 @@ PatmanView::PatmanView( Instrument * _instrument, QWidget * _parent ) :
m_tuneButton = new pixmapButton( this, tr( "Tune" ) );
m_tuneButton->setObjectName("tuneButton");
m_tuneButton->setCheckable( TRUE );
m_tuneButton->setCheckable( true );
m_tuneButton->move( 223, 138 );
m_tuneButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap(
"tune_on" ) );
@@ -494,7 +494,7 @@ PatmanView::PatmanView( Instrument * _instrument, QWidget * _parent ) :
m_displayFilename = tr( "No file selected" );
setAcceptDrops( TRUE );
setAcceptDrops( true );
}
@@ -514,7 +514,7 @@ void PatmanView::openFile( void )
QStringList types;
types << tr( "Patch-Files (*.pat)" );
ofd.setFilters( types );
ofd.setNameFilters( types );
if( m_pi->m_patchFile == "" )
{
@@ -532,7 +532,7 @@ void PatmanView::openFile( void )
{
QString f = configManager::inst()->userSamplesDir()
+ m_pi->m_patchFile;
if( QFileInfo( f ).exists() == FALSE )
if( QFileInfo( f ).exists() == false )
{
f = configManager::inst()->factorySamplesDir()
+ m_pi->m_patchFile;
@@ -652,4 +652,4 @@ void PatmanView::modelChanged( void )
#include "moc_patman.cxx"

4
plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp
View File

@@ -25,8 +25,8 @@
#include <QtGui/QLayout>
#include <QtGui/QLabel>
#include <QLayout>
#include <QLabel>
#include "peak_controller_effect_control_dialog.h"
#include "peak_controller_effect_controls.h"

4
plugins/peak_controller_effect/peak_controller_effect_controls.cpp
View File

@@ -24,7 +24,7 @@
*/
#include <QtXml/QDomElement>
#include <QDomElement>
#include "PeakController.h"
#include "peak_controller_effect_controls.h"
@@ -106,5 +106,5 @@ void PeakControllerEffectControls::saveSettings( QDomDocument & _doc,
#include "moc_peak_controller_effect_controls.cxx"

8
plugins/sf2_player/patches_dialog.cpp
View File

@@ -25,7 +25,7 @@
#include "patches_dialog.h"
#include <QtGui/QHeaderView>
#include <QHeaderView>
//#include <QFileInfo>
@@ -75,7 +75,11 @@ patchesDialog::patchesDialog( QWidget *pParent, Qt::WindowFlags wflags )
// pHeader->setResizeMode(QHeaderView::Custom);
pHeader->setDefaultAlignment(Qt::AlignLeft);
// pHeader->setDefaultSectionSize(200);
#if QT_VERSION >= 0x050000
pHeader->setSectionsMovable(false);
#else
pHeader->setMovable(false);
#endif
pHeader->setStretchLastSection(true);
m_progListView->resizeColumnToContents(0); // Prog.
@@ -367,4 +371,4 @@ void patchesDialog::progChanged (QTreeWidgetItem * _curr, QTreeWidgetItem * _pre
}
#include "moc_patches_dialog.cxx"

4
plugins/sf2_player/patches_dialog.h
View File

@@ -30,8 +30,8 @@
#include "LcdSpinBox.h"
#include <fluidsynth.h>
#include <QtGui/QWidget>
#include <QtGui/QLabel>
#include <QWidget>
#include <QLabel>
//----------------------------------------------------------------------------
// qsynthPresetForm -- UI wrapper form.

12
plugins/sf2_player/sf2_player.cpp
View File

@@ -23,10 +23,10 @@
*
*/
#include <QtCore/QDebug>
#include <QtGui/QLayout>
#include <QtGui/QLabel>
#include <QtXml/QDomDocument>
#include <QDebug>
#include <QLayout>
#include <QLabel>
#include <QDomDocument>
#include "FileDialog.h"
#include "sf2_player.h"
@@ -1052,7 +1052,7 @@ void sf2InstrumentView::showFileDialog()
QStringList types;
types << tr( "SoundFont2 Files (*.sf2)" );
ofd.setFilters( types );
ofd.setNameFilters( types );
QString dir;
if( k->m_filename != "" )
@@ -1117,5 +1117,5 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
}
#include "moc_sf2_player.cxx"

2
plugins/sf2_player/sf2_player.h
View File

@@ -27,7 +27,7 @@
#ifndef SF2_PLAYER_H
#define SF2_PLAYER_H
#include <QtCore/QMutex>
#include <QMutex>
#include "Instrument.h"
#include "pixmap_button.h"

4
plugins/sfxr/sfxr.cpp
View File

@@ -36,7 +36,7 @@ float frnd(float range)
}
#include <QtXml/QDomElement>
#include <QDomElement>
#include "sfxr.h"
#include "engine.h"
@@ -1126,4 +1126,4 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model*, void* data )
#include "moc_sfxr.cxx"

12
plugins/sid/sid_instrument.cpp
View File

@@ -24,8 +24,8 @@
*/
#include <QtGui/QPainter>
#include <QtXml/QDomElement>
#include <QPainter>
#include <QDomElement>
#include <cstdio>
@@ -694,19 +694,19 @@ void sidInstrumentView::updateKnobHint()
for( int i = 0; i < 3; ++i )
{
m_voiceKnobs[i].m_attKnob->setHintText( tr( "Attack:" ) + " ", " (" +
QString::fromAscii( attackTime[(int)k->m_voice[i]->
QString::fromLatin1( attackTime[(int)k->m_voice[i]->
m_attackModel.value()] ) + ")" );
toolTip::add( m_voiceKnobs[i].m_attKnob,
attackTime[(int)k->m_voice[i]->m_attackModel.value()] );
m_voiceKnobs[i].m_decKnob->setHintText( tr( "Decay:" ) + " ", " (" +
QString::fromAscii( decRelTime[(int)k->m_voice[i]->
QString::fromLatin1( decRelTime[(int)k->m_voice[i]->
m_decayModel.value()] ) + ")" );
toolTip::add( m_voiceKnobs[i].m_decKnob,
decRelTime[(int)k->m_voice[i]->m_decayModel.value()] );
m_voiceKnobs[i].m_relKnob->setHintText( tr( "Release:" ) + " ", " (" +
QString::fromAscii( decRelTime[(int)k->m_voice[i]->
QString::fromLatin1( decRelTime[(int)k->m_voice[i]->
m_releaseModel.value()] ) + ")" );
toolTip::add( m_voiceKnobs[i].m_relKnob,
decRelTime[(int)k->m_voice[i]->m_releaseModel.value()]);
@@ -830,5 +830,5 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
}
#include "moc_sid_instrument.cxx"

2
plugins/sid/sid_instrument.h
View File

@@ -27,7 +27,7 @@
#ifndef _SID_H
#define _SID_H
#include <QtCore/QObject>
#include <QObject>
#include "Instrument.h"
#include "InstrumentView.h"
#include "knob.h"

2
plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp
View File

@@ -24,7 +24,7 @@
#include <QtGui/QLayout>
#include <QLayout>
#include "stereoenhancer_control_dialog.h"
#include "stereoenhancer_controls.h"

4
plugins/stereo_enhancer/stereoenhancer_controls.cpp
View File

@@ -23,7 +23,7 @@
*/
#include <QtXml/QDomElement>
#include <QDomElement>
#include "stereoenhancer_controls.h"
#include "stereo_enhancer.h"
@@ -65,5 +65,5 @@ void stereoEnhancerControls::saveSettings( QDomDocument & _doc,
#include "moc_stereoenhancer_controls.cxx"

4
plugins/stereo_matrix/stereomatrix_control_dialog.cpp
View File

@@ -24,8 +24,8 @@
#include <QtGui/QLayout>
#include <QtGui/QLabel>
#include <QLayout>
#include <QLabel>
#include "stereomatrix_control_dialog.h"
#include "stereomatrix_controls.h"

4
plugins/stereo_matrix/stereomatrix_controls.cpp
View File

@@ -23,7 +23,7 @@
*/
#include <QtXml/QDomElement>
#include <QDomElement>
#include "stereomatrix_controls.h"
#include "stereo_matrix.h"
@@ -79,5 +79,5 @@ void stereoMatrixControls::saveSettings( QDomDocument & _doc,
#include "moc_stereomatrix_controls.cxx"

14
plugins/stk/mallets/mallets.cpp
View File

@@ -25,8 +25,8 @@
#include "mallets.h"
#include <QtCore/QDir>
#include <QtGui/QMessageBox>
#include <QDir>
#include <QMessageBox>
#include "BandedWG.h"
#include "ModalBar.h"
@@ -351,7 +351,7 @@ void malletsInstrumentView::setWidgetBackground( QWidget * _widget, const QStrin
_widget->setAutoFillBackground( true );
QPalette pal;
pal.setBrush( _widget->backgroundRole(),
PLUGIN_NAME::getIconPixmap( _pic.toAscii().constData() ) );
PLUGIN_NAME::getIconPixmap( _pic.toLatin1().constData() ) );
_widget->setPalette( pal );
}
@@ -534,7 +534,7 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
{
Stk::setSampleRate( _sample_rate );
Stk::setRawwavePath( configManager::inst()->stkDir()
.toAscii().constData() );
.toLatin1().constData() );
m_voice = new ModalBar();
@@ -581,7 +581,7 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
{
Stk::setSampleRate( _sample_rate );
Stk::setRawwavePath( configManager::inst()->stkDir()
.toAscii().constData() );
.toLatin1().constData() );
m_voice = new TubeBell();
@@ -626,7 +626,7 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
{
Stk::setSampleRate( _sample_rate );
Stk::setRawwavePath( configManager::inst()->stkDir()
.toAscii().constData() );
.toLatin1().constData() );
m_voice = new BandedWG();
@@ -670,6 +670,6 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
}
#include "moc_mallets.cxx"

8
plugins/triple_oscillator/TripleOscillator.cpp
View File

@@ -23,9 +23,9 @@
*/
#include <QtXml/QDomDocument>
#include <QtGui/QBitmap>
#include <QtGui/QPainter>
#include <QDomDocument>
#include <QBitmap>
#include <QPainter>
#include "TripleOscillator.h"
#include "automatable_button.h"
@@ -798,5 +798,5 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
}
#include "moc_TripleOscillator.cxx"

20
plugins/vestige/vestige.cpp
View File

@@ -24,13 +24,13 @@
#include "vestige.h"
#include <QtGui/QDropEvent>
#include <QtGui/QMessageBox>
#include <QtGui/QPainter>
#include <QtGui/QPushButton>
#include <QtGui/QMdiArea>
#include <QtGui/QMenu>
#include <QtXml/QDomElement>
#include <QDropEvent>
#include <QMessageBox>
#include <QPainter>
#include <QPushButton>
#include <QMdiArea>
#include <QMenu>
#include <QDomElement>
#include "engine.h"
#include "gui_templates.h"
@@ -552,7 +552,7 @@ void VestigeInstrumentView::managePlugin( void )
if ( m_vi->m_plugin != NULL && m_vi->m_subWindow == NULL ) {
m_vi->p_subWindow = new manageVestigeInstrumentView( _instrument2, _parent2, m_vi);
} else if (m_vi->m_subWindow != NULL) {
if (m_vi->m_subWindow->widget()->isVisible() == FALSE) {
if (m_vi->m_subWindow->widget()->isVisible() == false ) {
m_vi->m_scrollArea->show();
m_vi->m_subWindow->show();
} else {
@@ -634,7 +634,7 @@ void VestigeInstrumentView::openPlugin()
types << tr( "DLL-files (*.dll)" )
<< tr( "EXE-files (*.exe)" )
;
ofd.setFilters( types );
ofd.setNameFilters( types );
if( m_vi->m_pluginDLL != "" )
{
// select previously opened file
@@ -1166,5 +1166,5 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
}
#include "moc_vestige.cxx"

8
plugins/vestige/vestige.h
View File

@@ -27,10 +27,10 @@
#define _VESTIGE_H
#include <QtCore/QMutex>
#include <QtGui/QLayout>
#include <QtGui/QMdiSubWindow>
#include <QtGui/QScrollArea>
#include <QMutex>
#include <QLayout>
#include <QMdiSubWindow>
#include <QScrollArea>
#include "Instrument.h"
#include "InstrumentView.h"

4
plugins/vibed/nine_button_selector.cpp
View File

@@ -26,7 +26,7 @@
#include "nine_button_selector.h"
#include <QtGui/QWhatsThis>
#include <QWhatsThis>
#include "caption_menu.h"
#include "embed.h"
@@ -269,4 +269,4 @@ void nineButtonSelector::displayHelp()
#include "moc_nine_button_selector.cxx"

2
plugins/vibed/string_container.h
View File

@@ -24,7 +24,7 @@
#ifndef _STRING_CONTAINER_H
#define _STRING_CONTAINER_H
#include <QtCore/QVector>
#include <QVector>
#include "vibrating_string.h"

8
plugins/vibed/vibed.cpp
View File

@@ -22,9 +22,9 @@
*
*/
#include <QtXml/QDomDocument>
#include <QtCore/QMap>
#include <QtGui/QWhatsThis>
#include <QDomDocument>
#include <QMap>
#include <QWhatsThis>
#include "vibed.h"
#include "engine.h"
@@ -785,5 +785,5 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
}
#include "moc_vibed.cxx"

37
plugins/vst_base/VstPlugin.cpp
View File

@@ -1,7 +1,7 @@
/*
* VstPlugin.cpp - implementation of VstPlugin class
*
* Copyright (c) 2005-2013 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -24,20 +24,22 @@
#include "VstPlugin.h"
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
#include <QtCore/QLocale>
#include <QtCore/QTemporaryFile>
#include <QtGui/QCloseEvent>
#include <QtGui/QMdiArea>
#include <QtGui/QMdiSubWindow>
#include <QDir>
#include <QFileInfo>
#include <QLocale>
#include <QTemporaryFile>
#include <QCloseEvent>
#include <QMdiArea>
#include <QMdiSubWindow>
#ifdef LMMS_BUILD_LINUX
#include <QtGui/QX11EmbedContainer>
#include <QtGui/QX11Info>
#else
#include <QtGui/QLayout>
#if QT_VERSION < 0x050000
#include <QX11EmbedContainer>
#include <QX11Info>
#endif
#include <QtXml/QDomDocument>
#else
#include <QLayout>
#endif
#include <QDomDocument>
#ifdef LMMS_BUILD_WIN32
#include <windows.h>
@@ -49,7 +51,7 @@
#include "song.h"
#include "templates.h"
#include "FileDialog.h"
#include <QtGui/QLayout>
#include <QLayout>
class vstSubWin : public QMdiSubWindow
@@ -241,22 +243,25 @@ void VstPlugin::showEditor( QWidget * _parent, bool isEffect )
sw->setAttribute( Qt::WA_TranslucentBackground );
sw->setWindowFlags( Qt::FramelessWindowHint );
sw->setWidget( m_pluginWidget );
#if QT_VERSION < 0x050000
QX11EmbedContainer * xe = new QX11EmbedContainer( sw );
xe->embedClient( m_pluginWindowID );
xe->setFixedSize( m_pluginGeometry );
xe->show();
#endif
}
else
{
sw->setWindowFlags( Qt::WindowCloseButtonHint );
sw->setWidget( m_pluginWidget );
#if QT_VERSION < 0x050000
QX11EmbedContainer * xe = new QX11EmbedContainer( sw );
xe->embedClient( m_pluginWindowID );
xe->setFixedSize( m_pluginGeometry );
xe->move( 4, 24 );
xe->show();
#endif
}
}
@@ -662,5 +667,5 @@ QByteArray VstPlugin::saveChunk()
}
#include "moc_VstPlugin.cxx"

12
plugins/vst_base/VstPlugin.h
View File

@@ -25,12 +25,12 @@
#ifndef _VST_PLUGIN_H
#define _VST_PLUGIN_H
#include <QtCore/QMap>
#include <QtCore/QMutex>
#include <QtCore/QPointer>
#include <QtCore/QString>
#include <QtCore/QTimer>
#include <QtGui/QWidget>
#include <QMap>
#include <QMutex>
#include <QPointer>
#include <QString>
#include <QTimer>
#include <QWidget>
#include "Mixer.h"
#include "JournallingObject.h"

4
plugins/watsyn/Watsyn.cpp
View File

@@ -22,7 +22,7 @@
*
*/
#include <QtXml/QDomElement>
#include <QDomElement>
#include "Watsyn.h"
#include "engine.h"
@@ -1283,4 +1283,4 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
}
#include "moc_Watsyn.cxx"

2
plugins/waveshaper/waveshaper_control_dialog.cpp
View File

@@ -24,7 +24,7 @@
*/
#include <QtGui/QLayout>
#include <QLayout>
#include "waveshaper_control_dialog.h"
#include "waveshaper_controls.h"

4
plugins/waveshaper/waveshaper_controls.cpp
View File

@@ -24,7 +24,7 @@
*/
#include <QtXml/QDomElement>
#include <QDomElement>
#include "waveshaper_controls.h"
#include "waveshaper.h"
@@ -167,5 +167,5 @@ void waveShaperControls::subOneClicked()
}
#include "moc_waveshaper_controls.cxx"

4
plugins/zynaddsubfx/CMakeLists.txt
View File

@@ -102,6 +102,10 @@ SET(zynaddsubfx_core_SRCS
ADD_LIBRARY(ZynAddSubFxCore SHARED LocalZynAddSubFx.cpp ${zynaddsubfx_core_SRCS})
TARGET_LINK_LIBRARIES(ZynAddSubFxCore zynaddsubfx_nio ${FFTW3F_LIBRARIES} ${QT_LIBRARIES} -lz -lpthread)
IF(QT5)
TARGET_LINK_LIBRARIES(ZynAddSubFxCore Qt5::Widgets Qt5::Xml)
ENDIF()
IF(LMMS_BUILD_WIN32)
TARGET_LINK_LIBRARIES(ZynAddSubFxCore -lws2_32)
INSTALL(TARGETS ZynAddSubFxCore RUNTIME DESTINATION "${PLUGIN_DIR}")

18
plugins/zynaddsubfx/ZynAddSubFx.cpp
View File

@@ -24,16 +24,12 @@
#include "lmmsconfig.h"
#ifndef LMMS_BUILD_APPLE
#include <Qt/QtXml>
#endif
#ifdef LMMS_BUILD_APPLE
#include <QtXml>
#endif
#include <QtCore/QTemporaryFile>
#include <QtGui/QDropEvent>
#include <QtGui/QGridLayout>
#include <QtGui/QPushButton>
#include <QDir>
#include <QDomDocument>
#include <QTemporaryFile>
#include <QDropEvent>
#include <QGridLayout>
#include <QPushButton>
#include "ZynAddSubFx.h"
#include "engine.h"
@@ -49,7 +45,7 @@
#include "ControllerConnection.h"
#include "embed.cpp"
#include "moc_ZynAddSubFx.cxx"
extern "C"

4
plugins/zynaddsubfx/ZynAddSubFx.h
View File

@@ -25,8 +25,8 @@
#ifndef ZYNADDSUBFX_H
#define ZYNADDSUBFX_H
#include <QtCore/QMap>
#include <QtCore/QMutex>
#include <QMap>
#include <QMutex>
#include "AutomatableModel.h"
#include "Instrument.h"

4
plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp
View File

@@ -47,8 +47,8 @@
*/
#include <QtXml/QDomDocument>
#include <QtCore/QDebug>
#include <QDomDocument>
#include <QDebug>
#include "QtXmlWrapper.h"
#include <string>
#include <sstream>