comparison view/PaneStack.cpp @ 1374:631897ba9fca zoom

Merge from default branch

 }
 
 void
 PaneStack::deletePane(Pane *pane)
 {
-    cerr << "PaneStack::deletePane(" << pane << ")" << endl;
+#ifdef DEBUG_PANE_STACK
+    SVCERR << "PaneStack::deletePane(" << pane << ")" << endl;
+#endif
 
     std::vector<PaneRec>::iterator i;
     bool found = false;
 
     QWidget *stack = 0;

     }
 
     emit paneAboutToBeDeleted(pane);
     unlinkAlignmentViews();
 
-    cerr << "PaneStack::deletePane: about to delete parent " << pane->parent() << " of pane " << pane << endl;
+#ifdef DEBUG_PANE_STACK
+    SVCERR << "PaneStack::deletePane: about to delete parent " << pane->parent() << " of pane " << pane << endl;
+#endif
 
     // The property stack associated with the parent was initially
     // created with the same parent as it, so it would be deleted when
     // we delete the pane's parent in a moment -- but it may have been
     // reparented depending on the layout. We'd better delete it

 }
 
 void
 PaneStack::showOrHidePaneAccessories()
 {
-    cerr << "PaneStack::showOrHidePaneAccessories: count == " << getPaneCount() << endl;
+#ifdef DEBUG_PANE_STACK
+    SVCERR << "PaneStack::showOrHidePaneAccessories: count == " << getPaneCount() << endl;
+#endif
 
     bool multi = (getPaneCount() > 1);
     for (std::vector<PaneRec>::iterator i = m_panes.begin();
          i != m_panes.end(); ++i) {
         i->xButton->setVisible(multi && m_showAccessories);

         ++i;
     }
 
     relinkAlignmentViews();
 
-    cerr << "WARNING: PaneStack::hidePane(" << pane << "): Pane not found in visible panes" << endl;
+    SVCERR << "WARNING: PaneStack::hidePane(" << pane << "): Pane not found in visible panes" << endl;
 }
 
 void
 PaneStack::showPane(Pane *pane)
 {

         ++i;
     }
 
     relinkAlignmentViews();
 
-    cerr << "WARNING: PaneStack::showPane(" << pane << "): Pane not found in hidden panes" << endl;
+    SVCERR << "WARNING: PaneStack::showPane(" << pane << "): Pane not found in hidden panes" << endl;
 }
 
 void
 PaneStack::setCurrentPane(Pane *pane) // may be null
 {

 
     if (found || pane == 0) {
         m_currentPane = pane;
         emit currentPaneChanged(m_currentPane);
     } else {
-        cerr << "WARNING: PaneStack::setCurrentPane(" << pane << "): pane is not a visible pane in this stack" << endl;
+        SVCERR << "WARNING: PaneStack::setCurrentPane(" << pane << "): pane is not a visible pane in this stack" << endl;
     }
 }
 
 void
 PaneStack::setCurrentLayer(Pane *pane, Layer *layer) // may be null