Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

for debugging remove iostream from bww2mxml

  • Loading branch information...
commit 4e6aaa1ba4f82d44228f08f9721025e0a1e5e74e 1 parent fb87e64
@wschweer wschweer authored
View
12 bww2mxml/main.cpp
@@ -19,7 +19,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//=============================================================================
-#include <iostream>
+// #include <iostream>
#include <QtCore/QCoreApplication>
#include <QtCore/QFile>
@@ -31,7 +31,7 @@
void usage()
{
- std::cerr << "usage bww2mxml [infile [outfile]]" << std::endl;
+ //WS std::cerr << "usage bww2mxml [infile [outfile]]" << std::endl;
}
int main(int argc, char *argv[])
@@ -55,8 +55,8 @@ int main(int argc, char *argv[])
inFile.setFileName(args.at(1));
if (!inFile.open(QIODevice::ReadOnly))
{
- std::cerr << "Cannot open file '" << qPrintable(args.at(1)) << "' for reading: "
- << qPrintable(inFile.errorString()) << std::endl;
+//WS std::cerr << "Cannot open file '" << qPrintable(args.at(1)) << "' for reading: "
+// << qPrintable(inFile.errorString()) << std::endl;
return 2;
}
}
@@ -68,8 +68,8 @@ int main(int argc, char *argv[])
outFile.setFileName(args.at(2));
if (!outFile.open(QIODevice::WriteOnly))
{
- std::cerr << "Cannot open file '" << qPrintable(args.at(2)) << "' for writing: "
- << qPrintable(outFile.errorString()) << std::endl;
+// std::cerr << "Cannot open file '" << qPrintable(args.at(2)) << "' for writing: "
+// << qPrintable(outFile.errorString()) << std::endl;
return 2;
}
}
View
4 bww2mxml/parser.cpp
@@ -26,7 +26,7 @@
uinterrupted sequences of notes.
*/
-#include <iostream>
+// #include <iostream>
#include <QtCore/QStringList>
#include <QtCore/QtDebug>
@@ -568,11 +568,13 @@ namespace Bww {
void Parser::errorHandler(QString s)
{
+#if 0 // WS
std::cerr << "Parse error line "
<< lex.symLineNumber() + 1
<< ": "
<< qPrintable(s)
<< std::endl;
+#endif
}
/**
View
10 effects/effectgui.cpp
@@ -29,6 +29,16 @@ EffectGui::EffectGui(Effect* e)
}
//---------------------------------------------------------
+// EffectGui
+//---------------------------------------------------------
+
+EffectGui::~EffectGui()
+ {
+ printf("destructor EffectGui %p\n", this);
+ }
+
+
+//---------------------------------------------------------
// init
//---------------------------------------------------------
View
1  effects/effectgui.h
@@ -33,6 +33,7 @@ class EffectGui : public QQuickView {
public:
EffectGui(Effect*);
+ ~EffectGui();
void init(QUrl& url);
Effect* effect() const { return _effect; }
virtual void updateValues();
View
6 mstyle/mstyle.cpp
@@ -7087,7 +7087,8 @@ bool MgStyle::drawToolBoxTabShapeControl( const QStyleOption* option, QPainter*
// drawToolButtonLabelControl
//---------------------------------------------------------
-bool MgStyle::drawToolButtonLabelControl(const QStyleOption* option, QPainter* painter, const QWidget* widget) const {
+bool MgStyle::drawToolButtonLabelControl(const QStyleOption* option, QPainter* painter, const QWidget* widget) const
+ {
// need to customize palettes to deal with autoraised buttons
const State& flags( option->state );
const bool autoRaised(flags & State_AutoRaise);
@@ -7101,7 +7102,8 @@ bool MgStyle::drawToolButtonLabelControl(const QStyleOption* option, QPainter* p
return true;
QStyleOptionToolButton localOption(*toolButtonOpt);
- localOption.palette.setColor(QPalette::ButtonText, option->palette.color(QPalette::WindowText));
+ QColor color(option->palette.color(QPalette::WindowText));
+ localOption.palette.setColor(QPalette::ButtonText, color);
QCommonStyle::drawControl(CE_ToolButtonLabel, &localOption, painter, widget);
return true;
Please sign in to comment.
Something went wrong with that request. Please try again.