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

Merge remote-tracking branch 'lukas/cleanup/qt4'

Browse Source 
# Conflicts:
#	cmake/toolchains/common/MSYS.cmake
This commit is contained in:
Lukas W
2018-07-17 08:52:49 +02:00
parent 8cca464c27 11c693205e
commit ff1c30e35d
57 changed files with 100 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/AutomatableButton.h
View File

@@ -39,7 +39,7 @@ class LMMS_EXPORT AutomatableButton : public QPushButton, public BoolModelView
Q_OBJECT
public:
AutomatableButton( QWidget * _parent, const QString & _name
= QString::null );
= QString() );
virtual ~AutomatableButton();
inline void setCheckable( bool _on )
@@ -84,7 +84,7 @@ class LMMS_EXPORT automatableButtonGroup : public QWidget, public IntModelView
Q_OBJECT
public:
automatableButtonGroup( QWidget * _parent, const QString & _name
= QString::null );
= QString() );
virtual ~automatableButtonGroup();
void addButton( AutomatableButton * _btn );

2
include/AutomatableSlider.h
View File

@@ -36,7 +36,7 @@ class AutomatableSlider : public QSlider, public IntModelView
{
Q_OBJECT
public:
AutomatableSlider( QWidget * _parent, const QString & _name = QString::null );
AutomatableSlider( QWidget * _parent, const QString & _name = QString() );
virtual ~AutomatableSlider();
bool showStatus()

6
include/FileBrowser.h
View File

@@ -129,13 +129,13 @@ public:
void update( void );
inline QString fullName( QString path = QString::null )
inline QString fullName( QString path = QString() )
{
if( path == QString::null )
if( path == QString() )
{
path = m_directories[0];
}
if( path != QString::null )
if( path != QString() )
{
path += QDir::separator();
}

4
include/LcdSpinBox.h
View File

@@ -34,9 +34,9 @@ class LMMS_EXPORT LcdSpinBox : public LcdWidget, public IntModelView
{
Q_OBJECT
public:
LcdSpinBox( int numDigits, QWidget* parent, const QString& name = QString::null );
LcdSpinBox( int numDigits, QWidget* parent, const QString& name = QString() );
LcdSpinBox( int numDigits, const QString& style, QWidget* parent, const QString& name = QString::null );
LcdSpinBox( int numDigits, const QString& style, QWidget* parent, const QString& name = QString() );
virtual ~LcdSpinBox() = default;

6
include/LcdWidget.h
View File

@@ -40,9 +40,9 @@ class LMMS_EXPORT LcdWidget : public QWidget
Q_PROPERTY( QColor textShadowColor READ textShadowColor WRITE setTextShadowColor )
public:
LcdWidget( QWidget* parent, const QString& name = QString::null );
LcdWidget( int numDigits, QWidget* parent, const QString& name = QString::null );
LcdWidget( int numDigits, const QString& style, QWidget* parent, const QString& name = QString::null );
LcdWidget( QWidget* parent, const QString& name = QString() );
LcdWidget( int numDigits, QWidget* parent, const QString& name = QString() );
LcdWidget( int numDigits, const QString& style, QWidget* parent, const QString& name = QString() );
virtual ~LcdWidget();

4
include/LedCheckbox.h
View File

@@ -45,10 +45,10 @@ public:
} ;
LedCheckBox( const QString & _txt, QWidget * _parent,
const QString & _name = QString::null,
const QString & _name = QString(),
LedColors _color = Yellow );
LedCheckBox( QWidget * _parent,
const QString & _name = QString::null,
const QString & _name = QString(),
LedColors _color = Yellow );
virtual ~LedCheckBox();

6
include/MainApplication.h
View File

@@ -31,12 +31,10 @@
#ifdef LMMS_BUILD_WIN32
#include <windows.h>
#if QT_VERSION >= 0x050000
#include <QAbstractNativeEventFilter>
#endif
#endif
#if defined(LMMS_BUILD_WIN32) && QT_VERSION >= 0x050000
#if defined(LMMS_BUILD_WIN32)
class MainApplication : public QApplication, public QAbstractNativeEventFilter
#else
class MainApplication : public QApplication
@@ -47,10 +45,8 @@ public:
bool event(QEvent* event);
#ifdef LMMS_BUILD_WIN32
bool winEventFilter(MSG* msg, long* result);
#if QT_VERSION >= 0x050000
bool nativeEventFilter(const QByteArray& eventType, void* message,
long* result);
#endif
#endif
inline QString& queuedFile()
{

4
include/MidiApple.h
View File

@@ -47,7 +47,7 @@ public:
inline static QString probeDevice()
{
return QString::Null(); // no midi device name
return QString(); // no midi device name
}
inline static QString name()
@@ -56,7 +56,7 @@ public:
}
inline static QString configSection()
{
return QString::Null(); // no configuration settings
return QString(); // no configuration settings
}
virtual void processOutEvent( const MidiEvent & _me,

4
include/MidiDummy.h
View File

@@ -46,12 +46,12 @@ public:
inline static QString probeDevice()
{
return QString::Null(); // no midi device name
return QString(); // no midi device name
}
inline static QString configSection()
{
return QString::Null(); // no configuration settings
return QString(); // no configuration settings
}

4
include/MidiWinMM.h
View File

@@ -47,7 +47,7 @@ public:
inline static QString probeDevice()
{
return QString::Null(); // no midi device name
return QString(); // no midi device name
}
@@ -58,7 +58,7 @@ public:
inline static QString configSection()
{
return QString::Null(); // no configuration settings
return QString(); // no configuration settings
}

2
include/Model.h
View File

@@ -35,7 +35,7 @@ class LMMS_EXPORT Model : public QObject
{
Q_OBJECT
public:
Model( Model * _parent, QString _display_name = QString::null,
Model( Model * _parent, QString _display_name = QString(),
bool _default_constructed = false ) :
QObject( _parent ),
m_displayName( _display_name ),

2
include/PixmapButton.h
View File

@@ -36,7 +36,7 @@ class LMMS_EXPORT PixmapButton : public AutomatableButton
Q_OBJECT
public:
PixmapButton( QWidget * _parent,
const QString & _name = QString::null );
const QString & _name = QString() );
virtual ~PixmapButton();
void setActiveGraphic( const QPixmap & _pm );

8
include/RemotePlugin.h
View File

@@ -138,8 +138,8 @@ public:
m_shmID( -1 ),
#endif
m_data( NULL ),
m_dataSem( QString::null ),
m_messageSem( QString::null ),
m_dataSem( QString() ),
m_messageSem( QString() ),
m_lockDepth( 0 )
{
#ifdef USE_QT_SHMEM
@@ -181,8 +181,8 @@ public:
m_shmID( shmget( _shm_key, 0, 0 ) ),
#endif
m_data( NULL ),
m_dataSem( QString::null ),
m_messageSem( QString::null ),
m_dataSem( QString() ),
m_messageSem( QString() ),
m_lockDepth( 0 )
{
#ifdef USE_QT_SHMEM

6
include/embed.h
View File

@@ -60,11 +60,11 @@ class PixmapLoader
{
public:
PixmapLoader( const PixmapLoader * _ref ) :
m_name( _ref != NULL ? _ref->m_name : QString::null )
m_name( _ref != NULL ? _ref->m_name : QString() )
{
}
PixmapLoader( const QString & _name = QString::null ) :
PixmapLoader( const QString & _name = QString() ) :
m_name( _name )
{
}
@@ -96,7 +96,7 @@ protected:
class PluginPixmapLoader : public PixmapLoader
{
public:
PluginPixmapLoader( const QString & _name = QString::null ) :
PluginPixmapLoader( const QString & _name = QString() ) :
PixmapLoader( _name )
{
}