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

Update code to use FileInfo instead of QFileInfo

Browse Source 
Also removed all blocks similar to
```
#if QT_VERSION >= 0x040806
	filedialog.setOption( QFileDialog::DontUseCustomDirectoryIcons );
#endif
```
as this now takes place in the new subclass's constructor.
This commit is contained in:
Lukas W
2014-01-22 22:24:24 +01:00
parent 0bbfd907ae
commit 2e7bfe17e6
9 changed files with 42 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/SampleBuffer.cpp
View File

@@ -30,7 +30,6 @@
#include <QtCore/QBuffer>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtGui/QFileDialog>
#include <QtGui/QMessageBox>
#include <QtGui/QPainter>
@@ -61,6 +60,8 @@
#include "interpolation.h"
#include "templates.h"
#include "FileDialog.h"
SampleBuffer::SampleBuffer( const QString & _audio_file,
bool _is_base64_data ) :
@@ -829,10 +830,7 @@ void SampleBuffer::visualize( QPainter & _p, const QRect & _dr,
QString SampleBuffer::openAudioFile() const
{
QFileDialog ofd( NULL, tr( "Open audio file" ) );
#if QT_VERSION >= 0x040806
ofd.setOption( QFileDialog::DontUseCustomDirectoryIcons );
#endif
FileDialog ofd( NULL, tr( "Open audio file" ) );
QString dir;
if( !m_audioFile.isEmpty() )
@@ -855,7 +853,7 @@ QString SampleBuffer::openAudioFile() const
}
// change dir to position of previously opened file
ofd.setDirectory( dir );
ofd.setFileMode( QFileDialog::ExistingFiles );
ofd.setFileMode( FileDialog::ExistingFiles );
// set filters
QStringList types;

20
src/core/song.cpp
View File

@@ -25,7 +25,6 @@
#include <QtCore/QCoreApplication>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtGui/QFileDialog>
#include <QtGui/QMessageBox>
#include <math.h>
@@ -47,6 +46,7 @@
#include "ImportFilter.h"
#include "InstrumentTrack.h"
#include "MainWindow.h"
#include "FileDialog.h"
#include "MidiClient.h"
#include "mmp.h"
#include "note_play_handle.h"
@@ -1310,7 +1310,7 @@ bool song::guiSaveProjectAs( const QString & _file_name )
void song::importProject()
{
QFileDialog ofd( NULL, tr( "Import file" ),
FileDialog ofd( NULL, tr( "Import file" ),
configManager::inst()->userProjectsDir(),
tr("MIDI sequences") +
" (*.mid *.midi *.rmi);;" +
@@ -1320,11 +1320,8 @@ void song::importProject()
" (*.h2song);;" +
tr("All file types") +
" (*.*)");
#if QT_VERSION >= 0x040806
ofd.setOption( QFileDialog::DontUseCustomDirectoryIcons );
#endif
ofd.setFileMode( QFileDialog::ExistingFiles );
ofd.setFileMode( FileDialog::ExistingFiles );
if( ofd.exec () == QDialog::Accepted && !ofd.selectedFiles().isEmpty() )
{
ImportFilter::import( ofd.selectedFiles()[0], this );
@@ -1377,13 +1374,10 @@ void song::exportProject(bool multiExport)
return;
}
QFileDialog efd( engine::mainWindow() );
#if QT_VERSION >= 0x040806
efd.setOption( QFileDialog::DontUseCustomDirectoryIcons );
#endif
FileDialog efd( engine::mainWindow() );
if (multiExport)
{
efd.setFileMode( QFileDialog::Directory);
efd.setFileMode( FileDialog::Directory);
efd.setWindowTitle( tr( "Select directory for writing exported tracks..." ) );
if( !m_fileName.isEmpty() )
{
@@ -1392,7 +1386,7 @@ void song::exportProject(bool multiExport)
}
else
{
efd.setFileMode( QFileDialog::AnyFile );
efd.setFileMode( FileDialog::AnyFile );
int idx = 0;
QStringList types;
while( __fileEncodeDevices[idx].m_fileFormat !=
@@ -1417,7 +1411,7 @@ void song::exportProject(bool multiExport)
efd.setWindowTitle( tr( "Select file for project-export..." ) );
}
efd.setAcceptMode( QFileDialog::AcceptSave );
efd.setAcceptMode( FileDialog::AcceptSave );
if( efd.exec() == QDialog::Accepted &&

4
src/gui/MainWindow.cpp
View File

@@ -689,7 +689,7 @@ void MainWindow::openProject( void )
tr( "MultiMedia Project (*.mmp *.mmpz *.xml)" ) );
ofd.setDirectory( configManager::inst()->userProjectsDir() );
ofd.setFileMode( QFileDialog::ExistingFiles );
ofd.setFileMode( FileDialog::ExistingFiles );
if( ofd.exec () == QDialog::Accepted &&
!ofd.selectedFiles().isEmpty() )
{
@@ -764,7 +764,7 @@ bool MainWindow::saveProjectAs( void )
sfd.setDirectory( configManager::inst()->userProjectsDir() );
}
if( sfd.exec () == QFileDialog::Accepted &&
if( sfd.exec () == FileDialog::Accepted &&
!sfd.selectedFiles().isEmpty() && sfd.selectedFiles()[0] != "" )
{
engine::getSong()->guiSaveProjectAs(

25
src/gui/setup_dialog.cpp
View File

@@ -23,7 +23,6 @@
*/
#include <QtGui/QComboBox>
#include <QtGui/QFileDialog>
#include <QtGui/QImageReader>
#include <QtGui/QLabel>
#include <QtGui/QLayout>
@@ -46,6 +45,7 @@
#include "tooltip.h"
#include "led_checkbox.h"
#include "lcd_spinbox.h"
#include "FileDialog.h"
// platform-specific audio-interface-classes
@@ -1056,13 +1056,8 @@ void setupDialog::toggleOneInstrumentTrackWindow( bool _enabled )
void setupDialog::openWorkingDir()
{
QString new_dir = QFileDialog::getExistingDirectory( this,
tr( "Choose LMMS working directory" ),
m_workingDir
#if QT_VERSION >= 0x040806
, QFileDialog::DontUseCustomDirectoryIcons
#endif
);
QString new_dir = FileDialog::getExistingDirectory( this,
tr( "Choose LMMS working directory" ), m_workingDir );
if( new_dir != QString::null )
{
m_wdLineEdit->setText( new_dir );
@@ -1082,7 +1077,7 @@ void setupDialog::setWorkingDir( const QString & _wd )
void setupDialog::openVSTDir()
{
QString new_dir = QFileDialog::getExistingDirectory( this,
QString new_dir = FileDialog::getExistingDirectory( this,
tr( "Choose your VST-plugin directory" ),
m_vstDir );
if( new_dir != QString::null )
@@ -1104,7 +1099,7 @@ void setupDialog::setVSTDir( const QString & _vd )
void setupDialog::openArtworkDir()
{
QString new_dir = QFileDialog::getExistingDirectory( this,
QString new_dir = FileDialog::getExistingDirectory( this,
tr( "Choose artwork-theme directory" ),
m_artworkDir );
if( new_dir != QString::null )
@@ -1126,7 +1121,7 @@ void setupDialog::setArtworkDir( const QString & _ad )
void setupDialog::openFLDir()
{
QString new_dir = QFileDialog::getExistingDirectory( this,
QString new_dir = FileDialog::getExistingDirectory( this,
tr( "Choose FL Studio installation directory" ),
m_flDir );
if( new_dir != QString::null )
@@ -1140,7 +1135,7 @@ void setupDialog::openFLDir()
void setupDialog::openLADSPADir()
{
QString new_dir = QFileDialog::getExistingDirectory( this,
QString new_dir = FileDialog::getExistingDirectory( this,
tr( "Choose LADSPA plugin directory" ),
m_ladDir );
if( new_dir != QString::null )
@@ -1163,7 +1158,7 @@ void setupDialog::openLADSPADir()
void setupDialog::openSTKDir()
{
#ifdef LMMS_HAVE_STK
QString new_dir = QFileDialog::getExistingDirectory( this,
QString new_dir = FileDialog::getExistingDirectory( this,
tr( "Choose STK rawwave directory" ),
m_stkDir );
if( new_dir != QString::null )
@@ -1179,7 +1174,7 @@ void setupDialog::openSTKDir()
void setupDialog::openDefaultSoundfont()
{
#ifdef LMMS_HAVE_FLUIDSYNTH
QString new_file = QFileDialog::getOpenFileName( this,
QString new_file = FileDialog::getOpenFileName( this,
tr( "Choose default SoundFont" ), m_defaultSoundfont,
"SoundFont2 Files (*.sf2)" );
@@ -1212,7 +1207,7 @@ void setupDialog::openBackgroundArtwork()
QString dir = ( m_backgroundArtwork.isEmpty() ) ?
m_artworkDir :
m_backgroundArtwork;
QString new_file = QFileDialog::getOpenFileName( this,
QString new_file = FileDialog::getOpenFileName( this,
tr( "Choose background artwork" ), dir,
"Image Files (" + fileTypes + ")" );

8
src/tracks/InstrumentTrack.cpp
View File

@@ -28,7 +28,6 @@
#include <QtCore/QQueue>
#include <QtGui/QApplication>
#include <QtGui/QCloseEvent>
#include <QtGui/QFileDialog>
#include <QtGui/QLabel>
#include <QtGui/QLayout>
#include <QtGui/QLineEdit>
@@ -38,6 +37,7 @@
#include <QtGui/QMdiSubWindow>
#include <QtGui/QPainter>
#include "FileDialog.h"
#include "InstrumentTrack.h"
#include "AudioPort.h"
#include "AutomationPattern.h"
@@ -1462,7 +1462,7 @@ void InstrumentTrackWindow::modelChanged()
void InstrumentTrackWindow::saveSettingsBtnClicked()
{
QFileDialog sfd( this, tr( "Save preset" ), "",
FileDialog sfd( this, tr( "Save preset" ), "",
tr( "XML preset file (*.xpf)" ) );
QString preset_root = configManager::inst()->userPresetsDir();
@@ -1475,9 +1475,9 @@ void InstrumentTrackWindow::saveSettingsBtnClicked()
QDir( preset_root ).mkdir( m_track->instrumentName() );
}
sfd.setAcceptMode( QFileDialog::AcceptSave );
sfd.setAcceptMode( FileDialog::AcceptSave );
sfd.setDirectory( preset_root + m_track->instrumentName() );
sfd.setFileMode( QFileDialog::AnyFile );
sfd.setFileMode( FileDialog::AnyFile );
if( sfd.exec () == QDialog::Accepted &&
!sfd.selectedFiles().isEmpty() && sfd.selectedFiles()[0] != ""
)