Qt5

Author: chrisballinger

.gitignore

@@ -0,0 +1,10 @@
+.DS_Store
+CMakeCache.txt
+CMakeFiles/
+CMakeScripts/
+Debug/
+cmake_install.cmake
+pianobooster.build/
+pianobooster.xcodeproj/
+pianobooster_autogen/
+install_manifest.txt

PianoBooster/BUILD.txt PianoBooster/BUILD.mdPianoBooster/BUILD.txt renamed to PianoBooster/BUILD.md

@@ -1,6 +1,4 @@
-===============================================================================================
-   TO COMPILE THE SOURCE CODE IN LINUX
-===============================================================================================
+# Linux
 
    Ensure that the following packages 'cmake', 'libqt4-dev', 'libasound2-dev' and
    'build-essential" are installed.
@@ -15,15 +13,21 @@
 
    If you make changes to the source code then please post details on the forum.
 
-===============================================================================================
-   TO COMPILE THE SOURCE CODE IN MacOSX
-===============================================================================================
+# macOS
 
-   Install latest XCode (from Apple Developer Connection, free registration required)
+   Install latest Xcode (from Apple Developer Connection, free registration required)
 
-   Install CMake and QT libraries (either from source or via Fink or MacPorts)
+   Install CMake and QT libraries via Homebrew:
+      
+   ```
+   $ brew install cmake qt5
+   ```
 
-   Generate XCode project file, via 'cmake -G Xcode ../src'
+   Generate XCode project file via CMake:
+   
+   ```
+   $ cmake -G Xcode . -DCMAKE_PREFIX_PATH=$(brew --prefix qt)`
+   ```
 
    Open the project file in XCode, set whatever options you like (universal or single architecture,
    debug or release etc.) and compile
@@ -32,9 +36,7 @@
 
    If you make changes to the source code then please post details on the forum.
 
-===============================================================================================
-   TO COMPILE THE SOURCE CODE IN WINDOWS
-===============================================================================================
+# Windows
 
    To compile in Windows install the Open Source version of Qt and CMake and optionally Geany.
    When installing Qt select the option to download and install the MinGW compiler. Open the
@@ -49,16 +51,8 @@
 
    If you make changes to the source code then please post details on the forum.
 
-===============================================================================================
-   LICENSE
-===============================================================================================
-
-
-   In the PianoBooster directory type "cd release" to change to the "release" directory
 
-===============================================================================================
-   LICENSE
-===============================================================================================
+# License
 
    Piano Booster is fully copyrighted by the author and all rights are reserved.
 

PianoBooster/src/CMakeLists.txt

@@ -28,28 +28,18 @@ PROJECT( pianobooster )
 # enable warnings
 ADD_DEFINITIONS(-Wall)
 
-# by default only QtCore and QtGui modules are enabled
-# other modules must be enabled like this:
-SET(QT_USE_QTOPENGL TRUE)
-SET(QT_USE_QTXML TRUE)
-
-
 FIND_PACKAGE( OpenGL REQUIRED )
 
-# this command finds Qt4 libraries and sets all required variables
-# note that it's Qt4, not QT4 or qt4
-FIND_PACKAGE( Qt4 REQUIRED )
-
-# add some useful macros and variables
-# (QT_USE_FILE is a variable defined by FIND_PACKAGE( Qt4 ) that contains a path to CMake script)
-INCLUDE( ${QT_USE_FILE} )
+# Find the QtWidgets library
+find_package(Qt5Widgets)
+find_package(Qt5Xml)
+find_package(Qt5OpenGL)
 
 IF (USE_PCH)
 INCLUDE(precompile/PCHSupport_26.cmake)
 INCLUDE_DIRECTORIES( precompile .)
 ENDIF(USE_PCH)
 
-
 # Add in the link libraries for each operating system
 IF(${CMAKE_SYSTEM} MATCHES "Linux")
     #FIND_PACKAGE(PkgConfig REQUIRED)
@@ -100,12 +90,6 @@ ENDIF(USE_FLUIDSYNTH)
 # (CMAKE_BINARY_DIR holds a path to the build directory, while INCLUDE_DIRECTORIES() works just like INCLUDEPATH from qmake)
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${OPENGL_INCLUDE_DIR} )
 
-# tell CMake what libraries our executable needs,
-# luckily FIND_PACKAGE prepared QT_LIBRARIES variable for us:
-LINK_LIBRARIES( ${QT_LIBRARIES} )
-
-
-
 SET(PB_BASE_SRCS MidiFile.cpp MidiTrack.cpp Song.cpp Conductor.cpp Util.cpp
     Chord.cpp Tempo.cpp MidiDevice.cpp MidiDeviceRt.cpp rtmidi/RtMidi.cpp ${PB_BASE_SRCS})
 SET(PB_BASE_HDR MidiFile.h MidiTrack.h Song.h Conductor.h Rating.h Util.h
@@ -175,16 +159,10 @@ SET( PIANOBOOSTER_RCS
     ./application.qrc
 )
 
-# this command will generate rules that will run rcc on all files from PIANOBOOSTER_RCS
-# in result PIANOBOOSTER_RC_SRCS variable will contain paths to files produced by rcc
-QT4_ADD_RESOURCES( PIANOBOOSTER_RC_SRCS ${PIANOBOOSTER_RCS} )
-
-# this will run uic on .ui files:
-QT4_WRAP_UI( PIANOBOOSTER_UI_HDRS ${PIANOBOOSTER_UIS} )
-
-# and finally this will run moc:
-QT4_WRAP_CPP( PIANOBOOSTER_MOC_SRCS ${PIANOBOOSTER_MOC_HDRS} )
-
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 # here we instruct CMake to build "pianobooster" executable from all of the source files
 IF(APPLE)
@@ -211,6 +189,7 @@ IF (USE_PCH)
 ADD_PRECOMPILED_HEADER( pianobooster ${CMAKE_CURRENT_SOURCE_DIR}/precompile/precompile.h )
 ENDIF (USE_PCH)
 
+target_link_libraries (pianobooster Qt5::Widgets Qt5::Xml Qt5::OpenGL)
 
 INSTALL( FILES pianobooster.desktop DESTINATION share/applications )
 INSTALL(TARGETS pianobooster RUNTIME DESTINATION bin)

PianoBooster/src/GlView.cpp

@@ -27,7 +27,7 @@
 /*********************************************************************************/
 
 #include <QtGui>
-#include <QtOpenGL>
+#include <QtWidgets>
 
 #include <math.h>
 

PianoBooster/src/GlView.h

@@ -29,7 +29,8 @@
 #define __GLVIEW_H__
 #include <QTime>
 #include <QBasicTimer>
-#include <QGLWidget>
+#include <QtWidgets>
+#include <QtOpenGL>
 #include "Song.h"
 #include "Score.h"
 #include "Settings.h"

PianoBooster/src/GuiKeyboardSetupDialog.cpp

@@ -117,7 +117,7 @@ void GuiKeyboardSetupDialog::keyPressEvent ( QKeyEvent * event )
     if (event->isAutoRepeat() == true)
         return;
 
-    int c = event->text().toAscii().at(0);
+    int c = event->text().toLatin1().at(0);
     m_song->pcKeyPress( c, true);
 }
 
@@ -129,7 +129,7 @@ void GuiKeyboardSetupDialog::keyReleaseEvent ( QKeyEvent * event )
     if (event->text().length() == 0)
         return;
 
-    int c = event->text().toAscii().at(0);
+    int c = event->text().toLatin1().at(0);
     m_song->pcKeyPress( c, false);
 }
 

PianoBooster/src/GuiLoopingPopup.cpp

@@ -24,7 +24,7 @@
 
 */
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "GuiLoopingPopup.h"
 #include "GlView.h"

PianoBooster/src/GuiMidiSetupDialog.cpp

@@ -124,7 +124,8 @@ void GuiMidiSetupDialog::on_midiOutputCombo_activated (int index)
 void GuiMidiSetupDialog::on_latencyFixButton_clicked ( bool checked )
 {
     bool ok;
-    int latencyFix = QInputDialog::getInteger(this, tr("Enter a value for the latency fix in milliseconds"),
+    
+    int latencyFix = QInputDialog::getInt(this, tr("Enter a value for the latency fix in milliseconds"),
             tr(
             "The latency fix works by running the music ahead of what you<br>"
             "are playing to counteract the delay within the sound generator.<br><br>"

PianoBooster/src/QtWindow.cpp

@@ -694,7 +694,7 @@ void QtWindow::keyPressEvent ( QKeyEvent * event )
     if (event->key() == Qt::Key_F1)
         return;
 
-    int c = event->text().toAscii().at(0);
+    int c = event->text().toLatin1().at(0);
     m_song->pcKeyPress( c, true);
 }
 
@@ -706,7 +706,7 @@ void QtWindow::keyReleaseEvent ( QKeyEvent * event )
     if (event->text().length() == 0)
         return;
 
-    int c = event->text().toAscii().at(0);
+    int c = event->text().toLatin1().at(0);
     m_song->pcKeyPress( c, false);
 }
 

PianoBooster/src/Settings.h

@@ -28,7 +28,8 @@
 #define __SETTINGS_H__
 
 #include <QSettings>
-#include <QDomDocument>
+#include <QtWidgets>
+#include <QtXml>
 #include "Song.h"
 #include "Notation.h"