summaryrefslogtreecommitdiff
path: root/muse2
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-08-08 16:54:13 +0000
committerFlorian Jung <flo@windfisch.org>2011-08-08 16:54:13 +0000
commitbefca1aa676e5ee010525cc1af70051ec4c04722 (patch)
tree2f963899130e263e9d748f072adccff69b2b7bb1 /muse2
parentc95feff1f178ec0d89ea21abf5d7e6294c0d0132 (diff)
build fixes
Diffstat (limited to 'muse2')
-rw-r--r--muse2/muse/functions.cpp12
-rw-r--r--muse2/muse/functions.h23
-rw-r--r--muse2/muse/midiedit/dcanvas.cpp2
-rw-r--r--muse2/muse/midiedit/drumedit.cpp1
-rw-r--r--muse2/muse/midiedit/prcanvas.cpp2
-rw-r--r--muse2/muse/midiedit/scoreedit.cpp1
6 files changed, 26 insertions, 15 deletions
diff --git a/muse2/muse/functions.cpp b/muse2/muse/functions.cpp
index 66257401..7d5eecc0 100644
--- a/muse2/muse/functions.cpp
+++ b/muse2/muse/functions.cpp
@@ -28,6 +28,18 @@
#include <QMessageBox>
#include <QClipboard>
+#include "widgets/function_dialogs/velocity.h"
+#include "widgets/function_dialogs/quantize.h"
+#include "widgets/function_dialogs/crescendo.h"
+#include "widgets/function_dialogs/gatetime.h"
+#include "widgets/function_dialogs/remove.h"
+#include "widgets/function_dialogs/transpose.h"
+#include "widgets/function_dialogs/setlen.h"
+#include "widgets/function_dialogs/move.h"
+#include "widgets/function_dialogs/deloverlaps.h"
+#include "widgets/function_dialogs/legato.h"
+
+
using namespace std;
GateTime* gatetime_dialog=NULL;
diff --git a/muse2/muse/functions.h b/muse2/muse/functions.h
index 90fc64e9..3b8a23f3 100644
--- a/muse2/muse/functions.h
+++ b/muse2/muse/functions.h
@@ -8,24 +8,25 @@
#ifndef __FUNCTIONS_H__
#define __FUNCTIONS_H__
-#include "widgets/function_dialogs/velocity.h"
-#include "widgets/function_dialogs/quantize.h"
-#include "widgets/function_dialogs/crescendo.h"
-#include "widgets/function_dialogs/gatetime.h"
-#include "widgets/function_dialogs/remove.h"
-#include "widgets/function_dialogs/transpose.h"
-#include "widgets/function_dialogs/setlen.h"
-#include "widgets/function_dialogs/move.h"
-#include "widgets/function_dialogs/deloverlaps.h"
-#include "widgets/function_dialogs/legato.h"
-
#include <set>
#include "part.h"
+#include <QWidget>
class QString;
class QMimeData;
class Undo;
+class GateTime;
+class Velocity;
+class Quantize;
+class Remove;
+class DelOverlaps;
+class Setlen;
+class Move;
+class Transpose;
+class Crescendo;
+class Legato;
+
extern GateTime* gatetime_dialog;
extern Velocity* velocity_dialog;
extern Quantize* quantize_dialog;
diff --git a/muse2/muse/midiedit/dcanvas.cpp b/muse2/muse/midiedit/dcanvas.cpp
index d0a5ee31..921e59f6 100644
--- a/muse2/muse/midiedit/dcanvas.cpp
+++ b/muse2/muse/midiedit/dcanvas.cpp
@@ -158,8 +158,6 @@ Undo DrumCanvas::moveCanvasItems(CItemList& items, int dp, int dx, DragType dtyp
for(iPartToChange ip2c = parts2change.begin(); ip2c != parts2change.end(); ++ip2c)
{
Part* opart = ip2c->first;
- int diff = ip2c->second.xdiff;
-
if (opart->hasHiddenNotes())
{
forbidden=true;
diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp
index 1e678432..e6326cf9 100644
--- a/muse2/muse/midiedit/drumedit.cpp
+++ b/muse2/muse/midiedit/drumedit.cpp
@@ -44,6 +44,7 @@
#include "audio.h"
#include "gconfig.h"
#include "functions.h"
+#include "widgets/function_dialogs/quantize.h"
/*
static const char* map_file_pattern[] = {
diff --git a/muse2/muse/midiedit/prcanvas.cpp b/muse2/muse/midiedit/prcanvas.cpp
index 5fb59099..d06274b4 100644
--- a/muse2/muse/midiedit/prcanvas.cpp
+++ b/muse2/muse/midiedit/prcanvas.cpp
@@ -314,8 +314,6 @@ Undo PianoCanvas::moveCanvasItems(CItemList& items, int dp, int dx, DragType dty
for(iPartToChange ip2c = parts2change.begin(); ip2c != parts2change.end(); ++ip2c)
{
Part* opart = ip2c->first;
- int diff = ip2c->second.xdiff;
-
if (opart->hasHiddenNotes())
{
forbidden=true;
diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp
index 93bf2e95..1636cc5d 100644
--- a/muse2/muse/midiedit/scoreedit.cpp
+++ b/muse2/muse/midiedit/scoreedit.cpp
@@ -30,6 +30,7 @@
#include <QImage>
#include <QInputDialog>
#include <QMessageBox>
+#include <QSpinBox>
#include <stdio.h>
#include <math.h>