summaryrefslogtreecommitdiff
path: root/muse2/muse/arranger
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-08-14 18:24:47 +0000
committerFlorian Jung <flo@windfisch.org>2011-08-14 18:24:47 +0000
commit01d2680f0d18f7783ca1e1f48098590cd0317284 (patch)
tree4000612a2642f3e19da22ddd24244d323a9cedb4 /muse2/muse/arranger
parent6898f640d5a95ab9c175388f22c4c846b8dbe5ab (diff)
removed the senseless (unsigned long)(some_pointer) stuff, as some_pointer
was stored as "real" (uncasted) pointer in the same struct
Diffstat (limited to 'muse2/muse/arranger')
-rw-r--r--muse2/muse/arranger/arrangerview.cpp4
-rw-r--r--muse2/muse/arranger/arrangerview.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/muse2/muse/arranger/arrangerview.cpp b/muse2/muse/arranger/arrangerview.cpp
index e9ace563..8c0627b4 100644
--- a/muse2/muse/arranger/arrangerview.cpp
+++ b/muse2/muse/arranger/arrangerview.cpp
@@ -581,7 +581,7 @@ ArrangerView::~ArrangerView()
void ArrangerView::closeEvent(QCloseEvent* e)
{
- emit deleted((unsigned long)this);
+ emit deleted(static_cast<TopWin*>(this));
emit closed();
e->accept();
}
@@ -759,7 +759,7 @@ void ArrangerView::updateScoreMenus()
for (ToplevelList::const_iterator it=toplevels->begin(); it!=toplevels->end(); it++)
if (it->type()==Toplevel::SCORE)
{
- ScoreEdit* score = (ScoreEdit*) it->cobject();
+ ScoreEdit* score = (ScoreEdit*) it->object();
action=new QAction(score->get_name(), this);
connect(action, SIGNAL(activated()), scoreOneStaffPerTrackMapper, SLOT(map()));
diff --git a/muse2/muse/arranger/arrangerview.h b/muse2/muse/arranger/arrangerview.h
index 9f869402..dc4aa638 100644
--- a/muse2/muse/arranger/arrangerview.h
+++ b/muse2/muse/arranger/arrangerview.h
@@ -102,7 +102,7 @@ class ArrangerView : public TopWin
void cmd(int);
signals:
- void deleted(unsigned long);
+ void deleted(TopWin*);
void closed();
public: