Merge pull request #933 from LMMS/stable-1.1

Stable 1.1

include/LmmsPalette.h

@@ -43,6 +43,8 @@ class EXPORT LmmsPalette : public QWidget
 	Q_PROPERTY( QColor brightText READ brightText WRITE setBrightText )
 	Q_PROPERTY( QColor highlight READ highlight WRITE setHighlight )
 	Q_PROPERTY( QColor highlightedText READ highlightedText WRITE setHighlightedText )
+	Q_PROPERTY( QColor toolTipText READ toolTipText WRITE setToolTipText )
+	Q_PROPERTY( QColor toolTipBase READ toolTipBase WRITE setToolTipBase )
 
 public:
 	LmmsPalette( QWidget * parent, QStyle * stylearg  ); 
@@ -63,6 +65,8 @@ public:
 	ACCESSMET( brightText, setBrightText )
 	ACCESSMET( highlight, setHighlight )
 	ACCESSMET( highlightedText, setHighlightedText )
+	ACCESSMET( toolTipText, setToolTipText )
+	ACCESSMET( toolTipBase, setToolTipBase )
 
 #undef ACCESSMET
 
@@ -79,6 +83,8 @@ private:
 	QColor m_brightText;
 	QColor m_highlight;
 	QColor m_highlightedText;
+	QColor m_toolTipText;
+	QColor m_toolTipBase;
 };
 
 

include/lmms_math.h

@@ -28,10 +28,20 @@
 
 #include <stdint.h>
 #include "lmms_constants.h"
+#include "lmmsconfig.h"
 #include <QtCore/QtGlobal>
 
 #include <math.h>
 
+#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) 
+#ifndef isnanf
+#define isnanf(x)	isnan(x)
+#endif
+#ifndef isinff
+#define isinff(x)	isinf(x)
+#endif
+#endif
+
 #ifdef __INTEL_COMPILER
 
 static inline float absFraction( const float _x )

include/text_float.h

@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _TEXT_FLOAT
-#define _TEXT_FLOAT
+#ifndef TEXT_FLOAT_H
+#define TEXT_FLOAT_H
 
 #include <QtGui/QWidget>
 #include <QtGui/QPixmap>
@@ -34,6 +34,7 @@
 
 class EXPORT textFloat : public QWidget
 {
+	Q_OBJECT
 public:
 	textFloat();
 	virtual ~textFloat()
@@ -76,7 +77,6 @@ private:
 	QString m_text;
 	QPixmap m_pixmap;
 
-} ;
-
+};
 
 #endif