comparison widgets/PropertyBox.cpp @ 706:97ea68f62c1f imaf_enc

Merge from default branch

     m_container(container),
     m_showButton(0),
     m_playButton(0)
 {
 #ifdef DEBUG_PROPERTY_BOX
-    std::cerr << "PropertyBox[" << this << "(\"" <<
-	container->getPropertyContainerName() << "\" at " << container << ")]::PropertyBox" << std::endl;
+    cerr << "PropertyBox[" << this << "(\"" <<
+	container->getPropertyContainerName() << "\" at " << container << ")]::PropertyBox" << endl;
 #endif
 
     m_mainBox = new QVBoxLayout;
     setLayout(m_mainBox);
 

 
     connect(ColourDatabase::getInstance(), SIGNAL(colourDatabaseChanged()),
             this, SLOT(colourDatabaseChanged()));
 
 #ifdef DEBUG_PROPERTY_BOX
-    std::cerr << "PropertyBox[" << this << "]::PropertyBox returning" << std::endl;
+    cerr << "PropertyBox[" << this << "]::PropertyBox returning" << endl;
 #endif
 }
 
 PropertyBox::~PropertyBox()
 {
 #ifdef DEBUG_PROPERTY_BOX
-    std::cerr << "PropertyBox[" << this << "]::~PropertyBox" << std::endl;
+    cerr << "PropertyBox[" << this << "]::~PropertyBox" << endl;
 #endif
 }
 
 
 void
 PropertyBox::populateViewPlayFrame()
 {
 #ifdef DEBUG_PROPERTY_BOX
-    std::cerr << "PropertyBox(" << m_container << ")::populateViewPlayFrame" << std::endl;
+    cerr << "PropertyBox(" << m_container << ")::populateViewPlayFrame" << endl;
 #endif
 
     if (m_viewPlayFrame) {
 	delete m_viewPlayFrame;
 	m_viewPlayFrame = 0;

     QString groupName = m_container->getPropertyGroupName(name);
     QString propertyLabel = m_container->getPropertyLabel(name);
     QString iconName = m_container->getPropertyIconName(name);
 
 #ifdef DEBUG_PROPERTY_BOX
-    std::cerr << "PropertyBox[" << this
-	      << "(\"" << m_container->getPropertyContainerName().toStdString()
+    cerr << "PropertyBox[" << this
+	      << "(\"" << m_container->getPropertyContainerName()
 	      << "\")]";
-    std::cerr << "::updatePropertyEditor(\"" << name << "\"):";
-    std::cerr << " value " << value << ", have " << have << ", group \""
-	      << groupName << "\"" << std::endl;
+    cerr << "::updatePropertyEditor(\"" << name << "\"):";
+    cerr << " value " << value << ", have " << have << ", group \""
+	      << groupName << "\"" << endl;
 #endif
 
     bool inGroup = (groupName != QString());
 
     if (!have) {
 	if (inGroup) {
 	    if (m_groupLayouts.find(groupName) == m_groupLayouts.end()) {
 #ifdef DEBUG_PROPERTY_BOX
-		std::cerr << "PropertyBox: adding label \"" << groupName << "\" and frame for group for \"" << name << "\"" << std::endl;
+		cerr << "PropertyBox: adding label \"" << groupName << "\" and frame for group for \"" << name << "\"" << endl;
 #endif
 		m_layout->addWidget(new QLabel(groupName, m_mainWidget), row, 0);
 		QFrame *frame = new QFrame(m_mainWidget);
 		m_layout->addWidget(frame, row, 1, 1, 2);
 		m_groupLayouts[groupName] = new QGridLayout;
 		m_groupLayouts[groupName]->setMargin(0);
 		frame->setLayout(m_groupLayouts[groupName]);
 	    }
 	} else {
 #ifdef DEBUG_PROPERTY_BOX 
-	    std::cerr << "PropertyBox: adding label \"" << propertyLabel << "\"" << std::endl;
+	    cerr << "PropertyBox: adding label \"" << propertyLabel << "\"" << endl;
 #endif
 	    m_layout->addWidget(new QLabel(propertyLabel, m_mainWidget), row, 0);
 	}
     }
 

 	if (have) {
             button = dynamic_cast<QAbstractButton *>(m_propertyControllers[name]);
             assert(button);
 	} else {
 #ifdef DEBUG_PROPERTY_BOX 
-	    std::cerr << "PropertyBox: creating new checkbox" << std::endl;
+	    cerr << "PropertyBox: creating new checkbox" << endl;
 #endif
             if (iconName != "") {
                 button = new NotifyingPushButton();
                 button->setCheckable(true);
                 QIcon icon(IconLoader().load(iconName));

                 dial->blockSignals(false);
             }
                 
 	} else {
 #ifdef DEBUG_PROPERTY_BOX 
-	    std::cerr << "PropertyBox: creating new dial" << std::endl;
+	    cerr << "PropertyBox: creating new dial" << endl;
 #endif
 	    dial = new AudioDial();
 	    dial->setObjectName(name);
 	    dial->setMinimum(min);
 	    dial->setMaximum(max);

 	if (have) {
 	    cb = dynamic_cast<NotifyingComboBox *>(m_propertyControllers[name]);
 	    assert(cb);
 	} else {
 #ifdef DEBUG_PROPERTY_BOX 
-	    std::cerr << "PropertyBox: creating new combobox" << std::endl;
+	    cerr << "PropertyBox: creating new combobox" << endl;
 #endif
 
 	    cb = new NotifyingComboBox();
 	    cb->setObjectName(name);
             cb->setDuplicatesEnabled(false);

                 }
             }
         }
         cb->blockSignals(false);
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 	// Crashes on startup without this, for some reason
 	cb->setMinimumSize(QSize(10, 10));
 #endif
 
 	break;

 }    
 
 void
 PropertyBox::unitDatabaseChanged()
 {
-    std::cerr << "PropertyBox[" << this << "]: unitDatabaseChanged" << std::endl;
+    cerr << "PropertyBox[" << this << "]: unitDatabaseChanged" << endl;
     blockSignals(true);
 
-//    std::cerr << "my container is " << m_container << std::endl;
-//    std::cerr << "my container's name is... " << std::endl;
-//    std::cerr << m_container->objectName() << std::endl;
+//    cerr << "my container is " << m_container << endl;
+//    cerr << "my container's name is... " << endl;
+//    cerr << m_container->objectName() << endl;
 
     PropertyContainer::PropertyList properties = m_container->getProperties();
     for (size_t i = 0; i < properties.size(); ++i) {
         if (m_container->getPropertyType(properties[i]) ==
             PropertyContainer::UnitsProperty) {