Added initial Qt5 support

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.
2014-08-14 17:26:05 +02:00
parent dea2631035
commit 4cee046909
284 changed files with 1043 additions and 966 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,7 @@ OPTION(WANT_TAP		"Include Tom's Audio Processing LADSPA plugins" ON)
 OPTION(WANT_VST		"Include VST support" ON)
 OPTION(WANT_VST_NOWINE	"Include partial VST support (without wine)" OFF)
 OPTION(WANT_WINMM	"Include WinMM MIDI support" OFF)
+OPTION(WANT_QT5		"Build with Qt5" OFF)


 IF(LMMS_BUILD_APPLE)
@@ -97,8 +98,20 @@ CHECK_INCLUDE_FILES(locale.h LMMS_HAVE_LOCALE_H)

 LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}")

+IF(WANT_QT5)
+	SET(QT5 TRUE)
+
+	FIND_PACKAGE(Qt5Core REQUIRED)
+	FIND_PACKAGE(Qt5Gui REQUIRED)
+	FIND_PACKAGE(Qt5Widgets REQUIRED)
+	FIND_PACKAGE(Qt5Xml REQUIRED)
+
+
+ELSE()
+	SET(QT5 FALSE)
+
 # check for Qt4
-SET(QT_MIN_VERSION "4.3.0" COMPONENTS QtCore QtGui QtXml)
+SET(QT_MIN_VERSION "4.6.0" COMPONENTS QtCore QtGui QtXml)
 FIND_PACKAGE(Qt4 REQUIRED)
 SET(QT_USE_QTXML 1)
 EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_TRANSLATIONS" OUTPUT_VARIABLE QT_TRANSLATIONS_DIR)
@@ -113,6 +126,7 @@ IF(NOT WIN32)
 	STRING(REPLACE "-DQT_DLL" "" QT_DEFINITIONS "${QT_DEFINITIONS}")
 ENDIF(NOT WIN32)
 INCLUDE("${QT_USE_FILE}")
+ENDIF()

 # check for libsndfile
 PKG_CHECK_MODULES(SNDFILE REQUIRED sndfile>=1.0.11)
@@ -357,9 +371,13 @@ ENDIF(GIT_FOUND)

 SET(lmms_EMBEDDED_RESOURCES "${CMAKE_SOURCE_DIR}/AUTHORS" "${CMAKE_SOURCE_DIR}/COPYING" "${CONTRIBUTORS}")

+IF(QT5)
+QT5_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw)
+QT5_WRAP_UI(lmms_UI_out ${lmms_UI})
+ELSE()
 QT4_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw)
 QT4_WRAP_UI(lmms_UI_out ${lmms_UI})
-
+ENDIF()

 # embedded resources stuff
 IF(WIN32 OR WIN64)
@@ -375,7 +393,7 @@ ENDIF(WIN32 OR WIN64)
 SET(LMMS_ER_H "${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h")

 # we somehow have to make LMMS-binary depend on MOC-files
-ADD_FILE_DEPENDENCIES("${CMAKE_BINARY_DIR}/lmmsconfig.h" ${lmms_MOC_out})
+ADD_FILE_DEPENDENCIES("${CMAKE_BINARY_DIR}/lmmsconfig.h")

 ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND "${BIN2RES}" ARGS ${lmms_EMBEDDED_RESOURCES} > "\"${LMMS_ER_H}\"" DEPENDS "${BIN2RES}")

@@ -448,10 +466,14 @@ IF(NOT ("${OGGVORBIS_INCLUDE_DIR}" STREQUAL ""))
 ENDIF()

 ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz" COMMAND gzip -c "\"${CMAKE_SOURCE_DIR}/lmms.1\"" > "\"${CMAKE_BINARY_DIR}/lmms.1.gz\"" DEPENDS "${CMAKE_SOURCE_DIR}/lmms.1" COMMENT "Generating lmms.1.gz")
-ADD_EXECUTABLE(lmms ${lmms_SOURCES} ${lmms_INCLUDES} "${LMMS_ER_H}" ${lmms_UI_out} lmmsconfig.h lmmsversion.h "${WINRC}" "${CMAKE_BINARY_DIR}/lmms.1.gz")
+ADD_EXECUTABLE(lmms ${lmms_SOURCES} ${lmms_INCLUDES} ${lmms_MOC_out} "${LMMS_ER_H}" ${lmms_UI_out} lmmsconfig.h lmmsversion.h "${WINRC}" "${CMAKE_BINARY_DIR}/lmms.1.gz")

 TARGET_LINK_LIBRARIES(lmms ${CMAKE_THREAD_LIBS_INIT} ${QT_LIBRARIES} ${ASOUND_LIBRARY} ${SDL_LIBRARY} ${PORTAUDIO_LIBRARIES} ${PULSEAUDIO_LIBRARIES} ${JACK_LIBRARIES} ${OGGVORBIS_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${SNDFILE_LIBRARIES} ${EXTRA_LIBRARIES})

+IF(QT5)
+	TARGET_LINK_LIBRARIES(lmms Qt5::Widgets Qt5::Xml)
+ENDIF()
+
 IF(LMMS_BUILD_WIN32)

 	SET_TARGET_PROPERTIES(lmms PROPERTIES LINK_FLAGS "${LINK_FLAGS} -mwindows")
--- a/INSTALL.Qt5
+++ b/INSTALL.Qt5
@@ -0,0 +1,12 @@
+First of all please note that CMake >= 2.8.11 is required for building with
+Qt5 support. In order to build LMMS with Qt5, add the following flag when
+invoking cmake:
+
+-DWANT_QT5=ON
+
+If your Qt5 installation does not reside in standard installation paths,
+additionally pass e.g.
+
+-DCMAKE_PREFIX_PATH=/opt/qt53/
+
+
--- a/cmake/modules/BuildPlugin.cmake
+++ b/cmake/modules/BuildPlugin.cmake
@@ -67,10 +67,16 @@ MACRO(BUILD_PLUGIN)
 			DEPENDS ${BIN2RES})
 	ENDIF(ER_LEN)

+	IF(QT5)
+	QT5_WRAP_CPP(plugin_MOC_out ${PLUGIN_MOCFILES})
+	QT5_WRAP_UI(plugin_UIC_out ${PLUGIN_UICFILES})
+	ELSE()
 	QT4_WRAP_CPP(plugin_MOC_out ${PLUGIN_MOCFILES})
 	QT4_WRAP_UI(plugin_UIC_out ${PLUGIN_UICFILES})
+	ENDIF()
+
 	FOREACH(f ${PLUGIN_SOURCES})
-		ADD_FILE_DEPENDENCIES(${f} ${ER_H} ${plugin_MOC_out} ${plugin_UIC_out})
+		ADD_FILE_DEPENDENCIES(${f} ${ER_H} ${plugin_UIC_out})
 	ENDFOREACH(f)

 	IF(LMMS_BUILD_APPLE)
@@ -82,7 +88,11 @@ MACRO(BUILD_PLUGIN)
        	LINK_LIBRARIES(-llmms ${QT_LIBRARIES})
 	ENDIF(LMMS_BUILD_WIN32)

-	ADD_LIBRARY(${PLUGIN_NAME} MODULE ${PLUGIN_SOURCES})
+	ADD_LIBRARY(${PLUGIN_NAME} MODULE ${PLUGIN_SOURCES} ${plugin_MOC_out})
+	IF(QT5)
+	TARGET_LINK_LIBRARIES(${PLUGIN_NAME} Qt5::Widgets Qt5::Xml)
+	ENDIF()
+
 	INSTALL(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION "${PLUGIN_DIR}")

 	IF(LMMS_BUILD_APPLE)
--- a/include/AudioDevice.h
+++ b/include/AudioDevice.h
@@ -95,7 +95,7 @@ public:
 	public:
 		setupWidget( const QString & _caption, QWidget * _parent ) :
 			tabWidget( tabWidget::tr( "Settings for %1" ).arg(
-					tabWidget::tr( _caption.toAscii() ) ).
+					tabWidget::tr( _caption.toLatin1() ) ).
 							toUpper(), _parent )
 		{
 		}
--- a/include/AutomatableModelView.h
+++ b/include/AutomatableModelView.h
@@ -29,7 +29,7 @@
 #include "AutomatableModel.h"

 class QMenu;
-
+class QMouseEvent;

 class EXPORT AutomatableModelView : public ModelView
 {
--- a/include/AutomationEditor.h
+++ b/include/AutomationEditor.h
@@ -27,7 +27,7 @@
 #define AUTOMATION_EDITOR_H

 #include <QtCore/QMutex>
-#include <QtGui/QWidget>
+#include <QWidget>

 #include "lmms_basics.h"
 #include "JournallingObject.h"
--- a/include/Clipboard.h
+++ b/include/Clipboard.h
@@ -26,7 +26,7 @@
 #define _CLIPBOARD_H

 #include <QtCore/QMap>
-#include <QtXml/QDomElement>
+#include <QDomElement>


 class JournallingObject;
--- a/include/ControllerConnectionDialog.h
+++ b/include/ControllerConnectionDialog.h
@@ -27,9 +27,9 @@
 #ifndef _CONTROLLER_CONNECTION_DIALOG_H
 #define _CONTROLLER_CONNECTION_DIALOG_H

-#include <QtGui/QDialog>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QStandardItemModel>
+#include <QDialog>
+#include <QSortFilterProxyModel>
+#include <QStandardItemModel>

 #include "Controller.h"
 #include "AutomatableModel.h"
--- a/include/ControllerDialog.h
+++ b/include/ControllerDialog.h
@@ -26,7 +26,7 @@
 #ifndef _CONTROLLER_DIALOG_H
 #define _CONTROLLER_DIALOG_H

-#include <QtGui/QWidget>
+#include <QWidget>

 #include "ModelView.h"

--- a/include/ControllerRackView.h
+++ b/include/ControllerRackView.h
@@ -25,7 +25,7 @@
 #ifndef _CONTROLLER_RACK_VIEW_H
 #define _CONTROLLER_RACK_VIEW_H

-#include <QtGui/QWidget>
+#include <QWidget>

 #include "SerializingObject.h"
 #include "lmms_basics.h"
--- a/include/ControllerView.h
+++ b/include/ControllerView.h
@@ -25,7 +25,7 @@
 #ifndef _CONTROLLER_VIEW_H
 #define _CONTROLLER_VIEW_H

-#include <QtGui/QWidget>
+#include <QWidget>

 #include "AutomatableModel.h"
 #include "Controller.h"
--- a/include/DataFile.h
+++ b/include/DataFile.h
@@ -27,7 +27,7 @@
 #ifndef DATA_FILE_H
 #define DATA_FILE_H

-#include <QtXml/QDomDocument>
+#include <QDomDocument>
 #include <QTextStream>

 #include "export.h"
--- a/include/EffectControlDialog.h
+++ b/include/EffectControlDialog.h
@@ -26,7 +26,7 @@
 #ifndef _EFFECT_CONTROL_DIALOG_H
 #define _EFFECT_CONTROL_DIALOG_H

-#include <QtGui/QWidget>
+#include <QWidget>

 #include "ModelView.h"

--- a/include/EffectRackView.h
+++ b/include/EffectRackView.h
@@ -26,7 +26,7 @@
 #ifndef _EFFECT_RACK_VIEW_H
 #define _EFFECT_RACK_VIEW_H

-#include <QtGui/QWidget>
+#include <QWidget>

 #include "EffectChain.h"
 #include "ModelView.h"
--- a/include/EffectSelectDialog.h
+++ b/include/EffectSelectDialog.h
@@ -25,9 +25,9 @@
 #ifndef _EFFECT_SELECT_DIALOG_H
 #define _EFFECT_SELECT_DIALOG_H

-#include <QtGui/QDialog>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QStandardItemModel>
+#include <QDialog>
+#include <QSortFilterProxyModel>
+#include <QStandardItemModel>

 #include "EffectChain.h"
 #include "Effect.h"
--- a/include/EnvelopeAndLfoView.h
+++ b/include/EnvelopeAndLfoView.h
@@ -26,7 +26,7 @@
 #ifndef ENVELOPE_AND_LFO_VIEW_H
 #define ENVELOPE_AND_LFO_VIEW_H

-#include <QtGui/QWidget>
+#include <QWidget>

 #include "ModelView.h"

--- a/include/FileDialog.h
+++ b/include/FileDialog.h
@@ -26,7 +26,7 @@
 #ifndef FILEDIALOG_H
 #define FILEDIALOG_H

-#include <QtGui/QFileDialog>
+#include <QFileDialog>

 #include "export.h"

--- a/include/FxMixerView.h
+++ b/include/FxMixerView.h
@@ -25,10 +25,10 @@
 #ifndef FX_MIXER_VIEW_H
 #define FX_MIXER_VIEW_H

-#include <QtGui/QWidget>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QStackedLayout>
-#include <QtGui/QScrollArea>
+#include <QWidget>
+#include <QHBoxLayout>
+#include <QStackedLayout>
+#include <QScrollArea>

 #include "FxLine.h"
 #include "FxMixer.h"
--- a/include/Instrument.h
+++ b/include/Instrument.h
@@ -26,7 +26,7 @@
 #ifndef INSTRUMENT_H
 #define INSTRUMENT_H

-#include <QtGui/QWidget>
+#include <QWidget>

 #include "Plugin.h"
 #include "Mixer.h"
--- a/include/InstrumentFunctionViews.h
+++ b/include/InstrumentFunctionViews.h
@@ -27,7 +27,7 @@

 #include "ModelView.h"

-#include <QtGui/QWidget>
+#include <QWidget>

 class QLabel;
 class comboBox;
--- a/include/InstrumentMidiIOView.h
+++ b/include/InstrumentMidiIOView.h
@@ -26,7 +26,7 @@
 #ifndef INSTRUMENT_MIDI_IO_VIEW_H
 #define INSTRUMENT_MIDI_IO_VIEW_H

-#include <QtGui/QWidget>
+#include <QWidget>

 #include "ModelView.h"

--- a/include/InstrumentSoundShapingView.h
+++ b/include/InstrumentSoundShapingView.h
@@ -25,7 +25,7 @@
 #ifndef _INSTRUMENT_SOUND_SHAPING_VIEW_H
 #define _INSTRUMENT_SOUND_SHAPING_VIEW_H

-#include <QtGui/QWidget>
+#include <QWidget>

 #include "InstrumentSoundShaping.h"
 #include "ModelView.h"
--- a/include/InstrumentView.h
+++ b/include/InstrumentView.h
@@ -48,7 +48,7 @@ public:
 		return( castModel<Instrument>() );
 	}

-	virtual void setModel( Model * _model, bool = FALSE );
+	virtual void setModel( Model * _model, bool = false );

 	InstrumentTrackWindow * instrumentTrackWindow();

--- a/include/LadspaControlView.h
+++ b/include/LadspaControlView.h
@@ -26,7 +26,7 @@
 #ifndef _LADSPA_CONTROL_VIEW_H
 #define _LADSPA_CONTROL_VIEW_H

-#include <QtGui/QWidget>
+#include <QWidget>

 #include "ModelView.h"

--- a/include/LcdWidget.h
+++ b/include/LcdWidget.h
@@ -27,7 +27,7 @@
 #define _LCD_WIDGET_H

 #include <QtCore/QMap>
-#include <QtGui/QWidget>
+#include <QWidget>

 #include "export.h"

--- a/include/LfoController.h
+++ b/include/LfoController.h
@@ -25,7 +25,7 @@
 #ifndef LFO_CONTROLLER_H
 #define LFO_CONTROLLER_H

-#include <QtGui/QWidget>
+#include <QWidget>

 #include "Model.h"
 #include "AutomatableModel.h"
--- a/include/LmmsPalette.h
+++ b/include/LmmsPalette.h
@@ -23,7 +23,7 @@
 *
 */

-#include <QtGui/QWidget>
+#include <QWidget>
 #include "export.h"

 #ifndef LMMSPALETTE_H
--- a/include/LmmsStyle.h
+++ b/include/LmmsStyle.h
@@ -27,11 +27,11 @@
 #ifndef LMMS_STYLE_H
 #define LMMS_STYLE_H

-#include <QtGui/QPlastiqueStyle>
+#include <QProxyStyle>



-class LmmsStyle : public QPlastiqueStyle
+class LmmsStyle : public QProxyStyle
 {
 public:
 	enum ColorRole
--- a/include/MainWindow.h
+++ b/include/MainWindow.h
@@ -28,7 +28,7 @@
 #include <QtCore/QBasicTimer>
 #include <QtCore/QTimer>
 #include <QtCore/QList>
-#include <QtGui/QMainWindow>
+#include <QMainWindow>

 class QAction;
 class QDomElement;
--- a/include/MeterDialog.h
+++ b/include/MeterDialog.h
@@ -26,7 +26,7 @@
 #ifndef _METER_DIALOG_H
 #define _METER_DIALOG_H

-#include <QtGui/QWidget>
+#include <QWidget>

 #include "ModelView.h"

--- a/include/MidiClient.h
+++ b/include/MidiClient.h
@@ -112,7 +112,7 @@ public:
 	public:
 		setupWidget( const QString & _caption, QWidget * _parent ) :
 			tabWidget( tabWidget::tr( "Settings for %1" ).arg(
-					tr( _caption.toAscii() ) ).toUpper(),
+					tr( _caption.toLatin1() ) ).toUpper(),
 								_parent )
 		{
 		}
--- a/include/MidiController.h
+++ b/include/MidiController.h
@@ -25,7 +25,7 @@
 #ifndef MIDI_CONTROLLER_H
 #define MIDI_CONTROLLER_H

-#include <QtGui/QWidget>
+#include <QWidget>

 #include "AutomatableModel.h"
 #include "Controller.h"
--- a/include/MidiPortMenu.h
+++ b/include/MidiPortMenu.h
@@ -26,7 +26,7 @@
 #ifndef _MIDI_PORT_MENU_H
 #define _MIDI_PORT_MENU_H

-#include <QtGui/QMenu>
+#include <QMenu>

 #include "ModelView.h"
 #include "MidiPort.h"
--- a/include/MidiWinMM.h
+++ b/include/MidiWinMM.h
@@ -30,7 +30,6 @@
 #ifdef LMMS_BUILD_WIN32
 #include <windows.h>
 #include <mmsystem.h>
-#endif

 #include "MidiClient.h"
 #include "MidiPort.h"
@@ -153,3 +152,5 @@ signals:

 #endif

+#endif
+
--- a/include/PeakController.h
+++ b/include/PeakController.h
@@ -25,7 +25,7 @@
 #ifndef PEAK_CONTROLLER_H
 #define PEAK_CONTROLLER_H

-#include <QtGui/QWidget>
+#include <QWidget>

 #include "Model.h"
 #include "AutomatableModel.h"
--- a/include/PianoRoll.h
+++ b/include/PianoRoll.h
@@ -27,8 +27,8 @@
 #ifndef PIANO_ROLL_H
 #define PIANO_ROLL_H

-#include <QtGui/QWidget>
-#include <QtGui/QInputDialog>
+#include <QWidget>
+#include <QInputDialog>

 #include "ComboBoxModel.h"
 #include "SerializingObject.h"
--- a/include/PianoView.h
+++ b/include/PianoView.h
@@ -25,8 +25,8 @@
 #ifndef _PIANO_VIEW_H
 #define _PIANO_VIEW_H

-#include <QtGui/QPixmap>
-#include <QtGui/QScrollBar>
+#include <QPixmap>
+#include <QScrollBar>

 #include "ModelView.h"

--- a/include/Plugin.h
+++ b/include/Plugin.h
@@ -28,7 +28,7 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QList>
-#include <QtXml/QDomDocument>
+#include <QDomDocument>

 #include "JournallingObject.h"
 #include "Model.h"
--- a/include/PluginView.h
+++ b/include/PluginView.h
@@ -25,7 +25,7 @@
 #ifndef _PLUGIN_VIEW_H
 #define _PLUGIN_VIEW_H

-#include <QtGui/QWidget>
+#include <QWidget>

 #include "Plugin.h"
 #include "ModelView.h"
--- a/include/SampleTrack.h
+++ b/include/SampleTrack.h
@@ -25,7 +25,7 @@
 #ifndef SAMPLE_TRACK_H
 #define SAMPLE_TRACK_H

-#include <QtGui/QDialog>
+#include <QDialog>

 #include "AudioPort.h"
 #include "track.h"
--- a/include/SendButtonIndicator.h
+++ b/include/SendButtonIndicator.h
@@ -2,8 +2,8 @@
 #define SENDBUTTONINDICATOR_H

 #include <QDebug>
-#include <QtGui/QLabel>
-#include <QtGui/QPixmap>
+#include <QLabel>
+#include <QPixmap>

 #include "FxLine.h"
 #include "FxMixerView.h"
--- a/include/SideBar.h
+++ b/include/SideBar.h
@@ -26,8 +26,8 @@
 #define _SIDE_BAR_H

 #include <QtCore/QMap>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QToolBar>
+#include <QButtonGroup>
+#include <QToolBar>

 class QToolButton;
 class SideBarWidget;
--- a/include/SideBarWidget.h
+++ b/include/SideBarWidget.h
@@ -25,9 +25,9 @@
 #ifndef _SIDE_BAR_WIDGET_H
 #define _SIDE_BAR_WIDGET_H

-#include <QtGui/QPixmap>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QWidget>
+#include <QPixmap>
+#include <QVBoxLayout>
+#include <QWidget>


 class SideBarWidget : public QWidget
--- a/include/TempoSyncKnob.h
+++ b/include/TempoSyncKnob.h
@@ -26,7 +26,7 @@
 #ifndef _TEMPO_SYNC_KNOB_H
 #define _TEMPO_SYNC_KNOB_H

-#include <QtGui/QPixmap>
+#include <QPixmap>
 #include <QtCore/QPointer>

 #include "knob.h"
--- a/include/TimeDisplayWidget.h
+++ b/include/TimeDisplayWidget.h
@@ -26,8 +26,8 @@
 #ifndef _TIME_DISPLAY_WIDGET
 #define _TIME_DISPLAY_WIDGET

-#include <QtGui/QWidget>
-#include <QtGui/QHBoxLayout>
+#include <QWidget>
+#include <QHBoxLayout>

 #include "LcdWidget.h"

--- a/include/TrackContainerView.h
+++ b/include/TrackContainerView.h
@@ -27,8 +27,8 @@
 #define TRACK_CONTAINER_VIEW_H

 #include <QtCore/QVector>
-#include <QtGui/QScrollArea>
-#include <QtGui/QWidget>
+#include <QScrollArea>
+#include <QWidget>


 #include "track.h"
--- a/include/about_dialog.h
+++ b/include/about_dialog.h
@@ -26,7 +26,7 @@
 #ifndef _ABOUT_DIALOG_H
 #define _ABOUT_DIALOG_H

-#include <QtGui/QDialog>
+#include <QDialog>

 #include "ui_about_dialog.h"

--- a/include/automatable_button.h
+++ b/include/automatable_button.h
@@ -26,7 +26,7 @@
 #ifndef _AUTOMATABLE_BUTTON_H
 #define _AUTOMATABLE_BUTTON_H

-#include <QtGui/QPushButton>
+#include <QPushButton>

 #include "AutomatableModelView.h"

--- a/include/automatable_slider.h
+++ b/include/automatable_slider.h
@@ -26,7 +26,7 @@
 #ifndef _AUTOMATABLE_SLIDER_H
 #define _AUTOMATABLE_SLIDER_H

-#include <QtGui/QSlider>
+#include <QSlider>

 #include "AutomatableModelView.h"

--- a/include/caption_menu.h
+++ b/include/caption_menu.h
@@ -26,7 +26,7 @@
 #ifndef _CAPTION_MENU_H
 #define _CAPTION_MENU_H

-#include <QtGui/QMenu>
+#include <QMenu>

 #include "export.h"

--- a/include/combobox.h
+++ b/include/combobox.h
@@ -26,8 +26,8 @@
 #ifndef _COMBOBOX_H
 #define _COMBOBOX_H

-#include <QtGui/QMenu>
-#include <QtGui/QWidget>
+#include <QMenu>
+#include <QWidget>

 #include "ComboBoxModel.h"
 #include "AutomatableModelView.h"
--- a/include/cpuload_widget.h
+++ b/include/cpuload_widget.h
@@ -28,8 +28,8 @@
 #define _CPULOAD_WIDGET_H

 #include <QtCore/QTimer>
-#include <QtGui/QPixmap>
-#include <QtGui/QWidget>
+#include <QPixmap>
+#include <QWidget>

 #include "lmms_basics.h"

--- a/include/embed.h
+++ b/include/embed.h
@@ -25,7 +25,7 @@
 #ifndef _EMBED_H
 #define _EMBED_H

-#include <QtGui/QPixmap>
+#include <QPixmap>
 #include <QtCore/QString>

 #include "export.h"
@@ -78,8 +78,7 @@ public:
 	{
 		if( !m_name.isEmpty() )
 		{
-			return( embed::getIconPixmap(
-					m_name.toAscii().constData() ) );
+			return( embed::getIconPixmap( m_name.toLatin1().constData() ) );
 		}
 		return( QPixmap() );
 	}
@@ -112,7 +111,7 @@ public:
 		if( !m_name.isEmpty() )
 		{
 			return( PLUGIN_NAME::getIconPixmap(
-					m_name.toAscii().constData() ) );
+					m_name.toLatin1().constData() ) );
 		}
 		return( QPixmap() );
 	}
--- a/include/export_project_dialog.h
+++ b/include/export_project_dialog.h
@@ -27,7 +27,7 @@
 #ifndef _EXPORT_PROJECT_DIALOG_H
 #define _EXPORT_PROJECT_DIALOG_H

-#include <QtGui/QDialog>
+#include <QDialog>
 #include <vector>
 #include "ui_export_project.h"

--- a/include/fade_button.h
+++ b/include/fade_button.h
@@ -27,8 +27,8 @@
 #define _FADE_BUTTON_H 

 #include <QtCore/QTime>
-#include <QtGui/QAbstractButton>
-#include <QtGui/QColor>
+#include <QAbstractButton>
+#include <QColor>


 class fadeButton : public QAbstractButton
--- a/include/fader.h
+++ b/include/fader.h
@@ -49,8 +49,8 @@
 #define FADER_H

 #include <QtCore/QTime>
-#include <QtGui/QWidget>
-#include <QtGui/QPixmap>
+#include <QWidget>
+#include <QPixmap>

 #include "AutomatableModelView.h"

--- a/include/file_browser.h
+++ b/include/file_browser.h
@@ -28,7 +28,7 @@

 #include <QtCore/QDir>
 #include <QtCore/QMutex>
-#include <QtGui/QTreeWidget>
+#include <QTreeWidget>


 #include "SideBarWidget.h"
--- a/include/graph.h
+++ b/include/graph.h
@@ -27,9 +27,9 @@
 #ifndef GRAPH_H
 #define GRAPH_H

-#include <QtGui/QWidget>
-#include <QtGui/QPixmap>
-#include <QtGui/QCursor>
+#include <QWidget>
+#include <QPixmap>
+#include <QCursor>

 #include "Model.h"
 #include "ModelView.h"
--- a/include/group_box.h
+++ b/include/group_box.h
@@ -26,7 +26,7 @@
 #ifndef _GROUP_BOX_H
 #define _GROUP_BOX_H

-#include <QtGui/QWidget>
+#include <QWidget>

 #include "AutomatableModelView.h"
 #include "pixmap_button.h"
--- a/include/gui_templates.h
+++ b/include/gui_templates.h
@@ -28,9 +28,9 @@

 #include "lmmsconfig.h"

-#include <QtGui/QApplication>
-#include <QtGui/QFont>
-#include <QtGui/QDesktopWidget>
+#include <QApplication>
+#include <QFont>
+#include <QDesktopWidget>



--- a/include/knob.h
+++ b/include/knob.h
@@ -26,7 +26,7 @@
 #ifndef KNOB_H
 #define KNOB_H

-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QtCore/QPoint>

 #include "AutomatableModelView.h"
--- a/include/nstate_button.h
+++ b/include/nstate_button.h
@@ -26,7 +26,7 @@
 #ifndef _NSTATE_BUTTON_H
 #define _NSTATE_BUTTON_H

-#include <QtGui/QPixmap>
+#include <QPixmap>
 #include <QtCore/QVector>
 #include <QtCore/QPair>

--- a/include/pattern.h
+++ b/include/pattern.h
@@ -27,10 +27,10 @@
 #define PATTERN_H

 #include <QtCore/QVector>
-#include <QtGui/QWidget>
-#include <QtGui/QDialog>
+#include <QWidget>
+#include <QDialog>
 #include <QtCore/QThread>
-#include <QtGui/QPixmap>
+#include <QPixmap>


 #include "note.h"
--- a/include/pixmap_button.h
+++ b/include/pixmap_button.h
@@ -26,7 +26,7 @@
 #ifndef _PIXMAP_BUTTON_H
 #define _PIXMAP_BUTTON_H

-#include <QtGui/QPixmap>
+#include <QPixmap>

 #include "automatable_button.h"

--- a/include/plugin_browser.h
+++ b/include/plugin_browser.h
@@ -26,7 +26,7 @@
 #define _PLUGIN_BROWSER_H

 #include <QtCore/QTimer>
-#include <QtGui/QPixmap>
+#include <QPixmap>

 #include "SideBarWidget.h"
 #include "Plugin.h"
--- a/include/project_notes.h
+++ b/include/project_notes.h
@@ -26,7 +26,7 @@
 #ifndef _PROJECT_NOTES_H
 #define _PROJECT_NOTES_H

-#include <QtGui/QMainWindow>
+#include <QMainWindow>

 #include "JournallingObject.h"

--- a/include/rename_dialog.h
+++ b/include/rename_dialog.h
@@ -27,7 +27,7 @@
 #ifndef _RENAME_DIALOG_H
 #define _RENAME_DIALOG_H

-#include <QtGui/QDialog>
+#include <QDialog>


 class QLineEdit;
--- a/include/rubberband.h
+++ b/include/rubberband.h
@@ -27,7 +27,7 @@
 #ifndef _RUBBERBAND_H
 #define _RUBBERBAND_H

-#include <QtGui/QRubberBand>
+#include <QRubberBand>
 #include <QtCore/QVector>


--- a/include/setup_dialog.h
+++ b/include/setup_dialog.h
@@ -25,7 +25,7 @@
 #ifndef _SETUP_DIALOG_H
 #define _SETUP_DIALOG_H

-#include <QtGui/QDialog>
+#include <QDialog>
 #include <QtCore/QMap>

 #include "lmmsconfig.h"
--- a/include/string_pair_drag.h
+++ b/include/string_pair_drag.h
@@ -26,9 +26,9 @@
 #ifndef _STRING_PAIR_DRAG_H
 #define _STRING_PAIR_DRAG_H

-#include <QtGui/QDrag>
-#include <QtGui/QDragEnterEvent>
-#include <QtGui/QDropEvent>
+#include <QDrag>
+#include <QDragEnterEvent>
+#include <QDropEvent>
 #include <QMimeData>

 #include "export.h"
--- a/include/tab_bar.h
+++ b/include/tab_bar.h
@@ -27,8 +27,8 @@
 #define _TAB_BAR_H

 #include <QtCore/QMap>
-#include <QtGui/QLayout>
-#include <QtGui/QWidget>
+#include <QLayout>
+#include <QWidget>

 #include "export.h"

--- a/include/tab_button.h
+++ b/include/tab_button.h
@@ -26,7 +26,7 @@
 #ifndef _TAB_BUTTON_H
 #define _TAB_BUTTON_H

-#include <QtGui/QPushButton>
+#include <QPushButton>


 class tabButton : public QPushButton
--- a/include/tab_widget.h
+++ b/include/tab_widget.h
@@ -26,7 +26,7 @@
 #ifndef _TAB_WIDGET_H
 #define _TAB_WIDGET_H

-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QtCore/QMap>


--- a/include/text_float.h
+++ b/include/text_float.h
@@ -26,8 +26,8 @@
 #ifndef TEXT_FLOAT_H
 #define TEXT_FLOAT_H

-#include <QtGui/QWidget>
-#include <QtGui/QPixmap>
+#include <QWidget>
+#include <QPixmap>

 #include "export.h"

--- a/include/timeline.h
+++ b/include/timeline.h
@@ -26,7 +26,7 @@
 #ifndef _TIMELINE_H
 #define _TIMELINE_H

-#include <QtGui/QWidget>
+#include <QWidget>

 #include "song.h"

--- a/include/tool_button.h
+++ b/include/tool_button.h
@@ -26,8 +26,8 @@
 #ifndef _TOOL_BUTTON_H
 #define _TOOL_BUTTON_H 

-#include <QtGui/QToolButton>
-#include <QtGui/QColor>
+#include <QToolButton>
+#include <QColor>


 class toolButton : public QToolButton
--- a/include/track.h
+++ b/include/track.h
@@ -28,7 +28,7 @@

 #include <QtCore/QVector>
 #include <QtCore/QList>
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QColor>
 #include <QMimeData>

--- a/include/track_label_button.h
+++ b/include/track_label_button.h
@@ -26,7 +26,7 @@
 #ifndef _TRACK_LABEL_BUTTON_H
 #define _TRACK_LABEL_BUTTON_H

-#include <QtGui/QToolButton>
+#include <QToolButton>


 class trackView;
--- a/include/visualization_widget.h
+++ b/include/visualization_widget.h
@@ -26,8 +26,8 @@
 #ifndef _VISUALIZATION_WIDGET
 #define _VISUALIZATION_WIDGET

-#include <QtGui/QWidget>
-#include <QtGui/QPixmap>
+#include <QWidget>
+#include <QPixmap>

 #include "Mixer.h"

--- a/plugins/Amplifier/AmplifierControlDialog.cpp
+++ b/plugins/Amplifier/AmplifierControlDialog.cpp
@@ -23,7 +23,7 @@
 *
 */

-#include <QtGui/QLayout>
+#include <QLayout>

 #include "AmplifierControlDialog.h"
 #include "AmplifierControls.h"
--- a/plugins/Amplifier/AmplifierControls.cpp
+++ b/plugins/Amplifier/AmplifierControls.cpp
@@ -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"
+

--- a/plugins/BassBooster/BassBoosterControlDialog.cpp
+++ b/plugins/BassBooster/BassBoosterControlDialog.cpp
@@ -22,7 +22,7 @@
 *
 */

-#include <QtGui/QLayout>
+#include <QLayout>

 #include "BassBoosterControlDialog.h"
 #include "BassBoosterControls.h"
--- a/plugins/BassBooster/BassBoosterControls.cpp
+++ b/plugins/BassBooster/BassBoosterControls.cpp
@@ -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"
+

--- a/plugins/DualFilter/DualFilterControlDialog.cpp
+++ b/plugins/DualFilter/DualFilterControlDialog.cpp
@@ -23,7 +23,7 @@
 *
 */

-#include <QtGui/QLayout>
+#include <QLayout>

 #include "DualFilterControlDialog.h"
 #include "DualFilterControls.h"
--- a/plugins/DualFilter/DualFilterControls.cpp
+++ b/plugins/DualFilter/DualFilterControls.cpp
@@ -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"
+

--- a/plugins/HydrogenImport/HydrogenImport.cpp
+++ b/plugins/HydrogenImport/HydrogenImport.cpp
@@ -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>

--- a/plugins/HydrogenImport/HydrogenImport.h
+++ b/plugins/HydrogenImport/HydrogenImport.h
@@ -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"

--- a/plugins/LadspaEffect/LadspaControlDialog.cpp
+++ b/plugins/LadspaEffect/LadspaControlDialog.cpp
@@ -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"
+

--- a/plugins/LadspaEffect/LadspaControls.cpp
+++ b/plugins/LadspaEffect/LadspaControls.cpp
@@ -22,7 +22,7 @@
 *
 */

-#include <QtXml/QDomElement>
+#include <QDomElement>

 #include "LadspaEffect.h"

@@ -183,5 +183,5 @@ void LadspaControls::updateLinkStatesFromGlobal()
 }


-#include "moc_LadspaControls.cxx"
+

--- a/plugins/LadspaEffect/LadspaEffect.cpp
+++ b/plugins/LadspaEffect/LadspaEffect.cpp
@@ -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"
+

--- a/plugins/LadspaEffect/LadspaEffect.h
+++ b/plugins/LadspaEffect/LadspaEffect.h
@@ -26,7 +26,7 @@
 #ifndef _LADSPA_EFFECT_H
 #define _LADSPA_EFFECT_H

-#include <QtCore/QMutex>
+#include <QMutex>

 #include "Effect.h"
 #include "LadspaBase.h"
--- a/plugins/LadspaEffect/LadspaSubPluginFeatures.cpp
+++ b/plugins/LadspaEffect/LadspaSubPluginFeatures.cpp
@@ -25,8 +25,8 @@
 *
 */

-#include <QtGui/QHBoxLayout>
-#include <QtGui/QLabel>
+#include <QHBoxLayout>
+#include <QLabel>

 #include "LadspaSubPluginFeatures.h"
 #include "AudioDevice.h"
--- a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp
+++ b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp
@@ -22,8 +22,8 @@
 *
 */

-#include <QtGui/QLayout>
-#include <QtGui/QPainter>
+#include <QLayout>
+#include <QPainter>

 #include "SpectrumAnalyzer.h"
 #include "MainWindow.h"
--- a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControls.cpp
+++ b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControls.cpp
@@ -57,5 +57,5 @@ void SpectrumAnalyzerControls::saveSettings( QDomDocument & _doc,



-#include "moc_SpectrumAnalyzerControls.cxx"
+

--- a/plugins/VstEffect/VstEffect.cpp
+++ b/plugins/VstEffect/VstEffect.cpp
@@ -22,7 +22,7 @@
 *
 */

-#include <QtGui/QMessageBox>
+#include <QMessageBox>

 #include "VstEffect.h"
 #include "song.h"
--- a/plugins/VstEffect/VstEffect.h
+++ b/plugins/VstEffect/VstEffect.h
@@ -25,7 +25,7 @@
 #ifndef _VST_EFFECT_H
 #define _VST_EFFECT_H

-#include <QtCore/QMutex>
+#include <QMutex>

 #include "Effect.h"
 #include "VstPlugin.h"
--- a/plugins/VstEffect/VstEffectControlDialog.cpp
+++ b/plugins/VstEffect/VstEffectControlDialog.cpp
@@ -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 ) :
--- a/plugins/VstEffect/VstEffectControlDialog.h
+++ b/plugins/VstEffect/VstEffectControlDialog.h
@@ -30,7 +30,7 @@

 #include <QObject>
 #include <QPainter>
-#include <QtGui/QLabel>
+#include <QLabel>


 class VstEffectControls;
--- a/plugins/VstEffect/VstEffectControls.cpp
+++ b/plugins/VstEffect/VstEffectControls.cpp
@@ -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"
+

--- a/plugins/VstEffect/VstEffectControls.h
+++ b/plugins/VstEffect/VstEffectControls.h
@@ -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>

--- a/Show More
+++ b/Show More
				`@@ -57,5 +57,5 @@ void SpectrumAnalyzerControls::saveSettings( QDomDocument & _doc,`



				`#include "moc_SpectrumAnalyzerControls.cxx"`