From 4cee046909a229d7decb3ebcd28644d2a161811b Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Thu, 14 Aug 2014 17:26:05 +0200 Subject: [PATCH] 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. --- CMakeLists.txt | 30 ++++++- INSTALL.Qt5 | 12 +++ cmake/modules/BuildPlugin.cmake | 14 +++- include/AudioDevice.h | 2 +- include/AutomatableModelView.h | 2 +- include/AutomationEditor.h | 2 +- include/Clipboard.h | 2 +- include/ControllerConnectionDialog.h | 6 +- include/ControllerDialog.h | 2 +- include/ControllerRackView.h | 2 +- include/ControllerView.h | 2 +- include/DataFile.h | 2 +- include/EffectControlDialog.h | 2 +- include/EffectRackView.h | 2 +- include/EffectSelectDialog.h | 6 +- include/EnvelopeAndLfoView.h | 2 +- include/FileDialog.h | 2 +- include/FxMixerView.h | 8 +- include/Instrument.h | 2 +- include/InstrumentFunctionViews.h | 2 +- include/InstrumentMidiIOView.h | 2 +- include/InstrumentSoundShapingView.h | 2 +- include/InstrumentView.h | 2 +- include/LadspaControlView.h | 2 +- include/LcdWidget.h | 2 +- include/LfoController.h | 2 +- include/LmmsPalette.h | 2 +- include/LmmsStyle.h | 4 +- include/MainWindow.h | 2 +- include/MeterDialog.h | 2 +- include/MidiClient.h | 2 +- include/MidiController.h | 2 +- include/MidiPortMenu.h | 2 +- include/MidiWinMM.h | 3 +- include/PeakController.h | 2 +- include/PianoRoll.h | 4 +- include/PianoView.h | 4 +- include/Plugin.h | 2 +- include/PluginView.h | 2 +- include/SampleTrack.h | 2 +- include/SendButtonIndicator.h | 4 +- include/SideBar.h | 4 +- include/SideBarWidget.h | 6 +- include/TempoSyncKnob.h | 2 +- include/TimeDisplayWidget.h | 4 +- include/TrackContainerView.h | 4 +- include/about_dialog.h | 2 +- include/automatable_button.h | 2 +- include/automatable_slider.h | 2 +- include/caption_menu.h | 2 +- include/combobox.h | 4 +- include/cpuload_widget.h | 4 +- include/embed.h | 7 +- include/export_project_dialog.h | 2 +- include/fade_button.h | 4 +- include/fader.h | 4 +- include/file_browser.h | 2 +- include/graph.h | 6 +- include/group_box.h | 2 +- include/gui_templates.h | 6 +- include/knob.h | 2 +- include/nstate_button.h | 2 +- include/pattern.h | 6 +- include/pixmap_button.h | 2 +- include/plugin_browser.h | 2 +- include/project_notes.h | 2 +- include/rename_dialog.h | 2 +- include/rubberband.h | 2 +- include/setup_dialog.h | 2 +- include/string_pair_drag.h | 6 +- include/tab_bar.h | 4 +- include/tab_button.h | 2 +- include/tab_widget.h | 2 +- include/text_float.h | 4 +- include/timeline.h | 2 +- include/tool_button.h | 4 +- include/track.h | 2 +- include/track_label_button.h | 2 +- include/visualization_widget.h | 4 +- plugins/Amplifier/AmplifierControlDialog.cpp | 2 +- plugins/Amplifier/AmplifierControls.cpp | 4 +- .../BassBooster/BassBoosterControlDialog.cpp | 2 +- plugins/BassBooster/BassBoosterControls.cpp | 4 +- .../DualFilter/DualFilterControlDialog.cpp | 2 +- plugins/DualFilter/DualFilterControls.cpp | 4 +- plugins/HydrogenImport/HydrogenImport.cpp | 10 +-- plugins/HydrogenImport/HydrogenImport.h | 6 +- plugins/LadspaEffect/LadspaControlDialog.cpp | 6 +- plugins/LadspaEffect/LadspaControls.cpp | 4 +- plugins/LadspaEffect/LadspaEffect.cpp | 16 ++-- plugins/LadspaEffect/LadspaEffect.h | 2 +- .../LadspaEffect/LadspaSubPluginFeatures.cpp | 4 +- .../SpectrumAnalyzerControlDialog.cpp | 4 +- .../SpectrumAnalyzerControls.cpp | 2 +- plugins/VstEffect/VstEffect.cpp | 2 +- plugins/VstEffect/VstEffect.h | 2 +- plugins/VstEffect/VstEffectControlDialog.cpp | 14 ++-- plugins/VstEffect/VstEffectControlDialog.h | 2 +- plugins/VstEffect/VstEffectControls.cpp | 8 +- plugins/VstEffect/VstEffectControls.h | 10 +-- plugins/VstEffect/VstSubPluginFeatures.cpp | 4 +- .../audio_file_processor.cpp | 26 +++---- .../audio_file_processor.h | 2 +- plugins/bit_invader/bit_invader.cpp | 4 +- .../dynamics_processor_control_dialog.cpp | 2 +- .../dynamics_processor_controls.cpp | 4 +- plugins/flp_import/FlpImport.cpp | 12 +-- plugins/flp_import/FlpImport.h | 6 +- plugins/flp_import/unrtf.cpp | 4 +- plugins/kicker/kicker.cpp | 6 +- plugins/kicker/kicker.h | 2 +- plugins/ladspa_browser/ladspa_browser.cpp | 6 +- plugins/ladspa_browser/ladspa_description.cpp | 12 +-- plugins/ladspa_browser/ladspa_description.h | 2 +- plugins/ladspa_browser/ladspa_port_dialog.cpp | 5 +- plugins/ladspa_browser/ladspa_port_dialog.h | 2 +- plugins/lb302/lb302.cpp | 10 ++- plugins/lb303/lb303.cpp | 4 +- plugins/midi_import/MidiImport.cpp | 10 +-- plugins/midi_import/MidiImport.h | 6 +- plugins/monstro/Monstro.cpp | 6 +- plugins/nes/Nes.cpp | 4 +- plugins/opl2/opl2instrument.cpp | 4 +- plugins/organic/organic.cpp | 6 +- plugins/papu/papu_instrument.cpp | 6 +- plugins/papu/papu_instrument.h | 2 +- plugins/patman/patman.cpp | 22 +++--- .../peak_controller_effect_control_dialog.cpp | 4 +- .../peak_controller_effect_controls.cpp | 4 +- plugins/sf2_player/patches_dialog.cpp | 8 +- plugins/sf2_player/patches_dialog.h | 4 +- plugins/sf2_player/sf2_player.cpp | 12 +-- plugins/sf2_player/sf2_player.h | 2 +- plugins/sfxr/sfxr.cpp | 4 +- plugins/sid/sid_instrument.cpp | 12 +-- plugins/sid/sid_instrument.h | 2 +- .../stereoenhancer_control_dialog.cpp | 2 +- .../stereoenhancer_controls.cpp | 4 +- .../stereomatrix_control_dialog.cpp | 4 +- .../stereo_matrix/stereomatrix_controls.cpp | 4 +- plugins/stk/mallets/mallets.cpp | 14 ++-- .../triple_oscillator/TripleOscillator.cpp | 8 +- plugins/vestige/vestige.cpp | 20 ++--- plugins/vestige/vestige.h | 8 +- plugins/vibed/nine_button_selector.cpp | 4 +- plugins/vibed/string_container.h | 2 +- plugins/vibed/vibed.cpp | 8 +- plugins/vst_base/VstPlugin.cpp | 37 +++++---- plugins/vst_base/VstPlugin.h | 12 +-- plugins/watsyn/Watsyn.cpp | 4 +- .../waveshaper/waveshaper_control_dialog.cpp | 2 +- plugins/waveshaper/waveshaper_controls.cpp | 4 +- plugins/zynaddsubfx/CMakeLists.txt | 4 + plugins/zynaddsubfx/ZynAddSubFx.cpp | 18 ++--- plugins/zynaddsubfx/ZynAddSubFx.h | 4 +- .../zynaddsubfx/src/Misc/QtXmlWrapper.cpp | 4 +- src/core/AutomatableModel.cpp | 4 +- src/core/AutomationPattern.cpp | 8 +- src/core/ComboBoxModel.cpp | 2 +- src/core/Controller.cpp | 8 +- src/core/ControllerConnection.cpp | 8 +- src/core/DataFile.cpp | 10 +-- src/core/Effect.cpp | 2 +- src/core/EffectChain.cpp | 4 +- src/core/EnvelopeAndLfoParameters.cpp | 4 +- src/core/FxMixer.cpp | 2 +- src/core/ImportFilter.cpp | 2 +- src/core/InlineAutomation.cpp | 2 +- src/core/InstrumentFunctions.cpp | 4 +- src/core/InstrumentSoundShaping.cpp | 4 +- src/core/JournallingObject.cpp | 2 +- src/core/LadspaControl.cpp | 2 +- src/core/LfoController.cpp | 8 +- src/core/MeterModel.cpp | 2 +- src/core/Mixer.cpp | 2 +- src/core/Model.cpp | 2 +- src/core/PeakController.cpp | 8 +- src/core/Piano.cpp | 2 +- src/core/Plugin.cpp | 6 +- src/core/PresetPreviewPlayHandle.cpp | 10 +-- src/core/ProjectRenderer.cpp | 4 +- src/core/RemotePlugin.cpp | 6 +- src/core/RingBuffer.cpp | 2 +- src/core/SampleBuffer.cpp | 14 ++-- src/core/SerializingObject.cpp | 2 +- src/core/TempoSyncKnobModel.cpp | 6 +- src/core/TrackContainer.cpp | 8 +- src/core/VstSyncController.cpp | 4 +- src/core/audio/AudioAlsa.cpp | 8 +- src/core/audio/AudioFileDevice.cpp | 2 +- src/core/audio/AudioJack.cpp | 18 ++--- src/core/audio/AudioOss.cpp | 8 +- src/core/audio/AudioPortAudio.cpp | 6 +- src/core/audio/AudioPulseAudio.cpp | 4 +- src/core/audio/AudioSdl.cpp | 4 +- src/core/base64.cpp | 4 +- src/core/bb_track_container.cpp | 2 +- src/core/config_mgr.cpp | 12 +-- src/core/ladspa_manager.cpp | 10 +-- src/core/main.cpp | 24 +++--- src/core/midi/MidiAlsaRaw.cpp | 6 +- src/core/midi/MidiAlsaSeq.cpp | 12 +-- src/core/midi/MidiController.cpp | 8 +- src/core/midi/MidiOss.cpp | 4 +- src/core/midi/MidiPort.cpp | 4 +- src/core/midi/MidiWinMM.cpp | 10 +-- src/core/note.cpp | 2 +- src/core/song.cpp | 12 +-- src/core/timeline.cpp | 14 ++-- src/core/track.cpp | 14 ++-- src/gui/AutomatableModelView.cpp | 6 +- src/gui/AutomationEditor.cpp | 78 +++++++++---------- src/gui/AutomationPatternView.cpp | 8 +- src/gui/ControllerConnectionDialog.cpp | 10 +-- src/gui/ControllerDialog.cpp | 4 +- src/gui/EffectControlDialog.cpp | 6 +- src/gui/EffectSelectDialog.cpp | 2 +- src/gui/FxMixerView.cpp | 24 +++--- src/gui/InstrumentView.cpp | 4 +- src/gui/LfoControllerDialog.cpp | 10 +-- src/gui/LmmsPalette.cpp | 2 +- src/gui/LmmsStyle.cpp | 39 ++++++---- src/gui/MainWindow.cpp | 58 +++++++------- src/gui/ModelView.cpp | 2 +- src/gui/PeakControllerDialog.cpp | 10 +-- src/gui/PianoRoll.cpp | 24 +++--- src/gui/PianoView.cpp | 12 +-- src/gui/SongEditor.cpp | 38 ++++----- src/gui/ToolPluginView.cpp | 4 +- src/gui/TrackContainerView.cpp | 14 ++-- src/gui/bb_editor.cpp | 10 +-- src/gui/dialogs/FileDialog.cpp | 22 ++++-- src/gui/dialogs/VersionedSaveDialog.cpp | 10 +-- src/gui/embed.cpp | 2 +- src/gui/export_project_dialog.cpp | 8 +- src/gui/file_browser.cpp | 16 ++-- src/gui/plugin_browser.cpp | 10 +-- src/gui/setup_dialog.cpp | 26 +++---- src/gui/string_pair_drag.cpp | 14 ++-- src/gui/widgets/ControllerRackView.cpp | 16 ++-- src/gui/widgets/ControllerView.cpp | 16 ++-- src/gui/widgets/EffectRackView.cpp | 12 +-- src/gui/widgets/EffectView.cpp | 14 ++-- src/gui/widgets/EnvelopeAndLfoView.cpp | 6 +- src/gui/widgets/FxLine.cpp | 10 +-- src/gui/widgets/InstrumentFunctionViews.cpp | 6 +- src/gui/widgets/InstrumentMidiIOView.cpp | 8 +- .../widgets/InstrumentSoundShapingView.cpp | 4 +- src/gui/widgets/LadspaControlView.cpp | 4 +- src/gui/widgets/LcdSpinBox.cpp | 16 ++-- src/gui/widgets/LcdWidget.cpp | 14 ++-- src/gui/widgets/MeterDialog.cpp | 6 +- src/gui/widgets/MidiPortMenu.cpp | 2 +- src/gui/widgets/SideBar.cpp | 8 +- src/gui/widgets/SideBarWidget.cpp | 8 +- src/gui/widgets/TimeDisplayWidget.cpp | 4 +- src/gui/widgets/automatable_button.cpp | 6 +- src/gui/widgets/automatable_slider.cpp | 6 +- src/gui/widgets/caption_menu.cpp | 2 +- src/gui/widgets/combobox.cpp | 16 ++-- src/gui/widgets/cpuload_widget.cpp | 4 +- src/gui/widgets/fade_button.cpp | 10 +-- src/gui/widgets/fader.cpp | 12 +-- src/gui/widgets/graph.cpp | 8 +- src/gui/widgets/group_box.cpp | 6 +- src/gui/widgets/knob.cpp | 18 ++--- src/gui/widgets/led_checkbox.cpp | 6 +- src/gui/widgets/nstate_button.cpp | 4 +- src/gui/widgets/pixmap_button.cpp | 6 +- src/gui/widgets/project_notes.cpp | 26 +++---- src/gui/widgets/rename_dialog.cpp | 6 +- src/gui/widgets/rubberband.cpp | 2 +- src/gui/widgets/tab_bar.cpp | 4 +- src/gui/widgets/tab_widget.cpp | 10 +-- src/gui/widgets/tempo_sync_knob.cpp | 4 +- src/gui/widgets/text_float.cpp | 8 +- src/gui/widgets/tool_button.cpp | 2 +- src/gui/widgets/tooltip.cpp | 2 +- src/gui/widgets/track_label_button.cpp | 6 +- src/gui/widgets/visualization_widget.cpp | 6 +- src/tracks/InstrumentTrack.cpp | 28 +++---- src/tracks/SampleTrack.cpp | 18 ++--- src/tracks/bb_track.cpp | 10 +-- src/tracks/pattern.cpp | 18 ++--- 284 files changed, 1043 insertions(+), 966 deletions(-) create mode 100644 INSTALL.Qt5 diff --git a/CMakeLists.txt b/CMakeLists.txt index 78cfb3d831..7f2d015ff8 100644 --- 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") diff --git a/INSTALL.Qt5 b/INSTALL.Qt5 new file mode 100644 index 0000000000..e2f12a23b1 --- /dev/null +++ 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/ + + diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake index 283c4ba791..ea53486be3 100644 --- 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) diff --git a/include/AudioDevice.h b/include/AudioDevice.h index 9b0b3dd181..411f5bf07c 100644 --- 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 ) { } diff --git a/include/AutomatableModelView.h b/include/AutomatableModelView.h index f213db4059..024d8e7c4e 100644 --- a/include/AutomatableModelView.h +++ b/include/AutomatableModelView.h @@ -29,7 +29,7 @@ #include "AutomatableModel.h" class QMenu; - +class QMouseEvent; class EXPORT AutomatableModelView : public ModelView { diff --git a/include/AutomationEditor.h b/include/AutomationEditor.h index 5256cf72a8..50d4ca1f1e 100644 --- a/include/AutomationEditor.h +++ b/include/AutomationEditor.h @@ -27,7 +27,7 @@ #define AUTOMATION_EDITOR_H #include -#include +#include #include "lmms_basics.h" #include "JournallingObject.h" diff --git a/include/Clipboard.h b/include/Clipboard.h index 58d9a58286..647d8f3caa 100644 --- a/include/Clipboard.h +++ b/include/Clipboard.h @@ -26,7 +26,7 @@ #define _CLIPBOARD_H #include -#include +#include class JournallingObject; diff --git a/include/ControllerConnectionDialog.h b/include/ControllerConnectionDialog.h index 9d8a6ca11b..54f6365cf8 100644 --- a/include/ControllerConnectionDialog.h +++ b/include/ControllerConnectionDialog.h @@ -27,9 +27,9 @@ #ifndef _CONTROLLER_CONNECTION_DIALOG_H #define _CONTROLLER_CONNECTION_DIALOG_H -#include -#include -#include +#include +#include +#include #include "Controller.h" #include "AutomatableModel.h" diff --git a/include/ControllerDialog.h b/include/ControllerDialog.h index 3c82ccf6fa..828812c038 100644 --- a/include/ControllerDialog.h +++ b/include/ControllerDialog.h @@ -26,7 +26,7 @@ #ifndef _CONTROLLER_DIALOG_H #define _CONTROLLER_DIALOG_H -#include +#include #include "ModelView.h" diff --git a/include/ControllerRackView.h b/include/ControllerRackView.h index 60c8f0735f..64fc8fd74a 100644 --- a/include/ControllerRackView.h +++ b/include/ControllerRackView.h @@ -25,7 +25,7 @@ #ifndef _CONTROLLER_RACK_VIEW_H #define _CONTROLLER_RACK_VIEW_H -#include +#include #include "SerializingObject.h" #include "lmms_basics.h" diff --git a/include/ControllerView.h b/include/ControllerView.h index c86b47c70d..2a2d6a9758 100644 --- a/include/ControllerView.h +++ b/include/ControllerView.h @@ -25,7 +25,7 @@ #ifndef _CONTROLLER_VIEW_H #define _CONTROLLER_VIEW_H -#include +#include #include "AutomatableModel.h" #include "Controller.h" diff --git a/include/DataFile.h b/include/DataFile.h index 499853bf0e..3491386df6 100644 --- a/include/DataFile.h +++ b/include/DataFile.h @@ -27,7 +27,7 @@ #ifndef DATA_FILE_H #define DATA_FILE_H -#include +#include #include #include "export.h" diff --git a/include/EffectControlDialog.h b/include/EffectControlDialog.h index 65a0ff60d1..d0eef8cde3 100644 --- a/include/EffectControlDialog.h +++ b/include/EffectControlDialog.h @@ -26,7 +26,7 @@ #ifndef _EFFECT_CONTROL_DIALOG_H #define _EFFECT_CONTROL_DIALOG_H -#include +#include #include "ModelView.h" diff --git a/include/EffectRackView.h b/include/EffectRackView.h index 11b57fdaa7..e15f291484 100644 --- a/include/EffectRackView.h +++ b/include/EffectRackView.h @@ -26,7 +26,7 @@ #ifndef _EFFECT_RACK_VIEW_H #define _EFFECT_RACK_VIEW_H -#include +#include #include "EffectChain.h" #include "ModelView.h" diff --git a/include/EffectSelectDialog.h b/include/EffectSelectDialog.h index 52500d4699..a5d83ba851 100644 --- a/include/EffectSelectDialog.h +++ b/include/EffectSelectDialog.h @@ -25,9 +25,9 @@ #ifndef _EFFECT_SELECT_DIALOG_H #define _EFFECT_SELECT_DIALOG_H -#include -#include -#include +#include +#include +#include #include "EffectChain.h" #include "Effect.h" diff --git a/include/EnvelopeAndLfoView.h b/include/EnvelopeAndLfoView.h index 1ad292456d..ffed49f9a5 100644 --- 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 +#include #include "ModelView.h" diff --git a/include/FileDialog.h b/include/FileDialog.h index f4d81ea3de..1dc17643fb 100644 --- a/include/FileDialog.h +++ b/include/FileDialog.h @@ -26,7 +26,7 @@ #ifndef FILEDIALOG_H #define FILEDIALOG_H -#include +#include #include "export.h" diff --git a/include/FxMixerView.h b/include/FxMixerView.h index 8e96797c60..7eca91db45 100644 --- a/include/FxMixerView.h +++ b/include/FxMixerView.h @@ -25,10 +25,10 @@ #ifndef FX_MIXER_VIEW_H #define FX_MIXER_VIEW_H -#include -#include -#include -#include +#include +#include +#include +#include #include "FxLine.h" #include "FxMixer.h" diff --git a/include/Instrument.h b/include/Instrument.h index 88c8e9a192..6e8d71ca4c 100644 --- a/include/Instrument.h +++ b/include/Instrument.h @@ -26,7 +26,7 @@ #ifndef INSTRUMENT_H #define INSTRUMENT_H -#include +#include #include "Plugin.h" #include "Mixer.h" diff --git a/include/InstrumentFunctionViews.h b/include/InstrumentFunctionViews.h index 2a370468a7..7c24e92be4 100644 --- a/include/InstrumentFunctionViews.h +++ b/include/InstrumentFunctionViews.h @@ -27,7 +27,7 @@ #include "ModelView.h" -#include +#include class QLabel; class comboBox; diff --git a/include/InstrumentMidiIOView.h b/include/InstrumentMidiIOView.h index 3edd25e855..debb250a92 100644 --- 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 +#include #include "ModelView.h" diff --git a/include/InstrumentSoundShapingView.h b/include/InstrumentSoundShapingView.h index ff0152d5b1..78fa55b14c 100644 --- 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 +#include #include "InstrumentSoundShaping.h" #include "ModelView.h" diff --git a/include/InstrumentView.h b/include/InstrumentView.h index 8c4c4c8d31..d5aa7ede19 100644 --- a/include/InstrumentView.h +++ b/include/InstrumentView.h @@ -48,7 +48,7 @@ public: return( castModel() ); } - virtual void setModel( Model * _model, bool = FALSE ); + virtual void setModel( Model * _model, bool = false ); InstrumentTrackWindow * instrumentTrackWindow(); diff --git a/include/LadspaControlView.h b/include/LadspaControlView.h index 5bfdcb0ec5..2368f7f7fe 100644 --- a/include/LadspaControlView.h +++ b/include/LadspaControlView.h @@ -26,7 +26,7 @@ #ifndef _LADSPA_CONTROL_VIEW_H #define _LADSPA_CONTROL_VIEW_H -#include +#include #include "ModelView.h" diff --git a/include/LcdWidget.h b/include/LcdWidget.h index c637a20bef..3c4611b259 100644 --- a/include/LcdWidget.h +++ b/include/LcdWidget.h @@ -27,7 +27,7 @@ #define _LCD_WIDGET_H #include -#include +#include #include "export.h" diff --git a/include/LfoController.h b/include/LfoController.h index d5437d7b03..db1fdb54d2 100644 --- a/include/LfoController.h +++ b/include/LfoController.h @@ -25,7 +25,7 @@ #ifndef LFO_CONTROLLER_H #define LFO_CONTROLLER_H -#include +#include #include "Model.h" #include "AutomatableModel.h" diff --git a/include/LmmsPalette.h b/include/LmmsPalette.h index 8e6ef70867..75c9341242 100644 --- a/include/LmmsPalette.h +++ b/include/LmmsPalette.h @@ -23,7 +23,7 @@ * */ -#include +#include #include "export.h" #ifndef LMMSPALETTE_H diff --git a/include/LmmsStyle.h b/include/LmmsStyle.h index 539c9041bb..6c77fc1f19 100644 --- a/include/LmmsStyle.h +++ b/include/LmmsStyle.h @@ -27,11 +27,11 @@ #ifndef LMMS_STYLE_H #define LMMS_STYLE_H -#include +#include -class LmmsStyle : public QPlastiqueStyle +class LmmsStyle : public QProxyStyle { public: enum ColorRole diff --git a/include/MainWindow.h b/include/MainWindow.h index c621059ad8..8a92fa5f13 100644 --- a/include/MainWindow.h +++ b/include/MainWindow.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include class QAction; class QDomElement; diff --git a/include/MeterDialog.h b/include/MeterDialog.h index 698c6ce37b..31197e75f8 100644 --- a/include/MeterDialog.h +++ b/include/MeterDialog.h @@ -26,7 +26,7 @@ #ifndef _METER_DIALOG_H #define _METER_DIALOG_H -#include +#include #include "ModelView.h" diff --git a/include/MidiClient.h b/include/MidiClient.h index 2888999aca..ddde0c5801 100644 --- 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 ) { } diff --git a/include/MidiController.h b/include/MidiController.h index 5d28c8e438..ce43cc83ad 100644 --- a/include/MidiController.h +++ b/include/MidiController.h @@ -25,7 +25,7 @@ #ifndef MIDI_CONTROLLER_H #define MIDI_CONTROLLER_H -#include +#include #include "AutomatableModel.h" #include "Controller.h" diff --git a/include/MidiPortMenu.h b/include/MidiPortMenu.h index 55e61eee21..b08281c8b0 100644 --- a/include/MidiPortMenu.h +++ b/include/MidiPortMenu.h @@ -26,7 +26,7 @@ #ifndef _MIDI_PORT_MENU_H #define _MIDI_PORT_MENU_H -#include +#include #include "ModelView.h" #include "MidiPort.h" diff --git a/include/MidiWinMM.h b/include/MidiWinMM.h index 54b6bdf0de..9a06dfb5d1 100644 --- a/include/MidiWinMM.h +++ b/include/MidiWinMM.h @@ -30,7 +30,6 @@ #ifdef LMMS_BUILD_WIN32 #include #include -#endif #include "MidiClient.h" #include "MidiPort.h" @@ -153,3 +152,5 @@ signals: #endif +#endif + diff --git a/include/PeakController.h b/include/PeakController.h index d53211d958..93b3df0662 100644 --- a/include/PeakController.h +++ b/include/PeakController.h @@ -25,7 +25,7 @@ #ifndef PEAK_CONTROLLER_H #define PEAK_CONTROLLER_H -#include +#include #include "Model.h" #include "AutomatableModel.h" diff --git a/include/PianoRoll.h b/include/PianoRoll.h index 157f3b051e..99ddea4ef1 100644 --- a/include/PianoRoll.h +++ b/include/PianoRoll.h @@ -27,8 +27,8 @@ #ifndef PIANO_ROLL_H #define PIANO_ROLL_H -#include -#include +#include +#include #include "ComboBoxModel.h" #include "SerializingObject.h" diff --git a/include/PianoView.h b/include/PianoView.h index 3f99fbc003..36a82ef2be 100644 --- a/include/PianoView.h +++ b/include/PianoView.h @@ -25,8 +25,8 @@ #ifndef _PIANO_VIEW_H #define _PIANO_VIEW_H -#include -#include +#include +#include #include "ModelView.h" diff --git a/include/Plugin.h b/include/Plugin.h index 1deb6a64ec..bfc9bc34c3 100644 --- a/include/Plugin.h +++ b/include/Plugin.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "JournallingObject.h" #include "Model.h" diff --git a/include/PluginView.h b/include/PluginView.h index 0f17ff2f9b..e2d3ebbabe 100644 --- a/include/PluginView.h +++ b/include/PluginView.h @@ -25,7 +25,7 @@ #ifndef _PLUGIN_VIEW_H #define _PLUGIN_VIEW_H -#include +#include #include "Plugin.h" #include "ModelView.h" diff --git a/include/SampleTrack.h b/include/SampleTrack.h index a2e8f5b758..74a16a6501 100644 --- a/include/SampleTrack.h +++ b/include/SampleTrack.h @@ -25,7 +25,7 @@ #ifndef SAMPLE_TRACK_H #define SAMPLE_TRACK_H -#include +#include #include "AudioPort.h" #include "track.h" diff --git a/include/SendButtonIndicator.h b/include/SendButtonIndicator.h index 8615bc3921..97acde1ba5 100644 --- a/include/SendButtonIndicator.h +++ b/include/SendButtonIndicator.h @@ -2,8 +2,8 @@ #define SENDBUTTONINDICATOR_H #include -#include -#include +#include +#include #include "FxLine.h" #include "FxMixerView.h" diff --git a/include/SideBar.h b/include/SideBar.h index 9a544b8bb6..8312281d4b 100644 --- a/include/SideBar.h +++ b/include/SideBar.h @@ -26,8 +26,8 @@ #define _SIDE_BAR_H #include -#include -#include +#include +#include class QToolButton; class SideBarWidget; diff --git a/include/SideBarWidget.h b/include/SideBarWidget.h index ff38994328..53a7eb38f6 100644 --- a/include/SideBarWidget.h +++ b/include/SideBarWidget.h @@ -25,9 +25,9 @@ #ifndef _SIDE_BAR_WIDGET_H #define _SIDE_BAR_WIDGET_H -#include -#include -#include +#include +#include +#include class SideBarWidget : public QWidget diff --git a/include/TempoSyncKnob.h b/include/TempoSyncKnob.h index 0f6a9063cc..e9ef2a2888 100644 --- a/include/TempoSyncKnob.h +++ b/include/TempoSyncKnob.h @@ -26,7 +26,7 @@ #ifndef _TEMPO_SYNC_KNOB_H #define _TEMPO_SYNC_KNOB_H -#include +#include #include #include "knob.h" diff --git a/include/TimeDisplayWidget.h b/include/TimeDisplayWidget.h index cde431d966..6fffbc53c1 100644 --- a/include/TimeDisplayWidget.h +++ b/include/TimeDisplayWidget.h @@ -26,8 +26,8 @@ #ifndef _TIME_DISPLAY_WIDGET #define _TIME_DISPLAY_WIDGET -#include -#include +#include +#include #include "LcdWidget.h" diff --git a/include/TrackContainerView.h b/include/TrackContainerView.h index 0f1f53691e..6e70a9112d 100644 --- a/include/TrackContainerView.h +++ b/include/TrackContainerView.h @@ -27,8 +27,8 @@ #define TRACK_CONTAINER_VIEW_H #include -#include -#include +#include +#include #include "track.h" diff --git a/include/about_dialog.h b/include/about_dialog.h index b2621ba527..5dec392d87 100644 --- a/include/about_dialog.h +++ b/include/about_dialog.h @@ -26,7 +26,7 @@ #ifndef _ABOUT_DIALOG_H #define _ABOUT_DIALOG_H -#include +#include #include "ui_about_dialog.h" diff --git a/include/automatable_button.h b/include/automatable_button.h index 53084cfec8..78d719c94d 100644 --- a/include/automatable_button.h +++ b/include/automatable_button.h @@ -26,7 +26,7 @@ #ifndef _AUTOMATABLE_BUTTON_H #define _AUTOMATABLE_BUTTON_H -#include +#include #include "AutomatableModelView.h" diff --git a/include/automatable_slider.h b/include/automatable_slider.h index 3a41a77f60..1dc2b87602 100644 --- a/include/automatable_slider.h +++ b/include/automatable_slider.h @@ -26,7 +26,7 @@ #ifndef _AUTOMATABLE_SLIDER_H #define _AUTOMATABLE_SLIDER_H -#include +#include #include "AutomatableModelView.h" diff --git a/include/caption_menu.h b/include/caption_menu.h index e6bce5f43f..d0d6394aed 100644 --- a/include/caption_menu.h +++ b/include/caption_menu.h @@ -26,7 +26,7 @@ #ifndef _CAPTION_MENU_H #define _CAPTION_MENU_H -#include +#include #include "export.h" diff --git a/include/combobox.h b/include/combobox.h index 76bb361639..55a66eda9a 100644 --- a/include/combobox.h +++ b/include/combobox.h @@ -26,8 +26,8 @@ #ifndef _COMBOBOX_H #define _COMBOBOX_H -#include -#include +#include +#include #include "ComboBoxModel.h" #include "AutomatableModelView.h" diff --git a/include/cpuload_widget.h b/include/cpuload_widget.h index 096307c763..29c65de278 100644 --- a/include/cpuload_widget.h +++ b/include/cpuload_widget.h @@ -28,8 +28,8 @@ #define _CPULOAD_WIDGET_H #include -#include -#include +#include +#include #include "lmms_basics.h" diff --git a/include/embed.h b/include/embed.h index 3aa9c8ab2c..bcbf708117 100644 --- a/include/embed.h +++ b/include/embed.h @@ -25,7 +25,7 @@ #ifndef _EMBED_H #define _EMBED_H -#include +#include #include #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() ); } diff --git a/include/export_project_dialog.h b/include/export_project_dialog.h index 5b906e00b8..5106a83529 100644 --- 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 +#include #include #include "ui_export_project.h" diff --git a/include/fade_button.h b/include/fade_button.h index 861595ecb4..828e7480da 100644 --- a/include/fade_button.h +++ b/include/fade_button.h @@ -27,8 +27,8 @@ #define _FADE_BUTTON_H #include -#include -#include +#include +#include class fadeButton : public QAbstractButton diff --git a/include/fader.h b/include/fader.h index 500c5e49dc..8fffefb530 100644 --- a/include/fader.h +++ b/include/fader.h @@ -49,8 +49,8 @@ #define FADER_H #include -#include -#include +#include +#include #include "AutomatableModelView.h" diff --git a/include/file_browser.h b/include/file_browser.h index 3679b45a53..52d0812b78 100644 --- a/include/file_browser.h +++ b/include/file_browser.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include "SideBarWidget.h" diff --git a/include/graph.h b/include/graph.h index bd2254d9b0..e6ac3c003a 100644 --- a/include/graph.h +++ b/include/graph.h @@ -27,9 +27,9 @@ #ifndef GRAPH_H #define GRAPH_H -#include -#include -#include +#include +#include +#include #include "Model.h" #include "ModelView.h" diff --git a/include/group_box.h b/include/group_box.h index ef08b56f97..b56c5ea99c 100644 --- a/include/group_box.h +++ b/include/group_box.h @@ -26,7 +26,7 @@ #ifndef _GROUP_BOX_H #define _GROUP_BOX_H -#include +#include #include "AutomatableModelView.h" #include "pixmap_button.h" diff --git a/include/gui_templates.h b/include/gui_templates.h index 8045e26c9a..ee8175c7ce 100644 --- a/include/gui_templates.h +++ b/include/gui_templates.h @@ -28,9 +28,9 @@ #include "lmmsconfig.h" -#include -#include -#include +#include +#include +#include diff --git a/include/knob.h b/include/knob.h index 734766842a..d7d0bdfcd3 100644 --- a/include/knob.h +++ b/include/knob.h @@ -26,7 +26,7 @@ #ifndef KNOB_H #define KNOB_H -#include +#include #include #include "AutomatableModelView.h" diff --git a/include/nstate_button.h b/include/nstate_button.h index b866653a9e..26e5eb8c8c 100644 --- a/include/nstate_button.h +++ b/include/nstate_button.h @@ -26,7 +26,7 @@ #ifndef _NSTATE_BUTTON_H #define _NSTATE_BUTTON_H -#include +#include #include #include diff --git a/include/pattern.h b/include/pattern.h index 2fff9697e6..802e024302 100644 --- a/include/pattern.h +++ b/include/pattern.h @@ -27,10 +27,10 @@ #define PATTERN_H #include -#include -#include +#include +#include #include -#include +#include #include "note.h" diff --git a/include/pixmap_button.h b/include/pixmap_button.h index d15c4b9115..cd27655424 100644 --- a/include/pixmap_button.h +++ b/include/pixmap_button.h @@ -26,7 +26,7 @@ #ifndef _PIXMAP_BUTTON_H #define _PIXMAP_BUTTON_H -#include +#include #include "automatable_button.h" diff --git a/include/plugin_browser.h b/include/plugin_browser.h index b0473b7f48..6ee7896ee8 100644 --- a/include/plugin_browser.h +++ b/include/plugin_browser.h @@ -26,7 +26,7 @@ #define _PLUGIN_BROWSER_H #include -#include +#include #include "SideBarWidget.h" #include "Plugin.h" diff --git a/include/project_notes.h b/include/project_notes.h index 876507083b..cca84ef4e2 100644 --- a/include/project_notes.h +++ b/include/project_notes.h @@ -26,7 +26,7 @@ #ifndef _PROJECT_NOTES_H #define _PROJECT_NOTES_H -#include +#include #include "JournallingObject.h" diff --git a/include/rename_dialog.h b/include/rename_dialog.h index 0cc78fe78b..5dca34bf53 100644 --- a/include/rename_dialog.h +++ b/include/rename_dialog.h @@ -27,7 +27,7 @@ #ifndef _RENAME_DIALOG_H #define _RENAME_DIALOG_H -#include +#include class QLineEdit; diff --git a/include/rubberband.h b/include/rubberband.h index 2e4d303d80..5b92274021 100644 --- a/include/rubberband.h +++ b/include/rubberband.h @@ -27,7 +27,7 @@ #ifndef _RUBBERBAND_H #define _RUBBERBAND_H -#include +#include #include diff --git a/include/setup_dialog.h b/include/setup_dialog.h index a4136e3972..8384b638a1 100644 --- a/include/setup_dialog.h +++ b/include/setup_dialog.h @@ -25,7 +25,7 @@ #ifndef _SETUP_DIALOG_H #define _SETUP_DIALOG_H -#include +#include #include #include "lmmsconfig.h" diff --git a/include/string_pair_drag.h b/include/string_pair_drag.h index 0b431bdcb9..668aaebb0f 100644 --- 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 -#include -#include +#include +#include +#include #include #include "export.h" diff --git a/include/tab_bar.h b/include/tab_bar.h index dd60410526..5b59eaefc4 100644 --- a/include/tab_bar.h +++ b/include/tab_bar.h @@ -27,8 +27,8 @@ #define _TAB_BAR_H #include -#include -#include +#include +#include #include "export.h" diff --git a/include/tab_button.h b/include/tab_button.h index 87c0aed1ac..edb4b729e8 100644 --- a/include/tab_button.h +++ b/include/tab_button.h @@ -26,7 +26,7 @@ #ifndef _TAB_BUTTON_H #define _TAB_BUTTON_H -#include +#include class tabButton : public QPushButton diff --git a/include/tab_widget.h b/include/tab_widget.h index 40d7abf4a1..ced7ac04c3 100644 --- a/include/tab_widget.h +++ b/include/tab_widget.h @@ -26,7 +26,7 @@ #ifndef _TAB_WIDGET_H #define _TAB_WIDGET_H -#include +#include #include diff --git a/include/text_float.h b/include/text_float.h index e7ef370923..1292729c6e 100644 --- a/include/text_float.h +++ b/include/text_float.h @@ -26,8 +26,8 @@ #ifndef TEXT_FLOAT_H #define TEXT_FLOAT_H -#include -#include +#include +#include #include "export.h" diff --git a/include/timeline.h b/include/timeline.h index 58322d747d..dc6386817b 100644 --- a/include/timeline.h +++ b/include/timeline.h @@ -26,7 +26,7 @@ #ifndef _TIMELINE_H #define _TIMELINE_H -#include +#include #include "song.h" diff --git a/include/tool_button.h b/include/tool_button.h index 3a908f97e1..6075cd7b95 100644 --- a/include/tool_button.h +++ b/include/tool_button.h @@ -26,8 +26,8 @@ #ifndef _TOOL_BUTTON_H #define _TOOL_BUTTON_H -#include -#include +#include +#include class toolButton : public QToolButton diff --git a/include/track.h b/include/track.h index cdc09e3357..d440f26e49 100644 --- a/include/track.h +++ b/include/track.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/include/track_label_button.h b/include/track_label_button.h index 5638cf56ab..705c45b751 100644 --- 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 +#include class trackView; diff --git a/include/visualization_widget.h b/include/visualization_widget.h index 8b8c3fd169..d658052d98 100644 --- a/include/visualization_widget.h +++ b/include/visualization_widget.h @@ -26,8 +26,8 @@ #ifndef _VISUALIZATION_WIDGET #define _VISUALIZATION_WIDGET -#include -#include +#include +#include #include "Mixer.h" diff --git a/plugins/Amplifier/AmplifierControlDialog.cpp b/plugins/Amplifier/AmplifierControlDialog.cpp index 752601765b..85af94ca06 100644 --- a/plugins/Amplifier/AmplifierControlDialog.cpp +++ b/plugins/Amplifier/AmplifierControlDialog.cpp @@ -23,7 +23,7 @@ * */ -#include +#include #include "AmplifierControlDialog.h" #include "AmplifierControls.h" diff --git a/plugins/Amplifier/AmplifierControls.cpp b/plugins/Amplifier/AmplifierControls.cpp index 8c1217d574..122bb1a510 100644 --- a/plugins/Amplifier/AmplifierControls.cpp +++ b/plugins/Amplifier/AmplifierControls.cpp @@ -24,7 +24,7 @@ */ -#include +#include #include "AmplifierControls.h" #include "Amplifier.h" @@ -78,5 +78,5 @@ void AmplifierControls::saveSettings( QDomDocument& doc, QDomElement& _this ) -#include "moc_AmplifierControls.cxx" + diff --git a/plugins/BassBooster/BassBoosterControlDialog.cpp b/plugins/BassBooster/BassBoosterControlDialog.cpp index dbbded1fb2..385612bd65 100644 --- a/plugins/BassBooster/BassBoosterControlDialog.cpp +++ b/plugins/BassBooster/BassBoosterControlDialog.cpp @@ -22,7 +22,7 @@ * */ -#include +#include #include "BassBoosterControlDialog.h" #include "BassBoosterControls.h" diff --git a/plugins/BassBooster/BassBoosterControls.cpp b/plugins/BassBooster/BassBoosterControls.cpp index 321d6dd22e..a25e83d67d 100644 --- a/plugins/BassBooster/BassBoosterControls.cpp +++ b/plugins/BassBooster/BassBoosterControls.cpp @@ -23,7 +23,7 @@ */ -#include +#include #include "BassBoosterControls.h" #include "BassBooster.h" @@ -98,5 +98,5 @@ void BassBoosterControls::saveSettings( QDomDocument& doc, QDomElement& _this ) -#include "moc_BassBoosterControls.cxx" + diff --git a/plugins/DualFilter/DualFilterControlDialog.cpp b/plugins/DualFilter/DualFilterControlDialog.cpp index ca7c3d3bf2..0d85f655e6 100644 --- a/plugins/DualFilter/DualFilterControlDialog.cpp +++ b/plugins/DualFilter/DualFilterControlDialog.cpp @@ -23,7 +23,7 @@ * */ -#include +#include #include "DualFilterControlDialog.h" #include "DualFilterControls.h" diff --git a/plugins/DualFilter/DualFilterControls.cpp b/plugins/DualFilter/DualFilterControls.cpp index 06ead0b317..bb1abbdb0a 100644 --- a/plugins/DualFilter/DualFilterControls.cpp +++ b/plugins/DualFilter/DualFilterControls.cpp @@ -24,7 +24,7 @@ */ -#include +#include #include "DualFilterControls.h" #include "DualFilter.h" @@ -163,5 +163,5 @@ void DualFilterControls::saveSettings( QDomDocument& _doc, QDomElement& _this ) -#include "moc_DualFilterControls.cxx" + diff --git a/plugins/HydrogenImport/HydrogenImport.cpp b/plugins/HydrogenImport/HydrogenImport.cpp index 1c33d42ff7..29c8279de2 100644 --- a/plugins/HydrogenImport/HydrogenImport.cpp +++ b/plugins/HydrogenImport/HydrogenImport.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/plugins/HydrogenImport/HydrogenImport.h b/plugins/HydrogenImport/HydrogenImport.h index 6fe8e3c4c5..1c916f3c34 100644 --- a/plugins/HydrogenImport/HydrogenImport.h +++ b/plugins/HydrogenImport/HydrogenImport.h @@ -1,9 +1,9 @@ #ifndef _HYDROGEN_IMPORT_H #define _HYDROGEN_IMPORT_H -#include -#include -#include +#include +#include +#include #include "ImportFilter.h" diff --git a/plugins/LadspaEffect/LadspaControlDialog.cpp b/plugins/LadspaEffect/LadspaControlDialog.cpp index d217574cba..2ebf898307 100644 --- a/plugins/LadspaEffect/LadspaControlDialog.cpp +++ b/plugins/LadspaEffect/LadspaControlDialog.cpp @@ -25,8 +25,8 @@ */ -#include -#include +#include +#include #include "LadspaEffect.h" #include "LadspaControlDialog.h" @@ -143,5 +143,5 @@ void LadspaControlDialog::updateEffectView( LadspaControls * _ctl ) } -#include "moc_LadspaControlDialog.cxx" + diff --git a/plugins/LadspaEffect/LadspaControls.cpp b/plugins/LadspaEffect/LadspaControls.cpp index f7b16d5f2e..91ce55c357 100644 --- a/plugins/LadspaEffect/LadspaControls.cpp +++ b/plugins/LadspaEffect/LadspaControls.cpp @@ -22,7 +22,7 @@ * */ -#include +#include #include "LadspaEffect.h" @@ -183,5 +183,5 @@ void LadspaControls::updateLinkStatesFromGlobal() } -#include "moc_LadspaControls.cxx" + diff --git a/plugins/LadspaEffect/LadspaEffect.cpp b/plugins/LadspaEffect/LadspaEffect.cpp index 1dd5072d09..a27805c14f 100644 --- a/plugins/LadspaEffect/LadspaEffect.cpp +++ b/plugins/LadspaEffect/LadspaEffect.cpp @@ -24,7 +24,7 @@ */ -#include +#include #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" + diff --git a/plugins/LadspaEffect/LadspaEffect.h b/plugins/LadspaEffect/LadspaEffect.h index 52adc0f0de..85b27718d9 100644 --- a/plugins/LadspaEffect/LadspaEffect.h +++ b/plugins/LadspaEffect/LadspaEffect.h @@ -26,7 +26,7 @@ #ifndef _LADSPA_EFFECT_H #define _LADSPA_EFFECT_H -#include +#include #include "Effect.h" #include "LadspaBase.h" diff --git a/plugins/LadspaEffect/LadspaSubPluginFeatures.cpp b/plugins/LadspaEffect/LadspaSubPluginFeatures.cpp index 13aa66e5bd..875530502f 100644 --- a/plugins/LadspaEffect/LadspaSubPluginFeatures.cpp +++ b/plugins/LadspaEffect/LadspaSubPluginFeatures.cpp @@ -25,8 +25,8 @@ * */ -#include -#include +#include +#include #include "LadspaSubPluginFeatures.h" #include "AudioDevice.h" diff --git a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp index 9854d4c866..8dbb3e7a66 100644 --- a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp +++ b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp @@ -22,8 +22,8 @@ * */ -#include -#include +#include +#include #include "SpectrumAnalyzer.h" #include "MainWindow.h" diff --git a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControls.cpp b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControls.cpp index e9088dfd93..3598357b66 100644 --- a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControls.cpp +++ b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControls.cpp @@ -57,5 +57,5 @@ void SpectrumAnalyzerControls::saveSettings( QDomDocument & _doc, -#include "moc_SpectrumAnalyzerControls.cxx" + diff --git a/plugins/VstEffect/VstEffect.cpp b/plugins/VstEffect/VstEffect.cpp index 072aa3a48d..8817ffb95e 100644 --- a/plugins/VstEffect/VstEffect.cpp +++ b/plugins/VstEffect/VstEffect.cpp @@ -22,7 +22,7 @@ * */ -#include +#include #include "VstEffect.h" #include "song.h" diff --git a/plugins/VstEffect/VstEffect.h b/plugins/VstEffect/VstEffect.h index 4c11bbbcc2..cba32cdd63 100644 --- a/plugins/VstEffect/VstEffect.h +++ b/plugins/VstEffect/VstEffect.h @@ -25,7 +25,7 @@ #ifndef _VST_EFFECT_H #define _VST_EFFECT_H -#include +#include #include "Effect.h" #include "VstPlugin.h" diff --git a/plugins/VstEffect/VstEffectControlDialog.cpp b/plugins/VstEffect/VstEffectControlDialog.cpp index 2261f24660..a8467557cd 100644 --- a/plugins/VstEffect/VstEffectControlDialog.cpp +++ b/plugins/VstEffect/VstEffectControlDialog.cpp @@ -22,10 +22,10 @@ * */ -#include -#include -#include -#include +#include +#include +#include +#include #include "VstEffectControlDialog.h" #include "VstEffect.h" @@ -35,10 +35,10 @@ #include "tooltip.h" #include -#include +#include #include "gui_templates.h" -#include -#include +#include +#include VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : diff --git a/plugins/VstEffect/VstEffectControlDialog.h b/plugins/VstEffect/VstEffectControlDialog.h index 0912c906d8..558b17e375 100644 --- a/plugins/VstEffect/VstEffectControlDialog.h +++ b/plugins/VstEffect/VstEffectControlDialog.h @@ -30,7 +30,7 @@ #include #include -#include +#include class VstEffectControls; diff --git a/plugins/VstEffect/VstEffectControls.cpp b/plugins/VstEffect/VstEffectControls.cpp index 1d0803ec09..0eee04a731 100644 --- a/plugins/VstEffect/VstEffectControls.cpp +++ b/plugins/VstEffect/VstEffectControls.cpp @@ -22,13 +22,13 @@ * */ -#include +#include #include "VstEffectControls.h" #include "VstEffect.h" #include "MainWindow.h" -#include +#include #include @@ -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" + diff --git a/plugins/VstEffect/VstEffectControls.h b/plugins/VstEffect/VstEffectControls.h index bc33a20885..f901a2eb2d 100644 --- a/plugins/VstEffect/VstEffectControls.h +++ b/plugins/VstEffect/VstEffectControls.h @@ -28,14 +28,14 @@ #include "EffectControls.h" #include "VstEffectControlDialog.h" -#include +#include #include "embed.h" -#include +#include -#include -#include +#include +#include #include "knob.h" -#include +#include #include #include diff --git a/plugins/VstEffect/VstSubPluginFeatures.cpp b/plugins/VstEffect/VstSubPluginFeatures.cpp index 9052827cf7..e578f3ee83 100644 --- a/plugins/VstEffect/VstSubPluginFeatures.cpp +++ b/plugins/VstEffect/VstSubPluginFeatures.cpp @@ -24,8 +24,8 @@ * */ -#include -#include +#include +#include #include "VstSubPluginFeatures.h" #include "config_mgr.h" diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp index 03ce7832d9..8d9d65b4ba 100644 --- a/plugins/audio_file_processor/audio_file_processor.cpp +++ b/plugins/audio_file_processor/audio_file_processor.cpp @@ -23,11 +23,11 @@ */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -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" ); - setAcceptDrops( TRUE ); + setAcceptDrops( true ); } @@ -1262,5 +1262,5 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data ) } -#include "moc_audio_file_processor.cxx" + diff --git a/plugins/audio_file_processor/audio_file_processor.h b/plugins/audio_file_processor/audio_file_processor.h index 5531bb8902..b9e8a4bc5c 100644 --- a/plugins/audio_file_processor/audio_file_processor.h +++ b/plugins/audio_file_processor/audio_file_processor.h @@ -27,7 +27,7 @@ #ifndef AUDIO_FILE_PROCESSOR_H #define AUDIO_FILE_PROCESSOR_H -#include +#include #include "Instrument.h" #include "InstrumentView.h" diff --git a/plugins/bit_invader/bit_invader.cpp b/plugins/bit_invader/bit_invader.cpp index 95f06f53a8..9cab31847c 100644 --- a/plugins/bit_invader/bit_invader.cpp +++ b/plugins/bit_invader/bit_invader.cpp @@ -23,7 +23,7 @@ */ -#include +#include #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" + diff --git a/plugins/dynamics_processor/dynamics_processor_control_dialog.cpp b/plugins/dynamics_processor/dynamics_processor_control_dialog.cpp index e92e8e6d0f..ceb909d77f 100644 --- a/plugins/dynamics_processor/dynamics_processor_control_dialog.cpp +++ b/plugins/dynamics_processor/dynamics_processor_control_dialog.cpp @@ -24,7 +24,7 @@ */ -#include +#include #include "dynamics_processor_control_dialog.h" #include "dynamics_processor_controls.h" diff --git a/plugins/dynamics_processor/dynamics_processor_controls.cpp b/plugins/dynamics_processor/dynamics_processor_controls.cpp index ffe9d2d966..e0b9cf6688 100644 --- a/plugins/dynamics_processor/dynamics_processor_controls.cpp +++ b/plugins/dynamics_processor/dynamics_processor_controls.cpp @@ -24,7 +24,7 @@ */ -#include +#include #include "dynamics_processor_controls.h" #include "dynamics_processor.h" @@ -168,5 +168,5 @@ void dynProcControls::subOneClicked() } -#include "moc_dynamics_processor_controls.cxx" + diff --git a/plugins/flp_import/FlpImport.cpp b/plugins/flp_import/FlpImport.cpp index db566564ff..3dc60a3c2d 100644 --- a/plugins/flp_import/FlpImport.cpp +++ b/plugins/flp_import/FlpImport.cpp @@ -22,12 +22,12 @@ * */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "FlpImport.h" #include "NotePlayHandle.h" diff --git a/plugins/flp_import/FlpImport.h b/plugins/flp_import/FlpImport.h index b965810ed8..3cb19a8b46 100644 --- a/plugins/flp_import/FlpImport.h +++ b/plugins/flp_import/FlpImport.h @@ -25,9 +25,9 @@ #ifndef _FLP_IMPORT_H #define _FLP_IMPORT_H -#include -#include -#include +#include +#include +#include #include "ImportFilter.h" #include "note.h" diff --git a/plugins/flp_import/unrtf.cpp b/plugins/flp_import/unrtf.cpp index 7f3edaacfb..2b6cc5af78 100644 --- a/plugins/flp_import/unrtf.cpp +++ b/plugins/flp_import/unrtf.cpp @@ -25,8 +25,8 @@ #include "lmmsconfig.h" -#include -#include +#include +#include #include diff --git a/plugins/kicker/kicker.cpp b/plugins/kicker/kicker.cpp index 96e0ff4dfe..0096cb0e03 100644 --- a/plugins/kicker/kicker.cpp +++ b/plugins/kicker/kicker.cpp @@ -24,8 +24,8 @@ */ -#include -#include +#include +#include #include "kicker.h" #include "engine.h" @@ -375,5 +375,5 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data ) } -#include "moc_kicker.cxx" + diff --git a/plugins/kicker/kicker.h b/plugins/kicker/kicker.h index 0119db331d..92584908f7 100644 --- a/plugins/kicker/kicker.h +++ b/plugins/kicker/kicker.h @@ -27,7 +27,7 @@ #ifndef KICKER_H #define KICKER_H -#include +#include #include "Instrument.h" #include "InstrumentView.h" #include "knob.h" diff --git a/plugins/ladspa_browser/ladspa_browser.cpp b/plugins/ladspa_browser/ladspa_browser.cpp index 442edfdf87..05055078f9 100644 --- a/plugins/ladspa_browser/ladspa_browser.cpp +++ b/plugins/ladspa_browser/ladspa_browser.cpp @@ -28,8 +28,8 @@ #include "ladspa_browser.h" -#include -#include +#include +#include #include "gui_templates.h" @@ -235,4 +235,4 @@ void ladspaBrowserView::showPorts( const ladspa_key_t & _key ) -#include "moc_ladspa_browser.cxx" + diff --git a/plugins/ladspa_browser/ladspa_description.cpp b/plugins/ladspa_browser/ladspa_description.cpp index 19070adca2..b8ab2f9562 100644 --- a/plugins/ladspa_browser/ladspa_description.cpp +++ b/plugins/ladspa_browser/ladspa_description.cpp @@ -24,11 +24,11 @@ #include "ladspa_description.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "AudioDevice.h" #include "engine.h" @@ -217,4 +217,4 @@ void ladspaDescription::onDoubleClicked( QListWidgetItem * _item ) -#include "moc_ladspa_description.cxx" + diff --git a/plugins/ladspa_browser/ladspa_description.h b/plugins/ladspa_browser/ladspa_description.h index ce1164f708..cd186b1c3b 100644 --- a/plugins/ladspa_browser/ladspa_description.h +++ b/plugins/ladspa_browser/ladspa_description.h @@ -27,7 +27,7 @@ #define _LADSPA_DESCRIPTION_H -#include +#include #include "ladspa_manager.h" diff --git a/plugins/ladspa_browser/ladspa_port_dialog.cpp b/plugins/ladspa_browser/ladspa_port_dialog.cpp index 3a3370df38..e1e40b8be8 100644 --- a/plugins/ladspa_browser/ladspa_port_dialog.cpp +++ b/plugins/ladspa_browser/ladspa_port_dialog.cpp @@ -25,8 +25,8 @@ #include "ladspa_port_dialog.h" -#include -#include +#include +#include #include "embed.h" #include "engine.h" @@ -172,5 +172,4 @@ ladspaPortDialog::~ladspaPortDialog() -#include "moc_ladspa_port_dialog.cxx" diff --git a/plugins/ladspa_browser/ladspa_port_dialog.h b/plugins/ladspa_browser/ladspa_port_dialog.h index c249ef9801..8d4e4664aa 100644 --- a/plugins/ladspa_browser/ladspa_port_dialog.h +++ b/plugins/ladspa_browser/ladspa_port_dialog.h @@ -27,7 +27,7 @@ #define _LADSPA_PORT_DIALOG_H -#include +#include #include "ladspa_manager.h" diff --git a/plugins/lb302/lb302.cpp b/plugins/lb302/lb302.cpp index 15938f8cd2..6215c6cddc 100644 --- a/plugins/lb302/lb302.cpp +++ b/plugins/lb302/lb302.cpp @@ -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; diff --git a/plugins/lb303/lb303.cpp b/plugins/lb303/lb303.cpp index 6e00992496..623fe854f7 100644 --- a/plugins/lb303/lb303.cpp +++ b/plugins/lb303/lb303.cpp @@ -29,7 +29,7 @@ */ -#include +#include #include "lb303.h" #include "engine.h" @@ -41,7 +41,7 @@ #include "audio_port.h" #include "embed.cpp" -#include "moc_lb303.cxx" + // Envelope Recalculation period diff --git a/plugins/midi_import/MidiImport.cpp b/plugins/midi_import/MidiImport.cpp index 0444ce51a9..807c57043e 100644 --- a/plugins/midi_import/MidiImport.cpp +++ b/plugins/midi_import/MidiImport.cpp @@ -23,11 +23,11 @@ */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "MidiImport.h" #include "TrackContainer.h" diff --git a/plugins/midi_import/MidiImport.h b/plugins/midi_import/MidiImport.h index 66b839334f..1280e63909 100644 --- a/plugins/midi_import/MidiImport.h +++ b/plugins/midi_import/MidiImport.h @@ -25,9 +25,9 @@ #ifndef _MIDI_IMPORT_H #define _MIDI_IMPORT_H -#include -#include -#include +#include +#include +#include #include "MidiEvent.h" #include "ImportFilter.h" diff --git a/plugins/monstro/Monstro.cpp b/plugins/monstro/Monstro.cpp index 0323d63f00..3256790254 100644 --- a/plugins/monstro/Monstro.cpp +++ b/plugins/monstro/Monstro.cpp @@ -23,7 +23,7 @@ */ -#include +#include #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" + diff --git a/plugins/nes/Nes.cpp b/plugins/nes/Nes.cpp index 8f5de48347..d6f82d0d94 100644 --- a/plugins/nes/Nes.cpp +++ b/plugins/nes/Nes.cpp @@ -23,7 +23,7 @@ */ -#include +#include #include "Nes.h" #include "engine.h" @@ -927,4 +927,4 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data ) } -#include "moc_Nes.cxx" + diff --git a/plugins/opl2/opl2instrument.cpp b/plugins/opl2/opl2instrument.cpp index 6a169c9640..28e647796c 100644 --- a/plugins/opl2/opl2instrument.cpp +++ b/plugins/opl2/opl2instrument.cpp @@ -49,7 +49,7 @@ #include "InstrumentPlayHandle.h" #include "InstrumentTrack.h" -#include +#include #include "opl.h" #include "temuopl.h" @@ -713,4 +713,4 @@ void opl2instrumentView::modelChanged() } -#include "moc_opl2instrument.cxx" + diff --git a/plugins/organic/organic.cpp b/plugins/organic/organic.cpp index 1f4bb29963..5fefdd1013 100644 --- a/plugins/organic/organic.cpp +++ b/plugins/organic/organic.cpp @@ -26,8 +26,8 @@ #include "organic.h" -#include -#include +#include +#include #include "engine.h" @@ -661,4 +661,4 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data ) -#include "moc_organic.cxx" + diff --git a/plugins/papu/papu_instrument.cpp b/plugins/papu/papu_instrument.cpp index 50ed73f7dc..2edd1deec2 100644 --- a/plugins/papu/papu_instrument.cpp +++ b/plugins/papu/papu_instrument.cpp @@ -24,8 +24,8 @@ */ -#include -#include +#include +#include #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" + diff --git a/plugins/papu/papu_instrument.h b/plugins/papu/papu_instrument.h index dad2d0b708..34d0cb570a 100644 --- a/plugins/papu/papu_instrument.h +++ b/plugins/papu/papu_instrument.h @@ -26,7 +26,7 @@ #ifndef _PAPU_H #define _PAPU_H -#include +#include #include "Instrument.h" #include "InstrumentView.h" #include "knob.h" diff --git a/plugins/patman/patman.cpp b/plugins/patman/patman.cpp index 9df2f1d321..54b3cbab98 100644 --- a/plugins/patman/patman.cpp +++ b/plugins/patman/patman.cpp @@ -25,9 +25,9 @@ #include "patman.h" -#include -#include -#include +#include +#include +#include #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" + diff --git a/plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp b/plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp index 596a17de1f..7f63db4654 100644 --- a/plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp +++ b/plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp @@ -25,8 +25,8 @@ -#include -#include +#include +#include #include "peak_controller_effect_control_dialog.h" #include "peak_controller_effect_controls.h" diff --git a/plugins/peak_controller_effect/peak_controller_effect_controls.cpp b/plugins/peak_controller_effect/peak_controller_effect_controls.cpp index 836b72b1fc..1bd88091d5 100644 --- a/plugins/peak_controller_effect/peak_controller_effect_controls.cpp +++ b/plugins/peak_controller_effect/peak_controller_effect_controls.cpp @@ -24,7 +24,7 @@ */ -#include +#include #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" + diff --git a/plugins/sf2_player/patches_dialog.cpp b/plugins/sf2_player/patches_dialog.cpp index ac259c5fc2..47536d3a50 100644 --- a/plugins/sf2_player/patches_dialog.cpp +++ b/plugins/sf2_player/patches_dialog.cpp @@ -25,7 +25,7 @@ #include "patches_dialog.h" -#include +#include //#include @@ -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" + diff --git a/plugins/sf2_player/patches_dialog.h b/plugins/sf2_player/patches_dialog.h index deaf491b82..9690c97517 100644 --- a/plugins/sf2_player/patches_dialog.h +++ b/plugins/sf2_player/patches_dialog.h @@ -30,8 +30,8 @@ #include "LcdSpinBox.h" #include -#include -#include +#include +#include //---------------------------------------------------------------------------- // qsynthPresetForm -- UI wrapper form. diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp index 09c7eeed1a..34be715750 100644 --- a/plugins/sf2_player/sf2_player.cpp +++ b/plugins/sf2_player/sf2_player.cpp @@ -23,10 +23,10 @@ * */ -#include -#include -#include -#include +#include +#include +#include +#include #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" + diff --git a/plugins/sf2_player/sf2_player.h b/plugins/sf2_player/sf2_player.h index a50231c373..6238eeace0 100644 --- a/plugins/sf2_player/sf2_player.h +++ b/plugins/sf2_player/sf2_player.h @@ -27,7 +27,7 @@ #ifndef SF2_PLAYER_H #define SF2_PLAYER_H -#include +#include #include "Instrument.h" #include "pixmap_button.h" diff --git a/plugins/sfxr/sfxr.cpp b/plugins/sfxr/sfxr.cpp index 40182b2184..c0276d7f86 100644 --- a/plugins/sfxr/sfxr.cpp +++ b/plugins/sfxr/sfxr.cpp @@ -36,7 +36,7 @@ float frnd(float range) } -#include +#include #include "sfxr.h" #include "engine.h" @@ -1126,4 +1126,4 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model*, void* data ) -#include "moc_sfxr.cxx" + diff --git a/plugins/sid/sid_instrument.cpp b/plugins/sid/sid_instrument.cpp index dd6cd7af5f..619b869485 100644 --- a/plugins/sid/sid_instrument.cpp +++ b/plugins/sid/sid_instrument.cpp @@ -24,8 +24,8 @@ */ -#include -#include +#include +#include #include @@ -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" + diff --git a/plugins/sid/sid_instrument.h b/plugins/sid/sid_instrument.h index d7c6f75637..5e0c64b83f 100644 --- a/plugins/sid/sid_instrument.h +++ b/plugins/sid/sid_instrument.h @@ -27,7 +27,7 @@ #ifndef _SID_H #define _SID_H -#include +#include #include "Instrument.h" #include "InstrumentView.h" #include "knob.h" diff --git a/plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp b/plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp index 73603f318e..bdfc7eae9c 100644 --- a/plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp +++ b/plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp @@ -24,7 +24,7 @@ -#include +#include #include "stereoenhancer_control_dialog.h" #include "stereoenhancer_controls.h" diff --git a/plugins/stereo_enhancer/stereoenhancer_controls.cpp b/plugins/stereo_enhancer/stereoenhancer_controls.cpp index 4ea92c65e7..b0701e754a 100644 --- a/plugins/stereo_enhancer/stereoenhancer_controls.cpp +++ b/plugins/stereo_enhancer/stereoenhancer_controls.cpp @@ -23,7 +23,7 @@ */ -#include +#include #include "stereoenhancer_controls.h" #include "stereo_enhancer.h" @@ -65,5 +65,5 @@ void stereoEnhancerControls::saveSettings( QDomDocument & _doc, -#include "moc_stereoenhancer_controls.cxx" + diff --git a/plugins/stereo_matrix/stereomatrix_control_dialog.cpp b/plugins/stereo_matrix/stereomatrix_control_dialog.cpp index fa067279b8..304efc7e85 100644 --- a/plugins/stereo_matrix/stereomatrix_control_dialog.cpp +++ b/plugins/stereo_matrix/stereomatrix_control_dialog.cpp @@ -24,8 +24,8 @@ -#include -#include +#include +#include #include "stereomatrix_control_dialog.h" #include "stereomatrix_controls.h" diff --git a/plugins/stereo_matrix/stereomatrix_controls.cpp b/plugins/stereo_matrix/stereomatrix_controls.cpp index 69f60e7c98..d7b9d38378 100644 --- a/plugins/stereo_matrix/stereomatrix_controls.cpp +++ b/plugins/stereo_matrix/stereomatrix_controls.cpp @@ -23,7 +23,7 @@ */ -#include +#include #include "stereomatrix_controls.h" #include "stereo_matrix.h" @@ -79,5 +79,5 @@ void stereoMatrixControls::saveSettings( QDomDocument & _doc, -#include "moc_stereomatrix_controls.cxx" + diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp index cd20ccd7fb..692f644a87 100644 --- a/plugins/stk/mallets/mallets.cpp +++ b/plugins/stk/mallets/mallets.cpp @@ -25,8 +25,8 @@ #include "mallets.h" -#include -#include +#include +#include #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" + diff --git a/plugins/triple_oscillator/TripleOscillator.cpp b/plugins/triple_oscillator/TripleOscillator.cpp index 4ce5ee4d01..9da0cde058 100644 --- a/plugins/triple_oscillator/TripleOscillator.cpp +++ b/plugins/triple_oscillator/TripleOscillator.cpp @@ -23,9 +23,9 @@ */ -#include -#include -#include +#include +#include +#include #include "TripleOscillator.h" #include "automatable_button.h" @@ -798,5 +798,5 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data ) } -#include "moc_TripleOscillator.cxx" + diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp index 5723aafde8..89708e92c1 100644 --- a/plugins/vestige/vestige.cpp +++ b/plugins/vestige/vestige.cpp @@ -24,13 +24,13 @@ #include "vestige.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #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" + diff --git a/plugins/vestige/vestige.h b/plugins/vestige/vestige.h index 8854e43694..a94185c5ae 100644 --- a/plugins/vestige/vestige.h +++ b/plugins/vestige/vestige.h @@ -27,10 +27,10 @@ #define _VESTIGE_H -#include -#include -#include -#include +#include +#include +#include +#include #include "Instrument.h" #include "InstrumentView.h" diff --git a/plugins/vibed/nine_button_selector.cpp b/plugins/vibed/nine_button_selector.cpp index 3c88604f42..1ecb4d4f5d 100644 --- a/plugins/vibed/nine_button_selector.cpp +++ b/plugins/vibed/nine_button_selector.cpp @@ -26,7 +26,7 @@ #include "nine_button_selector.h" -#include +#include #include "caption_menu.h" #include "embed.h" @@ -269,4 +269,4 @@ void nineButtonSelector::displayHelp() -#include "moc_nine_button_selector.cxx" + diff --git a/plugins/vibed/string_container.h b/plugins/vibed/string_container.h index 2a217be215..f6af252d0a 100644 --- a/plugins/vibed/string_container.h +++ b/plugins/vibed/string_container.h @@ -24,7 +24,7 @@ #ifndef _STRING_CONTAINER_H #define _STRING_CONTAINER_H -#include +#include #include "vibrating_string.h" diff --git a/plugins/vibed/vibed.cpp b/plugins/vibed/vibed.cpp index 697812b59f..e0e888259e 100644 --- a/plugins/vibed/vibed.cpp +++ b/plugins/vibed/vibed.cpp @@ -22,9 +22,9 @@ * */ -#include -#include -#include +#include +#include +#include #include "vibed.h" #include "engine.h" @@ -785,5 +785,5 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data ) } -#include "moc_vibed.cxx" + diff --git a/plugins/vst_base/VstPlugin.cpp b/plugins/vst_base/VstPlugin.cpp index 5ed6164a4e..e0c433132a 100644 --- a/plugins/vst_base/VstPlugin.cpp +++ b/plugins/vst_base/VstPlugin.cpp @@ -1,7 +1,7 @@ /* * VstPlugin.cpp - implementation of VstPlugin class * - * Copyright (c) 2005-2013 Tobias Doerffel + * Copyright (c) 2005-2014 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -24,20 +24,22 @@ #include "VstPlugin.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #ifdef LMMS_BUILD_LINUX -#include -#include -#else -#include +#if QT_VERSION < 0x050000 +#include +#include #endif -#include +#else +#include +#endif +#include #ifdef LMMS_BUILD_WIN32 #include @@ -49,7 +51,7 @@ #include "song.h" #include "templates.h" #include "FileDialog.h" -#include +#include 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" + diff --git a/plugins/vst_base/VstPlugin.h b/plugins/vst_base/VstPlugin.h index 932601dc6f..924aa16244 100644 --- a/plugins/vst_base/VstPlugin.h +++ b/plugins/vst_base/VstPlugin.h @@ -25,12 +25,12 @@ #ifndef _VST_PLUGIN_H #define _VST_PLUGIN_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "Mixer.h" #include "JournallingObject.h" diff --git a/plugins/watsyn/Watsyn.cpp b/plugins/watsyn/Watsyn.cpp index 8f0abef289..602866dd24 100644 --- a/plugins/watsyn/Watsyn.cpp +++ b/plugins/watsyn/Watsyn.cpp @@ -22,7 +22,7 @@ * */ -#include +#include #include "Watsyn.h" #include "engine.h" @@ -1283,4 +1283,4 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data ) } -#include "moc_Watsyn.cxx" + diff --git a/plugins/waveshaper/waveshaper_control_dialog.cpp b/plugins/waveshaper/waveshaper_control_dialog.cpp index b32b5b2113..efee7a49f1 100644 --- a/plugins/waveshaper/waveshaper_control_dialog.cpp +++ b/plugins/waveshaper/waveshaper_control_dialog.cpp @@ -24,7 +24,7 @@ */ -#include +#include #include "waveshaper_control_dialog.h" #include "waveshaper_controls.h" diff --git a/plugins/waveshaper/waveshaper_controls.cpp b/plugins/waveshaper/waveshaper_controls.cpp index 4dfda0ca73..1fa0dc16d5 100644 --- a/plugins/waveshaper/waveshaper_controls.cpp +++ b/plugins/waveshaper/waveshaper_controls.cpp @@ -24,7 +24,7 @@ */ -#include +#include #include "waveshaper_controls.h" #include "waveshaper.h" @@ -167,5 +167,5 @@ void waveShaperControls::subOneClicked() } -#include "moc_waveshaper_controls.cxx" + diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt index 3fd07c8914..807d71b4f3 100644 --- a/plugins/zynaddsubfx/CMakeLists.txt +++ b/plugins/zynaddsubfx/CMakeLists.txt @@ -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}") diff --git a/plugins/zynaddsubfx/ZynAddSubFx.cpp b/plugins/zynaddsubfx/ZynAddSubFx.cpp index 40c2737c74..5ea2c433c7 100644 --- a/plugins/zynaddsubfx/ZynAddSubFx.cpp +++ b/plugins/zynaddsubfx/ZynAddSubFx.cpp @@ -24,16 +24,12 @@ #include "lmmsconfig.h" -#ifndef LMMS_BUILD_APPLE -#include -#endif -#ifdef LMMS_BUILD_APPLE -#include -#endif -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "ZynAddSubFx.h" #include "engine.h" @@ -49,7 +45,7 @@ #include "ControllerConnection.h" #include "embed.cpp" -#include "moc_ZynAddSubFx.cxx" + extern "C" diff --git a/plugins/zynaddsubfx/ZynAddSubFx.h b/plugins/zynaddsubfx/ZynAddSubFx.h index ac9cdf3ccd..d80a6c6d44 100644 --- a/plugins/zynaddsubfx/ZynAddSubFx.h +++ b/plugins/zynaddsubfx/ZynAddSubFx.h @@ -25,8 +25,8 @@ #ifndef ZYNADDSUBFX_H #define ZYNADDSUBFX_H -#include -#include +#include +#include #include "AutomatableModel.h" #include "Instrument.h" diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp index d8deefe95c..67ebe93aab 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp @@ -47,8 +47,8 @@ */ -#include -#include +#include +#include #include "QtXmlWrapper.h" #include #include diff --git a/src/core/AutomatableModel.cpp b/src/core/AutomatableModel.cpp index 8b93cfb9fe..3c75f39cdd 100644 --- a/src/core/AutomatableModel.cpp +++ b/src/core/AutomatableModel.cpp @@ -22,7 +22,7 @@ * */ -#include +#include #include "AutomatableModel.h" #include "AutomationPattern.h" @@ -715,5 +715,5 @@ float AutomatableModel::globalAutomationValueAt( const MidiTime& time ) } -#include "moc_AutomatableModel.cxx" + diff --git a/src/core/AutomationPattern.cpp b/src/core/AutomationPattern.cpp index c595a422e9..d2832d9fce 100644 --- a/src/core/AutomationPattern.cpp +++ b/src/core/AutomationPattern.cpp @@ -24,9 +24,9 @@ * */ -#include -#include -#include +#include +#include +#include #include "AutomationPattern.h" #include "AutomationPatternView.h" @@ -783,4 +783,4 @@ void AutomationPattern::generateTangents( timeMap::const_iterator it, -#include "moc_AutomationPattern.cxx" + diff --git a/src/core/ComboBoxModel.cpp b/src/core/ComboBoxModel.cpp index 8206f3c370..a7e5b8f191 100644 --- a/src/core/ComboBoxModel.cpp +++ b/src/core/ComboBoxModel.cpp @@ -66,5 +66,5 @@ int ComboBoxModel::findText( const QString& txt ) const -#include "moc_ComboBoxModel.cxx" + diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp index 2618fe5887..e47eef36ce 100644 --- a/src/core/Controller.cpp +++ b/src/core/Controller.cpp @@ -24,9 +24,9 @@ * */ -#include -#include -#include +#include +#include +#include #include "song.h" @@ -346,6 +346,6 @@ int Controller::connectionCount() const{ -#include "moc_Controller.cxx" + diff --git a/src/core/ControllerConnection.cpp b/src/core/ControllerConnection.cpp index e5db4ffbfb..ea0bc2b482 100644 --- a/src/core/ControllerConnection.cpp +++ b/src/core/ControllerConnection.cpp @@ -24,9 +24,9 @@ * */ -#include -#include -#include +#include +#include +#include #include "song.h" @@ -222,5 +222,5 @@ void ControllerConnection::deleteConnection() } -#include "moc_ControllerConnection.cxx" + diff --git a/src/core/DataFile.cpp b/src/core/DataFile.cpp index 8992d592a7..ed45829e90 100644 --- a/src/core/DataFile.cpp +++ b/src/core/DataFile.cpp @@ -28,11 +28,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "config_mgr.h" diff --git a/src/core/Effect.cpp b/src/core/Effect.cpp index 359a631cc5..ce4473636e 100644 --- a/src/core/Effect.cpp +++ b/src/core/Effect.cpp @@ -23,7 +23,7 @@ * */ -#include +#include #include "Effect.h" #include "engine.h" diff --git a/src/core/EffectChain.cpp b/src/core/EffectChain.cpp index 89e9028661..476cb86512 100644 --- a/src/core/EffectChain.cpp +++ b/src/core/EffectChain.cpp @@ -24,7 +24,7 @@ */ -#include +#include #include "EffectChain.h" #include "Effect.h" @@ -255,5 +255,5 @@ void EffectChain::clear() -#include "moc_EffectChain.cxx" + diff --git a/src/core/EnvelopeAndLfoParameters.cpp b/src/core/EnvelopeAndLfoParameters.cpp index 066c9132a1..4d6d663cc3 100644 --- a/src/core/EnvelopeAndLfoParameters.cpp +++ b/src/core/EnvelopeAndLfoParameters.cpp @@ -22,7 +22,7 @@ * */ -#include +#include #include "EnvelopeAndLfoParameters.h" #include "debug.h" @@ -530,6 +530,6 @@ void EnvelopeAndLfoParameters::updateSampleVars() -#include "moc_EnvelopeAndLfoParameters.cxx" + diff --git a/src/core/FxMixer.cpp b/src/core/FxMixer.cpp index 4389ce7932..391370cd6d 100644 --- a/src/core/FxMixer.cpp +++ b/src/core/FxMixer.cpp @@ -22,7 +22,7 @@ * */ -#include +#include #include "FxMixer.h" #include "MixerWorkerThread.h" diff --git a/src/core/ImportFilter.cpp b/src/core/ImportFilter.cpp index e32149df88..2f69a0a35b 100644 --- a/src/core/ImportFilter.cpp +++ b/src/core/ImportFilter.cpp @@ -23,7 +23,7 @@ */ -#include +#include #include "ImportFilter.h" #include "engine.h" diff --git a/src/core/InlineAutomation.cpp b/src/core/InlineAutomation.cpp index 58d570dc83..bafe91a6cb 100644 --- a/src/core/InlineAutomation.cpp +++ b/src/core/InlineAutomation.cpp @@ -22,7 +22,7 @@ * */ -#include +#include #include "InlineAutomation.h" diff --git a/src/core/InstrumentFunctions.cpp b/src/core/InstrumentFunctions.cpp index 5549a0d7e8..df1b73892d 100644 --- a/src/core/InstrumentFunctions.cpp +++ b/src/core/InstrumentFunctions.cpp @@ -22,7 +22,7 @@ * */ -#include +#include #include "InstrumentFunctions.h" #include "embed.h" @@ -523,4 +523,4 @@ void InstrumentFunctionArpeggio::loadSettings( const QDomElement & _this ) } -#include "moc_InstrumentFunctions.cxx" + diff --git a/src/core/InstrumentSoundShaping.cpp b/src/core/InstrumentSoundShaping.cpp index 6d2b89df46..887798f8d3 100644 --- a/src/core/InstrumentSoundShaping.cpp +++ b/src/core/InstrumentSoundShaping.cpp @@ -22,7 +22,7 @@ * */ -#include +#include #include "InstrumentSoundShaping.h" #include "basic_filters.h" @@ -384,5 +384,5 @@ void InstrumentSoundShaping::loadSettings( const QDomElement & _this ) -#include "moc_InstrumentSoundShaping.cxx" + diff --git a/src/core/JournallingObject.cpp b/src/core/JournallingObject.cpp index ce565551fa..80944b2d29 100644 --- a/src/core/JournallingObject.cpp +++ b/src/core/JournallingObject.cpp @@ -22,7 +22,7 @@ * */ -#include +#include #include diff --git a/src/core/LadspaControl.cpp b/src/core/LadspaControl.cpp index 3bee1c2cb9..60e26bb316 100644 --- a/src/core/LadspaControl.cpp +++ b/src/core/LadspaControl.cpp @@ -320,4 +320,4 @@ void LadspaControl::setLink( bool _state ) -#include "moc_LadspaControl.cxx" + diff --git a/src/core/LfoController.cpp b/src/core/LfoController.cpp index 8d563e88f7..7a71a2761d 100644 --- a/src/core/LfoController.cpp +++ b/src/core/LfoController.cpp @@ -24,9 +24,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include "song.h" @@ -229,6 +229,6 @@ ControllerDialog * LfoController::createDialog( QWidget * _parent ) } -#include "moc_LfoController.cxx" + diff --git a/src/core/MeterModel.cpp b/src/core/MeterModel.cpp index f4d97d733a..8a9baffe73 100644 --- a/src/core/MeterModel.cpp +++ b/src/core/MeterModel.cpp @@ -79,5 +79,5 @@ void MeterModel::loadSettings( const QDomElement & _this, -#include "moc_MeterModel.cxx" + diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp index b882b1b464..85f001468f 100644 --- a/src/core/Mixer.cpp +++ b/src/core/Mixer.cpp @@ -947,5 +947,5 @@ void Mixer::fifoWriter::run() -#include "moc_Mixer.cxx" + diff --git a/src/core/Model.cpp b/src/core/Model.cpp index db909ecc81..19e7bda008 100644 --- a/src/core/Model.cpp +++ b/src/core/Model.cpp @@ -46,5 +46,5 @@ QString Model::fullDisplayName() const -#include "moc_Model.cxx" + diff --git a/src/core/PeakController.cpp b/src/core/PeakController.cpp index 5913cd8dcf..76fb87e65d 100644 --- a/src/core/PeakController.cpp +++ b/src/core/PeakController.cpp @@ -24,9 +24,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include @@ -252,5 +252,5 @@ ControllerDialog * PeakController::createDialog( QWidget * _parent ) } -#include "moc_PeakController.cxx" + diff --git a/src/core/Piano.cpp b/src/core/Piano.cpp index ddf69c6e39..7fa7ba890d 100644 --- a/src/core/Piano.cpp +++ b/src/core/Piano.cpp @@ -126,5 +126,5 @@ void Piano::handleKeyRelease( int key ) -#include "moc_Piano.cxx" + diff --git a/src/core/Plugin.cpp b/src/core/Plugin.cpp index 8a81e2c999..ddd1b49220 100644 --- a/src/core/Plugin.cpp +++ b/src/core/Plugin.cpp @@ -24,9 +24,9 @@ * */ -#include -#include -#include +#include +#include +#include #include "Plugin.h" #include "embed.h" diff --git a/src/core/PresetPreviewPlayHandle.cpp b/src/core/PresetPreviewPlayHandle.cpp index 04dc2d2086..9fe738e7dc 100644 --- a/src/core/PresetPreviewPlayHandle.cpp +++ b/src/core/PresetPreviewPlayHandle.cpp @@ -22,8 +22,8 @@ * */ -#include -#include +#include +#include #include "PresetPreviewPlayHandle.h" #include "debug.h" @@ -47,9 +47,9 @@ public: m_previewNote( NULL ), m_dataMutex() { - setJournalling( FALSE ); + setJournalling( false ); m_previewInstrumentTrack = dynamic_cast( track::create( track::InstrumentTrack, this ) ); - m_previewInstrumentTrack->setJournalling( FALSE ); + m_previewInstrumentTrack->setJournalling( false ); } virtual ~PreviewTrackContainer() @@ -124,7 +124,7 @@ PresetPreviewPlayHandle::PresetPreviewPlayHandle( const QString & _preset_file, const bool j = engine::projectJournal()->isJournalling(); - engine::projectJournal()->setJournalling( FALSE ); + engine::projectJournal()->setJournalling( false ); engine::setSuppressMessages( true ); diff --git a/src/core/ProjectRenderer.cpp b/src/core/ProjectRenderer.cpp index 4017b4669f..47af1b0d2e 100644 --- a/src/core/ProjectRenderer.cpp +++ b/src/core/ProjectRenderer.cpp @@ -23,7 +23,7 @@ */ -#include +#include #include "ProjectRenderer.h" #include "song.h" @@ -228,5 +228,5 @@ void ProjectRenderer::updateConsoleProgress() -#include "moc_ProjectRenderer.cxx" + diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp index 29baf66b4c..73eb31a8d0 100644 --- a/src/core/RemotePlugin.cpp +++ b/src/core/RemotePlugin.cpp @@ -25,7 +25,7 @@ #define COMPILE_REMOTE_PLUGIN_BASE //#define DEBUG_REMOTE_PLUGIN #ifdef DEBUG_REMOTE_PLUGIN -#include +#include #endif #include "RemotePlugin.h" @@ -33,7 +33,7 @@ #include "engine.h" #include "config_mgr.h" -#include +#include #ifdef LMMS_HAVE_UNISTD_H #include @@ -395,5 +395,5 @@ bool RemotePlugin::processMessage( const message & _m ) -#include "moc_RemotePlugin.cxx" + diff --git a/src/core/RingBuffer.cpp b/src/core/RingBuffer.cpp index 8dff8b7d8e..aa878c2999 100644 --- a/src/core/RingBuffer.cpp +++ b/src/core/RingBuffer.cpp @@ -321,4 +321,4 @@ void RingBuffer::updateSamplerate() unlock(); } -#include "moc_RingBuffer.cxx" + diff --git a/src/core/SampleBuffer.cpp b/src/core/SampleBuffer.cpp index 8940ceb977..46bcc1ff69 100644 --- a/src/core/SampleBuffer.cpp +++ b/src/core/SampleBuffer.cpp @@ -26,11 +26,11 @@ #include "SampleBuffer.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -991,7 +991,7 @@ QString SampleBuffer::openAudioFile() const << tr( "RAW-Files (*.raw)" ) //<< tr( "MOD-Files (*.mod)" ) ; - ofd.setFilters( types ); + ofd.setNameFilters( types ); if( !m_audioFile.isEmpty() ) { // select previously opened file @@ -1468,7 +1468,7 @@ SampleBuffer::handleState::~handleState() -#include "moc_SampleBuffer.cxx" + /* vim: set tw=0 noexpandtab: */ diff --git a/src/core/SerializingObject.cpp b/src/core/SerializingObject.cpp index da1b7a5cb7..d6a032a025 100644 --- a/src/core/SerializingObject.cpp +++ b/src/core/SerializingObject.cpp @@ -22,7 +22,7 @@ * */ -#include +#include #include "SerializingObject.h" diff --git a/src/core/TempoSyncKnobModel.cpp b/src/core/TempoSyncKnobModel.cpp index c54e43b1e2..d2be63658a 100644 --- a/src/core/TempoSyncKnobModel.cpp +++ b/src/core/TempoSyncKnobModel.cpp @@ -23,8 +23,8 @@ * */ -#include -#include +#include +#include #include "TempoSyncKnobModel.h" #include "engine.h" @@ -181,6 +181,6 @@ void TempoSyncKnobModel::updateCustom() -#include "moc_TempoSyncKnobModel.cxx" + diff --git a/src/core/TrackContainer.cpp b/src/core/TrackContainer.cpp index 744cac788d..a37241170f 100644 --- a/src/core/TrackContainer.cpp +++ b/src/core/TrackContainer.cpp @@ -24,9 +24,9 @@ */ -#include -#include -#include +#include +#include +#include #include "TrackContainer.h" #include "InstrumentTrack.h" @@ -241,5 +241,5 @@ DummyTrackContainer::DummyTrackContainer() : -#include "moc_TrackContainer.cxx" + diff --git a/src/core/VstSyncController.cpp b/src/core/VstSyncController.cpp index 7d7177c82b..f8deb58cfb 100644 --- a/src/core/VstSyncController.cpp +++ b/src/core/VstSyncController.cpp @@ -23,7 +23,7 @@ * */ -#include +#include #include "config_mgr.h" #include "engine.h" @@ -196,5 +196,5 @@ void VstSyncController::updateSampleRate() -#include "moc_VstSyncController.cxx" + diff --git a/src/core/audio/AudioAlsa.cpp b/src/core/audio/AudioAlsa.cpp index 4e2dd70d17..ef6bd5dd63 100644 --- a/src/core/audio/AudioAlsa.cpp +++ b/src/core/audio/AudioAlsa.cpp @@ -22,8 +22,8 @@ * */ -#include -#include +#include +#include #include "AudioAlsa.h" @@ -53,7 +53,7 @@ AudioAlsa::AudioAlsa( bool & _success_ful, Mixer* _mixer ) : int err; if( ( err = snd_pcm_open( &m_handle, - probeDevice().toAscii().constData(), + probeDevice().toLatin1().constData(), SND_PCM_STREAM_PLAYBACK, 0 ) ) < 0 ) { @@ -208,7 +208,7 @@ void AudioAlsa::applyQualitySettings() int err; if( ( err = snd_pcm_open( &m_handle, - probeDevice().toAscii().constData(), + probeDevice().toLatin1().constData(), SND_PCM_STREAM_PLAYBACK, 0 ) ) < 0 ) { diff --git a/src/core/audio/AudioFileDevice.cpp b/src/core/audio/AudioFileDevice.cpp index 2a87db5544..e08d189cab 100644 --- a/src/core/audio/AudioFileDevice.cpp +++ b/src/core/audio/AudioFileDevice.cpp @@ -23,7 +23,7 @@ * */ -#include +#include #include "AudioFileDevice.h" #include "export_project_dialog.h" diff --git a/src/core/audio/AudioJack.cpp b/src/core/audio/AudioJack.cpp index d29dc7a157..7e79b9e694 100644 --- a/src/core/audio/AudioJack.cpp +++ b/src/core/audio/AudioJack.cpp @@ -26,9 +26,9 @@ #ifdef LMMS_HAVE_JACK -#include -#include -#include +#include +#include +#include #include @@ -140,7 +140,7 @@ bool AudioJack::initJackClient() const char * serverName = NULL; jack_status_t status; - m_client = jack_client_open( clientName.toAscii().constData(), + m_client = jack_client_open( clientName.toLatin1().constData(), JackNullOption, &status, serverName ); if( m_client == NULL ) @@ -156,7 +156,7 @@ bool AudioJack::initJackClient() { printf( "there's already a client with name '%s', so unique " "name '%s' was assigned\n", clientName. - toAscii().constData(), + toLatin1().constData(), jack_get_client_name( m_client ) ); } @@ -179,7 +179,7 @@ bool AudioJack::initJackClient() ( ( ch % 2 ) ? "R" : "L" ) + QString::number( ch / 2 + 1 ); m_outputPorts.push_back( jack_port_register( m_client, - name.toAscii().constData(), + name.toLatin1().constData(), JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0 ) ); if( m_outputPorts.back() == NULL ) @@ -284,7 +284,7 @@ void AudioJack::registerPort( AudioPort * _port ) for( ch_cnt_t ch = 0; ch < DEFAULT_CHANNELS; ++ch ) { m_portMap[_port].ports[ch] = jack_port_register( m_client, - name[ch].toAscii().constData(), + name[ch].toLatin1().constData(), JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0 ); } @@ -325,7 +325,7 @@ void AudioJack::renamePort( AudioPort * _port ) for( ch_cnt_t ch = 0; ch < DEFAULT_CHANNELS; ++ch ) { jack_port_set_name( m_portMap[_port].ports[ch], - name[ch].toAscii().constData() ); + name[ch].toLatin1().constData() ); } } #endif @@ -479,7 +479,7 @@ void AudioJack::setupWidget::saveSettings() -#include "moc_AudioJack.cxx" + #endif diff --git a/src/core/audio/AudioOss.cpp b/src/core/audio/AudioOss.cpp index 31a98a40bf..f73f211b2e 100644 --- a/src/core/audio/AudioOss.cpp +++ b/src/core/audio/AudioOss.cpp @@ -26,9 +26,9 @@ #ifdef LMMS_HAVE_OSS -#include -#include -#include +#include +#include +#include #include "endian_handling.h" #include "LcdSpinBox.h" @@ -80,7 +80,7 @@ AudioOss::AudioOss( bool & _success_ful, Mixer* _mixer ) : { _success_ful = false; - m_audioFD = open( probeDevice().toAscii().constData(), O_WRONLY, 0 ); + m_audioFD = open( probeDevice().toLatin1().constData(), O_WRONLY, 0 ); if( m_audioFD == -1 ) { diff --git a/src/core/audio/AudioPortAudio.cpp b/src/core/audio/AudioPortAudio.cpp index 2afaa3c633..087f8dc3b5 100644 --- a/src/core/audio/AudioPortAudio.cpp +++ b/src/core/audio/AudioPortAudio.cpp @@ -38,8 +38,8 @@ void AudioPortAudioSetupUtil::updateChannels() #ifdef LMMS_HAVE_PORTAUDIO -#include -#include +#include +#include #include "engine.h" #include "debug.h" @@ -487,5 +487,5 @@ void AudioPortAudio::setupWidget::saveSettings() #endif -#include "moc_AudioPortAudio.cxx" + diff --git a/src/core/audio/AudioPulseAudio.cpp b/src/core/audio/AudioPulseAudio.cpp index 12e119ddc0..6f6f63fd50 100644 --- a/src/core/audio/AudioPulseAudio.cpp +++ b/src/core/audio/AudioPulseAudio.cpp @@ -22,8 +22,8 @@ * */ -#include -#include +#include +#include #include "AudioPulseAudio.h" diff --git a/src/core/audio/AudioSdl.cpp b/src/core/audio/AudioSdl.cpp index a72dd5825e..4393dafdfb 100644 --- a/src/core/audio/AudioSdl.cpp +++ b/src/core/audio/AudioSdl.cpp @@ -26,8 +26,8 @@ #ifdef LMMS_HAVE_SDL -#include -#include +#include +#include #include "engine.h" #include "debug.h" diff --git a/src/core/base64.cpp b/src/core/base64.cpp index 973a2c4980..4eba245911 100644 --- a/src/core/base64.cpp +++ b/src/core/base64.cpp @@ -28,8 +28,8 @@ #include "base64.h" #include "lmms_basics.h" -#include -#include +#include +#include namespace base64 { diff --git a/src/core/bb_track_container.cpp b/src/core/bb_track_container.cpp index 0cbcef43b1..cd7dad95eb 100644 --- a/src/core/bb_track_container.cpp +++ b/src/core/bb_track_container.cpp @@ -262,5 +262,5 @@ void bbTrackContainer::createTCOsForBB( int _bb ) -#include "moc_bb_track_container.cxx" + diff --git a/src/core/config_mgr.cpp b/src/core/config_mgr.cpp index e25bba5ab6..82904e498a 100644 --- a/src/core/config_mgr.cpp +++ b/src/core/config_mgr.cpp @@ -22,11 +22,11 @@ * */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "lmmsversion.h" #include "config_mgr.h" @@ -210,7 +210,7 @@ void configManager::setValue( const QString & _class, #ifdef LMMS_BUILD_WIN32 -#include +#include #include // taken from qt-win-opensource-src-4.2.2/src/corelib/io/qsettings.cpp diff --git a/src/core/ladspa_manager.cpp b/src/core/ladspa_manager.cpp index bd533fb87d..19aa40f3c1 100644 --- a/src/core/ladspa_manager.cpp +++ b/src/core/ladspa_manager.cpp @@ -24,11 +24,11 @@ * */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/core/main.cpp b/src/core/main.cpp index e3416cbd34..a9b7f78b7d 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -27,18 +27,18 @@ #include "lmmsversion.h" #include "versioninfo.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef LMMS_HAVE_SCHED_H #include diff --git a/src/core/midi/MidiAlsaRaw.cpp b/src/core/midi/MidiAlsaRaw.cpp index 0820a4b48a..316bde251a 100644 --- a/src/core/midi/MidiAlsaRaw.cpp +++ b/src/core/midi/MidiAlsaRaw.cpp @@ -22,8 +22,8 @@ * */ -#include -#include +#include +#include #include "MidiAlsaRaw.h" #include "config_mgr.h" @@ -41,7 +41,7 @@ MidiAlsaRaw::MidiAlsaRaw() : { int err; if( ( err = snd_rawmidi_open( m_inputp, m_outputp, - probeDevice().toAscii().constData(), + probeDevice().toLatin1().constData(), 0 ) ) < 0 ) { printf( "cannot open MIDI-device: %s\n", snd_strerror( err ) ); diff --git a/src/core/midi/MidiAlsaSeq.cpp b/src/core/midi/MidiAlsaSeq.cpp index 662dc43eac..964ed18b90 100644 --- a/src/core/midi/MidiAlsaSeq.cpp +++ b/src/core/midi/MidiAlsaSeq.cpp @@ -22,8 +22,8 @@ * */ -#include -#include +#include +#include #include "MidiAlsaSeq.h" #include "config_mgr.h" @@ -82,7 +82,7 @@ MidiAlsaSeq::MidiAlsaSeq() : { int err; if( ( err = snd_seq_open( &m_seqHandle, - probeDevice().toAscii().constData(), + probeDevice().toLatin1().constData(), SND_SEQ_OPEN_DUPLEX, 0 ) ) < 0 ) { fprintf( stderr, "cannot open sequencer: %s\n", @@ -378,7 +378,7 @@ void MidiAlsaSeq::subscribeReadablePort( MidiPort * _port, snd_seq_addr_t sender; if( snd_seq_parse_address( m_seqHandle, &sender, - _dest.section( ' ', 0, 0 ).toAscii().constData() ) ) + _dest.section( ' ', 0, 0 ).toLatin1().constData() ) ) { fprintf( stderr, "error parsing sender-address!\n" ); @@ -429,7 +429,7 @@ void MidiAlsaSeq::subscribeWritablePort( MidiPort * _port, snd_seq_addr_t dest; if( snd_seq_parse_address( m_seqHandle, &dest, - _dest.section( ' ', 0, 0 ).toAscii().constData() ) ) + _dest.section( ' ', 0, 0 ).toLatin1().constData() ) ) { fprintf( stderr, "error parsing dest-address!\n" ); m_seqMutex.unlock(); @@ -735,7 +735,7 @@ void MidiAlsaSeq::setupWidget::saveSettings() } -#include "moc_MidiAlsaSeq.cxx" + #endif diff --git a/src/core/midi/MidiController.cpp b/src/core/midi/MidiController.cpp index 042429b491..911f57e87d 100644 --- a/src/core/midi/MidiController.cpp +++ b/src/core/midi/MidiController.cpp @@ -23,9 +23,9 @@ * */ -#include -#include -#include +#include +#include +#include #include "song.h" #include "engine.h" @@ -157,5 +157,5 @@ ControllerDialog * MidiController::createDialog( QWidget * _parent ) } -#include "moc_MidiController.cxx" + diff --git a/src/core/midi/MidiOss.cpp b/src/core/midi/MidiOss.cpp index c4cff5168b..7462adf9d8 100644 --- a/src/core/midi/MidiOss.cpp +++ b/src/core/midi/MidiOss.cpp @@ -28,8 +28,8 @@ #ifdef LMMS_HAVE_OSS -#include -#include +#include +#include #ifdef LMMS_HAVE_STDLIB_H diff --git a/src/core/midi/MidiPort.cpp b/src/core/midi/MidiPort.cpp index c5f8e5afa3..9b49a46189 100644 --- a/src/core/midi/MidiPort.cpp +++ b/src/core/midi/MidiPort.cpp @@ -23,7 +23,7 @@ * */ -#include +#include #include "MidiPort.h" #include "MidiClient.h" @@ -405,5 +405,5 @@ void MidiPort::updateOutputProgram() -#include "moc_MidiPort.cxx" + diff --git a/src/core/midi/MidiWinMM.cpp b/src/core/midi/MidiWinMM.cpp index 799d7f5df1..2c0d7c9ead 100644 --- a/src/core/midi/MidiWinMM.cpp +++ b/src/core/midi/MidiWinMM.cpp @@ -22,8 +22,8 @@ * */ -#include -#include +#include +#include #include "MidiWinMM.h" #include "config_mgr.h" @@ -147,7 +147,7 @@ void MidiWinMM::subscribeReadablePort( MidiPort* port, const QString& dest, bool { if( subscribe && port->isInputEnabled() == false ) { - qWarning( "port %s can't be (un)subscribed!\n", port->displayName().toAscii().constData() ); + qWarning( "port %s can't be (un)subscribed!\n", port->displayName().toLatin1().constData() ); return; } @@ -165,7 +165,7 @@ void MidiWinMM::subscribeWritablePort( MidiPort* port, const QString& dest, bool { if( subscribe && port->isOutputEnabled() == false ) { - qWarning( "port %s can't be (un)subscribed!\n", port->displayName().toAscii().constData() ); + qWarning( "port %s can't be (un)subscribed!\n", port->displayName().toLatin1().constData() ); return; } @@ -324,7 +324,7 @@ MidiWinMM::setupWidget::~setupWidget() -#include "moc_MidiWinMM.cxx" + #endif diff --git a/src/core/note.cpp b/src/core/note.cpp index 791f022a32..886aff702b 100644 --- a/src/core/note.cpp +++ b/src/core/note.cpp @@ -23,7 +23,7 @@ */ -#include +#include #include diff --git a/src/core/song.cpp b/src/core/song.cpp index 961bcd9d79..7bc4939113 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -22,10 +22,10 @@ * */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -1182,7 +1182,7 @@ void song::exportProject(bool multiExport) types << tr( __fileEncodeDevices[idx].m_description ); ++idx; } - efd.setFilters( types ); + efd.setNameFilters( types ); QString base_filename; if( !m_fileName.isEmpty() ) { @@ -1282,6 +1282,6 @@ void song::removeController( Controller * _controller ) } -#include "moc_song.cxx" + diff --git a/src/core/timeline.cpp b/src/core/timeline.cpp index 1aa932acfd..d50cbd4886 100644 --- a/src/core/timeline.cpp +++ b/src/core/timeline.cpp @@ -23,12 +23,12 @@ */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "timeline.h" @@ -391,6 +391,6 @@ void timeLine::mouseReleaseEvent( QMouseEvent* event ) -#include "moc_timeline.cxx" + diff --git a/src/core/track.cpp b/src/core/track.cpp index dffa1f683b..1e3ac1ed5a 100644 --- a/src/core/track.cpp +++ b/src/core/track.cpp @@ -40,11 +40,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "AutomationPattern.h" @@ -487,7 +487,7 @@ void trackContentObjectView::dropEvent( QDropEvent * _de ) } // Don't allow pasting a tco into itself. - QWidget * qwSource = _de->source(); + QObject* qwSource = _de->source(); if( qwSource != NULL && dynamic_cast( qwSource ) == this ) { @@ -2718,6 +2718,6 @@ void trackView::createTCOView( trackContentObject * _tco ) -#include "moc_track.cxx" + diff --git a/src/gui/AutomatableModelView.cpp b/src/gui/AutomatableModelView.cpp index e60d0429a9..319858140b 100644 --- a/src/gui/AutomatableModelView.cpp +++ b/src/gui/AutomatableModelView.cpp @@ -22,8 +22,8 @@ * */ -#include -#include +#include +#include #include "AutomatableModelView.h" #include "AutomationPattern.h" @@ -241,4 +241,4 @@ void AutomatableModelViewSlots::unlinkAllModels() } -#include "moc_AutomatableModelView.cxx" + diff --git a/src/gui/AutomationEditor.cpp b/src/gui/AutomationEditor.cpp index 7e65b0031e..b9e6c746d4 100644 --- a/src/gui/AutomationEditor.cpp +++ b/src/gui/AutomationEditor.cpp @@ -27,16 +27,16 @@ #include "AutomationEditor.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -94,9 +94,9 @@ AutomationEditor::AutomationEditor() : m_drawLastTick( 0 ), m_ppt( DEFAULT_PPT ), m_y_delta( DEFAULT_Y_DELTA ), - m_y_auto( TRUE ), + m_y_auto( true ), m_editMode( DRAW ), - m_scrollBack( FALSE ), + m_scrollBack( false ), m_gridColor( 0,0,0 ), m_graphColor(), m_vertexColor( 0,0,0 ), @@ -145,7 +145,7 @@ AutomationEditor::AutomationEditor() : m_toolBar = new QWidget( this ); m_toolBar->setFixedHeight( 32 ); m_toolBar->move( 0, 0 ); - m_toolBar->setAutoFillBackground( TRUE ); + m_toolBar->setAutoFillBackground( true ); QPalette pal; pal.setBrush( m_toolBar->backgroundRole(), embed::getIconPixmap( "toolbar_bg" ) ); @@ -197,14 +197,14 @@ AutomationEditor::AutomationEditor() : tr( "Draw mode (Shift+D)" ), this, SLOT( drawButtonToggled() ), m_toolBar ); - m_drawButton->setCheckable( TRUE ); - m_drawButton->setChecked( TRUE ); + m_drawButton->setCheckable( true ); + m_drawButton->setChecked( true ); m_eraseButton = new toolButton( embed::getIconPixmap( "edit_erase" ), tr( "Erase mode (Shift+E)" ), this, SLOT( eraseButtonToggled() ), m_toolBar ); - m_eraseButton->setCheckable( TRUE ); + m_eraseButton->setCheckable( true ); //TODO: m_selectButton and m_moveButton are broken. /*m_selectButton = new toolButton( embed::getIconPixmap( @@ -212,20 +212,20 @@ AutomationEditor::AutomationEditor() : tr( "Select mode (Shift+S)" ), this, SLOT( selectButtonToggled() ), m_toolBar ); - m_selectButton->setCheckable( TRUE ); + m_selectButton->setCheckable( true ); m_moveButton = new toolButton( embed::getIconPixmap( "edit_move" ), tr( "Move selection mode (Shift+M)" ), this, SLOT( moveButtonToggled() ), m_toolBar ); - m_moveButton->setCheckable( TRUE );*/ + m_moveButton->setCheckable( true );*/ QButtonGroup * tool_button_group = new QButtonGroup( this ); tool_button_group->addButton( m_drawButton ); tool_button_group->addButton( m_eraseButton ); //tool_button_group->addButton( m_selectButton ); //tool_button_group->addButton( m_moveButton ); - tool_button_group->setExclusive( TRUE ); + tool_button_group->setExclusive( true ); m_drawButton->setWhatsThis( tr( "Click here and draw-mode will be activated. In this " @@ -430,7 +430,7 @@ AutomationEditor::AutomationEditor() : setWindowIcon( embed::getIconPixmap( "automation" ) ); setCurrentPattern( NULL ); - setMouseTracking( TRUE ); + setMouseTracking( true ); setMinimumSize( tb_layout->minimumSize().width(), 128 ); @@ -678,7 +678,7 @@ void AutomationEditor::keyPressEvent( QKeyEvent * _ke ) /*case Qt::Key_A: if( _ke->modifiers() & Qt::ControlModifier ) { - m_selectButton->setChecked( TRUE ); + m_selectButton->setChecked( true ); selectAll(); update(); _ke->accept(); @@ -688,7 +688,7 @@ void AutomationEditor::keyPressEvent( QKeyEvent * _ke ) case Qt::Key_D: if( _ke->modifiers() & Qt::ShiftModifier ) { - m_drawButton->setChecked( TRUE ); + m_drawButton->setChecked( true ); _ke->accept(); } break; @@ -696,7 +696,7 @@ void AutomationEditor::keyPressEvent( QKeyEvent * _ke ) case Qt::Key_E: if( _ke->modifiers() & Qt::ShiftModifier ) { - m_eraseButton->setChecked( TRUE ); + m_eraseButton->setChecked( true ); _ke->accept(); } break; @@ -704,7 +704,7 @@ void AutomationEditor::keyPressEvent( QKeyEvent * _ke ) /*case Qt::Key_S: if( _ke->modifiers() & Qt::ShiftModifier ) { - m_selectButton->setChecked( TRUE ); + m_selectButton->setChecked( true ); _ke->accept(); } break; @@ -712,7 +712,7 @@ void AutomationEditor::keyPressEvent( QKeyEvent * _ke ) case Qt::Key_M: if( _ke->modifiers() & Qt::ShiftModifier ) { - m_moveButton->setChecked( TRUE ); + m_moveButton->setChecked( true ); _ke->accept(); } break;*/ @@ -939,7 +939,7 @@ void AutomationEditor::mousePressEvent( QMouseEvent * _me ) { // when clicking right in select-move, we // switch to move-mode - m_moveButton->setChecked( TRUE ); + m_moveButton->setChecked( true ); } else if( _me->button() == Qt::LeftButton && m_editMode == MOVE ) @@ -959,7 +959,7 @@ void AutomationEditor::mousePressEvent( QMouseEvent * _me ) { // when clicking right in select-move, we // switch to draw-mode - m_drawButton->setChecked( TRUE ); + m_drawButton->setChecked( true ); } update(); @@ -1142,7 +1142,7 @@ void AutomationEditor::mouseMoveEvent( QMouseEvent * _me ) m_selectedTick = pos_ticks - m_selectStartTick; if( (int) m_selectStartTick + m_selectedTick < 0 ) { - m_selectedTick = -qRound( m_selectStartTick ); + m_selectedTick = -m_selectStartTick; } m_selectedLevels = level - m_selectStartLevel; if( level <= m_selectStartLevel ) @@ -1254,7 +1254,7 @@ void AutomationEditor::mouseMoveEvent( QMouseEvent * _me ) new_selValuesForMove[ m_pattern->putValue( new_value_pos, it.value () + level_diff, - FALSE )] + false )] = it.value() + level_diff; } m_selValuesForMove = new_selValuesForMove; @@ -1304,7 +1304,7 @@ void AutomationEditor::mouseMoveEvent( QMouseEvent * _me ) if( (int) m_selectStartTick + m_selectedTick < 0 ) { - m_selectedTick = -qRound( m_selectStartTick ); + m_selectedTick = -m_selectStartTick; } float level = getLevel( _me->y() ); @@ -1597,7 +1597,7 @@ void AutomationEditor::paintEvent( QPaintEvent * _pe ) break; } - bool is_selected = FALSE; + bool is_selected = false; // if we're in move-mode, we may only draw // values in selected area, that have originally // been selected and not values that are now in @@ -1606,7 +1606,7 @@ void AutomationEditor::paintEvent( QPaintEvent * _pe ) { if( m_selValuesForMove.contains( it.key() ) ) { - is_selected = TRUE; + is_selected = true; } } else if( it.value() >= selLevel_start && @@ -1614,7 +1614,7 @@ void AutomationEditor::paintEvent( QPaintEvent * _pe ) it.key() >= sel_pos_start && it.key() + len_ticks <= sel_pos_end ) { - is_selected = TRUE; + is_selected = true; } float *values = m_pattern->valuesAfter( it.key() ); @@ -1647,7 +1647,7 @@ void AutomationEditor::paintEvent( QPaintEvent * _pe ) else { QFont f = p.font(); - f.setBold( TRUE ); + f.setBold( true ); p.setFont( pointSize<14>( f ) ); p.setPen( QApplication::palette().color( QPalette::Active, QPalette::BrightText ) ); @@ -1981,7 +1981,7 @@ void AutomationEditor::stop() { engine::getSong()->stop(); } - m_scrollBack = TRUE; + m_scrollBack = true; } @@ -2292,7 +2292,7 @@ void AutomationEditor::deleteSelectedValues() m_pattern->removeValue( it.key() ); } - if( update_after_delete == TRUE ) + if( update_after_delete == true ) { engine::getSong()->setModified(); update(); @@ -2308,7 +2308,7 @@ void AutomationEditor::updatePosition( const MidiTime & _t ) if( ( engine::getSong()->isPlaying() && engine::getSong()->playMode() == song::Mode_PlayAutomationPattern ) || - m_scrollBack == TRUE ) + m_scrollBack == true ) { const int w = width() - VALUES_WIDTH; if( _t > m_currentPosition + w * MidiTime::ticksPerTact() / m_ppt ) @@ -2323,7 +2323,7 @@ void AutomationEditor::updatePosition( const MidiTime & _t ) m_leftRightScroll->setValue( t.getTact() * MidiTime::ticksPerTact() ); } - m_scrollBack = FALSE; + m_scrollBack = false; } } @@ -2420,6 +2420,6 @@ void AutomationEditor::updateTopBottomLevels() -#include "moc_AutomationEditor.cxx" + diff --git a/src/gui/AutomationPatternView.cpp b/src/gui/AutomationPatternView.cpp index 51c2ae3976..d5e72bb5c0 100644 --- a/src/gui/AutomationPatternView.cpp +++ b/src/gui/AutomationPatternView.cpp @@ -22,9 +22,9 @@ * */ -#include -#include -#include +#include +#include +#include #include "AutomationPatternView.h" #include "AutomationEditor.h" @@ -433,5 +433,5 @@ void AutomationPatternView::scaleTimemapToFit( float oldMin, float oldMax ) -#include "moc_AutomationPatternView.cxx" + diff --git a/src/gui/ControllerConnectionDialog.cpp b/src/gui/ControllerConnectionDialog.cpp index 9b03338ef6..c1ae565ffe 100644 --- a/src/gui/ControllerConnectionDialog.cpp +++ b/src/gui/ControllerConnectionDialog.cpp @@ -23,10 +23,10 @@ * */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include "ControllerConnectionDialog.h" @@ -432,5 +432,5 @@ void ControllerConnectionDialog::enableAutoDetect( QAction * _a ) -#include "moc_ControllerConnectionDialog.cxx" + diff --git a/src/gui/ControllerDialog.cpp b/src/gui/ControllerDialog.cpp index de7d49653d..6aa29f800e 100644 --- a/src/gui/ControllerDialog.cpp +++ b/src/gui/ControllerDialog.cpp @@ -23,7 +23,7 @@ * */ -#include +#include #include "ControllerDialog.h" #include "Controller.h" @@ -51,5 +51,5 @@ void ControllerDialog::closeEvent( QCloseEvent * _ce ) } -#include "moc_ControllerDialog.cxx" + diff --git a/src/gui/EffectControlDialog.cpp b/src/gui/EffectControlDialog.cpp index e5f590f7c8..492b3988a2 100644 --- a/src/gui/EffectControlDialog.cpp +++ b/src/gui/EffectControlDialog.cpp @@ -23,8 +23,8 @@ * */ -#include -#include +#include +#include #include "EffectControlDialog.h" #include "EffectControls.h" @@ -57,5 +57,5 @@ void EffectControlDialog::closeEvent( QCloseEvent * _ce ) -#include "moc_EffectControlDialog.cxx" + diff --git a/src/gui/EffectSelectDialog.cpp b/src/gui/EffectSelectDialog.cpp index 321100f4d5..f7b8505601 100644 --- a/src/gui/EffectSelectDialog.cpp +++ b/src/gui/EffectSelectDialog.cpp @@ -212,5 +212,5 @@ void EffectSelectDialog::updateSelection() -#include "moc_EffectSelectDialog.cxx" + diff --git a/src/gui/FxMixerView.cpp b/src/gui/FxMixerView.cpp index 5e37a65116..7f34efaa35 100644 --- a/src/gui/FxMixerView.cpp +++ b/src/gui/FxMixerView.cpp @@ -25,17 +25,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "FxMixerView.h" #include "knob.h" @@ -506,5 +506,5 @@ void FxMixerView::updateFaders() -#include "moc_FxMixerView.cxx" + diff --git a/src/gui/InstrumentView.cpp b/src/gui/InstrumentView.cpp index 20880206f0..cf815a7a2d 100644 --- a/src/gui/InstrumentView.cpp +++ b/src/gui/InstrumentView.cpp @@ -22,7 +22,7 @@ * */ -#include +#include #include "InstrumentView.h" #include "embed.h" @@ -36,7 +36,7 @@ InstrumentView::InstrumentView( Instrument * _Instrument, QWidget * _parent ) : { setModel( _Instrument ); setFixedSize( 250, 250 ); - setAttribute( Qt::WA_DeleteOnClose, TRUE ); + setAttribute( Qt::WA_DeleteOnClose, true ); } diff --git a/src/gui/LfoControllerDialog.cpp b/src/gui/LfoControllerDialog.cpp index 03b0b2d014..f41964b523 100644 --- a/src/gui/LfoControllerDialog.cpp +++ b/src/gui/LfoControllerDialog.cpp @@ -23,11 +23,11 @@ * */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "caption_menu.h" #include "gui_templates.h" diff --git a/src/gui/LmmsPalette.cpp b/src/gui/LmmsPalette.cpp index 02c26312ea..c11159f8f2 100644 --- a/src/gui/LmmsPalette.cpp +++ b/src/gui/LmmsPalette.cpp @@ -96,4 +96,4 @@ QPalette LmmsPalette::palette() const } -#include "moc_LmmsPalette.cxx" + diff --git a/src/gui/LmmsStyle.cpp b/src/gui/LmmsStyle.cpp index 6041b389a4..f15014bdad 100644 --- a/src/gui/LmmsStyle.cpp +++ b/src/gui/LmmsStyle.cpp @@ -24,12 +24,13 @@ */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "LmmsStyle.h" #include "LmmsPalette.h" @@ -197,13 +198,19 @@ void drawPath( QPainter *p, const QPainterPath &path, LmmsStyle::LmmsStyle() : - QPlastiqueStyle() + QProxyStyle() { QFile file( "resources:style.css" ); file.open( QIODevice::ReadOnly ); qApp->setStyleSheet( file.readAll() ); if( s_palette != NULL ) { qApp->setPalette( *s_palette ); } + +#if QT_VERSION >= 0x050000 + setBaseStyle( QStyleFactory::create( "Fusion" ) ); +#else + setBaseStyle( QStyleFactory::create( "Plastique" ) ); +#endif } @@ -213,7 +220,7 @@ QPalette LmmsStyle::standardPalette( void ) const { if( s_palette != NULL) { return * s_palette; } - QPalette pal = QPlastiqueStyle::standardPalette(); + QPalette pal = QProxyStyle::standardPalette(); return( pal ); } @@ -402,7 +409,7 @@ void LmmsStyle::drawControl( ControlElement element, const QStyleOption* option, break; default: - QPlastiqueStyle::drawControl( element, option, painter, widget ); + QProxyStyle::drawControl( element, option, painter, widget ); break; } } @@ -429,7 +436,7 @@ void LmmsStyle::drawComplexControl( ComplexControl control, QColor( 192, 192, 192 ) ); so.palette.setColor( QPalette::Text, QColor( 64, 64, 64 ) ); - QPlastiqueStyle::drawComplexControl( control, &so, + QProxyStyle::drawComplexControl( control, &so, painter, widget ); return; } @@ -440,7 +447,7 @@ void LmmsStyle::drawComplexControl( ComplexControl control, QPalette::Background ) ); }*/ - QPlastiqueStyle::drawComplexControl( control, option, painter, widget ); + QProxyStyle::drawComplexControl( control, option, painter, widget ); } @@ -551,8 +558,7 @@ void LmmsStyle::drawPrimitive( PrimitiveElement element, } else { - QPlastiqueStyle::drawPrimitive( element, option, painter, - widget ); + QProxyStyle::drawPrimitive( element, option, painter, widget ); } } @@ -579,8 +585,7 @@ int LmmsStyle::pixelMetric( PixelMetric _metric, const QStyleOption * _option, return 24; default: - return QPlastiqueStyle::pixelMetric( _metric, _option, - _widget ); + return QProxyStyle::pixelMetric( _metric, _option, _widget ); } } @@ -605,13 +610,13 @@ QSize LmmsStyle::sizeFromContents( ContentsType type, const QStyleOption* option } } - return QPlastiqueStyle::sizeFromContents( type, option, size, widget ); + return QProxyStyle::sizeFromContents( type, option, size, widget ); } */ /* QRect LmmsStyle::subControlRect( ComplexControl control, const QStyleOptionComplex* option, SubControl subControl, const QWidget* widget ) const { - QRect rect = QPlastiqueStyle::subControlRect( control, option, subControl, widget ); + QRect rect = QProxyStyle::subControlRect( control, option, subControl, widget ); switch( control ) { diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 4035bb51ae..42a9c2770f 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -23,17 +23,17 @@ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "lmmsversion.h" #include "MainWindow.h" @@ -91,7 +91,7 @@ MainWindow::MainWindow() : SideBar * sideBar = new SideBar( Qt::Vertical, w ); QSplitter * splitter = new QSplitter( Qt::Horizontal, w ); - splitter->setChildrenCollapsible( FALSE ); + splitter->setChildrenCollapsible( false ); QString wdir = configManager::inst()->workingDir(); sideBar->appendTab( new pluginBrowser( splitter ) ); @@ -319,7 +319,7 @@ void MainWindow::finalize() QMenu * help_menu = new QMenu( this ); menuBar()->addMenu( help_menu )->setText( tr( "&Help" ) ); // May use offline help - if( TRUE ) + if( true ) { help_menu->addAction( embed::getIconPixmap( "help" ), tr( "Online help" ), @@ -580,7 +580,7 @@ bool MainWindow::mayChangeProject() if( !engine::getSong()->isModified() ) { - return( TRUE ); + return( true ); } QMessageBox mb( tr( "Project not saved" ), @@ -600,10 +600,10 @@ bool MainWindow::mayChangeProject() } else if( answer == QMessageBox::Discard ) { - return( TRUE ); + return( true ); } - return( FALSE ); + return( false ); } @@ -611,9 +611,9 @@ bool MainWindow::mayChangeProject() void MainWindow::clearKeyModifiers() { - m_keyMods.m_ctrl = FALSE; - m_keyMods.m_shift = FALSE; - m_keyMods.m_alt = FALSE; + m_keyMods.m_ctrl = false; + m_keyMods.m_shift = false; + m_keyMods.m_alt = false; } @@ -766,7 +766,7 @@ bool MainWindow::saveProject() { engine::getSong()->guiSaveProject(); } - return( TRUE ); + return( true ); } @@ -793,9 +793,9 @@ bool MainWindow::saveProjectAs() { engine::getSong()->guiSaveProjectAs( sfd.selectedFiles()[0] ); - return( TRUE ); + return( true ); } - return( FALSE ); + return( false ); } @@ -1020,9 +1020,9 @@ void MainWindow::keyPressEvent( QKeyEvent * _ke ) { switch( _ke->key() ) { - case Qt::Key_Control: m_keyMods.m_ctrl = TRUE; break; - case Qt::Key_Shift: m_keyMods.m_shift = TRUE; break; - case Qt::Key_Alt: m_keyMods.m_alt = TRUE; break; + case Qt::Key_Control: m_keyMods.m_ctrl = true; break; + case Qt::Key_Shift: m_keyMods.m_shift = true; break; + case Qt::Key_Alt: m_keyMods.m_alt = true; break; default: { InstrumentTrackWindow * w = @@ -1046,9 +1046,9 @@ void MainWindow::keyReleaseEvent( QKeyEvent * _ke ) { switch( _ke->key() ) { - case Qt::Key_Control: m_keyMods.m_ctrl = FALSE; break; - case Qt::Key_Shift: m_keyMods.m_shift = FALSE; break; - case Qt::Key_Alt: m_keyMods.m_alt = FALSE; break; + case Qt::Key_Control: m_keyMods.m_ctrl = false; break; + case Qt::Key_Shift: m_keyMods.m_shift = false; break; + case Qt::Key_Alt: m_keyMods.m_alt = false; break; default: if( InstrumentTrackView::topLevelInstrumentTrackWindow() ) { @@ -1149,5 +1149,5 @@ void MainWindow::autoSave() } -#include "moc_MainWindow.cxx" + diff --git a/src/gui/ModelView.cpp b/src/gui/ModelView.cpp index 3d22b09e20..b92304d2f2 100644 --- a/src/gui/ModelView.cpp +++ b/src/gui/ModelView.cpp @@ -22,7 +22,7 @@ * */ -#include +#include #include "ModelView.h" diff --git a/src/gui/PeakControllerDialog.cpp b/src/gui/PeakControllerDialog.cpp index 06fb770f59..a5b10ab48a 100644 --- a/src/gui/PeakControllerDialog.cpp +++ b/src/gui/PeakControllerDialog.cpp @@ -24,11 +24,11 @@ */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "caption_menu.h" #include "gui_templates.h" diff --git a/src/gui/PianoRoll.cpp b/src/gui/PianoRoll.cpp index 66a6f69712..65b6baa09e 100644 --- a/src/gui/PianoRoll.cpp +++ b/src/gui/PianoRoll.cpp @@ -24,17 +24,17 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -4255,6 +4255,6 @@ note * PianoRoll::noteUnderMouse() -#include "moc_PianoRoll.cxx" + diff --git a/src/gui/PianoView.cpp b/src/gui/PianoView.cpp index d0e38fd1c7..74e91c89cb 100644 --- a/src/gui/PianoView.cpp +++ b/src/gui/PianoView.cpp @@ -37,11 +37,11 @@ */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "PianoView.h" @@ -918,5 +918,5 @@ void PianoView::paintEvent( QPaintEvent * ) -#include "moc_PianoView.cxx" + diff --git a/src/gui/SongEditor.cpp b/src/gui/SongEditor.cpp index 1d99a5a16f..121298ea1e 100644 --- a/src/gui/SongEditor.cpp +++ b/src/gui/SongEditor.cpp @@ -22,16 +22,16 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -134,7 +134,7 @@ SongEditor::SongEditor( song * _song ) : toolButton * hq_btn = new toolButton( embed::getIconPixmap( "hq_mode" ), tr( "High quality mode" ), NULL, NULL, tb ); - hq_btn->setCheckable( TRUE ); + hq_btn->setCheckable( true ); connect( hq_btn, SIGNAL( toggled( bool ) ), this, SLOT( setHighQuality( bool ) ) ); hq_btn->setFixedWidth( 42 ); @@ -145,7 +145,7 @@ SongEditor::SongEditor( song * _song ) : engine::mainWindow()->addSpacingToToolBar( 10 ); - m_timeSigDisplay = new MeterDialog( this, TRUE ); + m_timeSigDisplay = new MeterDialog( this, true ); m_timeSigDisplay->setModel( &m_s->m_timeSigModel ); engine::mainWindow()->addWidgetToToolBar( m_timeSigDisplay ); @@ -485,13 +485,13 @@ void SongEditor::stop() void SongEditor::keyPressEvent( QKeyEvent * _ke ) { if( /*_ke->modifiers() & Qt::ShiftModifier*/ - engine::mainWindow()->isShiftPressed() == TRUE && + engine::mainWindow()->isShiftPressed() == true && _ke->key() == Qt::Key_Insert ) { m_s->insertBar(); } else if(/* _ke->modifiers() & Qt::ShiftModifier &&*/ - engine::mainWindow()->isShiftPressed() == TRUE && + engine::mainWindow()->isShiftPressed() == true && _ke->key() == Qt::Key_Delete ) { m_s->removeBar(); @@ -538,7 +538,7 @@ void SongEditor::keyPressEvent( QKeyEvent * _ke ) void SongEditor::wheelEvent( QWheelEvent * _we ) { - if( engine::mainWindow()->isCtrlPressed() == TRUE ) + if( engine::mainWindow()->isCtrlPressed() == true ) { if( _we->delta() > 0 ) { @@ -562,7 +562,7 @@ void SongEditor::wheelEvent( QWheelEvent * _we ) // and make sure, all TCO's are resized and relocated realignTracks(); } - else if( engine::mainWindow()->isShiftPressed() == TRUE ) + else if( engine::mainWindow()->isShiftPressed() == true ) { m_leftRightScroll->setValue( m_leftRightScroll->value() - _we->delta() / 30 ); @@ -581,7 +581,7 @@ void SongEditor::wheelEvent( QWheelEvent * _we ) void SongEditor::masterVolumeChanged( int _new_val ) { masterVolumeMoved( _new_val ); - if( m_mvsStatus->isVisible() == FALSE && m_s->m_loadingProject == FALSE + if( m_mvsStatus->isVisible() == false && m_s->m_loadingProject == false && m_masterVolumeSlider->showStatus() ) { m_mvsStatus->moveGlobal( m_masterVolumeSlider, @@ -624,7 +624,7 @@ void SongEditor::masterVolumeReleased( void ) void SongEditor::masterPitchChanged( int _new_val ) { masterPitchMoved( _new_val ); - if( m_mpsStatus->isVisible() == FALSE && m_s->m_loadingProject == FALSE + if( m_mpsStatus->isVisible() == false && m_s->m_loadingProject == false && m_masterPitchSlider->showStatus() ) { m_mpsStatus->moveGlobal( m_masterPitchSlider, @@ -795,7 +795,7 @@ bool SongEditor::allowRubberband() const -#include "moc_SongEditor.cxx" + /* vim: set tw=0 noexpandtab: */ diff --git a/src/gui/ToolPluginView.cpp b/src/gui/ToolPluginView.cpp index d3402a888e..977addfa78 100644 --- a/src/gui/ToolPluginView.cpp +++ b/src/gui/ToolPluginView.cpp @@ -26,8 +26,8 @@ #include "ToolPlugin.h" #include "ToolPluginView.h" -#include -#include +#include +#include #include "embed.h" #include "engine.h" diff --git a/src/gui/TrackContainerView.cpp b/src/gui/TrackContainerView.cpp index c2d905e6d6..362aee580b 100644 --- a/src/gui/TrackContainerView.cpp +++ b/src/gui/TrackContainerView.cpp @@ -23,12 +23,12 @@ */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "TrackContainerView.h" @@ -458,5 +458,5 @@ void TrackContainerView::scrollArea::wheelEvent( QWheelEvent * _we ) -#include "moc_TrackContainerView.cxx" + diff --git a/src/gui/bb_editor.cpp b/src/gui/bb_editor.cpp index 7a20874549..9552df580f 100644 --- a/src/gui/bb_editor.cpp +++ b/src/gui/bb_editor.cpp @@ -23,10 +23,10 @@ */ -#include -#include -#include -#include +#include +#include +#include +#include #include "bb_editor.h" #include "bb_track_container.h" @@ -323,5 +323,5 @@ void bbEditor::keyPressEvent( QKeyEvent * _ke ) -#include "moc_bb_editor.cxx" + diff --git a/src/gui/dialogs/FileDialog.cpp b/src/gui/dialogs/FileDialog.cpp index ad77018cc9..d0002ffb10 100644 --- a/src/gui/dialogs/FileDialog.cpp +++ b/src/gui/dialogs/FileDialog.cpp @@ -22,10 +22,10 @@ * */ -#include -#include -#include -#include +#include +#include +#include +#include #include "config_mgr.h" #include "FileDialog.h" @@ -41,15 +41,27 @@ FileDialog::FileDialog( QWidget *parent, const QString &caption, // Add additional locations to the sidebar QList urls = sidebarUrls(); +#if QT_VERSION >= 0x050000 + urls << QUrl::fromLocalFile( QStandardPaths::writableLocation( QStandardPaths::DesktopLocation ) ); +#else urls << QUrl::fromLocalFile( QDesktopServices::storageLocation( QDesktopServices::DesktopLocation ) ); +#endif // Find downloads directory QDir downloadDir( QDir::homePath() + "/Downloads" ); if ( ! downloadDir.exists() ) +#if QT_VERSION >= 0x050000 + downloadDir = QStandardPaths::writableLocation( QStandardPaths::DownloadLocation ); +#else downloadDir = QDesktopServices::storageLocation( QDesktopServices::DocumentsLocation ) + "/Downloads"; +#endif if ( downloadDir.exists() ) urls << QUrl::fromLocalFile( downloadDir.absolutePath() ); +#if QT_VERSION >= 0x050000 + urls << QUrl::fromLocalFile( QStandardPaths::writableLocation( QStandardPaths::MusicLocation ) ); +#else urls << QUrl::fromLocalFile( QDesktopServices::storageLocation( QDesktopServices::MusicLocation ) ); +#endif urls << QUrl::fromLocalFile( configManager::inst()->workingDir() ); setSidebarUrls(urls); @@ -65,4 +77,4 @@ void FileDialog::clearSelection() } -#include "moc_FileDialog.cxx" + diff --git a/src/gui/dialogs/VersionedSaveDialog.cpp b/src/gui/dialogs/VersionedSaveDialog.cpp index c52f47dc2c..69dde43082 100644 --- a/src/gui/dialogs/VersionedSaveDialog.cpp +++ b/src/gui/dialogs/VersionedSaveDialog.cpp @@ -23,10 +23,10 @@ */ -#include -#include -#include -#include +#include +#include +#include +#include #include "VersionedSaveDialog.h" @@ -136,4 +136,4 @@ void VersionedSaveDialog::decrementVersion() selectFile( file ); } -#include "moc_VersionedSaveDialog.cxx" + diff --git a/src/gui/embed.cpp b/src/gui/embed.cpp index 0de9c20f02..98d04c52d3 100644 --- a/src/gui/embed.cpp +++ b/src/gui/embed.cpp @@ -23,7 +23,7 @@ */ -#include +#include #include #include #include diff --git a/src/gui/export_project_dialog.cpp b/src/gui/export_project_dialog.cpp index df9bb7bc00..41da331bcf 100644 --- a/src/gui/export_project_dialog.cpp +++ b/src/gui/export_project_dialog.cpp @@ -22,9 +22,9 @@ * */ -#include -#include -#include +#include +#include +#include #include "export_project_dialog.h" #include "song.h" @@ -343,7 +343,7 @@ void exportProjectDialog::updateTitleBar( int _prog ) -#include "moc_export_project_dialog.cxx" + /* vim: set tw=0 noexpandtab: */ diff --git a/src/gui/file_browser.cpp b/src/gui/file_browser.cpp index 826d301997..2ca83ed99f 100644 --- a/src/gui/file_browser.cpp +++ b/src/gui/file_browser.cpp @@ -24,13 +24,13 @@ */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "file_browser.h" #include "bb_track_container.h" @@ -1053,5 +1053,5 @@ QString fileItem::extension( const QString & _file ) -#include "moc_file_browser.cxx" + diff --git a/src/gui/plugin_browser.cpp b/src/gui/plugin_browser.cpp index 431d41b702..5efa156534 100644 --- a/src/gui/plugin_browser.cpp +++ b/src/gui/plugin_browser.cpp @@ -22,10 +22,10 @@ * */ -#include -#include -#include -#include +#include +#include +#include +#include #include "plugin_browser.h" #include "embed.h" @@ -224,6 +224,6 @@ void pluginDescWidget::updateHeight() -#include "moc_plugin_browser.cxx" + diff --git a/src/gui/setup_dialog.cpp b/src/gui/setup_dialog.cpp index 623028da25..d5c9d9c91b 100644 --- a/src/gui/setup_dialog.cpp +++ b/src/gui/setup_dialog.cpp @@ -22,14 +22,14 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "setup_dialog.h" #include "tab_bar.h" @@ -620,7 +620,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : for( AswMap::iterator it = m_audioIfaceSetupWidgets.begin(); it != m_audioIfaceSetupWidgets.end(); ++it ) { - m_audioIfaceNames[tr( it.key().toAscii())] = it.key(); + m_audioIfaceNames[tr( it.key().toLatin1())] = it.key(); } for( trMap::iterator it = m_audioIfaceNames.begin(); it != m_audioIfaceNames.end(); ++it ) @@ -631,7 +631,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : m_audioInterfaces->addItem( it.key() ); } m_audioInterfaces->setCurrentIndex( m_audioInterfaces->findText( - tr( engine::mixer()->audioDevName().toAscii() ) ) ); + tr( engine::mixer()->audioDevName().toLatin1() ) ) ); m_audioIfaceSetupWidgets[engine::mixer()->audioDevName()]->show(); connect( m_audioInterfaces, SIGNAL( activated( const QString & ) ), @@ -700,7 +700,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : for( MswMap::iterator it = m_midiIfaceSetupWidgets.begin(); it != m_midiIfaceSetupWidgets.end(); ++it ) { - m_midiIfaceNames[tr( it.key().toAscii())] = it.key(); + m_midiIfaceNames[tr( it.key().toLatin1())] = it.key(); } for( trMap::iterator it = m_midiIfaceNames.begin(); it != m_midiIfaceNames.end(); ++it ) @@ -712,7 +712,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : } m_midiInterfaces->setCurrentIndex( m_midiInterfaces->findText( - tr( engine::mixer()->midiClientName().toAscii() ) ) ); + tr( engine::mixer()->midiClientName().toLatin1() ) ) ); m_midiIfaceSetupWidgets[engine::mixer()->midiClientName()]->show(); connect( m_midiInterfaces, SIGNAL( activated( const QString & ) ), @@ -1302,5 +1302,5 @@ void setupDialog::displayMIDIHelp() -#include "moc_setup_dialog.cxx" + diff --git a/src/gui/string_pair_drag.cpp b/src/gui/string_pair_drag.cpp index 2e760c10c1..71fe6a98ae 100644 --- a/src/gui/string_pair_drag.cpp +++ b/src/gui/string_pair_drag.cpp @@ -25,9 +25,9 @@ */ -#include -#include -#include +#include +#include +#include #include "string_pair_drag.h" @@ -52,7 +52,7 @@ stringPairDrag::stringPairDrag( const QString & _key, const QString & _value, } QString txt = _key + ":" + _value; QMimeData * m = new QMimeData(); - m->setData( mimeType(), txt.toAscii() ); + m->setData( mimeType(), txt.toLatin1() ); setMimeData( m ); start( Qt::IgnoreAction ); } @@ -78,16 +78,16 @@ bool stringPairDrag::processDragEnterEvent( QDragEnterEvent * _dee, { if( !_dee->mimeData()->hasFormat( mimeType() ) ) { - return( FALSE ); + return( false ); } QString txt = _dee->mimeData()->data( mimeType() ); if( _allowed_keys.split( ',' ).contains( txt.section( ':', 0, 0 ) ) ) { _dee->acceptProposedAction(); - return( TRUE ); + return( true ); } _dee->ignore(); - return( FALSE ); + return( false ); } diff --git a/src/gui/widgets/ControllerRackView.cpp b/src/gui/widgets/ControllerRackView.cpp index 97ce687fe0..1775d69791 100644 --- a/src/gui/widgets/ControllerRackView.cpp +++ b/src/gui/widgets/ControllerRackView.cpp @@ -23,13 +23,13 @@ * */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include "song.h" @@ -194,5 +194,5 @@ void ControllerRackView::addController() -#include "moc_ControllerRackView.cxx" + diff --git a/src/gui/widgets/ControllerView.cpp b/src/gui/widgets/ControllerView.cpp index 936412b337..82010a27b1 100644 --- a/src/gui/widgets/ControllerView.cpp +++ b/src/gui/widgets/ControllerView.cpp @@ -24,13 +24,13 @@ */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "ControllerView.h" @@ -198,5 +198,5 @@ void ControllerView::displayHelp() -#include "moc_ControllerView.cxx" + diff --git a/src/gui/widgets/EffectRackView.cpp b/src/gui/widgets/EffectRackView.cpp index 8c485d7694..92db1c6391 100644 --- a/src/gui/widgets/EffectRackView.cpp +++ b/src/gui/widgets/EffectRackView.cpp @@ -23,11 +23,11 @@ * */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "EffectRackView.h" #include "EffectSelectDialog.h" @@ -264,5 +264,5 @@ void EffectRackView::modelChanged() -#include "moc_EffectRackView.cxx" + diff --git a/src/gui/widgets/EffectView.cpp b/src/gui/widgets/EffectView.cpp index e4c01bed82..a8d6ead4c4 100644 --- a/src/gui/widgets/EffectView.cpp +++ b/src/gui/widgets/EffectView.cpp @@ -23,12 +23,12 @@ * */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "EffectView.h" #include "caption_menu.h" @@ -287,5 +287,5 @@ void EffectView::modelChanged() -#include "moc_EffectView.cxx" + diff --git a/src/gui/widgets/EnvelopeAndLfoView.cpp b/src/gui/widgets/EnvelopeAndLfoView.cpp index 450724238e..0f208fd1e4 100644 --- a/src/gui/widgets/EnvelopeAndLfoView.cpp +++ b/src/gui/widgets/EnvelopeAndLfoView.cpp @@ -23,8 +23,8 @@ * */ -#include -#include +#include +#include #include "EnvelopeAndLfoView.h" #include "EnvelopeAndLfoParameters.h" @@ -591,6 +591,6 @@ void EnvelopeAndLfoView::lfoUserWaveChanged() -#include "moc_EnvelopeAndLfoView.cxx" + diff --git a/src/gui/widgets/FxLine.cpp b/src/gui/widgets/FxLine.cpp index ea8f6353d2..5122ba4e45 100644 --- a/src/gui/widgets/FxLine.cpp +++ b/src/gui/widgets/FxLine.cpp @@ -26,10 +26,10 @@ #include "FxLine.h" #include -#include -#include -#include -#include +#include +#include +#include +#include #include "FxMixer.h" #include "FxMixerView.h" @@ -261,5 +261,5 @@ void FxLine::setBackgroundActive( const QBrush & c ) m_backgroundActive = c; } -#include "moc_FxLine.cxx" + diff --git a/src/gui/widgets/InstrumentFunctionViews.cpp b/src/gui/widgets/InstrumentFunctionViews.cpp index e2305906ed..7bce28bfc3 100644 --- a/src/gui/widgets/InstrumentFunctionViews.cpp +++ b/src/gui/widgets/InstrumentFunctionViews.cpp @@ -22,8 +22,8 @@ * */ -#include -#include +#include +#include #include "InstrumentFunctions.h" #include "InstrumentFunctionViews.h" @@ -202,5 +202,5 @@ void InstrumentFunctionArpeggioView::modelChanged() -#include "moc_InstrumentFunctionViews.cxx" + diff --git a/src/gui/widgets/InstrumentMidiIOView.cpp b/src/gui/widgets/InstrumentMidiIOView.cpp index 6f69d2fa04..fa1cc5e7db 100644 --- a/src/gui/widgets/InstrumentMidiIOView.cpp +++ b/src/gui/widgets/InstrumentMidiIOView.cpp @@ -22,10 +22,10 @@ * */ -#include -#include -#include -#include +#include +#include +#include +#include #include "InstrumentMidiIOView.h" #include "MidiPortMenu.h" diff --git a/src/gui/widgets/InstrumentSoundShapingView.cpp b/src/gui/widgets/InstrumentSoundShapingView.cpp index 8bd9b2d048..f068701eb3 100644 --- a/src/gui/widgets/InstrumentSoundShapingView.cpp +++ b/src/gui/widgets/InstrumentSoundShapingView.cpp @@ -22,7 +22,7 @@ * */ -#include +#include #include "InstrumentSoundShapingView.h" #include "EnvelopeAndLfoParameters.h" @@ -163,5 +163,5 @@ void InstrumentSoundShapingView::modelChanged() -#include "moc_InstrumentSoundShapingView.cxx" + diff --git a/src/gui/widgets/LadspaControlView.cpp b/src/gui/widgets/LadspaControlView.cpp index 585dba51c5..856e1d86f0 100644 --- a/src/gui/widgets/LadspaControlView.cpp +++ b/src/gui/widgets/LadspaControlView.cpp @@ -23,7 +23,7 @@ * */ -#include +#include #include "LadspaControl.h" #include "LadspaControlView.h" @@ -124,5 +124,5 @@ LadspaControlView::~LadspaControlView() -#include "moc_LadspaControlView.cxx" + diff --git a/src/gui/widgets/LcdSpinBox.cpp b/src/gui/widgets/LcdSpinBox.cpp index 03632e6fc0..04c556f48c 100644 --- a/src/gui/widgets/LcdSpinBox.cpp +++ b/src/gui/widgets/LcdSpinBox.cpp @@ -23,13 +23,13 @@ * */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "LcdSpinBox.h" #include "caption_menu.h" @@ -190,5 +190,5 @@ void LcdSpinBox::enterValue() } } -#include "moc_LcdSpinBox.cxx" + diff --git a/src/gui/widgets/LcdWidget.cpp b/src/gui/widgets/LcdWidget.cpp index 604040051a..1b68a48627 100644 --- a/src/gui/widgets/LcdWidget.cpp +++ b/src/gui/widgets/LcdWidget.cpp @@ -25,12 +25,12 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "LcdWidget.h" #include "engine.h" @@ -257,5 +257,5 @@ void LcdWidget::initUi(const QString& name , const QString& style) -#include "moc_LcdWidget.cxx" + diff --git a/src/gui/widgets/MeterDialog.cpp b/src/gui/widgets/MeterDialog.cpp index e5fbe139d6..89f7b3c645 100644 --- a/src/gui/widgets/MeterDialog.cpp +++ b/src/gui/widgets/MeterDialog.cpp @@ -24,9 +24,9 @@ */ -#include -#include -#include +#include +#include +#include #include "MeterDialog.h" #include "MeterModel.h" diff --git a/src/gui/widgets/MidiPortMenu.cpp b/src/gui/widgets/MidiPortMenu.cpp index 835f537d7a..e0e828f4d4 100644 --- a/src/gui/widgets/MidiPortMenu.cpp +++ b/src/gui/widgets/MidiPortMenu.cpp @@ -100,5 +100,5 @@ void MidiPortMenu::updateMenu() -#include "moc_MidiPortMenu.cxx" + diff --git a/src/gui/widgets/SideBar.cpp b/src/gui/widgets/SideBar.cpp index ec0eccb55e..f385b9a152 100644 --- a/src/gui/widgets/SideBar.cpp +++ b/src/gui/widgets/SideBar.cpp @@ -22,9 +22,9 @@ * */ -#include -#include -#include +#include +#include +#include #include "SideBar.h" #include "SideBarWidget.h" @@ -159,5 +159,5 @@ void SideBar::toggleButton( QAbstractButton * _btn ) } -#include "moc_SideBar.cxx" + diff --git a/src/gui/widgets/SideBarWidget.cpp b/src/gui/widgets/SideBarWidget.cpp index ae8f1a739d..4d71f154de 100644 --- a/src/gui/widgets/SideBarWidget.cpp +++ b/src/gui/widgets/SideBarWidget.cpp @@ -22,9 +22,9 @@ * */ -#include -#include -#include +#include +#include +#include #include "SideBarWidget.h" #include "gui_templates.h" @@ -85,5 +85,5 @@ void SideBarWidget::resizeEvent( QResizeEvent * ) -#include "moc_SideBarWidget.cxx" + diff --git a/src/gui/widgets/TimeDisplayWidget.cpp b/src/gui/widgets/TimeDisplayWidget.cpp index d13da37ff9..0d852bdeb3 100644 --- a/src/gui/widgets/TimeDisplayWidget.cpp +++ b/src/gui/widgets/TimeDisplayWidget.cpp @@ -22,7 +22,7 @@ * */ -#include +#include #include "TimeDisplayWidget.h" #include "MainWindow.h" @@ -138,6 +138,6 @@ void TimeDisplayWidget::mousePressEvent( QMouseEvent* mouseEvent ) -#include "moc_TimeDisplayWidget.cxx" + diff --git a/src/gui/widgets/automatable_button.cpp b/src/gui/widgets/automatable_button.cpp index d0687a0a6d..9e2eff7203 100644 --- a/src/gui/widgets/automatable_button.cpp +++ b/src/gui/widgets/automatable_button.cpp @@ -25,8 +25,8 @@ #include "automatable_button.h" -#include -#include +#include +#include #include "caption_menu.h" #include "engine.h" @@ -269,5 +269,5 @@ void automatableButtonGroup::updateButtons() } -#include "moc_automatable_button.cxx" + diff --git a/src/gui/widgets/automatable_slider.cpp b/src/gui/widgets/automatable_slider.cpp index 9649e96455..afa3ffd119 100644 --- a/src/gui/widgets/automatable_slider.cpp +++ b/src/gui/widgets/automatable_slider.cpp @@ -25,8 +25,8 @@ #include "automatable_slider.h" -#include -#include +#include +#include #include "caption_menu.h" #include "embed.h" @@ -144,5 +144,5 @@ void automatableSlider::updateSlider() -#include "moc_automatable_slider.cxx" + diff --git a/src/gui/widgets/caption_menu.cpp b/src/gui/widgets/caption_menu.cpp index ebb13d5e64..1fde787209 100644 --- a/src/gui/widgets/caption_menu.cpp +++ b/src/gui/widgets/caption_menu.cpp @@ -45,6 +45,6 @@ captionMenu::~captionMenu() -#include "moc_caption_menu.cxx" + diff --git a/src/gui/widgets/combobox.cpp b/src/gui/widgets/combobox.cpp index 02c97dff77..53b01eea17 100644 --- a/src/gui/widgets/combobox.cpp +++ b/src/gui/widgets/combobox.cpp @@ -26,13 +26,13 @@ #include "combobox.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "caption_menu.h" #include "engine.h" @@ -254,6 +254,6 @@ void comboBox::setItem( QAction* item ) -#include "moc_combobox.cxx" + diff --git a/src/gui/widgets/cpuload_widget.cpp b/src/gui/widgets/cpuload_widget.cpp index f634a6b1ef..820dd33e51 100644 --- a/src/gui/widgets/cpuload_widget.cpp +++ b/src/gui/widgets/cpuload_widget.cpp @@ -24,7 +24,7 @@ */ -#include +#include #include "cpuload_widget.h" #include "embed.h" @@ -103,6 +103,6 @@ void cpuloadWidget::updateCpuLoad() -#include "moc_cpuload_widget.cxx" + diff --git a/src/gui/widgets/fade_button.cpp b/src/gui/widgets/fade_button.cpp index 0ae0c1f892..535b20a97b 100644 --- a/src/gui/widgets/fade_button.cpp +++ b/src/gui/widgets/fade_button.cpp @@ -23,10 +23,10 @@ */ -#include -#include -#include -#include +#include +#include +#include +#include #include "embed.h" #include "fade_button.h" @@ -118,6 +118,6 @@ void fadeButton::signalUpdate() -#include "moc_fade_button.cxx" + diff --git a/src/gui/widgets/fader.cpp b/src/gui/widgets/fader.cpp index d12112f821..3be8c6a062 100644 --- a/src/gui/widgets/fader.cpp +++ b/src/gui/widgets/fader.cpp @@ -45,10 +45,10 @@ */ -#include -#include -#include -#include +#include +#include +#include +#include #include "fader.h" #include "embed.h" @@ -174,7 +174,7 @@ void fader::mouseDoubleClickEvent( QMouseEvent* mouseEvent ) bool ok; // TODO: dbV handling - int newValue = QInputDialog::getInteger( this, windowTitle(), + int newValue = QInputDialog::getInt( this, windowTitle(), tr( "Please enter a new value between %1 and %2:" ). arg( model()->minValue()*100 ). arg( model()->maxValue()*100 ), @@ -344,5 +344,5 @@ void fader::setPeakRed( const QColor & c ) m_peakRed = c; } -#include "moc_fader.cxx" + diff --git a/src/gui/widgets/graph.cpp b/src/gui/widgets/graph.cpp index 2345bf422c..dd37c24df1 100644 --- a/src/gui/widgets/graph.cpp +++ b/src/gui/widgets/graph.cpp @@ -23,9 +23,9 @@ * */ -#include -#include -#include +#include +#include +#include #include "graph.h" #include "string_pair_drag.h" @@ -701,4 +701,4 @@ void graphModel::drawSampleAt( int x, float val ) -#include "moc_graph.cxx" + diff --git a/src/gui/widgets/group_box.cpp b/src/gui/widgets/group_box.cpp index ee5f3f25b4..1b7c6af07a 100644 --- a/src/gui/widgets/group_box.cpp +++ b/src/gui/widgets/group_box.cpp @@ -22,8 +22,8 @@ * */ -#include -#include +#include +#include #ifndef __USE_XOPEN #define __USE_XOPEN @@ -140,6 +140,6 @@ void groupBox::updatePixmap() -#include "moc_group_box.cxx" + diff --git a/src/gui/widgets/knob.cpp b/src/gui/widgets/knob.cpp index 7bb226795a..2dcf299a39 100644 --- a/src/gui/widgets/knob.cpp +++ b/src/gui/widgets/knob.cpp @@ -22,14 +22,14 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #ifndef __USE_XOPEN #define __USE_XOPEN @@ -805,5 +805,5 @@ void knob::displayHelp() -#include "moc_knob.cxx" + diff --git a/src/gui/widgets/led_checkbox.cpp b/src/gui/widgets/led_checkbox.cpp index 5ce132c483..4c40004cc1 100644 --- a/src/gui/widgets/led_checkbox.cpp +++ b/src/gui/widgets/led_checkbox.cpp @@ -23,8 +23,8 @@ */ -#include -#include +#include +#include #include "led_checkbox.h" #include "embed.h" @@ -132,5 +132,5 @@ void ledCheckBox::onTextUpdated() -#include "moc_led_checkbox.cxx" + diff --git a/src/gui/widgets/nstate_button.cpp b/src/gui/widgets/nstate_button.cpp index e77c989968..26841e68ff 100644 --- a/src/gui/widgets/nstate_button.cpp +++ b/src/gui/widgets/nstate_button.cpp @@ -23,7 +23,7 @@ */ -#include +#include #include "nstate_button.h" #include "embed.h" @@ -100,6 +100,6 @@ void nStateButton::mousePressEvent( QMouseEvent * _me ) -#include "moc_nstate_button.cxx" + diff --git a/src/gui/widgets/pixmap_button.cpp b/src/gui/widgets/pixmap_button.cpp index a7b5bcf641..1ac9822f06 100644 --- a/src/gui/widgets/pixmap_button.cpp +++ b/src/gui/widgets/pixmap_button.cpp @@ -24,8 +24,8 @@ */ -#include -#include +#include +#include #include "pixmap_button.h" #include "MainWindow.h" @@ -133,6 +133,6 @@ void pixmapButton::setInactiveGraphic( const QPixmap & _pm, bool _update ) -#include "moc_pixmap_button.cxx" + diff --git a/src/gui/widgets/project_notes.cpp b/src/gui/widgets/project_notes.cpp index fb16a35c93..26602119f3 100644 --- a/src/gui/widgets/project_notes.cpp +++ b/src/gui/widgets/project_notes.cpp @@ -25,17 +25,17 @@ #include "project_notes.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "embed.h" #include "engine.h" @@ -48,7 +48,7 @@ projectNotes::projectNotes() : QMainWindow( engine::mainWindow()->workspace() ) { m_edit = new QTextEdit( this ); - m_edit->setAutoFillBackground( TRUE ); + m_edit->setAutoFillBackground( true ); QPalette pal; pal.setColor( m_edit->backgroundRole(), QColor( 64, 64, 64 ) ); m_edit->setPalette( pal ); @@ -394,6 +394,6 @@ void projectNotes::loadSettings( const QDomElement & _this ) } -#include "moc_project_notes.cxx" + diff --git a/src/gui/widgets/rename_dialog.cpp b/src/gui/widgets/rename_dialog.cpp index 7365f3c7fa..f17aaeabf9 100644 --- a/src/gui/widgets/rename_dialog.cpp +++ b/src/gui/widgets/rename_dialog.cpp @@ -23,8 +23,8 @@ */ -#include -#include +#include +#include #include "rename_dialog.h" @@ -76,5 +76,5 @@ void renameDialog::textChanged( const QString & _new_string ) -#include "moc_rename_dialog.cxx" + diff --git a/src/gui/widgets/rubberband.cpp b/src/gui/widgets/rubberband.cpp index b6f20d427e..04b12f60fb 100644 --- a/src/gui/widgets/rubberband.cpp +++ b/src/gui/widgets/rubberband.cpp @@ -104,6 +104,6 @@ QVector rubberBand::selectableObjects() const -#include "moc_rubberband.cxx" + diff --git a/src/gui/widgets/tab_bar.cpp b/src/gui/widgets/tab_bar.cpp index 1340cbcfcd..86e46b9126 100644 --- a/src/gui/widgets/tab_bar.cpp +++ b/src/gui/widgets/tab_bar.cpp @@ -242,7 +242,7 @@ bool tabBar::allHidden() -#include "moc_tab_bar.cxx" -#include "moc_tab_button.cxx" + + diff --git a/src/gui/widgets/tab_widget.cpp b/src/gui/widgets/tab_widget.cpp index 0650aeb979..14ad1c1ee8 100644 --- a/src/gui/widgets/tab_widget.cpp +++ b/src/gui/widgets/tab_widget.cpp @@ -25,10 +25,10 @@ #include "tab_widget.h" -#include -#include -#include -#include +#include +#include +#include +#include #include "gui_templates.h" @@ -229,6 +229,6 @@ void tabWidget::wheelEvent( QWheelEvent * _we ) -#include "moc_tab_widget.cxx" + diff --git a/src/gui/widgets/tempo_sync_knob.cpp b/src/gui/widgets/tempo_sync_knob.cpp index 331fea908e..53520906d0 100644 --- a/src/gui/widgets/tempo_sync_knob.cpp +++ b/src/gui/widgets/tempo_sync_knob.cpp @@ -24,7 +24,7 @@ */ -#include +#include #include "TempoSyncKnob.h" #include "engine.h" @@ -304,6 +304,6 @@ void TempoSyncKnob::showCustom() -#include "moc_TempoSyncKnob.cxx" + diff --git a/src/gui/widgets/text_float.cpp b/src/gui/widgets/text_float.cpp index 5068fa8837..52c7691298 100644 --- a/src/gui/widgets/text_float.cpp +++ b/src/gui/widgets/text_float.cpp @@ -22,9 +22,9 @@ * */ -#include -#include -#include +#include +#include +#include #include "text_float.h" #include "gui_templates.h" @@ -200,4 +200,4 @@ void textFloat::updateSize() -#include "moc_text_float.cxx" + diff --git a/src/gui/widgets/tool_button.cpp b/src/gui/widgets/tool_button.cpp index 0939180e96..77a428a702 100644 --- a/src/gui/widgets/tool_button.cpp +++ b/src/gui/widgets/tool_button.cpp @@ -102,6 +102,6 @@ void toolButton::toggledBool( bool _on ) -#include "moc_tool_button.cxx" + diff --git a/src/gui/widgets/tooltip.cpp b/src/gui/widgets/tooltip.cpp index 6f07962367..6aa81c3b9e 100644 --- a/src/gui/widgets/tooltip.cpp +++ b/src/gui/widgets/tooltip.cpp @@ -23,7 +23,7 @@ */ -#include +#include #include "tooltip.h" #include "config_mgr.h" diff --git a/src/gui/widgets/track_label_button.cpp b/src/gui/widgets/track_label_button.cpp index f264857019..5891eced9f 100644 --- a/src/gui/widgets/track_label_button.cpp +++ b/src/gui/widgets/track_label_button.cpp @@ -24,8 +24,8 @@ */ -#include -#include +#include +#include #include "track_label_button.h" @@ -163,5 +163,5 @@ void trackLabelButton::paintEvent( QPaintEvent * _pe ) -#include "moc_track_label_button.cxx" + diff --git a/src/gui/widgets/visualization_widget.cpp b/src/gui/widgets/visualization_widget.cpp index fd0afbd848..a3c5ecf21f 100644 --- a/src/gui/widgets/visualization_widget.cpp +++ b/src/gui/widgets/visualization_widget.cpp @@ -23,8 +23,8 @@ */ -#include -#include +#include +#include #include "visualization_widget.h" #include "gui_templates.h" @@ -190,6 +190,6 @@ void visualizationWidget::mousePressEvent( QMouseEvent * _me ) -#include "moc_visualization_widget.cxx" + diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index cd456d5670..ec16be1ecb 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -23,19 +23,19 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "FileDialog.h" #include "InstrumentTrack.h" @@ -1579,6 +1579,6 @@ void InstrumentTrackWindow::loadSettings( const QDomElement& thisElement ) -#include "moc_InstrumentTrack.cxx" + diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp index 2cac879272..51e222fdba 100644 --- a/src/tracks/SampleTrack.cpp +++ b/src/tracks/SampleTrack.cpp @@ -23,14 +23,14 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gui_templates.h" #include "SampleTrack.h" @@ -599,5 +599,5 @@ void SampleTrackView::modelChanged() -#include "moc_SampleTrack.cxx" + diff --git a/src/tracks/bb_track.cpp b/src/tracks/bb_track.cpp index 49835e9238..63f8c424ad 100644 --- a/src/tracks/bb_track.cpp +++ b/src/tracks/bb_track.cpp @@ -22,10 +22,10 @@ * */ -#include -#include -#include -#include +#include +#include +#include +#include #include "bb_editor.h" #include "bb_track.h" @@ -629,6 +629,6 @@ void bbTrackView::clickedTrackLabel() -#include "moc_bb_track.cxx" + diff --git a/src/tracks/pattern.cpp b/src/tracks/pattern.cpp index 434379350c..5001d6ec65 100644 --- a/src/tracks/pattern.cpp +++ b/src/tracks/pattern.cpp @@ -23,14 +23,14 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include "pattern.h" @@ -1157,6 +1157,6 @@ void patternView::paintEvent( QPaintEvent * ) -#include "moc_pattern.cxx" +