summaryrefslogtreecommitdiff
path: root/muse2/synti/organ/organ.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-04-11 14:46:12 +0000
committerFlorian Jung <flo@windfisch.org>2011-04-11 14:46:12 +0000
commit384e0d2f6d77ab107268921511dd91464d4accb3 (patch)
treef361808b7af39d0d28188e5efb0140b3e01ab8a1 /muse2/synti/organ/organ.cpp
parent51eda45715625b6da768e670388510c91b01ff5c (diff)
parentc8a651f88b5728e246cb46599521ce981f0f4cfb (diff)
cosmetic stuff: made many functions static, improved pixmap loading
synced with current trunk
Diffstat (limited to 'muse2/synti/organ/organ.cpp')
-rw-r--r--muse2/synti/organ/organ.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/muse2/synti/organ/organ.cpp b/muse2/synti/organ/organ.cpp
index 1aa87742..56fb4db1 100644
--- a/muse2/synti/organ/organ.cpp
+++ b/muse2/synti/organ/organ.cpp
@@ -636,28 +636,28 @@ int Organ::getControllerInfo(int id, const char** name, int* controller,
}
//---------------------------------------------------------
-// guiVisible
+// nativeGuiVisible
//---------------------------------------------------------
-bool Organ::guiVisible() const
+bool Organ::nativeGuiVisible() const
{
return gui->isVisible();
}
//---------------------------------------------------------
-// showGui
+// showNativeGui
//---------------------------------------------------------
-void Organ::showGui(bool val)
+void Organ::showNativeGui(bool val)
{
gui->setVisible(val);
}
//---------------------------------------------------------
-// getGeometry
+// getNativeGeometry
//---------------------------------------------------------
-void Organ::getGeometry(int* x, int* y, int* w, int* h) const
+void Organ::getNativeGeometry(int* x, int* y, int* w, int* h) const
{
QPoint pos(gui->pos());
QSize size(gui->size());
@@ -668,10 +668,10 @@ void Organ::getGeometry(int* x, int* y, int* w, int* h) const
}
//---------------------------------------------------------
-// setGeometry
+// setNativeGeometry
//---------------------------------------------------------
-void Organ::setGeometry(int x, int y, int w, int h)
+void Organ::setNativeGeometry(int x, int y, int w, int h)
{
gui->resize(QSize(w, h));
gui->move(QPoint(x, y));