diff options
author | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-09-09 03:49:53 +0000 |
---|---|---|
committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-09-09 03:49:53 +0000 |
commit | ad72332d2cbd0d22e5d49d9fd60c985e563b17d0 (patch) | |
tree | 11f22bb42664eb9e8aa2527ec175d20dd09a0390 /muse2/muse/widgets | |
parent | d3e8a1b4c98cb3ba8b73f367ea88ad23f8dbca66 (diff) |
namespace work (part deux)
Diffstat (limited to 'muse2/muse/widgets')
149 files changed, 650 insertions, 127 deletions
diff --git a/muse2/muse/widgets/CMakeLists.txt b/muse2/muse/widgets/CMakeLists.txt index 8f2f9420..48299f4a 100644 --- a/muse2/muse/widgets/CMakeLists.txt +++ b/muse2/muse/widgets/CMakeLists.txt @@ -184,7 +184,7 @@ file (GLOB widgets_source_files tb1.cpp tempolabel.cpp tools.cpp - ttoolbar.cpp + # ttoolbar.cpp ttoolbutton.cpp unusedwavefiles.cpp utils.cpp diff --git a/muse2/muse/widgets/checkbox.cpp b/muse2/muse/widgets/checkbox.cpp index e707fcbc..def23730 100644 --- a/muse2/muse/widgets/checkbox.cpp +++ b/muse2/muse/widgets/checkbox.cpp @@ -24,6 +24,8 @@ #include <QMouseEvent> +namespace MusEWidget { + //--------------------------------------------------------- // CheckBox //--------------------------------------------------------- @@ -71,4 +73,4 @@ void CheckBox::mouseReleaseEvent(QMouseEvent *e) emit checkboxReleased(_id); } - +} // namespace MusEWidget diff --git a/muse2/muse/widgets/checkbox.h b/muse2/muse/widgets/checkbox.h index 19022557..d50b31d3 100644 --- a/muse2/muse/widgets/checkbox.h +++ b/muse2/muse/widgets/checkbox.h @@ -25,6 +25,7 @@ #include <QCheckBox> +namespace MusEWidget { //--------------------------------------------------------- // CheckBox @@ -55,5 +56,7 @@ class CheckBox : public QCheckBox { void setId(int i) { _id = i; } }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/citem.cpp b/muse2/muse/widgets/citem.cpp index ebca00fc..1fe861a0 100644 --- a/muse2/muse/widgets/citem.cpp +++ b/muse2/muse/widgets/citem.cpp @@ -24,6 +24,8 @@ #include "citem.h" #include <stdio.h> +namespace MusEWidget { + //--------------------------------------------------------- // CItem //--------------------------------------------------------- @@ -106,3 +108,4 @@ void CItemList::add(CItem* item) std::multimap<int, CItem*, std::less<int> >::insert(std::pair<const int, CItem*> (item->bbox().x(), item)); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/citem.h b/muse2/muse/widgets/citem.h index 659b898b..bdeca213 100644 --- a/muse2/muse/widgets/citem.h +++ b/muse2/muse/widgets/citem.h @@ -32,6 +32,8 @@ class Event; class Part; +namespace MusEWidget { + //--------------------------------------------------------- // CItem // virtuelle Basisklasse fr alle Canvas Item's @@ -101,5 +103,7 @@ class CItemList: public std::multimap<int, CItem*, std::less<int> > { CItem* find(const QPoint& pos) const; }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/comboQuant.cpp b/muse2/muse/widgets/comboQuant.cpp index b24ca673..c455851a 100644 --- a/muse2/muse/widgets/comboQuant.cpp +++ b/muse2/muse/widgets/comboQuant.cpp @@ -28,6 +28,8 @@ #include "comboQuant.h" +namespace MusEWidget { + static int quantTable[] = { 1, 16, 32, 64, 128, 256, 512, 1024, 1, 24, 48, 96, 192, 384, 768, 1536, @@ -107,3 +109,4 @@ void ComboQuant::setValue(int val) setCurrentIndex(0); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/comboQuant.h b/muse2/muse/widgets/comboQuant.h index 0a9460b8..8e1d80ea 100644 --- a/muse2/muse/widgets/comboQuant.h +++ b/muse2/muse/widgets/comboQuant.h @@ -30,6 +30,8 @@ class QWidget; class QTableWidget; +namespace MusEWidget { + //--------------------------------------------------------- // ComboQuant //--------------------------------------------------------- @@ -50,5 +52,7 @@ class ComboQuant : public QComboBox { void setValue(int val); }; +} + #endif diff --git a/muse2/muse/widgets/combobox.cpp b/muse2/muse/widgets/combobox.cpp index c151e3ae..d32685d0 100644 --- a/muse2/muse/widgets/combobox.cpp +++ b/muse2/muse/widgets/combobox.cpp @@ -26,6 +26,8 @@ #include "combobox.h" +namespace MusEWidget { + //--------------------------------------------------------- // ComboBox //--------------------------------------------------------- @@ -103,3 +105,4 @@ void ComboBox::addAction(const QString& s, int id) itemlist << id; } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/combobox.h b/muse2/muse/widgets/combobox.h index b2f973dc..8de82989 100644 --- a/muse2/muse/widgets/combobox.h +++ b/muse2/muse/widgets/combobox.h @@ -28,6 +28,8 @@ class QMenu; class QSignalMapper; +namespace MusEWidget { + //--------------------------------------------------------- // ComboBox //--------------------------------------------------------- @@ -57,6 +59,8 @@ class ComboBox : public QToolButton { void addAction(const QString& s, int id = -1); }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/comment.cpp b/muse2/muse/widgets/comment.cpp index 926cfbb3..99fd8487 100644 --- a/muse2/muse/widgets/comment.cpp +++ b/muse2/muse/widgets/comment.cpp @@ -26,6 +26,8 @@ #include <QWidget> +namespace MusEWidget { + //--------------------------------------------------------- // Comment //--------------------------------------------------------- @@ -102,3 +104,4 @@ void TrackComment::setText(const QString& s) song->update(SC_TRACK_MODIFIED); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/comment.h b/muse2/muse/widgets/comment.h index 7aa32551..4fc0bd33 100644 --- a/muse2/muse/widgets/comment.h +++ b/muse2/muse/widgets/comment.h @@ -29,6 +29,8 @@ class Xml; class Track; class QWidget; +namespace MusEWidget { + //--------------------------------------------------------- // Comment //--------------------------------------------------------- @@ -66,5 +68,7 @@ class TrackComment : public Comment { TrackComment(Track*, QWidget*); }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/ctrlcombo.cpp b/muse2/muse/widgets/ctrlcombo.cpp index e95b0ca6..61a7e50f 100644 --- a/muse2/muse/widgets/ctrlcombo.cpp +++ b/muse2/muse/widgets/ctrlcombo.cpp @@ -23,6 +23,8 @@ #include "ctrlcombo.h" +namespace MusEWidget { + //--------------------------------------------------------- // CtrlComboBox //--------------------------------------------------------- @@ -69,3 +71,4 @@ CtrlComboBox::CtrlComboBox(QWidget* parent) insertItem(i, QString(ctxt[i])); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/ctrlcombo.h b/muse2/muse/widgets/ctrlcombo.h index dfdf42ca..dca3d91e 100644 --- a/muse2/muse/widgets/ctrlcombo.h +++ b/muse2/muse/widgets/ctrlcombo.h @@ -26,12 +26,15 @@ #include <QComboBox> +namespace MusEWidget { + class CtrlComboBox : public QComboBox { Q_OBJECT public: CtrlComboBox(QWidget* parent); }; +} // namespace MusEWidget #endif diff --git a/muse2/muse/widgets/dentry.cpp b/muse2/muse/widgets/dentry.cpp index 15f90d09..000dec50 100644 --- a/muse2/muse/widgets/dentry.cpp +++ b/muse2/muse/widgets/dentry.cpp @@ -35,6 +35,8 @@ #define TIMEC2 20 #define TIMER4 50 +namespace MusEWidget { + //--------------------------------------------------------- // Dentry // lineedit double values @@ -255,3 +257,4 @@ void Dentry::setValue(double v) val = v; } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/dentry.h b/muse2/muse/widgets/dentry.h index 5cf7d7a3..1e429187 100644 --- a/muse2/muse/widgets/dentry.h +++ b/muse2/muse/widgets/dentry.h @@ -27,6 +27,8 @@ #include "sliderbase.h" +namespace MusEWidget { + //--------------------------------------------------------- // Dentry //--------------------------------------------------------- @@ -85,4 +87,7 @@ class Dentry : public QLineEdit { SliderBase* slider() const { return _slider; } void setSlider(SliderBase* s) { _slider = s; } }; + +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/didyouknow.h b/muse2/muse/widgets/didyouknow.h index b60e9520..212e9254 100644 --- a/muse2/muse/widgets/didyouknow.h +++ b/muse2/muse/widgets/didyouknow.h @@ -23,6 +23,7 @@ class QDialog; +namespace MusEWidget { //--------------------------------------------------------- // DidYouKnowWidget @@ -36,3 +37,5 @@ class DidYouKnowWidget : public QDialog, public Ui::DidYouKnow public: DidYouKnowWidget(QDialog *parent = 0) : QDialog(parent) { setupUi(this); } }; + +} // namespace MusEWidget diff --git a/muse2/muse/widgets/dimap.cpp b/muse2/muse/widgets/dimap.cpp index b6a2c9a3..7fff9115 100644 --- a/muse2/muse/widgets/dimap.cpp +++ b/muse2/muse/widgets/dimap.cpp @@ -26,6 +26,8 @@ #include "dimap.h" #include "mmath.h" +namespace MusEWidget { + const double DiMap::LogMin = 1.0e-150; const double DiMap::LogMax = 1.0e150; @@ -111,7 +113,7 @@ DiMap::~DiMap() bool DiMap::contains(double x) const { - return ( (x >= qwtMin(d_x1, d_x1)) && (x <= qwtMax(d_x1, d_x2))); + return ( (x >= MusEUtil::qwtMin(d_x1, d_x1)) && (x <= MusEUtil::qwtMax(d_x1, d_x2))); } //------------------------------------------------------------ @@ -128,7 +130,7 @@ bool DiMap::contains(double x) const bool DiMap::contains(int x) const { - return ( (x >= qwtMin(d_y1, d_y1)) && (x <= qwtMax(d_y1, d_y2))); + return ( (x >= MusEUtil::qwtMin(d_y1, d_y1)) && (x <= MusEUtil::qwtMax(d_y1, d_y2))); } //------------------------------------------------------------ @@ -267,10 +269,10 @@ double DiMap::invTransform(int y) const int DiMap::limTransform(double x) const { - if ( x > qwtMax(d_x1, d_x2) ) - x = qwtMax(d_x1, d_x2); - else if ( x < qwtMin(d_x1, d_x2)) - x = qwtMin(d_x1, d_x2); + if ( x > MusEUtil::qwtMax(d_x1, d_x2) ) + x = MusEUtil::qwtMax(d_x1, d_x2); + else if ( x < MusEUtil::qwtMin(d_x1, d_x2)) + x = MusEUtil::qwtMin(d_x1, d_x2); return transform(x); } @@ -317,3 +319,5 @@ void DiMap::newFactor() else d_cnv = 0.0; } + +} // namespace MusEWidget diff --git a/muse2/muse/widgets/dimap.h b/muse2/muse/widgets/dimap.h index faa23ab6..fc522b4e 100644 --- a/muse2/muse/widgets/dimap.h +++ b/muse2/muse/widgets/dimap.h @@ -27,6 +27,8 @@ #include <QtGlobal> +namespace MusEWidget { + class DiMap { double d_x1, d_x2; // double interval boundaries @@ -63,4 +65,6 @@ class DiMap bool logarithmic() const { return d_log;} }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/doublelabel.cpp b/muse2/muse/widgets/doublelabel.cpp index 043944f5..00d9e2fa 100644 --- a/muse2/muse/widgets/doublelabel.cpp +++ b/muse2/muse/widgets/doublelabel.cpp @@ -24,6 +24,8 @@ #include "doublelabel.h" +namespace MusEWidget { + //--------------------------------------------------------- // DoubleLabel //--------------------------------------------------------- @@ -206,3 +208,5 @@ QSize DoubleLabel::minimumSizeHint() const { return sizeHint(); } + +} // namespace MusEWidget diff --git a/muse2/muse/widgets/doublelabel.h b/muse2/muse/widgets/doublelabel.h index 20732391..d02546e6 100644 --- a/muse2/muse/widgets/doublelabel.h +++ b/muse2/muse/widgets/doublelabel.h @@ -25,6 +25,8 @@ #include "dentry.h" +namespace MusEWidget { + //--------------------------------------------------------- // DoubleLabel //--------------------------------------------------------- @@ -73,4 +75,6 @@ class DoubleLabel : public Dentry { void setSuffix(const QString& s) { _suffix = s; } }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/drange.cpp b/muse2/muse/widgets/drange.cpp index 04b51905..18868b2c 100644 --- a/muse2/muse/widgets/drange.cpp +++ b/muse2/muse/widgets/drange.cpp @@ -29,6 +29,8 @@ #include "mmath.h" #include "drange.h" +namespace MusEWidget { + const double DoubleRange::MinRelStep = 1.0e-10; const double DoubleRange::DefaultRelStep = 1.0e-2; const double DoubleRange::MinEps = 1.0e-10; @@ -71,8 +73,8 @@ void DoubleRange::setNewValue(double x, bool align) { d_prevValue = d_value; - double vmin = qwtMin(d_minValue, d_maxValue); - double vmax = qwtMax(d_minValue, d_maxValue); + double vmin = MusEUtil::qwtMin(d_minValue, d_maxValue); + double vmax = MusEUtil::qwtMax(d_minValue, d_maxValue); // Range check @@ -104,11 +106,11 @@ void DoubleRange::setNewValue(double x, bool align) d_value = d_minValue; // correct rounding error at the border - if (fabs(d_value - d_maxValue) < MinEps * qwtAbs(d_step)) + if (fabs(d_value - d_maxValue) < MinEps * MusEUtil::qwtAbs(d_step)) d_value = d_maxValue; // correct rounding error if value = 0 - if (fabs(d_value) < MinEps * qwtAbs(d_step)) + if (fabs(d_value) < MinEps * MusEUtil::qwtAbs(d_step)) d_value = 0.0; } if (d_prevValue != d_value) @@ -177,7 +179,7 @@ void DoubleRange::setRange(double vmin, double vmax, double vstep, int pageSize) // // limit page size // - d_pageSize = qwtLim(pageSize,0, int(qwtAbs((d_maxValue - d_minValue) / d_step))); + d_pageSize = MusEUtil::qwtLim(pageSize,0, int(MusEUtil::qwtAbs((d_maxValue - d_minValue) / d_step))); // // If the value lies out of the range, it @@ -271,6 +273,7 @@ void DoubleRange::incPages(int nPages) double DoubleRange::step() const { - return qwtAbs(d_step); + return MusEUtil::qwtAbs(d_step); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/drange.h b/muse2/muse/widgets/drange.h index 3b5971cf..938b70c6 100644 --- a/muse2/muse/widgets/drange.h +++ b/muse2/muse/widgets/drange.h @@ -25,6 +25,8 @@ #ifndef __DOUBLE_RANGE_H__ #define __DOUBLE_RANGE_H__ +namespace MusEWidget { + //--------------------------------------------------------- // DoubleRange //--------------------------------------------------------- @@ -77,4 +79,6 @@ class DoubleRange double step() const; }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/editnotedialogbase.ui b/muse2/muse/widgets/editnotedialogbase.ui index b19efc49..165bdf02 100644 --- a/muse2/muse/widgets/editnotedialogbase.ui +++ b/muse2/muse/widgets/editnotedialogbase.ui @@ -156,7 +156,7 @@ </widget> </item> <item row="2" column="1"> - <widget class="PitchEdit" name="pl" native="true"/> + <widget class="MusEWidget::PitchEdit" name="pl" native="true"/> </item> </layout> </widget> @@ -169,7 +169,7 @@ <container>0</container> </customwidget> <customwidget> - <class>PitchEdit</class> + <class>MusEWidget::PitchEdit</class> <extends>QWidget</extends> <header>pitchedit.h</header> </customwidget> diff --git a/muse2/muse/widgets/filedialog.cpp b/muse2/muse/widgets/filedialog.cpp index ada1505c..0df0fa7f 100644 --- a/muse2/muse/widgets/filedialog.cpp +++ b/muse2/muse/widgets/filedialog.cpp @@ -34,6 +34,7 @@ #include "../globals.h" #include "gconfig.h" +namespace MusEWidget { MFileDialog::ViewType MFileDialog::lastViewUsed = GLOBAL_VIEW; //QString MFileDialog::lastUserDir = ""; @@ -564,3 +565,4 @@ FILE* MFile::open(const char* mode, const QStringList& pattern, return f; } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/filedialog.h b/muse2/muse/widgets/filedialog.h index a2beeb3b..74297210 100644 --- a/muse2/muse/widgets/filedialog.h +++ b/muse2/muse/widgets/filedialog.h @@ -26,6 +26,8 @@ class QStringList; +namespace MusEWidget { + //--------------------------------------------------------- // FileDialogButtonsWidget // Wrapper around Ui::FileDialogButtons @@ -123,3 +125,4 @@ class MFile { bool warnIfOverwrite, const QString& caption); }; +} // namespace MusEWidget diff --git a/muse2/muse/widgets/function_dialogs/crescendo.cpp b/muse2/muse/widgets/function_dialogs/crescendo.cpp index 53d6238d..f8245b24 100644 --- a/muse2/muse/widgets/function_dialogs/crescendo.cpp +++ b/muse2/muse/widgets/function_dialogs/crescendo.cpp @@ -24,6 +24,8 @@ #include "crescendo.h" #include "xml.h" +namespace MusEDialog { + Crescendo::Crescendo(QWidget* parent) : QDialog(parent) { @@ -125,3 +127,5 @@ void Crescendo::absolute_changed(bool val) end_spinbox->setSuffix(" %"); } } + +} // namespace MusEDialog diff --git a/muse2/muse/widgets/function_dialogs/crescendo.h b/muse2/muse/widgets/function_dialogs/crescendo.h index c920d610..c0871ab8 100644 --- a/muse2/muse/widgets/function_dialogs/crescendo.h +++ b/muse2/muse/widgets/function_dialogs/crescendo.h @@ -28,6 +28,8 @@ class QButtonGroup; class Xml; +namespace MusEDialog { + class Crescendo : public QDialog, public Ui::CrescendoBase { Q_OBJECT @@ -58,5 +60,7 @@ class Crescendo : public QDialog, public Ui::CrescendoBase void absolute_changed(bool); }; +} // namespace MusEDialog + #endif diff --git a/muse2/muse/widgets/function_dialogs/deloverlaps.cpp b/muse2/muse/widgets/function_dialogs/deloverlaps.cpp index 7fa81ef5..0841b6e9 100644 --- a/muse2/muse/widgets/function_dialogs/deloverlaps.cpp +++ b/muse2/muse/widgets/function_dialogs/deloverlaps.cpp @@ -24,6 +24,7 @@ #include "deloverlaps.h" #include "xml.h" +namespace MusEDialog { DelOverlaps::DelOverlaps(QWidget* parent) : QDialog(parent) @@ -92,3 +93,5 @@ void DelOverlaps::write_configuration(int level, Xml& xml) xml.intTag(level, "range", range); xml.tag(level, "/del_overlaps"); } + +} // namespace MusEDialog diff --git a/muse2/muse/widgets/function_dialogs/deloverlaps.h b/muse2/muse/widgets/function_dialogs/deloverlaps.h index 9d51e0bd..2fc470cd 100644 --- a/muse2/muse/widgets/function_dialogs/deloverlaps.h +++ b/muse2/muse/widgets/function_dialogs/deloverlaps.h @@ -28,6 +28,8 @@ class QButtonGroup; class Xml; +namespace MusEDialog { + class DelOverlaps : public QDialog, public Ui::DelOverlapsBase { Q_OBJECT @@ -51,5 +53,7 @@ class DelOverlaps : public QDialog, public Ui::DelOverlapsBase int exec(); }; +} // namespace MusEDialog + #endif diff --git a/muse2/muse/widgets/function_dialogs/gatetime.cpp b/muse2/muse/widgets/function_dialogs/gatetime.cpp index dc810ff3..537260ca 100644 --- a/muse2/muse/widgets/function_dialogs/gatetime.cpp +++ b/muse2/muse/widgets/function_dialogs/gatetime.cpp @@ -28,6 +28,8 @@ #include "xml.h" #include "song.h" +namespace MusEDialog { + //--------------------------------------------------------- // GateTime //--------------------------------------------------------- @@ -121,3 +123,5 @@ void GateTime::write_configuration(int level, Xml& xml) xml.intTag(level, "rate", rateVal); xml.tag(level, "/mod_len"); } + +} // namespace MusEDialog diff --git a/muse2/muse/widgets/function_dialogs/gatetime.h b/muse2/muse/widgets/function_dialogs/gatetime.h index 79c6bd75..20d28948 100644 --- a/muse2/muse/widgets/function_dialogs/gatetime.h +++ b/muse2/muse/widgets/function_dialogs/gatetime.h @@ -28,6 +28,8 @@ class QButtonGroup; class Xml; +namespace MusEDialog { + //--------------------------------------------------------- // GateTime //--------------------------------------------------------- @@ -57,5 +59,7 @@ class GateTime : public QDialog, public Ui::GateTimeBase { int exec(); }; +} // namespace MusEDialog + #endif diff --git a/muse2/muse/widgets/function_dialogs/legato.cpp b/muse2/muse/widgets/function_dialogs/legato.cpp index 0c117d2c..5ca6e29b 100644 --- a/muse2/muse/widgets/function_dialogs/legato.cpp +++ b/muse2/muse/widgets/function_dialogs/legato.cpp @@ -24,6 +24,8 @@ #include "legato.h" #include "xml.h" +namespace MusEDialog { + Legato::Legato(QWidget* parent) : QDialog(parent) { @@ -101,3 +103,5 @@ void Legato::write_configuration(int level, Xml& xml) xml.intTag(level, "allow_shortening", allow_shortening); xml.tag(level, "/legato"); } + +} // namespace MusEDialog diff --git a/muse2/muse/widgets/function_dialogs/legato.h b/muse2/muse/widgets/function_dialogs/legato.h index c701a716..c2cbeabc 100644 --- a/muse2/muse/widgets/function_dialogs/legato.h +++ b/muse2/muse/widgets/function_dialogs/legato.h @@ -28,6 +28,8 @@ class QButtonGroup; class Xml; +namespace MusEDialog { + class Legato : public QDialog, public Ui::LegatoBase { Q_OBJECT @@ -54,5 +56,7 @@ class Legato : public QDialog, public Ui::LegatoBase int exec(); }; +} // namespace MusEDialog + #endif diff --git a/muse2/muse/widgets/function_dialogs/move.cpp b/muse2/muse/widgets/function_dialogs/move.cpp index 379ae30e..2529cb68 100644 --- a/muse2/muse/widgets/function_dialogs/move.cpp +++ b/muse2/muse/widgets/function_dialogs/move.cpp @@ -24,6 +24,8 @@ #include "move.h" #include "xml.h" +namespace MusEDialog { + Move::Move(QWidget* parent) : QDialog(parent) { @@ -97,3 +99,5 @@ void Move::write_configuration(int level, Xml& xml) xml.intTag(level, "amount", amount); xml.tag(level, "/move"); } + +} // namespace MusEDialog diff --git a/muse2/muse/widgets/function_dialogs/move.h b/muse2/muse/widgets/function_dialogs/move.h index c4c91484..39718134 100644 --- a/muse2/muse/widgets/function_dialogs/move.h +++ b/muse2/muse/widgets/function_dialogs/move.h @@ -28,6 +28,8 @@ class QButtonGroup; class Xml; +namespace MusEDialog { + class Move : public QDialog, public Ui::MoveBase { Q_OBJECT @@ -53,5 +55,7 @@ class Move : public QDialog, public Ui::MoveBase int exec(); }; +} // namespace MusEDialog + #endif diff --git a/muse2/muse/widgets/function_dialogs/quantize.cpp b/muse2/muse/widgets/function_dialogs/quantize.cpp index cc225d45..0841e106 100644 --- a/muse2/muse/widgets/function_dialogs/quantize.cpp +++ b/muse2/muse/widgets/function_dialogs/quantize.cpp @@ -24,6 +24,8 @@ #include "quantize.h" #include "xml.h" +namespace MusEDialog { + Quantize::Quantize(QWidget* parent) : QDialog(parent) { @@ -116,3 +118,6 @@ void Quantize::write_configuration(int level, Xml& xml) xml.intTag(level, "quant_len", quant_len); xml.tag(level, "/quantize"); } + +} // namespace MusEDialog + diff --git a/muse2/muse/widgets/function_dialogs/quantize.h b/muse2/muse/widgets/function_dialogs/quantize.h index c8b933c9..69498810 100644 --- a/muse2/muse/widgets/function_dialogs/quantize.h +++ b/muse2/muse/widgets/function_dialogs/quantize.h @@ -28,6 +28,8 @@ class QButtonGroup; class Xml; +namespace MusEDialog { + class Quantize : public QDialog, public Ui::QuantBase { Q_OBJECT @@ -57,5 +59,7 @@ class Quantize : public QDialog, public Ui::QuantBase int exec(); }; +} // namespace MusEDialog + #endif diff --git a/muse2/muse/widgets/function_dialogs/remove.cpp b/muse2/muse/widgets/function_dialogs/remove.cpp index 4742dce4..69558fc3 100644 --- a/muse2/muse/widgets/function_dialogs/remove.cpp +++ b/muse2/muse/widgets/function_dialogs/remove.cpp @@ -24,6 +24,8 @@ #include "remove.h" #include "xml.h" +namespace MusEDialog { + Remove::Remove(QWidget* parent) : QDialog(parent) { @@ -111,3 +113,6 @@ void Remove::write_configuration(int level, Xml& xml) xml.intTag(level, "len_thres_used", len_thres_used); xml.tag(level, "/erase"); } + +} // namespace MusEDialog + diff --git a/muse2/muse/widgets/function_dialogs/remove.h b/muse2/muse/widgets/function_dialogs/remove.h index 785d72eb..aba05909 100644 --- a/muse2/muse/widgets/function_dialogs/remove.h +++ b/muse2/muse/widgets/function_dialogs/remove.h @@ -28,6 +28,8 @@ class QButtonGroup; class Xml; +namespace MusEDialog { + class Remove : public QDialog, public Ui::RemoveBase { Q_OBJECT @@ -56,5 +58,7 @@ class Remove : public QDialog, public Ui::RemoveBase int exec(); }; +} // namespace MusEDialog + #endif diff --git a/muse2/muse/widgets/function_dialogs/setlen.cpp b/muse2/muse/widgets/function_dialogs/setlen.cpp index f75f878c..81a589ae 100644 --- a/muse2/muse/widgets/function_dialogs/setlen.cpp +++ b/muse2/muse/widgets/function_dialogs/setlen.cpp @@ -24,6 +24,8 @@ #include "setlen.h" #include "xml.h" +namespace MusEDialog { + Setlen::Setlen(QWidget* parent) : QDialog(parent) { @@ -96,3 +98,5 @@ void Setlen::write_configuration(int level, Xml& xml) xml.intTag(level, "len", len); xml.tag(level, "/setlen"); } + +} // namespace MusEDialog diff --git a/muse2/muse/widgets/function_dialogs/setlen.h b/muse2/muse/widgets/function_dialogs/setlen.h index 930652ab..fea6a5dd 100644 --- a/muse2/muse/widgets/function_dialogs/setlen.h +++ b/muse2/muse/widgets/function_dialogs/setlen.h @@ -28,6 +28,8 @@ class QButtonGroup; class Xml; +namespace MusEDialog { + class Setlen : public QDialog, public Ui::SetlenBase { Q_OBJECT @@ -53,5 +55,7 @@ class Setlen : public QDialog, public Ui::SetlenBase int exec(); }; +} // namespace MusEDialog + #endif diff --git a/muse2/muse/widgets/function_dialogs/transpose.cpp b/muse2/muse/widgets/function_dialogs/transpose.cpp index 1d4d512d..dd642050 100644 --- a/muse2/muse/widgets/function_dialogs/transpose.cpp +++ b/muse2/muse/widgets/function_dialogs/transpose.cpp @@ -24,6 +24,8 @@ #include "transpose.h" #include "xml.h" +namespace MusEDialog { + Transpose::Transpose(QWidget* parent) : QDialog(parent) { @@ -96,3 +98,5 @@ void Transpose::write_configuration(int level, Xml& xml) xml.intTag(level, "amount", amount); xml.tag(level, "/transpose"); } + +} // namespace MusEDialog diff --git a/muse2/muse/widgets/function_dialogs/transpose.h b/muse2/muse/widgets/function_dialogs/transpose.h index 651976d8..b6363ae5 100644 --- a/muse2/muse/widgets/function_dialogs/transpose.h +++ b/muse2/muse/widgets/function_dialogs/transpose.h @@ -28,6 +28,8 @@ class QButtonGroup; class Xml; +namespace MusEDialog { + class Transpose : public QDialog, public Ui::TransposeBase { Q_OBJECT @@ -51,5 +53,7 @@ class Transpose : public QDialog, public Ui::TransposeBase int exec(); }; +} // namespace MusEDialog + #endif diff --git a/muse2/muse/widgets/function_dialogs/velocity.cpp b/muse2/muse/widgets/function_dialogs/velocity.cpp index 56019e23..81655b5f 100644 --- a/muse2/muse/widgets/function_dialogs/velocity.cpp +++ b/muse2/muse/widgets/function_dialogs/velocity.cpp @@ -24,6 +24,8 @@ #include "velocity.h" #include "xml.h" +namespace MusEDialog { + //--------------------------------------------------------- // Velocity //--------------------------------------------------------- @@ -115,3 +117,5 @@ void Velocity::write_configuration(int level, Xml& xml) xml.intTag(level, "rate", rateVal); xml.tag(level, "/mod_velo"); } + +} // namespace MusEDialog diff --git a/muse2/muse/widgets/function_dialogs/velocity.h b/muse2/muse/widgets/function_dialogs/velocity.h index 1642a99d..9ef6cd2a 100644 --- a/muse2/muse/widgets/function_dialogs/velocity.h +++ b/muse2/muse/widgets/function_dialogs/velocity.h @@ -28,6 +28,8 @@ class QButtonGroup; class Xml; +namespace MusEDialog { + //--------------------------------------------------------- // Velocity //--------------------------------------------------------- @@ -57,5 +59,7 @@ class Velocity : public QDialog, public Ui::VelocityBase { int exec(); }; +} // namespace MusEDialog + #endif diff --git a/muse2/muse/widgets/genset.cpp b/muse2/muse/widgets/genset.cpp index d910e5a8..b8a93089 100644 --- a/muse2/muse/widgets/genset.cpp +++ b/muse2/muse/widgets/genset.cpp @@ -34,6 +34,8 @@ #include "globals.h" #include "icons.h" +namespace MusEWidget { + static int rtcResolutions[] = { 1024, 2048, 4096, 8192, 16384, 32768 }; @@ -511,3 +513,5 @@ void GlobalSettingsConfig::defaultInstrumentsPath() QString dir = MusEGlobal::configPath + "/instruments"; userInstrumentsPath->setText(dir); } + +} // namespace MusEWidget diff --git a/muse2/muse/widgets/genset.h b/muse2/muse/widgets/genset.h index 592f0395..3a2c6354 100644 --- a/muse2/muse/widgets/genset.h +++ b/muse2/muse/widgets/genset.h @@ -28,6 +28,8 @@ #include <QShowEvent> +namespace MusEWidget { + //--------------------------------------------------------- // GlobalSettingsConfig //--------------------------------------------------------- @@ -56,4 +58,6 @@ class GlobalSettingsConfig : public QDialog, public Ui::GlobalSettingsDialogBase GlobalSettingsConfig(QWidget* parent=0); }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/header.cpp b/muse2/muse/widgets/header.cpp index c720e605..8e2efe21 100644 --- a/muse2/muse/widgets/header.cpp +++ b/muse2/muse/widgets/header.cpp @@ -28,6 +28,8 @@ #include <QStandardItemModel> #include <QMouseEvent> +namespace MusEWidget { + //--------------------------------------------------------- // readStatus //--------------------------------------------------------- @@ -189,3 +191,5 @@ void Header::changeColumns(QAction *a) else hideSection(section); } + +} // namespace MusEWidget diff --git a/muse2/muse/widgets/header.h b/muse2/muse/widgets/header.h index 3f26f392..47c79192 100644 --- a/muse2/muse/widgets/header.h +++ b/muse2/muse/widgets/header.h @@ -30,6 +30,8 @@ class QStandardItemModel; class Xml; +namespace MusEWidget { + class Header : public QHeaderView { Q_OBJECT @@ -47,5 +49,7 @@ class Header : public QHeaderView { void changeColumns(QAction* a); }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/hitscale.cpp b/muse2/muse/widgets/hitscale.cpp index aaa7dd3b..c1fcdd87 100644 --- a/muse2/muse/widgets/hitscale.cpp +++ b/muse2/muse/widgets/hitscale.cpp @@ -28,6 +28,8 @@ #include "song.h" +namespace MusEWidget { + //--------------------------------------------------------- // HitScale //--------------------------------------------------------- @@ -145,4 +147,5 @@ void HitScale::pdraw(QPainter& p, const QRect& r) p.drawLine(xp, 0, xp, height()); } +} diff --git a/muse2/muse/widgets/hitscale.h b/muse2/muse/widgets/hitscale.h index fadebb8a..cf43ef4a 100644 --- a/muse2/muse/widgets/hitscale.h +++ b/muse2/muse/widgets/hitscale.h @@ -27,6 +27,8 @@ class MidiEditor; +namespace MusEWidget { + //--------------------------------------------------------- // HitScale // scale for midi track @@ -57,5 +59,8 @@ class HitScale : public View { public: HitScale(int* raster, QWidget* parent, int xscale); }; + +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/intlabel.cpp b/muse2/muse/widgets/intlabel.cpp index 890aac1f..6884adfb 100644 --- a/muse2/muse/widgets/intlabel.cpp +++ b/muse2/muse/widgets/intlabel.cpp @@ -25,6 +25,8 @@ #include "intlabel.h" #include "utils.h" +namespace MusEWidget { + //--------------------------------------------------------- // IntLabel //--------------------------------------------------------- @@ -39,7 +41,7 @@ IntLabel::IntLabel(int _val, int _min, int _max, QWidget* parent, val = _val+1; // dont optimize away off = _off; setValue(_val); - int len = num2cols(min, max); + int len = MusEUtil::num2cols(min, max); setSize(len); } @@ -57,7 +59,7 @@ void IntLabel::setRange(int mn, int mx) { min = mn; max = mx; - setSize(num2cols(min, max)); + setSize(MusEUtil::num2cols(min, max)); int v = val; if(val < mn) v = mn; @@ -153,3 +155,4 @@ void IntLabel::setOff(int v) setString(val); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/intlabel.h b/muse2/muse/widgets/intlabel.h index f68667e4..34c075d8 100644 --- a/muse2/muse/widgets/intlabel.h +++ b/muse2/muse/widgets/intlabel.h @@ -28,6 +28,8 @@ class QString; +namespace MusEWidget { + //--------------------------------------------------------- // IntLabel //--------------------------------------------------------- @@ -58,4 +60,6 @@ class IntLabel : public Nentry { void setRange(int, int); }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/itransformbase.ui b/muse2/muse/widgets/itransformbase.ui index 51280e56..2e9fb602 100644 --- a/muse2/muse/widgets/itransformbase.ui +++ b/muse2/muse/widgets/itransformbase.ui @@ -533,7 +533,7 @@ </widget> </item> <item row="2" column="1"> - <widget class="SpinBoxFP" name="procVal1a"> + <widget class="MusEWidget::SpinBoxFP" name="procVal1a"> <property name="maximum" stdset="0"> <number>99999999</number> </property> @@ -736,21 +736,21 @@ </widget> </item> <item row="2" column="2"> - <widget class="SpinBoxFP" name="procVal2a"> + <widget class="MusEWidget::SpinBoxFP" name="procVal2a"> <property name="maximum" stdset="0"> <number>99999999</number> </property> </widget> </item> <item row="2" column="3"> - <widget class="SpinBoxFP" name="procPortVala"> + <widget class="MusEWidget::SpinBoxFP" name="procPortVala"> <property name="maximum" stdset="0"> <number>99999999</number> </property> </widget> </item> <item row="2" column="4"> - <widget class="SpinBoxFP" name="procChannelVala"> + <widget class="MusEWidget::SpinBoxFP" name="procChannelVala"> <property name="maximum" stdset="0"> <number>99999999</number> </property> @@ -1106,7 +1106,7 @@ <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> - <class>SpinBoxFP</class> + <class>MusEWidget::SpinBoxFP</class> <extends>QDoubleSpinBox</extends> <header>spinboxFP.h</header> </customwidget> diff --git a/muse2/muse/widgets/knob.cpp b/muse2/muse/widgets/knob.cpp index e792e1ce..9bc63b33 100644 --- a/muse2/muse/widgets/knob.cpp +++ b/muse2/muse/widgets/knob.cpp @@ -34,6 +34,8 @@ #include <QPaintEvent> #include <QResizeEvent> +namespace MusEWidget { + //--------------------------------------------------------- // The QwtKnob widget imitates look and behaviour of a volume knob on a radio. // It contains @@ -333,8 +335,8 @@ void Knob::resizeEvent(QResizeEvent *) // printf("resize %d %d %d\n", r.height(), r.width(), d_knobWidth); -// width = qwtMin(qwtMin(r.height(), r.width()), d_knobWidth); - width = qwtMin(r.height(), r.width()); +// width = MusEUtil::qwtMin(MusEUtil::qwtMin(r.height(), r.width()), d_knobWidth); + width = MusEUtil::qwtMin(r.height(), r.width()); width_2 = width / 2; int x = r.x() + r.width() / 2 - width_2; @@ -423,7 +425,7 @@ void Knob::drawMarker(QPainter *p, double arc, const QColor &c) p->setBrush(c); p->setPen(Qt::NoPen); - rb = double(qwtMax(radius - 4 - d_dotWidth / 2, 0)); + rb = double(MusEUtil::qwtMax(radius - 4 - d_dotWidth / 2, 0)); p->drawEllipse(xm - int(rint(sa * rb)) - d_dotWidth / 2, ym - int(rint(ca * rb)) - d_dotWidth / 2, d_dotWidth, d_dotWidth); @@ -436,8 +438,8 @@ void Knob::drawMarker(QPainter *p, double arc, const QColor &c) pn.setWidth(2); p->setPen(pn); - rb = qwtMax(double((radius - 1) / 3.0), 0.0); - re = qwtMax(double(radius - 1), 0.0); + rb = MusEUtil::qwtMax(double((radius - 1) / 3.0), 0.0); + re = MusEUtil::qwtMax(double(radius - 1), 0.0); p->setRenderHint(QPainter::Antialiasing, true); p->drawLine( xm, @@ -468,7 +470,7 @@ void Knob::drawMarker(QPainter *p, double arc, const QColor &c) //------------------------------------------------------------ void Knob::setKnobWidth(int w) { - d_knobWidth = qwtMax(w,5); + d_knobWidth = MusEUtil::qwtMax(w,5); resize(size()); repaint(); } @@ -487,7 +489,7 @@ void Knob::setKnobWidth(int w) //------------------------------------------------------------ void Knob::setBorderWidth(int bw) { - d_borderWidth = qwtMax(bw, 0); + d_borderWidth = MusEUtil::qwtMax(bw, 0); resize(size()); repaint(); } @@ -571,3 +573,4 @@ void Knob::setMarkerColor(const QColor c) repaint(); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/knob.h b/muse2/muse/widgets/knob.h index 6c44ad27..a629f158 100644 --- a/muse2/muse/widgets/knob.h +++ b/muse2/muse/widgets/knob.h @@ -30,6 +30,7 @@ #include <QResizeEvent> #include <QPaintEvent> +namespace MusEWidget { //--------------------------------------------------------- // Knob @@ -103,5 +104,6 @@ class Knob : public SliderBase, public ScaleIf void setMarkerColor(const QColor c); }; +} // namespace MusEWidget #endif diff --git a/muse2/muse/widgets/lcombo.cpp b/muse2/muse/widgets/lcombo.cpp index 6136994c..ca17e5e3 100644 --- a/muse2/muse/widgets/lcombo.cpp +++ b/muse2/muse/widgets/lcombo.cpp @@ -25,6 +25,7 @@ #include <QHBoxLayout> #include <QLabel> +namespace MusEWidget { //--------------------------------------------------------- // LabelCombo @@ -64,3 +65,5 @@ void LabelCombo::setCurrentIndex(int i) if(box->currentIndex() != r) box->setCurrentIndex(r); } + +} // namespace MusEWidget diff --git a/muse2/muse/widgets/lcombo.h b/muse2/muse/widgets/lcombo.h index 98c50158..f500dc60 100644 --- a/muse2/muse/widgets/lcombo.h +++ b/muse2/muse/widgets/lcombo.h @@ -29,6 +29,7 @@ class QString; +namespace MusEWidget { //--------------------------------------------------------- // LabelCombo @@ -56,4 +57,6 @@ class LabelCombo : public QWidget { void setFocusPolicy ( Qt::FocusPolicy fp ) { box->setFocusPolicy(fp); } }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/menutitleitem.cpp b/muse2/muse/widgets/menutitleitem.cpp index 684f6842..c15c8c64 100644 --- a/muse2/muse/widgets/menutitleitem.cpp +++ b/muse2/muse/widgets/menutitleitem.cpp @@ -22,6 +22,8 @@ #include "menutitleitem.h" +namespace MusEWidget { + //--------------------------------------------------------- // MenuTitleItem //--------------------------------------------------------- @@ -48,3 +50,4 @@ QWidget* MenuTitleItem::createWidget(QWidget *parent) return l; } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/menutitleitem.h b/muse2/muse/widgets/menutitleitem.h index cfc6f6da..98573c72 100644 --- a/muse2/muse/widgets/menutitleitem.h +++ b/muse2/muse/widgets/menutitleitem.h @@ -25,6 +25,8 @@ #include <QWidgetAction> +namespace MusEWidget { + //--------------------------------------------------------- // MenuTitleItem //--------------------------------------------------------- @@ -41,4 +43,5 @@ class MenuTitleItem : public QWidgetAction { QWidget* createWidget(QWidget* /*parent*/); }; +} // namespace MusEWidget #endif diff --git a/muse2/muse/widgets/meter.cpp b/muse2/muse/widgets/meter.cpp index c4216c0c..f4d907d1 100644 --- a/muse2/muse/widgets/meter.cpp +++ b/muse2/muse/widgets/meter.cpp @@ -33,6 +33,8 @@ #include "gconfig.h" #include "fastlog.h" +namespace MusEWidget { + //--------------------------------------------------------- // Meter //--------------------------------------------------------- @@ -357,3 +359,4 @@ void Meter::mousePressEvent(QMouseEvent*) emit mousePress(); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/meter.h b/muse2/muse/widgets/meter.h index 09464988..62ad3fe0 100644 --- a/muse2/muse/widgets/meter.h +++ b/muse2/muse/widgets/meter.h @@ -32,6 +32,7 @@ class QResizeEvent; class QMouseEvent; class QPainter; +namespace MusEWidget { class Meter : public QFrame { Q_OBJECT @@ -97,5 +98,8 @@ class Meter : public QFrame { Meter(QWidget* parent, MeterType type = DBMeter); void setRange(double min, double max); }; + +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/metronome.cpp b/muse2/muse/widgets/metronome.cpp index 4bb58160..e639df81 100644 --- a/muse2/muse/widgets/metronome.cpp +++ b/muse2/muse/widgets/metronome.cpp @@ -30,6 +30,8 @@ #include "track.h" #include "audio.h" +namespace MusEWidget { + //--------------------------------------------------------- // MetronomeConfig //--------------------------------------------------------- @@ -196,3 +198,6 @@ void MetronomeConfig::beepVolumeChanged(int volume) // this value is directly applied, not using th Apply button, it just seems more usable this way. MusEGlobal::audioClickVolume=volume/100.0; } + +} // namespace MusEWidget + diff --git a/muse2/muse/widgets/metronome.h b/muse2/muse/widgets/metronome.h index 93dc05f0..62edcdc5 100644 --- a/muse2/muse/widgets/metronome.h +++ b/muse2/muse/widgets/metronome.h @@ -28,6 +28,8 @@ class QDialog; +namespace MusEWidget { + //--------------------------------------------------------- // MetronomeConfig //--------------------------------------------------------- @@ -48,4 +50,7 @@ class MetronomeConfig : public QDialog, public Ui::MetronomeConfigBase { public: MetronomeConfig(QDialog* parent=0); }; + +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/midisyncimpl.cpp b/muse2/muse/widgets/midisyncimpl.cpp index 1e6e27e2..89075af9 100644 --- a/muse2/muse/widgets/midisyncimpl.cpp +++ b/muse2/muse/widgets/midisyncimpl.cpp @@ -41,6 +41,8 @@ #include "driver/audiodev.h" #include "audio.h" +namespace MusEWidget { + enum { DEVCOL_NO = 0, DEVCOL_NAME, DEVCOL_IN, DEVCOL_TICKIN, DEVCOL_MRTIN, DEVCOL_MMCIN, DEVCOL_MTCIN, DEVCOL_MTCTYPE, DEVCOL_RID, DEVCOL_RCLK, DEVCOL_RMRT, DEVCOL_RMMC, DEVCOL_RMTC, DEVCOL_RREWSTART, DEVCOL_TID, DEVCOL_TCLK, DEVCOL_TMRT, DEVCOL_TMMC, DEVCOL_TMTC, /* DEVCOL_TREWSTART, */ }; @@ -1266,3 +1268,4 @@ void MidiSyncConfig::setDirty() applyButton->setEnabled(true); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/midisyncimpl.h b/muse2/muse/widgets/midisyncimpl.h index 21300be9..ddccf7c9 100644 --- a/muse2/muse/widgets/midisyncimpl.h +++ b/muse2/muse/widgets/midisyncimpl.h @@ -31,6 +31,8 @@ class QCloseEvent; class QDialog; class QTreeWidgetItem; +namespace MusEWidget { + //---------------------------------------------------------- // MidiSyncLViewItem //---------------------------------------------------------- @@ -130,5 +132,7 @@ class MidiSyncConfig : public QDialog, public Ui::MidiSyncConfigBase { void setDirty(); }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/mittransposebase.ui b/muse2/muse/widgets/mittransposebase.ui index b29e34ed..06a18029 100644 --- a/muse2/muse/widgets/mittransposebase.ui +++ b/muse2/muse/widgets/mittransposebase.ui @@ -44,7 +44,7 @@ </widget> </item> <item> - <widget class="PitchEdit" name="triggerKeySpinBox" native="true"/> + <widget class="MusEWidget::PitchEdit" name="triggerKeySpinBox" native="true"/> </item> <item> <widget class="QLabel" name="TextLabel2"> @@ -101,7 +101,7 @@ <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> - <class>PitchEdit</class> + <class>MusEWidget::PitchEdit</class> <extends>QWidget</extends> <header>pitchedit.h</header> </customwidget> diff --git a/muse2/muse/widgets/mixdowndialog.cpp b/muse2/muse/widgets/mixdowndialog.cpp index 40bf69c3..01c1d049 100644 --- a/muse2/muse/widgets/mixdowndialog.cpp +++ b/muse2/muse/widgets/mixdowndialog.cpp @@ -33,13 +33,15 @@ SndFile* getSndFile(const SndFile* sf, QWidget* parent) { - MixdownFileDialog* dialog = new MixdownFileDialog(sf, parent); + MusEWidget::MixdownFileDialog* dialog = new MusEWidget::MixdownFileDialog(sf, parent); dialog->exec(); SndFile* sndFile = dialog->sndFile(); delete dialog; return sndFile; } +namespace MusEWidget { + //--------------------------------------------------------- // MixdownFileDialog //--------------------------------------------------------- @@ -118,3 +120,4 @@ void MixdownFileDialog::fdialog() editPath->setText(path); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/mixdowndialog.h b/muse2/muse/widgets/mixdowndialog.h index 71eafa8b..cca60178 100644 --- a/muse2/muse/widgets/mixdowndialog.h +++ b/muse2/muse/widgets/mixdowndialog.h @@ -31,6 +31,8 @@ class SndFile; extern SndFile* getSndFile(const SndFile* sf, QWidget* parent); +namespace MusEWidget { + //--------------------------------------------------------- // MixdownFileDialog //--------------------------------------------------------- @@ -49,5 +51,7 @@ class MixdownFileDialog : public QDialog, public Ui::MixdownFileDialogBase { SndFile* sndFile() { return sf; } }; +} + #endif diff --git a/muse2/muse/widgets/mlabel.cpp b/muse2/muse/widgets/mlabel.cpp index 6f1b3810..071427b6 100644 --- a/muse2/muse/widgets/mlabel.cpp +++ b/muse2/muse/widgets/mlabel.cpp @@ -22,9 +22,11 @@ #include "mlabel.h" +namespace MusEWidget { void MLabel::mousePressEvent(QMouseEvent*) { emit mousePressed(); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/mlabel.h b/muse2/muse/widgets/mlabel.h index 07c83feb..64a52220 100644 --- a/muse2/muse/widgets/mlabel.h +++ b/muse2/muse/widgets/mlabel.h @@ -25,6 +25,8 @@ #include <QLabel> +namespace MusEWidget { + //--------------------------------------------------------- // MLabel // label widged which sends signal mousePressed @@ -48,5 +50,8 @@ class MLabel : public QLabel { MLabel(QWidget* parent, const char* name = 0) : QLabel(parent) {setObjectName(name);}; }; + +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/mmath.cpp b/muse2/muse/widgets/mmath.cpp index 31c22744..52dffea2 100644 --- a/muse2/muse/widgets/mmath.cpp +++ b/muse2/muse/widgets/mmath.cpp @@ -46,6 +46,7 @@ // qwtInt -- Return nearest integer // qwtLim -- Limit a values +namespace MusEUtil { //------------------------------------------------------------ //.F qwtGetMin @@ -320,3 +321,5 @@ void qwtLogSpace(double *array, int size, double xmin, double xmax) array[i] = exp(lxmin + double(i) * lstep); } + +} // namespace MusEUtil diff --git a/muse2/muse/widgets/mmath.h b/muse2/muse/widgets/mmath.h index 0449b3ad..813aed93 100644 --- a/muse2/muse/widgets/mmath.h +++ b/muse2/muse/widgets/mmath.h @@ -27,6 +27,8 @@ #define LOG_MIN 1.0e-100 #define LOG_MAX 1.0e100 +namespace MusEUtil { + double qwtCeil125(double x); double qwtFloor125(double x); void qwtTwistArray(double *array, int size); @@ -88,5 +90,7 @@ T qwtLim(const T& x, const T& x1, const T& x2) return rv; } +} + #endif diff --git a/muse2/muse/widgets/mtrackinfo.cpp b/muse2/muse/widgets/mtrackinfo.cpp index 60baebce..e4c4e217 100644 --- a/muse2/muse/widgets/mtrackinfo.cpp +++ b/muse2/muse/widgets/mtrackinfo.cpp @@ -43,6 +43,8 @@ #include "popupmenu.h" #include "routepopup.h" +namespace MusEWidget { + //--------------------------------------------------------- // setTrack //--------------------------------------------------------- @@ -557,7 +559,7 @@ void MidiTrackInfo::setLabelFont() // Set the label's font. trackNameLabel->setFont(MusEConfig::config.fonts[6]); // Dealing with a horizontally constrained label. Ignore vertical. Use a minimum readable point size. - autoAdjustFontSize(trackNameLabel, trackNameLabel->text(), false, true, MusEConfig::config.fonts[6].pointSize(), 5); + MusEUtil::autoAdjustFontSize(trackNameLabel, trackNameLabel->text(), false, true, MusEConfig::config.fonts[6].pointSize(), 5); } //--------------------------------------------------------- @@ -1564,3 +1566,4 @@ void MidiTrackInfo::recordClicked() } } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/mtrackinfo.h b/muse2/muse/widgets/mtrackinfo.h index 122d8aa0..42be1f58 100644 --- a/muse2/muse/widgets/mtrackinfo.h +++ b/muse2/muse/widgets/mtrackinfo.h @@ -26,6 +26,8 @@ class Track; +namespace MusEWidget { + //--------------------------------------------------------- // MidiTrackInfo //--------------------------------------------------------- @@ -80,7 +82,7 @@ class MidiTrackInfo : public QWidget, public Ui::MidiTrackInfoBase void updateTrackInfo(int); }; - +} // namespace MusEWidget #endif diff --git a/muse2/muse/widgets/mtrackinfobase.ui b/muse2/muse/widgets/mtrackinfobase.ui index 53e772c8..99c06ad0 100644 --- a/muse2/muse/widgets/mtrackinfobase.ui +++ b/muse2/muse/widgets/mtrackinfobase.ui @@ -86,7 +86,7 @@ </widget> </item> <item row="2" column="0"> - <widget class="SpinBox" name="iOutputChannel"> + <widget class="MusEWidget::SpinBox" name="iOutputChannel"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -247,7 +247,7 @@ </layout> </item> <item row="4" column="0"> - <widget class="SpinBox" name="iTransp"> + <widget class="MusEWidget::SpinBox" name="iTransp"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -291,7 +291,7 @@ </widget> </item> <item row="5" column="0"> - <widget class="SpinBox" name="iVerz"> + <widget class="MusEWidget::SpinBox" name="iVerz"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -332,7 +332,7 @@ </widget> </item> <item row="6" column="0"> - <widget class="SpinBox" name="iLen"> + <widget class="MusEWidget::SpinBox" name="iLen"> <property name="sizePolicy"> <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -376,7 +376,7 @@ </widget> </item> <item row="7" column="0"> - <widget class="SpinBox" name="iAnschl"> + <widget class="MusEWidget::SpinBox" name="iAnschl"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -423,7 +423,7 @@ </widget> </item> <item row="8" column="0"> - <widget class="SpinBox" name="iKompr"> + <widget class="MusEWidget::SpinBox" name="iKompr"> <property name="sizePolicy"> <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -575,7 +575,7 @@ </layout> </item> <item row="12" column="0"> - <widget class="SpinBox" name="iHBank"> + <widget class="MusEWidget::SpinBox" name="iHBank"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -628,7 +628,7 @@ </widget> </item> <item row="13" column="0"> - <widget class="SpinBox" name="iLBank"> + <widget class="MusEWidget::SpinBox" name="iLBank"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -681,7 +681,7 @@ </widget> </item> <item row="14" column="0"> - <widget class="SpinBox" name="iProgram"> + <widget class="MusEWidget::SpinBox" name="iProgram"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -748,7 +748,7 @@ </layout> </item> <item row="15" column="0"> - <widget class="SpinBox" name="iLautst"> + <widget class="MusEWidget::SpinBox" name="iLautst"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -815,7 +815,7 @@ </layout> </item> <item row="16" column="0"> - <widget class="SpinBox" name="iPan"> + <widget class="MusEWidget::SpinBox" name="iPan"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -905,7 +905,7 @@ <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> - <class>SpinBox</class> + <class>MusEWidget::SpinBox</class> <extends>QSpinBox</extends> <header location="global">spinbox.h</header> </customwidget> diff --git a/muse2/muse/widgets/mtscale.cpp b/muse2/muse/widgets/mtscale.cpp index d7046fa7..1bd34de3 100644 --- a/muse2/muse/widgets/mtscale.cpp +++ b/muse2/muse/widgets/mtscale.cpp @@ -30,6 +30,8 @@ #include "icons.h" #include "gconfig.h" +namespace MusEWidget { + //--------------------------------------------------------- // MTScale // Midi Time Scale @@ -431,3 +433,4 @@ void MTScale::pdraw(QPainter& p, const QRect& r) } } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/mtscale.h b/muse2/muse/widgets/mtscale.h index 36443fca..820e33c6 100644 --- a/muse2/muse/widgets/mtscale.h +++ b/muse2/muse/widgets/mtscale.h @@ -26,6 +26,8 @@ #include "view.h" +namespace MusEWidget { + //--------------------------------------------------------- // MTScale // scale for midi track @@ -60,5 +62,8 @@ class MTScale : public View { MTScale(int* raster, QWidget* parent, int xscale, bool f = false); void setBarLocator(bool f) { barLocator = f; } }; + +} + #endif diff --git a/muse2/muse/widgets/mtscale_flo.cpp b/muse2/muse/widgets/mtscale_flo.cpp index e60738bb..50abf75d 100644 --- a/muse2/muse/widgets/mtscale_flo.cpp +++ b/muse2/muse/widgets/mtscale_flo.cpp @@ -31,6 +31,8 @@ #include "gconfig.h" #include "scoreedit.h" +namespace MusEWidget { + //--------------------------------------------------------- // MTScale // Midi Time Scale @@ -338,3 +340,5 @@ void MTScaleFlo::pos_add_changed() { redraw(); } + +} // namespace MusEWidget diff --git a/muse2/muse/widgets/mtscale_flo.h b/muse2/muse/widgets/mtscale_flo.h index 3ac30651..b7169ab6 100644 --- a/muse2/muse/widgets/mtscale_flo.h +++ b/muse2/muse/widgets/mtscale_flo.h @@ -28,6 +28,8 @@ class ScoreCanvas; +namespace MusEWidget { + //--------------------------------------------------------- // MTScaleFlo // scale for midi track @@ -62,5 +64,8 @@ class MTScaleFlo : public View { public: MTScaleFlo(ScoreCanvas* parent_editor, QWidget* parent_widget); }; + +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/nentry.cpp b/muse2/muse/widgets/nentry.cpp index c5132f83..13569b0d 100644 --- a/muse2/muse/widgets/nentry.cpp +++ b/muse2/muse/widgets/nentry.cpp @@ -36,6 +36,8 @@ #define TIMEC2 20 #define TIMER4 50 +namespace MusEWidget { + NentryFilter::NentryFilter(QObject* parent) : QObject(parent) { @@ -414,3 +416,4 @@ bool Nentry::keyPress(QKeyEvent* event) return true; } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/nentry.h b/muse2/muse/widgets/nentry.h index a82a258c..c0508c63 100644 --- a/muse2/muse/widgets/nentry.h +++ b/muse2/muse/widgets/nentry.h @@ -30,6 +30,8 @@ class QLabel; class QLineEdit; class QTimer; +namespace MusEWidget { + class NentryFilter : public QObject { Q_OBJECT @@ -96,4 +98,7 @@ class Nentry : public QFrame { void setFocusPolicy(Qt::FocusPolicy); bool contextMenu(QContextMenuEvent*); }; + +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/noteinfo.cpp b/muse2/muse/widgets/noteinfo.cpp index 78e8e882..2a262723 100644 --- a/muse2/muse/widgets/noteinfo.cpp +++ b/muse2/muse/widgets/noteinfo.cpp @@ -31,6 +31,8 @@ ///#include "posedit.h" #include "pitchedit.h" +namespace MusEWidget { + //--------------------------------------------------- // NoteInfo // ToolBar @@ -224,3 +226,4 @@ void NoteInfo::timeChanged(const Pos& pos) emit valueChanged(VAL_TIME, pos.tick()); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/noteinfo.h b/muse2/muse/widgets/noteinfo.h index 499662a6..6ca34a42 100644 --- a/muse2/muse/widgets/noteinfo.h +++ b/muse2/muse/widgets/noteinfo.h @@ -32,9 +32,12 @@ namespace Awl { class QSpinBox; ///class PosEdit; -class PitchEdit; class Pos; +namespace MusEWidget { + +class PitchEdit; + //--------------------------------------------------------- // NoteInfo //--------------------------------------------------------- @@ -72,5 +75,8 @@ class NoteInfo : public QToolBar { signals: void valueChanged(NoteInfo::ValType, int); }; + +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/pitchedit.cpp b/muse2/muse/widgets/pitchedit.cpp index 61e962fc..7d637d01 100644 --- a/muse2/muse/widgets/pitchedit.cpp +++ b/muse2/muse/widgets/pitchedit.cpp @@ -24,6 +24,8 @@ #include "pitchedit.h" #include "helper.h" +namespace MusEWidget { + //--------------------------------------------------------- // PitchEdit //--------------------------------------------------------- @@ -77,3 +79,4 @@ void PitchEdit::setDeltaMode(bool val) setRange(0, 127); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/pitchedit.h b/muse2/muse/widgets/pitchedit.h index 6cce3f1d..0c334d22 100644 --- a/muse2/muse/widgets/pitchedit.h +++ b/muse2/muse/widgets/pitchedit.h @@ -25,6 +25,10 @@ #include <QSpinBox> +extern QString pitch2string(int v); + +namespace MusEWidget { + //--------------------------------------------------------- // PitchEdit //--------------------------------------------------------- @@ -43,6 +47,6 @@ class PitchEdit : public QSpinBox { void setDeltaMode(bool); }; -extern QString pitch2string(int v); +} // namespace MusEWidget #endif diff --git a/muse2/muse/widgets/pitchlabel.cpp b/muse2/muse/widgets/pitchlabel.cpp index b9cd6d3d..b1f062a8 100644 --- a/muse2/muse/widgets/pitchlabel.cpp +++ b/muse2/muse/widgets/pitchlabel.cpp @@ -27,6 +27,8 @@ #include "pitchlabel.h" #include "helper.h" +namespace MusEWidget { + //--------------------------------------------------------- // PitchLabel //--------------------------------------------------------- @@ -110,3 +112,4 @@ void PitchLabel::setPitch(int val) setValue(val); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/pitchlabel.h b/muse2/muse/widgets/pitchlabel.h index da0c42e8..3fe2eb42 100644 --- a/muse2/muse/widgets/pitchlabel.h +++ b/muse2/muse/widgets/pitchlabel.h @@ -25,6 +25,8 @@ #include <QLabel> +namespace MusEWidget { + //--------------------------------------------------------- // PitchLabel //--------------------------------------------------------- @@ -51,6 +53,7 @@ class PitchLabel : public QLabel { bool pitchMode() const { return _pitchMode; } }; +} // namespace MusEWidget #endif diff --git a/muse2/muse/widgets/popupmenu.cpp b/muse2/muse/widgets/popupmenu.cpp index 827e60b9..2b0b6711 100644 --- a/muse2/muse/widgets/popupmenu.cpp +++ b/muse2/muse/widgets/popupmenu.cpp @@ -41,6 +41,8 @@ #include "route.h" +namespace MusEWidget { + //====================== // PopupMenu //====================== @@ -388,3 +390,4 @@ void PopupView::clear() } */ +} // namespace MusEWidget diff --git a/muse2/muse/widgets/popupmenu.h b/muse2/muse/widgets/popupmenu.h index 309adfdb..b51cfd56 100644 --- a/muse2/muse/widgets/popupmenu.h +++ b/muse2/muse/widgets/popupmenu.h @@ -47,6 +47,8 @@ class QEvent; //class QTimer; //class QStandardItemModel; +namespace MusEWidget { + class PopupMenu : public QMenu { Q_OBJECT @@ -99,6 +101,7 @@ class PopupView : public QColumnView }; */ +} // namespace MusEWidget #endif diff --git a/muse2/muse/widgets/posedit.cpp b/muse2/muse/widgets/posedit.cpp index c09a385b..0e031c38 100644 --- a/muse2/muse/widgets/posedit.cpp +++ b/muse2/muse/widgets/posedit.cpp @@ -38,6 +38,8 @@ extern int mtcType; +namespace MusEWidget { + //--------------------------------------------------------- // QNumberSection //--------------------------------------------------------- @@ -867,3 +869,5 @@ void PosEdit::setEnabled(bool v) QWidget::setEnabled(v); updateButtons(); } + +} // namespace MusEWidget diff --git a/muse2/muse/widgets/posedit.h b/muse2/muse/widgets/posedit.h index 8db08d59..3224a3a6 100644 --- a/muse2/muse/widgets/posedit.h +++ b/muse2/muse/widgets/posedit.h @@ -34,6 +34,8 @@ class QTimerEvent; class PosEditor; class SpinBox; +namespace MusEWidget { + //--------------------------------------------------------- // PosEdit //--------------------------------------------------------- @@ -116,4 +118,6 @@ class PosEdit : public QWidget void enterPressed(); }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/poslabel.cpp b/muse2/muse/widgets/poslabel.cpp index cb54de0c..98a7eba3 100644 --- a/muse2/muse/widgets/poslabel.cpp +++ b/muse2/muse/widgets/poslabel.cpp @@ -35,6 +35,8 @@ extern int mtcType; +namespace MusEWidget { + //--------------------------------------------------------- // PosLabel //--------------------------------------------------------- @@ -169,3 +171,4 @@ void PosLabel::setSmpte(bool val) updateValue(); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/poslabel.h b/muse2/muse/widgets/poslabel.h index f458ec6c..38236ac7 100644 --- a/muse2/muse/widgets/poslabel.h +++ b/muse2/muse/widgets/poslabel.h @@ -25,6 +25,8 @@ #include <QLabel> +namespace MusEWidget { + //--------------------------------------------------------- // PosLabel //--------------------------------------------------------- @@ -56,6 +58,7 @@ class PosLabel : public QLabel { bool smpte() const { return _smpte; } }; +} // namespace MusEWidget #endif diff --git a/muse2/muse/widgets/projectcreateimpl.cpp b/muse2/muse/widgets/projectcreateimpl.cpp index bb36f6f4..d6f918b3 100644 --- a/muse2/muse/widgets/projectcreateimpl.cpp +++ b/muse2/muse/widgets/projectcreateimpl.cpp @@ -28,6 +28,8 @@ #include "globals.h" #include "app.h" +namespace MusEWidget { + ProjectCreateImpl::ProjectCreateImpl(QWidget *parent) : QDialog(parent) { @@ -91,3 +93,5 @@ void ProjectCreateImpl::ok() MusEGlobal::muse->changeConfig(true); emit accept(); } + +} //namespace MusEWidget diff --git a/muse2/muse/widgets/projectcreateimpl.h b/muse2/muse/widgets/projectcreateimpl.h index aa5613f4..d6881840 100644 --- a/muse2/muse/widgets/projectcreateimpl.h +++ b/muse2/muse/widgets/projectcreateimpl.h @@ -26,6 +26,8 @@ #include <QDialog> #include "ui_projectcreate.h" +namespace MusEWidget { + class ProjectCreateImpl : public QDialog, Ui::ProjectCreate { Q_OBJECT @@ -45,4 +47,6 @@ public slots: }; +} // namespace MusEWidget + #endif // PROJECTCREATEIMPL_H diff --git a/muse2/muse/widgets/routepopup.cpp b/muse2/muse/widgets/routepopup.cpp index e2d83b65..ec3f3ea0 100644 --- a/muse2/muse/widgets/routepopup.cpp +++ b/muse2/muse/widgets/routepopup.cpp @@ -34,6 +34,8 @@ #include "menutitleitem.h" #include "popupmenu.h" +namespace MusEWidget { + //--------------------------------------------------------- // addMenuItem //--------------------------------------------------------- @@ -1420,3 +1422,4 @@ void RoutePopupMenu::popup(const QPoint& p, Track* track, bool isOutput) _pup->popup(p); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/routepopup.h b/muse2/muse/widgets/routepopup.h index 330a800b..7f5a8820 100644 --- a/muse2/muse/widgets/routepopup.h +++ b/muse2/muse/widgets/routepopup.h @@ -27,12 +27,15 @@ class Track; class AudioTrack; -class PopupMenu; class QWidget; class QString; class QAction; class QPoint; +namespace MusEWidget { + +class PopupMenu; + class RoutePopupMenu : public QObject { Q_OBJECT @@ -72,4 +75,6 @@ class RoutePopupMenu : public QObject void popup(const QPoint& p, Track* track = 0, bool isOutput = false); }; +} + #endif diff --git a/muse2/muse/widgets/scldiv.cpp b/muse2/muse/widgets/scldiv.cpp index f0058848..ba19f659 100644 --- a/muse2/muse/widgets/scldiv.cpp +++ b/muse2/muse/widgets/scldiv.cpp @@ -26,6 +26,8 @@ #include "scldiv.h" #include "mmath.h" +namespace MusEWidget { + // ScaleDiv - A class for building scale divisions // // The ScaleDiv class can build @@ -82,10 +84,10 @@ static bool limRange(double &val, double v1, double v2, double eps_rel = 0.0, { bool rv = TRUE; - double vmin = qwtMin(v1, v2); - double vmax = qwtMax(v1, v2); - double delta_min = qwtMax(qwtAbs(eps_rel * vmin), qwtAbs(eps_abs)); - double delta_max = qwtMax(qwtAbs(eps_rel * vmax), qwtAbs(eps_abs)); + double vmin = MusEUtil::qwtMin(v1, v2); + double vmax = MusEUtil::qwtMax(v1, v2); + double delta_min = MusEUtil::qwtMax(MusEUtil::qwtAbs(eps_rel * vmin), MusEUtil::qwtAbs(eps_abs)); + double delta_max = MusEUtil::qwtMax(MusEUtil::qwtAbs(eps_rel * vmax), MusEUtil::qwtAbs(eps_abs)); if (val < vmin) { @@ -231,8 +233,8 @@ bool ScaleDiv::rebuild(double x1, double x2, int maxMajSteps, int maxMinSteps, int rv; - d_lBound = qwtMin(x1, x2); - d_hBound = qwtMax(x1, x2); + d_lBound = MusEUtil::qwtMin(x1, x2); + d_hBound = MusEUtil::qwtMax(x1, x2); d_log = log; if (d_log) @@ -244,8 +246,8 @@ bool ScaleDiv::rebuild(double x1, double x2, int maxMajSteps, int maxMinSteps, { d_lBound = x1; d_hBound = x2; - qwtTwistArray(d_majMarks.data(), d_majMarks.size()); - qwtTwistArray(d_minMarks.data(), d_minMarks.size()); + MusEUtil::qwtTwistArray(d_majMarks.data(), d_majMarks.size()); + MusEUtil::qwtTwistArray(d_minMarks.data(), d_minMarks.size()); } return rv; @@ -291,9 +293,9 @@ bool ScaleDiv::buildLinDiv(int maxMajSteps, int maxMinSteps, double step) bool rv = TRUE; // parameter range check - maxMajSteps = qwtMax(1, maxMajSteps); - maxMinSteps = qwtMax(0, maxMinSteps); - step = qwtAbs(step); + maxMajSteps = MusEUtil::qwtMax(1, maxMajSteps); + maxMinSteps = MusEUtil::qwtMax(0, maxMinSteps); + step = MusEUtil::qwtAbs(step); // reset vectors d_minMarks.resize(0); @@ -305,7 +307,7 @@ bool ScaleDiv::buildLinDiv(int maxMajSteps, int maxMinSteps, double step) // Set up major divisions // if (step == 0.0) - d_majStep = qwtCeil125(qwtAbs(d_hBound - d_lBound) * 0.999999 + d_majStep = MusEUtil::qwtCeil125(MusEUtil::qwtAbs(d_hBound - d_lBound) * 0.999999 / double(maxMajSteps)); else d_majStep = step; @@ -315,10 +317,10 @@ bool ScaleDiv::buildLinDiv(int maxMajSteps, int maxMinSteps, double step) firstTick = ceil( (d_lBound - step_eps * d_majStep) / d_majStep) * d_majStep; lastTick = floor( (d_hBound + step_eps * d_majStep) / d_majStep) * d_majStep; - nMaj = qwtMin(10000, int(rint((lastTick - firstTick) / d_majStep)) + 1); + nMaj = MusEUtil::qwtMin(10000, int(rint((lastTick - firstTick) / d_majStep)) + 1); d_majMarks.resize(nMaj); - qwtLinSpace(d_majMarks.data(), d_majMarks.size(), firstTick, lastTick); + MusEUtil::qwtLinSpace(d_majMarks.data(), d_majMarks.size(), firstTick, lastTick); // // Set up minor divisions @@ -326,14 +328,14 @@ bool ScaleDiv::buildLinDiv(int maxMajSteps, int maxMinSteps, double step) if (maxMinSteps < 1) // no minor divs return TRUE; - minStep = qwtCeil125( d_majStep / double(maxMinSteps) ); + minStep = MusEUtil::qwtCeil125( d_majStep / double(maxMinSteps) ); if (minStep == 0.0) return TRUE; - nMin = qwtAbs(int(rint(d_majStep / minStep))) - 1; // # minor steps per interval + nMin = MusEUtil::qwtAbs(int(rint(d_majStep / minStep))) - 1; // # minor steps per interval // Do the minor steps fit into the interval? - if ( qwtAbs(double(nMin + 1) * minStep - d_majStep) > step_eps * d_majStep) + if ( MusEUtil::qwtAbs(double(nMin + 1) * minStep - d_majStep) > step_eps * d_majStep) { nMin = 1; minStep = d_majStep * 0.5; @@ -408,9 +410,9 @@ bool ScaleDiv::buildLogDiv(int maxMajSteps, int maxMinSteps, double majStep) // Parameter range check - maxMajSteps = qwtMax(1, qwtAbs(maxMajSteps)); - maxMinSteps = qwtMax(0, qwtAbs(maxMinSteps)); - majStep = qwtAbs(majStep); + maxMajSteps = MusEUtil::qwtMax(1, MusEUtil::qwtAbs(maxMajSteps)); + maxMinSteps = MusEUtil::qwtMax(0, MusEUtil::qwtAbs(maxMinSteps)); + majStep = MusEUtil::qwtAbs(majStep); // boundary check limRange(d_hBound, LOG_MIN, LOG_MAX); @@ -440,12 +442,12 @@ bool ScaleDiv::buildLogDiv(int maxMajSteps, int maxMinSteps, double majStep) // Set up major scale divisions // if (majStep == 0.0) - d_majStep = qwtCeil125( width * 0.999999 / double(maxMajSteps)); + d_majStep = MusEUtil::qwtCeil125( width * 0.999999 / double(maxMajSteps)); else d_majStep = majStep; // major step must be >= 1 decade - d_majStep = qwtMax(d_majStep, 1.0); + d_majStep = MusEUtil::qwtMax(d_majStep, 1.0); lFirst = ceil((log10(d_lBound) - step_eps * d_majStep) / d_majStep) * d_majStep; @@ -454,10 +456,10 @@ bool ScaleDiv::buildLogDiv(int maxMajSteps, int maxMinSteps, double majStep) firstTick = pow(10.0, lFirst); lastTick = pow(10.0, lLast); - nMaj = qwtMin(10000, int(rint(qwtAbs(lLast - lFirst) / d_majStep)) + 1); + nMaj = MusEUtil::qwtMin(10000, int(rint(MusEUtil::qwtAbs(lLast - lFirst) / d_majStep)) + 1); d_majMarks.resize(nMaj); - qwtLogSpace(d_majMarks.data(), d_majMarks.size(), firstTick, lastTick); + MusEUtil::qwtLogSpace(d_majMarks.data(), d_majMarks.size(), firstTick, lastTick); // @@ -536,15 +538,15 @@ bool ScaleDiv::buildLogDiv(int maxMajSteps, int maxMinSteps, double majStep) { // substep width in decades, at least one decade - minStep = qwtCeil125( (d_majStep - step_eps * (d_majStep / double(maxMinSteps))) + minStep = MusEUtil::qwtCeil125( (d_majStep - step_eps * (d_majStep / double(maxMinSteps))) / double(maxMinSteps) ); - minStep = qwtMax(1.0, minStep); + minStep = MusEUtil::qwtMax(1.0, minStep); // # subticks per interval nMin = int(rint(d_majStep / minStep)) - 1; // Do the minor steps fit into the interval? - if ( qwtAbs( double(nMin + 1) * minStep - d_majStep) > step_eps * d_majStep) + if ( MusEUtil::qwtAbs( double(nMin + 1) * minStep - d_majStep) > step_eps * d_majStep) nMin = 0; if (nMin < 1) return TRUE; // no subticks @@ -553,7 +555,7 @@ bool ScaleDiv::buildLogDiv(int maxMajSteps, int maxMinSteps, double majStep) buffer.resize((d_majMarks.size() + 1) * nMin ); // substep factor = 10^substeps - minFactor = qwtMax(pow(10,minStep), 10.0); + minFactor = MusEUtil::qwtMax(pow(10,minStep), 10.0); // Are there minor ticks below the first major tick? if ( d_lBound < firstTick ) @@ -657,7 +659,7 @@ void ScaleDiv::reset() d_log = FALSE; } - +} // namespace MusEWidget diff --git a/muse2/muse/widgets/scldiv.h b/muse2/muse/widgets/scldiv.h index a788e7b8..1f91c2db 100644 --- a/muse2/muse/widgets/scldiv.h +++ b/muse2/muse/widgets/scldiv.h @@ -27,6 +27,8 @@ #include <QVector> +namespace MusEWidget { + class ScaleDiv { double d_lBound; @@ -64,4 +66,6 @@ class ScaleDiv bool log, double step = 0.0, bool ascend = TRUE); }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/scldraw.cpp b/muse2/muse/widgets/scldraw.cpp index cf69852e..c35d04e0 100644 --- a/muse2/muse/widgets/scldraw.cpp +++ b/muse2/muse/widgets/scldraw.cpp @@ -30,6 +30,8 @@ #include "scldraw.h" +namespace MusEWidget { + int const ScaleDraw::minLen = 10; const double step_eps = 1.0e-6; @@ -222,7 +224,7 @@ void ScaleDraw::draw(QPainter *p) const hval = majTick - 0.5 * d_scldiv.majStep(); } - if (qwtAbs(val-hval) < step_eps * d_scldiv.majStep()) + if (MusEUtil::qwtAbs(val-hval) < step_eps * d_scldiv.majStep()) drawTick(p, val, d_medLen); else drawTick(p, val, d_minLen); @@ -275,10 +277,10 @@ void ScaleDraw::drawTick(QPainter *p, double val, int len) const if ((tval <= d_minAngle + 359 * 16) || (tval >= d_minAngle - 359 * 16)) { arc = double(tval) / 16.0 * M_PI / 180.0; - x1 = qwtInt(d_xCenter + sin(arc) * d_radius); - x2 = qwtInt(d_xCenter + sin(arc) * (d_radius + double(len))); - y1 = qwtInt(d_yCenter - cos(arc) * d_radius); - y2 = qwtInt(d_yCenter - cos(arc) * (d_radius + double(len))); + x1 = MusEUtil::qwtInt(d_xCenter + sin(arc) * d_radius); + x2 = MusEUtil::qwtInt(d_xCenter + sin(arc) * (d_radius + double(len))); + y1 = MusEUtil::qwtInt(d_yCenter - cos(arc) * d_radius); + y2 = MusEUtil::qwtInt(d_yCenter - cos(arc) * (d_radius + double(len))); p->drawLine(x1, y1, x2, y2); } break; @@ -322,7 +324,7 @@ void ScaleDraw::drawLabel(QPainter *p, double val) const tval = transform(val); // correct rounding errors if val = 0 - if ((!d_scldiv.logScale()) && (qwtAbs(val) < qwtAbs(step_eps * d_scldiv.majStep()))) + if ((!d_scldiv.logScale()) && (MusEUtil::qwtAbs(val) < MusEUtil::qwtAbs(step_eps * d_scldiv.majStep()))) val = 0.0; label.setNum(val, d_fmt, d_prec); @@ -353,12 +355,12 @@ void ScaleDraw::drawLabel(QPainter *p, double val) const if ((arc < -M_PI) || (arc > M_PI)) arc -= floor((arc + M_PI) / M_PI * 0.5) * 2.0 * M_PI; - xpos = 1 + qwtInt(d_xCenter + (d_radius + double(d_majLen + d_vpad)) * sin(arc)); - ypos = qwtInt(d_yCenter - (d_radius + double(d_majLen + d_vpad)) * cos(arc)); + xpos = 1 + MusEUtil::qwtInt(d_xCenter + (d_radius + double(d_majLen + d_vpad)) * sin(arc)); + ypos = MusEUtil::qwtInt(d_yCenter - (d_radius + double(d_majLen + d_vpad)) * cos(arc)); if (arc < -pi_75) { - p->drawText(xpos - qwtInt(double(fm.width(label)) + p->drawText(xpos - MusEUtil::qwtInt(double(fm.width(label)) * (1.0 + (arc + pi_75) * M_2_PI) ), ypos + fm.ascent() - 1, label); @@ -368,13 +370,13 @@ void ScaleDraw::drawLabel(QPainter *p, double val) const p->drawText(xpos - fm.width(label), - ypos - qwtInt(double(fm.ascent() - 1) + ypos - MusEUtil::qwtInt(double(fm.ascent() - 1) * (arc + M_PI_4) * M_2_PI), label); } else if (arc < pi_4) { - p->drawText(xpos + qwtInt(double(fm.width(label)) + p->drawText(xpos + MusEUtil::qwtInt(double(fm.width(label)) * ( arc - M_PI_4 ) * M_2_PI ), ypos, label); @@ -382,13 +384,13 @@ void ScaleDraw::drawLabel(QPainter *p, double val) const else if (arc < pi_75) { p->drawText(xpos, - ypos + qwtInt(double(fm.ascent() - 1) + ypos + MusEUtil::qwtInt(double(fm.ascent() - 1) * (arc - M_PI_4) * M_2_PI), label); } else { - p->drawText(xpos - qwtInt(double(fm.width(label)) + p->drawText(xpos - MusEUtil::qwtInt(double(fm.width(label)) * ( arc - pi_75) * M_2_PI ), ypos + fm.ascent() - 1, label); @@ -431,8 +433,8 @@ void ScaleDraw::drawBackbone(QPainter *p) const break; case Round: - a1 = qwtMin(i1(), i2()) - 90 * 16; - a2 = qwtMax(i1(), i2()) - 90 * 16; + a1 = MusEUtil::qwtMin(i1(), i2()) - 90 * 16; + a2 = MusEUtil::qwtMax(i1(), i2()) - 90 * 16; p->drawArc(d_xorg, d_yorg, d_len, d_len, @@ -692,7 +694,7 @@ QRect ScaleDraw::maxBoundingRect(QPainter *p) const while (a > 2880) a -= 5760; while (a < - 2880) a += 5760; - ar = qwtAbs(a); + ar = MusEUtil::qwtAbs(a); if (ar < amin) amin = ar; if (ar > amax) amax = ar; @@ -706,18 +708,18 @@ QRect ScaleDraw::maxBoundingRect(QPainter *p) const while (a > 2880) a -= 5760; while (a < - 2880) a += 5760; - ar = qwtAbs(a); + ar = MusEUtil::qwtAbs(a); if (ar < amin) amin = ar; if (ar > amax) amax = ar; } arc = double(amin) / 16.0 * M_PI / 180.0; - r.setTop(qwtInt(d_yCenter - (d_radius + double(d_majLen + d_vpad)) * cos(arc)) + r.setTop(MusEUtil::qwtInt(d_yCenter - (d_radius + double(d_majLen + d_vpad)) * cos(arc)) + fm.ascent() ); arc = double(amax) / 16.0 * M_PI / 180.0; - r.setBottom(qwtInt(d_yCenter - (d_radius + double(d_majLen + d_vpad)) * cos(arc)) + r.setBottom(MusEUtil::qwtInt(d_yCenter - (d_radius + double(d_majLen + d_vpad)) * cos(arc)) + fm.height() ); wmax = d_len + d_majLen + d_hpad + wl; @@ -763,10 +765,10 @@ void ScaleDraw::setAngleRange(double angle1, double angle2) { int amin, amax; - angle1 = qwtLim(angle1, -360.0, 360.0); - angle2 = qwtLim(angle2, -360.0, 360.0); - amin = int(rint(qwtMin(angle1, angle2) * 16.0)); - amax = int(rint(qwtMax(angle1, angle2) * 16.0)); + angle1 = MusEUtil::qwtLim(angle1, -360.0, 360.0); + angle2 = MusEUtil::qwtLim(angle2, -360.0, 360.0); + amin = int(rint(MusEUtil::qwtMin(angle1, angle2) * 16.0)); + amax = int(rint(MusEUtil::qwtMax(angle1, angle2) * 16.0)); if (amin == amax) { @@ -842,10 +844,10 @@ int ScaleDraw::maxLabelWidth(QPainter *p, int worst) const { val = d_scldiv.majMark(i); // correct rounding errors if val = 0 - if ((!d_scldiv.logScale()) && (qwtAbs(val) < step_eps * qwtAbs(d_scldiv.majStep()))) + if ((!d_scldiv.logScale()) && (MusEUtil::qwtAbs(val) < step_eps * MusEUtil::qwtAbs(d_scldiv.majStep()))) val = 0.0; s.setNum(val, d_fmt, d_prec); - rv = qwtMax(rv,fm.width(s)); + rv = MusEUtil::qwtMax(rv,fm.width(s)); } } @@ -880,7 +882,7 @@ int ScaleDraw::maxLabelWidth(QPainter *p, int worst) const // //------------------------------------------------------------ - +} // namespace MusEWidget diff --git a/muse2/muse/widgets/scldraw.h b/muse2/muse/widgets/scldraw.h index f79a215e..2c1543cd 100644 --- a/muse2/muse/widgets/scldraw.h +++ b/muse2/muse/widgets/scldraw.h @@ -31,7 +31,7 @@ class QPainter; class QRect; -class AutoScale; +namespace MusEWidget { class ScaleDraw : public DiMap { public: @@ -87,6 +87,8 @@ class ScaleDraw : public DiMap { void draw(QPainter *p) const; }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/sclif.cpp b/muse2/muse/widgets/sclif.cpp index 9922429f..93987999 100644 --- a/muse2/muse/widgets/sclif.cpp +++ b/muse2/muse/widgets/sclif.cpp @@ -24,6 +24,8 @@ #include "sclif.h" +namespace MusEWidget { + // ScaleIf - An interface class for widgets containing a scale // // This interface class is used to provide classes @@ -214,3 +216,4 @@ void ScaleIf::setScaleMaxMinor(int ticks) } } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/sclif.h b/muse2/muse/widgets/sclif.h index 0b505b5a..e168dfc3 100644 --- a/muse2/muse/widgets/sclif.h +++ b/muse2/muse/widgets/sclif.h @@ -27,6 +27,8 @@ #include "scldraw.h" +namespace MusEWidget { + //--------------------------------------------------------- // ScaleIf //--------------------------------------------------------- @@ -57,5 +59,7 @@ class ScaleIf int scaleMaxMajor() const {return d_maxMinor;} }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/scrollscale.cpp b/muse2/muse/widgets/scrollscale.cpp index 6341d6b9..21ed10b6 100644 --- a/muse2/muse/widgets/scrollscale.cpp +++ b/muse2/muse/widgets/scrollscale.cpp @@ -35,6 +35,8 @@ #include "scrollscale.h" #include "icons.h" +namespace MusEWidget { + //--------------------------------------------------------- // setScale // "val" - slider value in range 0-1024 @@ -524,3 +526,4 @@ int ScrollScale::convertQuickZoomLevelToMag(int zoomlevel) return vals[zoomlevel]; } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/scrollscale.h b/muse2/muse/widgets/scrollscale.h index df85075a..0fce5b56 100644 --- a/muse2/muse/widgets/scrollscale.h +++ b/muse2/muse/widgets/scrollscale.h @@ -31,6 +31,8 @@ class QResizeEvent; class QScrollBar; class QToolButton; +namespace MusEWidget { + //--------------------------------------------------------- // ScrollScale //--------------------------------------------------------- @@ -97,5 +99,7 @@ class ScrollScale : public QWidget { static int convertQuickZoomLevelToMag(int zoomlvl); }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/section.h b/muse2/muse/widgets/section.h index a61bf684..02b84355 100644 --- a/muse2/muse/widgets/section.h +++ b/muse2/muse/widgets/section.h @@ -23,6 +23,8 @@ #ifndef __SECTION_H__ #define __SECTION_H__ +namespace MusEWidget { + struct Section { int offset; unsigned len; @@ -30,5 +32,7 @@ struct Section { int val; }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/shortcutcapturedialog.cpp b/muse2/muse/widgets/shortcutcapturedialog.cpp index db800a8a..a470d698 100644 --- a/muse2/muse/widgets/shortcutcapturedialog.cpp +++ b/muse2/muse/widgets/shortcutcapturedialog.cpp @@ -40,6 +40,8 @@ #include <QInputEvent> #include <QChar> +namespace MusEWidget { + ShortcutCaptureDialog::ShortcutCaptureDialog(QWidget* parent, int index) : QDialog(parent) { @@ -123,3 +125,4 @@ void ShortcutCaptureDialog::apply() done(key); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/shortcutcapturedialog.h b/muse2/muse/widgets/shortcutcapturedialog.h index 390da333..9af3f7c2 100644 --- a/muse2/muse/widgets/shortcutcapturedialog.h +++ b/muse2/muse/widgets/shortcutcapturedialog.h @@ -38,6 +38,8 @@ class QKeyEvent; +namespace MusEWidget { + class ShortcutCaptureDialog : public QDialog, public Ui::ShortcutCaptureDialogBase { Q_OBJECT @@ -55,3 +57,4 @@ class ShortcutCaptureDialog : public QDialog, public Ui::ShortcutCaptureDialogBa ~ShortcutCaptureDialog(); }; +} // namespace MusEWidget diff --git a/muse2/muse/widgets/shortcutconfig.cpp b/muse2/muse/widgets/shortcutconfig.cpp index c58652fd..8e4d7b1a 100644 --- a/muse2/muse/widgets/shortcutconfig.cpp +++ b/muse2/muse/widgets/shortcutconfig.cpp @@ -41,6 +41,8 @@ #include "shortcutcapturedialog.h" #include "shortcuts.h" +namespace MusEWidget { + ShortcutConfig::ShortcutConfig(QWidget* parent) : QDialog(parent) { @@ -155,3 +157,5 @@ void ShortcutConfig::assignAll() applyButton->setDown(false); done(_config_changed); } + +} // namespace MusEWidget diff --git a/muse2/muse/widgets/shortcutconfig.h b/muse2/muse/widgets/shortcutconfig.h index 0346bf04..fe417c05 100644 --- a/muse2/muse/widgets/shortcutconfig.h +++ b/muse2/muse/widgets/shortcutconfig.h @@ -40,6 +40,9 @@ class QCloseEvent; #include "ui_shortcutconfigbase.h" #define SHRT_CATEGORY_COL 0 + +namespace MusEWidget { + enum { SHRT_SHRTCUT_COL = 0, @@ -80,4 +83,6 @@ class ShortcutConfig : public QDialog, public Ui::ShortcutConfigBase { }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/sigedit.cpp b/muse2/muse/widgets/sigedit.cpp index 950e480a..c2c5a842 100644 --- a/muse2/muse/widgets/sigedit.cpp +++ b/muse2/muse/widgets/sigedit.cpp @@ -42,6 +42,8 @@ extern int mtcType; +namespace MusEWidget { + bool Sig::isValid() const { if((z < 1) || (z > 63)) @@ -752,3 +754,5 @@ void SigEdit::enterPressed() { emit returnPressed(); } + +} // namespace MusEWidget diff --git a/muse2/muse/widgets/sigedit.h b/muse2/muse/widgets/sigedit.h index 38b229a1..3b1ca635 100644 --- a/muse2/muse/widgets/sigedit.h +++ b/muse2/muse/widgets/sigedit.h @@ -30,6 +30,8 @@ class QResizeEvent; class QTimerEvent; +namespace MusEWidget { + class SigEditor; class SpinBox; @@ -100,4 +102,6 @@ class SigEdit : public QWidget void enterPressed(); }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/siglabel.cpp b/muse2/muse/widgets/siglabel.cpp index 9941b018..1a1c9164 100644 --- a/muse2/muse/widgets/siglabel.cpp +++ b/muse2/muse/widgets/siglabel.cpp @@ -35,6 +35,8 @@ #include <QWheelEvent> #include <QLabel> +namespace MusEWidget { + //--------------------------------------------------------- // SigLabel // edit Signature Values (4/4) @@ -177,3 +179,5 @@ void SigLabel::setFrame(bool flag) setFrameStyle(flag ? Panel | Sunken : NoFrame); setLineWidth(2); } + +} // namespace MusEWidget diff --git a/muse2/muse/widgets/siglabel.h b/muse2/muse/widgets/siglabel.h index 88617d78..33248e53 100644 --- a/muse2/muse/widgets/siglabel.h +++ b/muse2/muse/widgets/siglabel.h @@ -30,6 +30,8 @@ class QWheelEvent; class QMouseEvent; +namespace MusEWidget { + //--------------------------------------------------------- // SigLabel // show/edit time signature @@ -58,5 +60,8 @@ class SigLabel : public QLabel { AL::TimeSignature value() const { return AL::TimeSignature(z, n); } void setFrame(bool); }; + +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/sigscale.cpp b/muse2/muse/widgets/sigscale.cpp index 8ec0ca70..bcfb540e 100644 --- a/muse2/muse/widgets/sigscale.cpp +++ b/muse2/muse/widgets/sigscale.cpp @@ -32,6 +32,8 @@ #include "song.h" #include "gconfig.h" +namespace MusEWidget { + //--------------------------------------------------------- // SigScale //--------------------------------------------------------- @@ -164,4 +166,4 @@ void SigScale::pdraw(QPainter& p, const QRect& r) p.drawLine(xp, 0, xp, h); } - +} // namespace MusEWidget diff --git a/muse2/muse/widgets/sigscale.h b/muse2/muse/widgets/sigscale.h index 576967cd..9ecacfb1 100644 --- a/muse2/muse/widgets/sigscale.h +++ b/muse2/muse/widgets/sigscale.h @@ -27,6 +27,8 @@ class MidiEditor; +namespace MusEWidget { + //--------------------------------------------------------- // SigScale // Time Signature Scale @@ -57,5 +59,8 @@ class SigScale : public View { public: SigScale(int* raster, QWidget* parent, int xscale); }; + +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/slider.cpp b/muse2/muse/widgets/slider.cpp index 853eae29..f50c144a 100644 --- a/muse2/muse/widgets/slider.cpp +++ b/muse2/muse/widgets/slider.cpp @@ -29,6 +29,7 @@ #include "slider.h" +namespace MusEWidget { //------------------------------------------------------------- // Slider - The Slider Widget @@ -108,7 +109,7 @@ Slider::~Slider() //----------------------------------------------------- void Slider::setThumbLength(int l) { - d_thumbLength = qwtMax(l,8); + d_thumbLength = MusEUtil::qwtMax(l,8); d_thumbHalf = d_thumbLength / 2; resize(size()); } @@ -127,7 +128,7 @@ void Slider::setThumbLength(int l) //------------------------------------------------------------ void Slider::setThumbWidth(int w) { - d_thumbWidth = qwtMax(w,4); + d_thumbWidth = MusEUtil::qwtMax(w,4); resize(size()); } @@ -761,8 +762,8 @@ void Slider::rangeChange() //------------------------------------------------------------ void Slider::setMargins(int hor, int vert) { - d_xMargin = qwtMax(0, hor); - d_yMargin = qwtMin(0, vert); + d_xMargin = MusEUtil::qwtMax(0, hor); + d_yMargin = MusEUtil::qwtMin(0, vert); resize(this->size()); } @@ -871,3 +872,4 @@ void Slider::setPageStep(double) { } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/slider.h b/muse2/muse/widgets/slider.h index 696d0f0d..a76c5270 100644 --- a/muse2/muse/widgets/slider.h +++ b/muse2/muse/widgets/slider.h @@ -30,6 +30,8 @@ #include "sliderbase.h" #include "scldraw.h" +namespace MusEWidget { + //--------------------------------------------------------- // Slider //--------------------------------------------------------- @@ -106,4 +108,7 @@ class Slider : public SliderBase, public ScaleIf void setMargins(int x, int y); QSize sizeHint(); // const; }; + +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/sliderbase.cpp b/muse2/muse/widgets/sliderbase.cpp index bee1a638..8b85878e 100644 --- a/muse2/muse/widgets/sliderbase.cpp +++ b/muse2/muse/widgets/sliderbase.cpp @@ -29,6 +29,8 @@ #include <QMouseEvent> #include <QTimerEvent> +namespace MusEWidget { + // DESCRIPTION // SliderBase is a base class for // slider widgets. QwtSliderBase handles the mouse events @@ -182,7 +184,7 @@ void SliderBase::mousePressEvent(QMouseEvent *e) d_mouseOffset = 0; DoubleRange::incPages(d_direction); emit sliderMoved(value(), _id); - d_tmrID = startTimer(qwtMax(250, 2 * d_updTime)); + d_tmrID = startTimer(MusEUtil::qwtMax(250, 2 * d_updTime)); break; case ScrMouse: @@ -727,6 +729,7 @@ void SliderBase::stepPages(int pages) // //------------------------------------------------------------ +} // namespace MusEWidget diff --git a/muse2/muse/widgets/sliderbase.h b/muse2/muse/widgets/sliderbase.h index 78e40335..39860153 100644 --- a/muse2/muse/widgets/sliderbase.h +++ b/muse2/muse/widgets/sliderbase.h @@ -30,6 +30,8 @@ #include <QTime> #include <QWidget> +namespace MusEWidget { + //--------------------------------------------------------- // SliderBase //--------------------------------------------------------- @@ -109,4 +111,6 @@ class SliderBase : public QWidget, public DoubleRange void setId(int i) { _id = i; } }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/songinfo.h b/muse2/muse/widgets/songinfo.h index 926d93a8..8e576876 100644 --- a/muse2/muse/widgets/songinfo.h +++ b/muse2/muse/widgets/songinfo.h @@ -25,6 +25,8 @@ class QDialog; +namespace MusEWidget { + //--------------------------------------------------------- // SongInfoWidget // Wrapper around Ui::SongInfo @@ -37,3 +39,5 @@ class SongInfoWidget : public QDialog, public Ui::SongInfo public: SongInfoWidget(QDialog *parent = 0) : QDialog(parent) { setupUi(this); } }; + +} // namespace MusEWidget diff --git a/muse2/muse/widgets/spinbox.cpp b/muse2/muse/widgets/spinbox.cpp index b263b317..0111158d 100644 --- a/muse2/muse/widgets/spinbox.cpp +++ b/muse2/muse/widgets/spinbox.cpp @@ -24,6 +24,8 @@ #include <QEvent> #include "spinbox.h" +namespace MusEWidget { + //--------------------------------------------------------- // SpinBox //--------------------------------------------------------- @@ -97,3 +99,4 @@ void SpinBox::stepDown() _clearFocus = true; } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/spinbox.h b/muse2/muse/widgets/spinbox.h index 5f870eb5..01cd6ad5 100644 --- a/muse2/muse/widgets/spinbox.h +++ b/muse2/muse/widgets/spinbox.h @@ -30,6 +30,8 @@ #include <QSpinBox> #include <QEvent> +namespace MusEWidget { + //--------------------------------------------------------- // SpinBox //--------------------------------------------------------- @@ -54,5 +56,7 @@ class SpinBox : public QSpinBox { SpinBox(int minValue, int maxValue, int step = 1, QWidget* parent=0); }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/spinboxFP.cpp b/muse2/muse/widgets/spinboxFP.cpp index 52b94e03..696e589f 100644 --- a/muse2/muse/widgets/spinboxFP.cpp +++ b/muse2/muse/widgets/spinboxFP.cpp @@ -29,6 +29,8 @@ #include "spinboxFP.h" +namespace MusEWidget { + //--------------------------------------------------------- // SpinBoxFP //--------------------------------------------------------- @@ -184,4 +186,6 @@ int SpinBoxFP::valueFromText(const QString& text) const return QSpinBox::valueFromText(text); } -*/
\ No newline at end of file +*/ + +} // namespace MusEWidget diff --git a/muse2/muse/widgets/spinboxFP.h b/muse2/muse/widgets/spinboxFP.h index 2b9d65f0..81fc4876 100644 --- a/muse2/muse/widgets/spinboxFP.h +++ b/muse2/muse/widgets/spinboxFP.h @@ -29,6 +29,8 @@ //class QValidator; //class QDoubleValidator; +namespace MusEWidget { + //--------------------------------------------------------- // SpinBoxFP //--------------------------------------------------------- @@ -64,5 +66,7 @@ class SpinBoxFP : public QDoubleSpinBox { //int decimals() const { return _decimals; } }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/splitter.cpp b/muse2/muse/widgets/splitter.cpp index fcc74214..09220b24 100644 --- a/muse2/muse/widgets/splitter.cpp +++ b/muse2/muse/widgets/splitter.cpp @@ -26,6 +26,8 @@ #include <QList> #include <QStringList> +namespace MusEWidget { + //--------------------------------------------------------- // Splitter //--------------------------------------------------------- @@ -92,3 +94,5 @@ void Splitter::readStatus(Xml& xml) } } } + +} // namespace MusEWidget diff --git a/muse2/muse/widgets/splitter.h b/muse2/muse/widgets/splitter.h index 1f921309..3121fe87 100644 --- a/muse2/muse/widgets/splitter.h +++ b/muse2/muse/widgets/splitter.h @@ -27,6 +27,8 @@ class Xml; +namespace MusEWidget { + //--------------------------------------------------------- // Splitter //--------------------------------------------------------- @@ -40,5 +42,7 @@ class Splitter : public QSplitter { void readStatus(Xml&); }; +} + #endif diff --git a/muse2/muse/widgets/swidget.cpp b/muse2/muse/widgets/swidget.cpp index 06e3f91d..f8461977 100644 --- a/muse2/muse/widgets/swidget.cpp +++ b/muse2/muse/widgets/swidget.cpp @@ -24,6 +24,8 @@ #include <QResizeEvent> +namespace MusEWidget { + //--------------------------------------------------------- // resizeEvent //--------------------------------------------------------- @@ -33,3 +35,4 @@ void SWidget::resizeEvent(QResizeEvent* ev) emit heightChanged(ev->size().height()); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/swidget.h b/muse2/muse/widgets/swidget.h index 50f55b84..0412ac41 100644 --- a/muse2/muse/widgets/swidget.h +++ b/muse2/muse/widgets/swidget.h @@ -25,6 +25,8 @@ #include <QWidget> +namespace MusEWidget { + //--------------------------------------------------------- // SWidget // a simple widget which emits a heighChanged signal @@ -43,5 +45,7 @@ class SWidget : public QWidget { SWidget(QWidget* parent) : QWidget(parent) {} }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/tb1.cpp b/muse2/muse/widgets/tb1.cpp index fdd08e2a..272359f0 100644 --- a/muse2/muse/widgets/tb1.cpp +++ b/muse2/muse/widgets/tb1.cpp @@ -35,6 +35,8 @@ #include "poslabel.h" #include "pitchlabel.h" +namespace MusEWidget { + static int rasterTable[] = { //------ 8 4 2 1, 4, 8, 16, 32, 64, 128, 256, 512, 1024, @@ -208,3 +210,4 @@ void Toolbar1::setPitchMode(bool /*flag*/) // pitch->setPitchMode(flag); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/tb1.h b/muse2/muse/widgets/tb1.h index eb1d7269..93181c39 100644 --- a/muse2/muse/widgets/tb1.h +++ b/muse2/muse/widgets/tb1.h @@ -28,11 +28,14 @@ class QToolButton; class QTableWidget; -class PosLabel; -class PitchLabel; class Track; class LabelCombo; +namespace MusEWidget { + +class PitchLabel; +class PosLabel; + //--------------------------------------------------------- // Toolbar1 //--------------------------------------------------------- @@ -68,4 +71,6 @@ class Toolbar1 : public QToolBar { void setPitchMode(bool flag); }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/tempolabel.cpp b/muse2/muse/widgets/tempolabel.cpp index 526a4245..cdbc029d 100644 --- a/muse2/muse/widgets/tempolabel.cpp +++ b/muse2/muse/widgets/tempolabel.cpp @@ -25,6 +25,8 @@ #include "tempolabel.h" +namespace MusEWidget { + //--------------------------------------------------------- // TempoLabel //--------------------------------------------------------- @@ -135,4 +137,4 @@ void TempoEdit::setValue(double val) // return lrint(60000000.0/value()); // } - +} // namespace MusEWidget diff --git a/muse2/muse/widgets/tempolabel.h b/muse2/muse/widgets/tempolabel.h index 7604cae8..682c1e37 100644 --- a/muse2/muse/widgets/tempolabel.h +++ b/muse2/muse/widgets/tempolabel.h @@ -26,6 +26,8 @@ #include <QLabel> #include <QDoubleSpinBox> +namespace MusEWidget { + //--------------------------------------------------------- // TempoLabel //--------------------------------------------------------- @@ -74,5 +76,7 @@ class TempoEdit : public QDoubleSpinBox { //int tempo() const; }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/transformbase.ui b/muse2/muse/widgets/transformbase.ui index 578b4a97..ffa56338 100644 --- a/muse2/muse/widgets/transformbase.ui +++ b/muse2/muse/widgets/transformbase.ui @@ -417,7 +417,7 @@ </widget> </item> <item row="2" column="1"> - <widget class="SpinBoxFP" name="procVal1a"> + <widget class="MusEWidget::SpinBoxFP" name="procVal1a"> <property name="maximum" stdset="0"> <number>99999999</number> </property> @@ -453,21 +453,21 @@ </widget> </item> <item row="2" column="2"> - <widget class="SpinBoxFP" name="procVal2a"> + <widget class="MusEWidget::SpinBoxFP" name="procVal2a"> <property name="maximum" stdset="0"> <number>99999999</number> </property> </widget> </item> <item row="2" column="3"> - <widget class="SpinBoxFP" name="procLenA"> + <widget class="MusEWidget::SpinBoxFP" name="procLenA"> <property name="maximum" stdset="0"> <number>99999999</number> </property> </widget> </item> <item row="2" column="4"> - <widget class="SpinBoxFP" name="procPosA"> + <widget class="MusEWidget::SpinBoxFP" name="procPosA"> <property name="maximum" stdset="0"> <number>99999999</number> </property> @@ -798,14 +798,14 @@ </widget> </item> <item row="3" column="4"> - <widget class="SpinBoxFP" name="selBarB"> + <widget class="MusEWidget::SpinBoxFP" name="selBarB"> <property name="decimals" stdset="0"> <number>3</number> </property> </widget> </item> <item row="2" column="4"> - <widget class="SpinBoxFP" name="selBarA"> + <widget class="MusEWidget::SpinBoxFP" name="selBarA"> <property name="minimum" stdset="0"> <number>1000</number> </property> @@ -974,7 +974,7 @@ </widget> </item> <item> - <widget class="ComboQuant" name="funcQuantVal" native="true"/> + <widget class="MusEWidget::ComboQuant" name="funcQuantVal" native="true"/> </item> </layout> </widget> @@ -986,12 +986,12 @@ <layoutdefault spacing="6" margin="11"/> <customwidgets> <customwidget> - <class>SpinBoxFP</class> + <class>MusEWidget::SpinBoxFP</class> <extends>QDoubleSpinBox</extends> <header>spinboxFP.h</header> </customwidget> <customwidget> - <class>ComboQuant</class> + <class>MusEWidget::ComboQuant</class> <extends>QComboBox</extends> <header>comboQuant.h</header> </customwidget> diff --git a/muse2/muse/widgets/ttoolbutton.cpp b/muse2/muse/widgets/ttoolbutton.cpp index 1703083f..6bf43b1f 100644 --- a/muse2/muse/widgets/ttoolbutton.cpp +++ b/muse2/muse/widgets/ttoolbutton.cpp @@ -27,6 +27,8 @@ #include "gconfig.h" #include "icons.h" +namespace MusEWidget { + //--------------------------------------------------------- // drawButton //--------------------------------------------------------- @@ -41,4 +43,4 @@ void TransparentToolButton::drawButton(QPainter* p) p->drawPixmap(QPoint((w - pm.width())/2, (h - pm.height())/2), pm); } - +} // namespace MusEWidget diff --git a/muse2/muse/widgets/ttoolbutton.h b/muse2/muse/widgets/ttoolbutton.h index 8a79f16f..b61d2f7c 100644 --- a/muse2/muse/widgets/ttoolbutton.h +++ b/muse2/muse/widgets/ttoolbutton.h @@ -25,6 +25,8 @@ #include <QToolButton> +namespace MusEWidget { + //--------------------------------------------------------- // TransparentToolButton //--------------------------------------------------------- @@ -39,5 +41,7 @@ class TransparentToolButton : public QToolButton { : QToolButton(parent) {setObjectName(name);} }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/unusedwavefiles.cpp b/muse2/muse/widgets/unusedwavefiles.cpp index 810105bf..07fcbf0c 100644 --- a/muse2/muse/widgets/unusedwavefiles.cpp +++ b/muse2/muse/widgets/unusedwavefiles.cpp @@ -31,6 +31,8 @@ #include "globals.h" #include "app.h" +namespace MusEWidget { + UnusedWaveFiles::UnusedWaveFiles(QWidget *parent) : QDialog(parent), ui(new Ui::UnusedWaveFiles) @@ -117,3 +119,5 @@ void UnusedWaveFiles::accept() } QDialog::accept(); } + +} // namespace MusEWidget diff --git a/muse2/muse/widgets/unusedwavefiles.h b/muse2/muse/widgets/unusedwavefiles.h index d3a66234..fba41212 100644 --- a/muse2/muse/widgets/unusedwavefiles.h +++ b/muse2/muse/widgets/unusedwavefiles.h @@ -29,6 +29,8 @@ namespace Ui { class UnusedWaveFiles; } +namespace MusEWidget { + class UnusedWaveFiles : public QDialog { Q_OBJECT @@ -45,4 +47,6 @@ private: Ui::UnusedWaveFiles *ui; }; +} // namespace MusEWidget + #endif // UNUSEDWAVEFILES_H diff --git a/muse2/muse/widgets/utils.cpp b/muse2/muse/widgets/utils.cpp index c2c60d12..e46d265c 100644 --- a/muse2/muse/widgets/utils.cpp +++ b/muse2/muse/widgets/utils.cpp @@ -34,6 +34,8 @@ #include "utils.h" +namespace MusEUtil { + //--------------------------------------------------------- // curTime //--------------------------------------------------------- @@ -400,4 +402,6 @@ QGradient gGradientFromQColor(const QColor& c, const QPointF& start, const QPoin gradient.setColorAt(1, c1); return gradient; -}
\ No newline at end of file +} + +} // namespace MusEUtils diff --git a/muse2/muse/widgets/utils.h b/muse2/muse/widgets/utils.h index 5862443a..b74ba394 100644 --- a/muse2/muse/widgets/utils.h +++ b/muse2/muse/widgets/utils.h @@ -31,6 +31,7 @@ class QCanvas; class QPointF; class QColor; +namespace MusEUtil { extern QString bitmap2String(int bm); extern int string2bitmap(const QString& str); @@ -45,5 +46,7 @@ extern QFrame* vLine(QWidget* parent); extern void dump(const unsigned char* p, int n); extern double curTime(); +} // namespace MusEUtils + #endif diff --git a/muse2/muse/widgets/verticalmeter.cpp b/muse2/muse/widgets/verticalmeter.cpp index e76d7015..b0e0198f 100644 --- a/muse2/muse/widgets/verticalmeter.cpp +++ b/muse2/muse/widgets/verticalmeter.cpp @@ -32,6 +32,8 @@ #include "gconfig.h" #include "fastlog.h" +namespace MusEWidget { + //--------------------------------------------------------- // VerticalMeter //--------------------------------------------------------- @@ -269,3 +271,5 @@ void VerticalMeter::resizeEvent(QResizeEvent* ev) QRegion maskregion(rounded_rect.toFillPolygon().toPolygon()); setMask(maskregion); } + +} // namespace MusEWidget diff --git a/muse2/muse/widgets/verticalmeter.h b/muse2/muse/widgets/verticalmeter.h index 3579600a..d6bee245 100644 --- a/muse2/muse/widgets/verticalmeter.h +++ b/muse2/muse/widgets/verticalmeter.h @@ -31,6 +31,8 @@ class QResizeEvent; class QMouseEvent; class QPainter; +namespace MusEWidget { + class VerticalMeter : public Meter { Q_OBJECT @@ -56,5 +58,8 @@ class VerticalMeter : public Meter { VerticalMeter(QWidget* parent, MeterType type = DBMeter); void setRange(double min, double max); }; + +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/view.cpp b/muse2/muse/widgets/view.cpp index 99d86d3c..9be66ed5 100644 --- a/muse2/muse/widgets/view.cpp +++ b/muse2/muse/widgets/view.cpp @@ -42,6 +42,8 @@ // just ate up all the time no matter what I tried. //#defines VIEW_USE_DOUBLE_BUFFERING 1 +namespace MusEWidget { + //--------------------------------------------------------- // View::View // double xMag = (xmag < 0) ? 1.0/-xmag : double(xmag) @@ -977,3 +979,5 @@ QRect View::devToVirt(const QRect& r) return QRect(x, y, w, h); } */ + +} // namespace MusEWidget diff --git a/muse2/muse/widgets/view.h b/muse2/muse/widgets/view.h index 1569d60f..e5f33657 100644 --- a/muse2/muse/widgets/view.h +++ b/muse2/muse/widgets/view.h @@ -34,6 +34,8 @@ class QPainter; class QPixmap; class QResizeEvent; +namespace MusEWidget { + //--------------------------------------------------------- // View // horizontal View with double buffering @@ -126,5 +128,7 @@ class View : public QWidget { int rmapx(int x) const; }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/vscale.cpp b/muse2/muse/widgets/vscale.cpp index c4a9df08..22af7889 100644 --- a/muse2/muse/widgets/vscale.cpp +++ b/muse2/muse/widgets/vscale.cpp @@ -25,6 +25,8 @@ #include <QPainter> #include <QPaintEvent> +namespace MusEWidget { + //--------------------------------------------------------- // paintEvent //--------------------------------------------------------- @@ -41,3 +43,4 @@ void VScale::paintEvent(QPaintEvent*) p.end(); } +} // namespace MusEWidget diff --git a/muse2/muse/widgets/vscale.h b/muse2/muse/widgets/vscale.h index bba35c04..e926b3cb 100644 --- a/muse2/muse/widgets/vscale.h +++ b/muse2/muse/widgets/vscale.h @@ -27,6 +27,8 @@ class QPaintEvent; +namespace MusEWidget { + //--------------------------------------------------------- // VScale //--------------------------------------------------------- @@ -40,5 +42,7 @@ class VScale : public QWidget { VScale(QWidget* parent=0) : QWidget(parent) {setFixedWidth(18);} }; +} // namespace MusEWidget + #endif diff --git a/muse2/muse/widgets/wtscale.cpp b/muse2/muse/widgets/wtscale.cpp index 1ffabae3..3b6aa6eb 100644 --- a/muse2/muse/widgets/wtscale.cpp +++ b/muse2/muse/widgets/wtscale.cpp @@ -33,6 +33,8 @@ #include "../marker/marker.h" #include "icons.h" +namespace MusEWidget { + //--------------------------------------------------------- // WTScale // Wave Time Scale @@ -299,3 +301,5 @@ void WTScale::pdraw(QPainter& p, const QRect& r) } } +} // namespace MusEWidget + diff --git a/muse2/muse/widgets/wtscale.h b/muse2/muse/widgets/wtscale.h index dd6d5eef..b25de627 100644 --- a/muse2/muse/widgets/wtscale.h +++ b/muse2/muse/widgets/wtscale.h @@ -25,6 +25,8 @@ #include "view.h" +namespace MusEWidget { + //--------------------------------------------------------- // WTScale // scale for wave track @@ -57,5 +59,8 @@ class WTScale : public View { WTScale(int* raster, QWidget* parent, int xscale); void setBarLocator(bool f) { barLocator = f; } }; + +} // namespace MusEWidget + #endif |