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

Qt deprecation fix (#5619)

Browse Source 
Qt6 TODO: Orientation check by comparing angleDelta().x() and y() won't make sense
because the direction is arbitrary in Qt 6.
This commit is contained in:
Dat Ng
2020-09-13 04:09:46 +02:00
committed by GitHub
parent d29066fa83
commit 3d8b31039f
30 changed files with 255 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GigPlayer/PatchesDialog.h
View File

@@ -43,7 +43,7 @@ class PatchesDialog : public QDialog, private Ui::PatchesDialog
public:
// Constructor.
PatchesDialog( QWidget * pParent = 0, Qt::WindowFlags wflags = 0 );
PatchesDialog(QWidget * pParent = 0, Qt::WindowFlags wflags = QFlag(0));
// Destructor.
virtual ~PatchesDialog();

2
plugins/audio_file_processor/audio_file_processor.cpp
View File

@@ -867,7 +867,7 @@ void AudioFileProcessorWaveView::mouseMoveEvent( QMouseEvent * _me )
void AudioFileProcessorWaveView::wheelEvent( QWheelEvent * _we )
{
zoom( _we->delta() > 0 );
zoom( _we->angleDelta().y() > 0 );
update();
}

2
plugins/ladspa_browser/ladspa_port_dialog.cpp
View File

@@ -65,7 +65,7 @@ ladspaPortDialog::ladspaPortDialog( const ladspa_key_t & _key )
for( int col = 0; col < 7; ++col )
{
QTableWidgetItem * item = new QTableWidgetItem;
item->setFlags( 0 );
item->setFlags(QFlag(0));
settings->setItem( row, col, item );
}

9
plugins/lb302/lb302.cpp
View File

@@ -433,8 +433,11 @@ QString lb302Synth::nodeName() const
// OBSOLETE. Break apart once we get Q_OBJECT to work. >:[
void lb302Synth::recalcFilter()
{
#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0))
vcf.loadRelaxed()->recalc();
#else
vcf.load()->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.
@@ -683,7 +686,11 @@ void lb302Synth::initNote( lb302Note *n)
if(n->dead ==0){
// Swap next two blocks??
#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0))
vcf.loadRelaxed()->playNote();
#else
vcf.load()->playNote();
#endif
// Ensure envelope is recalculated
vcf_envpos = ENVINC;

2
plugins/sf2_player/patches_dialog.h
View File

@@ -43,7 +43,7 @@ class patchesDialog : public QDialog, private Ui::patchesDialog
public:
// Constructor.
patchesDialog(QWidget *pParent = 0, Qt::WindowFlags wflags = 0);
patchesDialog(QWidget *pParent = 0, Qt::WindowFlags wflags = QFlag(0));
// Destructor.
virtual ~patchesDialog();