Mercurial > hg > svgui

changeset 584:1fe7951a61e8 debug-output

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove most toStdString calls (no longer needed, with debug header)
author Chris Cannam
date Thu, 12 May 2011 17:31:43 +0100
parents 4c484636d5ec
children f4960f8ce798
files layer/ImageLayer.cpp layer/Layer.cpp layer/LayerFactory.cpp layer/SpectrogramLayer.cpp view/Pane.cpp view/View.cpp view/ViewManager.cpp widgets/ActivityLog.cpp widgets/AudioDial.cpp widgets/Fader.cpp widgets/Fader.h widgets/ImageDialog.cpp widgets/InteractiveFileFinder.cpp widgets/PluginParameterBox.cpp widgets/PropertyBox.cpp widgets/SubdividingMenu.cpp widgets/TextAbbrev.cpp widgets/TipDialog.cpp widgets/TipDialog.h widgets/TransformFinder.cpp
diffstat 20 files changed, 88 insertions(+), 84 deletions(-) [+]
line wrap: on
line diff
--- a/layer/ImageLayer.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/layer/ImageLayer.cpp	Thu May 12 17:31:43 2011 +0100
@@ -500,7 +500,7 @@
 bool
 ImageLayer::getImageOriginalSize(QString name, QSize &size) const
 {
-//    std::cerr << "getImageOriginalSize: \"" << name.toStdString() << "\"" << std::endl;
+//    std::cerr << "getImageOriginalSize: \"" << name << "\"" << std::endl;
 
     QMutexLocker locker(&m_imageMapMutex);
     if (m_images.find(name) == m_images.end()) {
@@ -521,7 +521,7 @@
 {
     bool need = false;
 
-//    std::cerr << "ImageLayer::getImage(" << v << ", " << name.toStdString() << ", ("
+//    std::cerr << "ImageLayer::getImage(" << v << ", " << name << ", ("
 //              << maxSize.width() << "x" << maxSize.height() << "))" << std::endl;
 
     if (!m_scaled[v][name].isNull()  &&
@@ -627,7 +627,7 @@
 {
     QImage image(getLocalFilename(url));
     if (image.isNull()) {
-        std::cerr << "Failed to open image from url \"" << url.toStdString() << "\" (local filename \"" << getLocalFilename(url).toStdString() << "\"" << std::endl;
+        std::cerr << "Failed to open image from url \"" << url << "\" (local filename \"" << getLocalFilename(url) << "\"" << std::endl;
         delete m_fileSources[url];
         m_fileSources.erase(url);
         return false;
@@ -906,7 +906,7 @@
 void
 ImageLayer::checkAddSource(QString img) const
 {
-    std::cerr << "ImageLayer::checkAddSource(" << img.toStdString() << "): yes, trying..." << std::endl;
+    std::cerr << "ImageLayer::checkAddSource(" << img << "): yes, trying..." << std::endl;
 
     if (m_fileSources.find(img) != m_fileSources.end()) {
         return;
@@ -915,7 +915,7 @@
     ProgressDialog dialog(tr("Opening image URL..."), true, 2000);
     FileSource *rf = new FileSource(img, &dialog);
     if (rf->isOK()) {
-        std::cerr << "ok, adding it (local filename = " << rf->getLocalFilename().toStdString() << ")" << std::endl;
+        std::cerr << "ok, adding it (local filename = " << rf->getLocalFilename() << ")" << std::endl;
         m_fileSources[img] = rf;
         connect(rf, SIGNAL(ready()), this, SLOT(fileSourceReady()));
     } else {
@@ -948,7 +948,7 @@
          i != m_fileSources.end(); ++i) {
         if (i->second == rf) {
             img = i->first;
-//            std::cerr << "it's image \"" << img.toStdString() << "\"" << std::endl;
+//            std::cerr << "it's image \"" << img << "\"" << std::endl;
             break;
         }
     }
--- a/layer/Layer.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/layer/Layer.cpp	Thu May 12 17:31:43 2011 +0100
@@ -106,7 +106,7 @@
 PlayParameters *
 Layer::getPlayParameters() 
 {
-//    std::cerr << "Layer (" << this << ", " << objectName().toStdString() << ")::getPlayParameters: model is "<< getModel() << std::endl;
+//    std::cerr << "Layer (" << this << ", " << objectName() << ")::getPlayParameters: model is "<< getModel() << std::endl;
     const Model *model = getModel();
     if (model) {
 	return PlayParameterRepository::getInstance()->getPlayParameters(model);
--- a/layer/LayerFactory.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/layer/LayerFactory.cpp	Thu May 12 17:31:43 2011 +0100
@@ -446,7 +446,7 @@
 		  << type << std::endl;
     } else {
 //	std::cerr << "LayerFactory::createLayer: Setting object name "
-//		  << getLayerPresentationName(type).toStdString() << " on " << layer << std::endl;
+//		  << getLayerPresentationName(type) << " on " << layer << std::endl;
 	layer->setObjectName(getLayerPresentationName(type));
         setLayerDefaultProperties(type, layer);
     }
@@ -457,14 +457,14 @@
 void
 LayerFactory::setLayerDefaultProperties(LayerType type, Layer *layer)
 {
-//    std::cerr << "LayerFactory::setLayerDefaultProperties: type " << type << " (name \"" << getLayerTypeName(type).toStdString() << "\")" << std::endl;
+//    std::cerr << "LayerFactory::setLayerDefaultProperties: type " << type << " (name \"" << getLayerTypeName(type) << "\")" << std::endl;
 
     QSettings settings;
     settings.beginGroup("LayerDefaults");
     QString defaults = settings.value(getLayerTypeName(type), "").toString();
     if (defaults == "") return;
 
-//    std::cerr << "defaults=\"" << defaults.toStdString() << "\"" << std::endl;
+//    std::cerr << "defaults=\"" << defaults << "\"" << std::endl;
 
     QString xml = layer->toXmlString();
     QDomDocument docOld, docNew;
@@ -481,7 +481,7 @@
             QDomAttr attr = attrNodes.item(i).toAttr();
             if (attr.isNull()) continue;
 //            std::cerr << "append \"" << attr.name().toStdString()
-//                      << "\" -> \"" << attr.value().toStdString() << "\""
+//                      << "\" -> \"" << attr.value() << "\""
 //                      << std::endl;
             attrs.append(attr.name(), "", "", attr.value());
         }
@@ -493,7 +493,7 @@
             if (attr.isNull()) continue;
             if (attrs.value(attr.name()) == "") {
 //                std::cerr << "append \"" << attr.name().toStdString()
-//                          << "\" -> \"" << attr.value().toStdString() << "\""
+//                          << "\" -> \"" << attr.value() << "\""
 //                          << std::endl;
                 attrs.append(attr.name(), "", "", attr.value());
             }
--- a/layer/SpectrogramLayer.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/layer/SpectrogramLayer.cpp	Thu May 12 17:31:43 2011 +0100
@@ -638,7 +638,7 @@
 void
 SpectrogramLayer::preferenceChanged(PropertyContainer::PropertyName name)
 {
-    std::cerr << "SpectrogramLayer::preferenceChanged(" << name.toStdString() << ")" << std::endl;
+    std::cerr << "SpectrogramLayer::preferenceChanged(" << name << ")" << std::endl;
 
     if (name == "Window Type") {
         setWindowType(Preferences::getInstance()->getWindowType());
--- a/view/Pane.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/view/Pane.cpp	Thu May 12 17:31:43 2011 +0100
@@ -828,7 +828,7 @@
     QString title = model->getTitle();
     QString maker = model->getMaker();
 //std::cerr << "Pane::drawWorkTitle: title=\"" << title.toStdString()
-//<< "\", maker=\"" << maker.toStdString() << "\"" << std::endl;
+//<< "\", maker=\"" << maker << "\"" << std::endl;
     if (title == "") return;
 
     QString text = title;
@@ -875,7 +875,7 @@
     for (LayerList::iterator i = m_layers.begin(); i != m_layers.end(); ++i) {
         texts.push_back((*i)->getLayerPresentationName());
 //        std::cerr << "Pane " << this << ": Layer presentation name for " << *i << ": "
-//                  << texts[texts.size()-1].toStdString() << std::endl;
+//                  << texts[texts.size()-1] << std::endl;
         pixmaps.push_back((*i)->getLayerPresentationPixmap
                           (QSize(fontAscent, fontAscent)));
     }
@@ -892,7 +892,7 @@
 	
         for (size_t i = 0; i < texts.size(); ++i) {
 
-//            std::cerr << "Pane "<< this << ": text " << i << ": " << texts[i].toStdString() << std::endl;
+//            std::cerr << "Pane "<< this << ": text " << i << ": " << texts[i] << std::endl;
             
             if (i + 1 == texts.size()) {
                 paint.setPen(getForeground());
@@ -1724,7 +1724,7 @@
             rmin = powf(10, rmin);
             rmax = powf(10, rmax);
         }
-        std::cerr << "finally: rmin: " << rmin << ", rmax: " << rmax << " " << unit.toStdString() << std::endl;
+        std::cerr << "finally: rmin: " << rmin << ", rmax: " << rmax << " " << unit << std::endl;
 
         layer->setDisplayExtents(rmin, rmax);
         updateVerticalPanner();
--- a/view/View.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/view/View.cpp	Thu May 12 17:31:43 2011 +0100
@@ -1272,7 +1272,7 @@
 
     for (LayerList::const_iterator i = m_layers.begin(); i != m_layers.end(); ++i) {
 //        std::cerr << "View::getScrollableBackLayers: calling isLayerDormant on layer " << *i << std::endl;
-//        std::cerr << "(name is " << (*i)->objectName().toStdString() << ")"
+//        std::cerr << "(name is " << (*i)->objectName() << ")"
 //                  << std::endl;
 //        std::cerr << "View::getScrollableBackLayers: I am " << this << std::endl;
 	if ((*i)->isLayerDormant(this)) continue;
--- a/view/ViewManager.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/view/ViewManager.cpp	Thu May 12 17:31:43 2011 +0100
@@ -61,17 +61,17 @@
     if (getGlobalDarkBackground()) {
 /*
         std::cerr << "dark palette:" << std::endl;
-        std::cerr << "window = " << QApplication::palette().color(QPalette::Window).name().toStdString() << std::endl;
-        std::cerr << "windowtext = " << QApplication::palette().color(QPalette::WindowText).name().toStdString() << std::endl;
-        std::cerr << "base = " << QApplication::palette().color(QPalette::Base).name().toStdString() << std::endl;
-        std::cerr << "alternatebase = " << QApplication::palette().color(QPalette::AlternateBase).name().toStdString() << std::endl;
-        std::cerr << "text = " << QApplication::palette().color(QPalette::Text).name().toStdString() << std::endl;
-        std::cerr << "button = " << QApplication::palette().color(QPalette::Button).name().toStdString() << std::endl;
-        std::cerr << "buttontext = " << QApplication::palette().color(QPalette::ButtonText).name().toStdString() << std::endl;
-        std::cerr << "brighttext = " << QApplication::palette().color(QPalette::BrightText).name().toStdString() << std::endl;
-        std::cerr << "light = " << QApplication::palette().color(QPalette::Light).name().toStdString() << std::endl;
-        std::cerr << "dark = " << QApplication::palette().color(QPalette::Dark).name().toStdString() << std::endl;
-        std::cerr << "mid = " << QApplication::palette().color(QPalette::Mid).name().toStdString() << std::endl;
+        std::cerr << "window = " << QApplication::palette().color(QPalette::Window).name() << std::endl;
+        std::cerr << "windowtext = " << QApplication::palette().color(QPalette::WindowText).name() << std::endl;
+        std::cerr << "base = " << QApplication::palette().color(QPalette::Base).name() << std::endl;
+        std::cerr << "alternatebase = " << QApplication::palette().color(QPalette::AlternateBase).name() << std::endl;
+        std::cerr << "text = " << QApplication::palette().color(QPalette::Text).name() << std::endl;
+        std::cerr << "button = " << QApplication::palette().color(QPalette::Button).name() << std::endl;
+        std::cerr << "buttontext = " << QApplication::palette().color(QPalette::ButtonText).name() << std::endl;
+        std::cerr << "brighttext = " << QApplication::palette().color(QPalette::BrightText).name() << std::endl;
+        std::cerr << "light = " << QApplication::palette().color(QPalette::Light).name() << std::endl;
+        std::cerr << "dark = " << QApplication::palette().color(QPalette::Dark).name() << std::endl;
+        std::cerr << "mid = " << QApplication::palette().color(QPalette::Mid).name() << std::endl;
 */
         m_lightPalette = QPalette(QColor("#000000"),  // WindowText
                                   QColor("#dddfe4"),  // Button
@@ -87,17 +87,17 @@
     } else {
 /*
         std::cerr << "light palette:" << std::endl;
-        std::cerr << "window = " << QApplication::palette().color(QPalette::Window).name().toStdString() << std::endl;
-        std::cerr << "windowtext = " << QApplication::palette().color(QPalette::WindowText).name().toStdString() << std::endl;
-        std::cerr << "base = " << QApplication::palette().color(QPalette::Base).name().toStdString() << std::endl;
-        std::cerr << "alternatebase = " << QApplication::palette().color(QPalette::AlternateBase).name().toStdString() << std::endl;
-        std::cerr << "text = " << QApplication::palette().color(QPalette::Text).name().toStdString() << std::endl;
-        std::cerr << "button = " << QApplication::palette().color(QPalette::Button).name().toStdString() << std::endl;
-        std::cerr << "buttontext = " << QApplication::palette().color(QPalette::ButtonText).name().toStdString() << std::endl;
-        std::cerr << "brighttext = " << QApplication::palette().color(QPalette::BrightText).name().toStdString() << std::endl;
-        std::cerr << "light = " << QApplication::palette().color(QPalette::Light).name().toStdString() << std::endl;
-        std::cerr << "dark = " << QApplication::palette().color(QPalette::Dark).name().toStdString() << std::endl;
-        std::cerr << "mid = " << QApplication::palette().color(QPalette::Mid).name().toStdString() << std::endl;
+        std::cerr << "window = " << QApplication::palette().color(QPalette::Window).name() << std::endl;
+        std::cerr << "windowtext = " << QApplication::palette().color(QPalette::WindowText).name() << std::endl;
+        std::cerr << "base = " << QApplication::palette().color(QPalette::Base).name() << std::endl;
+        std::cerr << "alternatebase = " << QApplication::palette().color(QPalette::AlternateBase).name() << std::endl;
+        std::cerr << "text = " << QApplication::palette().color(QPalette::Text).name() << std::endl;
+        std::cerr << "button = " << QApplication::palette().color(QPalette::Button).name() << std::endl;
+        std::cerr << "buttontext = " << QApplication::palette().color(QPalette::ButtonText).name() << std::endl;
+        std::cerr << "brighttext = " << QApplication::palette().color(QPalette::BrightText).name() << std::endl;
+        std::cerr << "light = " << QApplication::palette().color(QPalette::Light).name() << std::endl;
+        std::cerr << "dark = " << QApplication::palette().color(QPalette::Dark).name() << std::endl;
+        std::cerr << "mid = " << QApplication::palette().color(QPalette::Mid).name() << std::endl;
 */
         m_darkPalette = QPalette(QColor("#ffffff"),  // WindowText
                                  QColor("#3e3e3e"),  // Button
--- a/widgets/ActivityLog.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/widgets/ActivityLog.cpp	Thu May 12 17:31:43 2011 +0100
@@ -53,7 +53,7 @@
 ActivityLog::activityHappened(QString name)
 {
     name = name.replace("&", "");
-//    std::cerr << "ActivityLog::activityHappened(" << name.toStdString() << ")" << std::endl;
+//    std::cerr << "ActivityLog::activityHappened(" << name << ")" << std::endl;
     if (name == m_prevName) {
 //        std::cerr << "(ignoring duplicate)" << std::endl;
         return;
--- a/widgets/AudioDial.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/widgets/AudioDial.cpp	Thu May 12 17:31:43 2011 +0100
@@ -99,7 +99,7 @@
 
 void AudioDial::setRangeMapper(RangeMapper *mapper)
 {
-//    std::cerr << "AudioDial[" << this << "][\"" << objectName().toStdString() << "\"::setRangeMapper(" << mapper << ") [current is " << m_rangeMapper << "] (have " << dialsExtant << " dials extant)" << std::endl;
+//    std::cerr << "AudioDial[" << this << "][\"" << objectName() << "\"::setRangeMapper(" << mapper << ") [current is " << m_rangeMapper << "] (have " << dialsExtant << " dials extant)" << std::endl;
 
     if (m_rangeMapper == mapper) return;
 
--- a/widgets/Fader.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/widgets/Fader.cpp	Thu May 12 17:31:43 2011 +0100
@@ -222,7 +222,7 @@
                 .arg(abs(int(db * 10.0) % 10))
                 .arg(abs(int(db * 100.0) % 10));
 	}
-        std::cerr << "Fader: setting tooltip to \"" << text.toStdString() << "\"" << std::endl;
+        std::cerr << "Fader: setting tooltip to \"" << text << "\"" << std::endl;
         QWidget::setToolTip(text);
 	update();
     }
--- a/widgets/Fader.h	Thu Apr 14 15:21:21 2011 +0100
+++ b/widgets/Fader.h	Thu May 12 17:31:43 2011 +0100
@@ -34,6 +34,8 @@
 #include <QWheelEvent>
 #include <QPaintEvent>
 
+#include "base/Debug.h"
+
 class Fader : public QWidget
 {
     Q_OBJECT
--- a/widgets/ImageDialog.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/widgets/ImageDialog.cpp	Thu May 12 17:31:43 2011 +0100
@@ -204,7 +204,7 @@
             }
         }
         
-//        std::cerr << "image filename: \"" << fileName.toStdString() << "\"" << std::endl;
+//        std::cerr << "image filename: \"" << fileName << "\"" << std::endl;
 
         m_loadedImage = QPixmap(fileName);
         m_loadedImageFile = img;
--- a/widgets/InteractiveFileFinder.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/widgets/InteractiveFileFinder.cpp	Thu May 12 17:31:43 2011 +0100
@@ -284,7 +284,7 @@
         
         QFileInfo fi(path);
 
-        std::cerr << "type = " << type << ", suffix = " << fi.suffix().toStdString() << std::endl;
+        std::cerr << "type = " << type << ", suffix = " << fi.suffix() << std::endl;
         
         if ((type == LayerFile || type == LayerFileNoMidi)
             && fi.suffix() == "") {
@@ -301,7 +301,7 @@
             } else if (selectedFilter.contains(".ttl")) {
                 expectedExtension = "ttl";
             }
-            std::cerr << "expected extension = " << expectedExtension.toStdString() << std::endl;
+            std::cerr << "expected extension = " << expectedExtension << std::endl;
             if (expectedExtension != "") {
                 path = QString("%1.%2").arg(path).arg(expectedExtension);
                 fi = QFileInfo(path);
@@ -408,8 +408,8 @@
 {
     if (relativeTo == "") return "";
 
-    std::cerr << "Looking for \"" << location.toStdString() << "\" next to \""
-              << relativeTo.toStdString() << "\"..." << std::endl;
+    std::cerr << "Looking for \"" << location << "\" next to \""
+              << relativeTo << "\"..." << std::endl;
 
     QString fileName;
     QString resolved;
@@ -427,7 +427,7 @@
     if (FileSource::isRemote(relativeTo)) {
         resolved = QUrl(relativeTo).resolved(fileName).toString();
         if (!FileSource(resolved).isAvailable()) resolved = "";
-        std::cerr << "resolved: " << resolved.toStdString() << std::endl;
+        std::cerr << "resolved: " << resolved << std::endl;
     } else {
         if (QUrl(relativeTo).scheme() == "file") {
             relativeTo = QUrl(relativeTo).toLocalFile();
--- a/widgets/PluginParameterBox.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/widgets/PluginParameterBox.cpp	Thu May 12 17:31:43 2011 +0100
@@ -225,7 +225,7 @@
     }
 
     if (m_params.find(identifier) == m_params.end()) {
-        std::cerr << "WARNING: PluginParameterBox::dialChanged: Unknown parameter \"" << identifier.toStdString() << "\"" << std::endl;
+        std::cerr << "WARNING: PluginParameterBox::dialChanged: Unknown parameter \"" << identifier << "\"" << std::endl;
         return;
     }
 
@@ -267,7 +267,7 @@
         spin->blockSignals(false);
     }
 
-//    std::cerr << "setting plugin parameter \"" << identifier.toStdString() << "\" to value " << newValue << std::endl;
+//    std::cerr << "setting plugin parameter \"" << identifier << "\" to value " << newValue << std::endl;
 
     m_plugin->setParameter(identifier.toStdString(), newValue);
 
@@ -288,7 +288,7 @@
     }
 
     if (m_params.find(identifier) == m_params.end()) {
-        std::cerr << "WARNING: PluginParameterBox::checkBoxChanged: Unknown parameter \"" << identifier.toStdString() << "\"" << std::endl;
+        std::cerr << "WARNING: PluginParameterBox::checkBoxChanged: Unknown parameter \"" << identifier << "\"" << std::endl;
         return;
     }
 
@@ -314,7 +314,7 @@
     }
 
     if (m_params.find(identifier) == m_params.end()) {
-        std::cerr << "WARNING: PluginParameterBox::spinBoxChanged: Unknown parameter \"" << identifier.toStdString() << "\"" << std::endl;
+        std::cerr << "WARNING: PluginParameterBox::spinBoxChanged: Unknown parameter \"" << identifier << "\"" << std::endl;
         return;
     }
 
@@ -352,7 +352,7 @@
         dial->blockSignals(false);
     }
 
-    std::cerr << "setting plugin parameter \"" << identifier.toStdString() << "\" to value " << value << std::endl;
+    std::cerr << "setting plugin parameter \"" << identifier << "\" to value " << value << std::endl;
 
     m_plugin->setParameter(identifier.toStdString(), value);
 
--- a/widgets/PropertyBox.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/widgets/PropertyBox.cpp	Thu May 12 17:31:43 2011 +0100
@@ -60,7 +60,7 @@
 {
 #ifdef DEBUG_PROPERTY_BOX
     std::cerr << "PropertyBox[" << this << "(\"" <<
-	container->getPropertyContainerName().toStdString() << "\" at " << container << ")]::PropertyBox" << std::endl;
+	container->getPropertyContainerName() << "\" at " << container << ")]::PropertyBox" << std::endl;
 #endif
 
     m_mainBox = new QVBoxLayout;
@@ -148,7 +148,7 @@
     layout->setMargin(layout->margin() / 2);
 
 #ifdef DEBUG_PROPERTY_BOX
-    std::cerr << "PropertyBox::populateViewPlayFrame: container " << m_container << " (name " << m_container->getPropertyContainerName().toStdString() << ") params " << params << std::endl;
+    std::cerr << "PropertyBox::populateViewPlayFrame: container " << m_container << " (name " << m_container->getPropertyContainerName() << ") params " << params << std::endl;
 #endif
 
     if (layer) {
@@ -277,9 +277,9 @@
     std::cerr << "PropertyBox[" << this
 	      << "(\"" << m_container->getPropertyContainerName().toStdString()
 	      << "\")]";
-    std::cerr << "::updatePropertyEditor(\"" << name.toStdString() << "\"):";
+    std::cerr << "::updatePropertyEditor(\"" << name << "\"):";
     std::cerr << " value " << value << ", have " << have << ", group \""
-	      << groupName.toStdString() << "\"" << std::endl;
+	      << groupName << "\"" << std::endl;
 #endif
 
     bool inGroup = (groupName != QString());
@@ -288,7 +288,7 @@
 	if (inGroup) {
 	    if (m_groupLayouts.find(groupName) == m_groupLayouts.end()) {
 #ifdef DEBUG_PROPERTY_BOX
-		std::cerr << "PropertyBox: adding label \"" << groupName.toStdString() << "\" and frame for group for \"" << name.toStdString() << "\"" << std::endl;
+		std::cerr << "PropertyBox: adding label \"" << groupName << "\" and frame for group for \"" << name << "\"" << std::endl;
 #endif
 		m_layout->addWidget(new QLabel(groupName, m_mainWidget), row, 0);
 		QFrame *frame = new QFrame(m_mainWidget);
@@ -299,7 +299,7 @@
 	    }
 	} else {
 #ifdef DEBUG_PROPERTY_BOX 
-	    std::cerr << "PropertyBox: adding label \"" << propertyLabel.toStdString() << "\"" << std::endl;
+	    std::cerr << "PropertyBox: adding label \"" << propertyLabel << "\"" << std::endl;
 #endif
 	    m_layout->addWidget(new QLabel(propertyLabel, m_mainWidget), row, 0);
 	}
@@ -566,7 +566,7 @@
 
 //    std::cerr << "my container is " << m_container << std::endl;
 //    std::cerr << "my container's name is... " << std::endl;
-//    std::cerr << m_container->objectName().toStdString() << std::endl;
+//    std::cerr << m_container->objectName() << std::endl;
 
     PropertyContainer::PropertyList properties = m_container->getProperties();
     for (size_t i = 0; i < properties.size(); ++i) {
--- a/widgets/SubdividingMenu.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/widgets/SubdividingMenu.cpp	Thu May 12 17:31:43 2011 +0100
@@ -176,12 +176,12 @@
     }
 
     if (m_nameToChunkMenuMap.find(name) == m_nameToChunkMenuMap.end()) {
-//        std::cerr << "SubdividingMenu::addAction(" << name.toStdString() << "): not found in name-to-chunk map, adding to main menu" << std::endl;
+//        std::cerr << "SubdividingMenu::addAction(" << name << "): not found in name-to-chunk map, adding to main menu" << std::endl;
         QMenu::addAction(action);
         return;
     }
 
-//    std::cerr << "SubdividingMenu::addAction(" << name.toStdString() << "): found in name-to-chunk map for menu " << m_nameToChunkMenuMap[name]->title().toStdString() << std::endl;
+//    std::cerr << "SubdividingMenu::addAction(" << name << "): found in name-to-chunk map for menu " << m_nameToChunkMenuMap[name]->title() << std::endl;
     m_nameToChunkMenuMap[name]->addAction(action);
 }
 
@@ -195,11 +195,11 @@
     }
 
     if (m_nameToChunkMenuMap.find(name) == m_nameToChunkMenuMap.end()) {
-//        std::cerr << "SubdividingMenu::addAction(" << name.toStdString() << "): not found in name-to-chunk map, adding to main menu" << std::endl;
+//        std::cerr << "SubdividingMenu::addAction(" << name << "): not found in name-to-chunk map, adding to main menu" << std::endl;
         return QMenu::addAction(name);
     }
 
-//    std::cerr << "SubdividingMenu::addAction(" << name.toStdString() << "): found in name-to-chunk map for menu " << m_nameToChunkMenuMap[name]->title().toStdString() << std::endl;
+//    std::cerr << "SubdividingMenu::addAction(" << name << "): found in name-to-chunk map for menu " << m_nameToChunkMenuMap[name]->title() << std::endl;
     return m_nameToChunkMenuMap[name]->addAction(name);
 }
 
@@ -212,12 +212,12 @@
     }
 
     if (m_nameToChunkMenuMap.find(name) == m_nameToChunkMenuMap.end()) {
-//        std::cerr << "SubdividingMenu::addAction(" << name.toStdString() << "): not found in name-to-chunk map, adding to main menu" << std::endl;
+//        std::cerr << "SubdividingMenu::addAction(" << name << "): not found in name-to-chunk map, adding to main menu" << std::endl;
         QMenu::addAction(action);
         return;
     }
 
-//    std::cerr << "SubdividingMenu::addAction(" << name.toStdString() << "): found in name-to-chunk map for menu " << m_nameToChunkMenuMap[name]->title().toStdString() << std::endl;
+//    std::cerr << "SubdividingMenu::addAction(" << name << "): found in name-to-chunk map for menu " << m_nameToChunkMenuMap[name]->title() << std::endl;
     m_nameToChunkMenuMap[name]->addAction(action);
 }
 
@@ -232,12 +232,12 @@
     }
 
     if (m_nameToChunkMenuMap.find(name) == m_nameToChunkMenuMap.end()) {
-//        std::cerr << "SubdividingMenu::addMenu(" << name.toStdString() << "): not found in name-to-chunk map, adding to main menu" << std::endl;
+//        std::cerr << "SubdividingMenu::addMenu(" << name << "): not found in name-to-chunk map, adding to main menu" << std::endl;
         QMenu::addMenu(menu);
         return;
     }
 
-//    std::cerr << "SubdividingMenu::addMenu(" << name.toStdString() << "): found in name-to-chunk map for menu " << m_nameToChunkMenuMap[name]->title().toStdString() << std::endl;
+//    std::cerr << "SubdividingMenu::addMenu(" << name << "): found in name-to-chunk map for menu " << m_nameToChunkMenuMap[name]->title() << std::endl;
     m_nameToChunkMenuMap[name]->addMenu(menu);
 }
 
@@ -252,11 +252,11 @@
     }
 
     if (m_nameToChunkMenuMap.find(name) == m_nameToChunkMenuMap.end()) {
-//        std::cerr << "SubdividingMenu::addMenu(" << name.toStdString() << "): not found in name-to-chunk map, adding to main menu" << std::endl;
+//        std::cerr << "SubdividingMenu::addMenu(" << name << "): not found in name-to-chunk map, adding to main menu" << std::endl;
         return QMenu::addMenu(name);
     }
 
-//    std::cerr << "SubdividingMenu::addMenu(" << name.toStdString() << "): found in name-to-chunk map for menu " << m_nameToChunkMenuMap[name]->title().toStdString() << std::endl;
+//    std::cerr << "SubdividingMenu::addMenu(" << name << "): found in name-to-chunk map for menu " << m_nameToChunkMenuMap[name]->title() << std::endl;
     return m_nameToChunkMenuMap[name]->addMenu(name);
 }
 
@@ -269,12 +269,12 @@
     }
 
     if (m_nameToChunkMenuMap.find(name) == m_nameToChunkMenuMap.end()) {
-//        std::cerr << "SubdividingMenu::addMenu(" << name.toStdString() << "): not found in name-to-chunk map, adding to main menu" << std::endl;
+//        std::cerr << "SubdividingMenu::addMenu(" << name << "): not found in name-to-chunk map, adding to main menu" << std::endl;
         QMenu::addMenu(menu);
         return;
     }
 
-//    std::cerr << "SubdividingMenu::addMenu(" << name.toStdString() << "): found in name-to-chunk map for menu " << m_nameToChunkMenuMap[name]->title().toStdString() << std::endl;
+//    std::cerr << "SubdividingMenu::addMenu(" << name << "): found in name-to-chunk map for menu " << m_nameToChunkMenuMap[name]->title() << std::endl;
     m_nameToChunkMenuMap[name]->addMenu(menu);
 }
 
--- a/widgets/TextAbbrev.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/widgets/TextAbbrev.cpp	Thu May 12 17:31:43 2011 +0100
@@ -263,7 +263,7 @@
 
 //    std::cerr << "TextAbbrev::getPrefixLength: prefix length is " << candidate << std::endl;
 //    for (int i = 0; i < texts.size(); ++i) {
-//        std::cerr << texts[i].left(candidate).toStdString() << "|" << texts[i].right(texts[i].length() - candidate).toStdString() << std::endl;
+//        std::cerr << texts[i].left(candidate) << "|" << texts[i].right(texts[i].length() - candidate) << std::endl;
 //    }
 
     return candidate;
--- a/widgets/TipDialog.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/widgets/TipDialog.cpp	Thu May 12 17:31:43 2011 +0100
@@ -134,7 +134,7 @@
 
     QFile file(filename);
 
-    std::cerr << "TipDialog::readTips from " << filename.toStdString() << std::endl;
+    std::cerr << "TipDialog::readTips from " << filename << std::endl;
 
     QXmlInputSource source(&file);
     
@@ -146,7 +146,7 @@
 TipDialog::showTip()
 {
     if (m_tipNumber < int(m_tips.size())) {
-        std::cerr << "Tip " << m_tipNumber << " is: " << m_tips[m_tipNumber].toStdString() << std::endl;
+        std::cerr << "Tip " << m_tipNumber << " is: " << m_tips[m_tipNumber] << std::endl;
         m_label->setText(m_tips[m_tipNumber]);
     } else {
         accept();
@@ -188,11 +188,11 @@
 {
     QString name = qName.toLower();
 
-    std::cerr << "TipFileParser::startElement(" << name.toStdString() << ")" << std::endl;
+    std::cerr << "TipFileParser::startElement(" << name << ")" << std::endl;
 
     if (name == "tips") {
         QString caption = attributes.value("caption");
-        std::cerr << "TipFileParser::caption = " << caption.toStdString() << std::endl;
+        std::cerr << "TipFileParser::caption = " << caption << std::endl;
         if (caption != "") m_dialog->m_caption = caption;
     } else if (name == "tip") {
         if (m_inTip) {
@@ -263,7 +263,7 @@
 bool
 TipDialog::TipFileParser::characters(const QString &text)
 {
-    std::cerr << "TipFileParser::characters(" << text.toStdString() << ")" << std::endl;
+    std::cerr << "TipFileParser::characters(" << text << ")" << std::endl;
 
     if (m_inText || m_inHtml) {
         m_dialog->m_tips[m_dialog->m_tips.size()-1] += text;
@@ -280,7 +280,7 @@
 	.arg(exception.message())
 	.arg(exception.lineNumber())
 	.arg(exception.columnNumber());
-    std::cerr << errorString.toStdString() << std::endl;
+    std::cerr << errorString << std::endl;
     return QXmlDefaultHandler::error(exception);
 }
 
@@ -292,6 +292,6 @@
 	.arg(exception.message())
 	.arg(exception.lineNumber())
 	.arg(exception.columnNumber());
-    std::cerr << errorString.toStdString() << std::endl;
+    std::cerr << errorString << std::endl;
     return QXmlDefaultHandler::fatalError(exception);
 }
--- a/widgets/TipDialog.h	Thu Apr 14 15:21:21 2011 +0100
+++ b/widgets/TipDialog.h	Thu May 12 17:31:43 2011 +0100
@@ -22,6 +22,8 @@
 
 #include <vector>
 
+#include "base/Debug.h"
+
 class QLabel;
 class QXmlInputSource;
 
--- a/widgets/TransformFinder.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/widgets/TransformFinder.cpp	Thu May 12 17:31:43 2011 +0100
@@ -169,7 +169,7 @@
 void
 TransformFinder::searchTextChanged(const QString &text)
 {
-//    std::cerr << "text is " << text.toStdString() << std::endl;
+//    std::cerr << "text is " << text << std::endl;
     m_newSearchText = text;
 }
 
@@ -318,7 +318,7 @@
         m_labels[i]->setFixedWidth(this->width() - 40);
         m_labels[i]->setUnselectedText(labelText);
 
-//        std::cerr << "selected text: " << selectedText.toStdString() << std::endl;
+//        std::cerr << "selected text: " << selectedText << std::endl;
         m_labels[i]->setSelectedText(selectedText);
 
         m_labels[i]->setSelected(m_selectedTransform == desc.identifier);
@@ -351,7 +351,7 @@
         }
     }
     std::cerr << "selectedLabelChanged: selected transform is now \""
-              << m_selectedTransform.toStdString() << "\"" << std::endl;
+              << m_selectedTransform << "\"" << std::endl;
 }
 
 void