fixed various GCC-warnings

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1077 0778d3d1-df1d-0410-868b-ea421aaaa00d

include/automatable_model.h

@@ -41,28 +41,28 @@ class track;
 
 
 // simple way to map a property of a view to a model
-#define mapPropertyFromModelPtr(type,getfunc,setfunc,modelname)	\
-		public:						\
-			inline type getfunc( void ) const	\
-			{					\
-				return( modelname->value() );	\
-			}					\
-		public slots:					\
-			inline void setfunc( const type _val )	\
-			{					\
-				modelname->setValue( _val );	\
+#define mapPropertyFromModelPtr(type,getfunc,setfunc,modelname)		\
+		public:							\
+			inline type getfunc( void ) const		\
+			{						\
+				return( (type) modelname->value() );	\
+			}						\
+		public slots:						\
+			inline void setfunc( const type _val )		\
+			{						\
+				modelname->setValue( _val );		\
 			}
 
-#define mapPropertyFromModel(type,getfunc,setfunc,modelname)	\
-		public:						\
-			inline type getfunc( void ) const	\
-			{					\
-				return( modelname.value() );	\
-			}					\
-		public slots:					\
-			inline void setfunc( const type _val )	\
-			{					\
-				modelname.setValue( _val );	\
+#define mapPropertyFromModel(type,getfunc,setfunc,modelname)		\
+		public:							\
+			inline type getfunc( void ) const		\
+			{						\
+				return( (type) modelname.value() );	\
+			}						\
+		public slots:						\
+			inline void setfunc( const type _val )		\
+			{						\
+				modelname.setValue( _val );		\
 			}
 
 

include/automation_editor.h

@@ -202,13 +202,13 @@ private:
 
 	actions m_action;
 
-	Uint32 m_selectStartTick;
-	int m_selectedTick;
-	int m_selectStartLevel;
-	int m_selectedLevels;
+	tick m_selectStartTick;
+	tick m_selectedTick;
+	float m_selectStartLevel;
+	float m_selectedLevels;
 
-	int m_moveStartLevel;
-	int m_moveStartTick;
+	float m_moveStartLevel;
+	tick m_moveStartTick;
 	int m_moveXOffset;
 
 	int m_ppt;