Updated to modern Qt

[virtualtones] / stringinstrument.h

diff --git a/stringinstrument.h b/stringinstrument.h
index e88d29f332276799e769c3683a53cebf287cb501..b3497b4f68b43af878f5975b1db9129b7e3bd9d7 100644 (file)
--- a/stringinstrument.h
+++ b/stringinstrument.h
@@ -9,6 +9,11 @@
 #include <qwidget.h>
 #include <qpixmap.h>
 #include <qpainter.h>
+#include <qtimer.h>
+#include <QWidget>
+#include <QPixmap>
+#include <QPainter>
+#include <QTimer>
 
 #include "instrument.h"
 
@@ -21,6 +26,9 @@ Q_OBJECT
                StringInstrument(QWidget *parent);
                ~StringInstrument();
 
+       private slots:
+               void emitSounds();
+
        protected:
                QString generateHelp();
                void paintEvent(QPaintEvent *);
@@ -28,12 +36,9 @@ Q_OBJECT
                void keyReleaseEvent(QKeyEvent *);
 
 
-               void zeroArray(bool array[4][4]);
-               void zeroArray(bool array[4]);
-               void zeroArray(int array[4]);
                virtual void setNotes(int array[4])=0; // Set the base string notes
-               void copyArray(int source[4], int dest[4]);
-               void emitSounds();
+
+               QPixmap background;
 
                // Keys
                bool down[4][4];