summaryrefslogtreecommitdiff
path: root/muse2/muse/widgets/pasteeventsdialog.h
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2012-05-28 14:15:52 +0000
committerFlorian Jung <flo@windfisch.org>2012-05-28 14:15:52 +0000
commitd2a88cfaad5ac385fc3c6212c09ad7fbc38e9454 (patch)
tree387da0b38255003e1a971629ea0de32273ac3d3c /muse2/muse/widgets/pasteeventsdialog.h
parent716f5a5b56a3b7ff59004ef0a1af5f98cb2a691c (diff)
merged with release_2_0
Diffstat (limited to 'muse2/muse/widgets/pasteeventsdialog.h')
-rw-r--r--muse2/muse/widgets/pasteeventsdialog.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/muse2/muse/widgets/pasteeventsdialog.h b/muse2/muse/widgets/pasteeventsdialog.h
index e22a3693..d02c0fef 100644
--- a/muse2/muse/widgets/pasteeventsdialog.h
+++ b/muse2/muse/widgets/pasteeventsdialog.h
@@ -49,15 +49,15 @@ class PasteEventsDialog : public QDialog, public Ui::PasteEventsDialogBase
public:
PasteEventsDialog(QWidget* parent = 0);
- int number;
- int raster;
- bool always_new_part;
- bool never_new_part;
- unsigned max_distance;
- bool into_single_part;
+ static int number;
+ static int raster;
+ static bool always_new_part;
+ static bool never_new_part;
+ static unsigned max_distance;
+ static bool into_single_part;
bool into_single_part_allowed;
- void read_configuration(MusECore::Xml& xml);
+ static void read_configuration(MusECore::Xml& xml);
void write_configuration(int level, MusECore::Xml& xml);