GNOME.org
 

[dasher: 21/21] Standardize 'int Time' to an unsigned long

commit ad4983841414a7d519d7196c34d41af7b644f910
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date:   Thu Jul 14 12:46:18 2011 +0100

    Standardize 'int Time' to an unsigned long
    
    (This is a big deal on linux, where the high bit is often set!)

 Src/DasherCore/AlternatingDirectMode.cpp  |    2 +-
 Src/DasherCore/AlternatingDirectMode.h    |    2 +-
 Src/DasherCore/ButtonMode.cpp             |    2 +-
 Src/DasherCore/ButtonMode.h               |    4 ++--
 Src/DasherCore/ButtonMultiPress.cpp       |    2 +-
 Src/DasherCore/ButtonMultiPress.h         |    8 +++++---
 Src/DasherCore/CircleStartHandler.cpp     |    2 +-
 Src/DasherCore/CircleStartHandler.h       |    2 +-
 Src/DasherCore/DasherButtons.cpp          |    2 +-
 Src/DasherCore/DasherButtons.h            |    2 +-
 Src/DasherCore/DasherInput.h              |    4 ++--
 Src/DasherCore/DasherInterfaceBase.cpp    |    2 +-
 Src/DasherCore/DasherInterfaceBase.h      |    2 +-
 Src/DasherCore/DynamicButtons.cpp         |    7 +++----
 Src/DasherCore/DynamicButtons.h           |    6 +++---
 Src/DasherCore/FrameRate.cpp              |    2 +-
 Src/DasherCore/FrameRate.h                |    2 +-
 Src/DasherCore/OneButtonDynamicFilter.cpp |    5 +----
 Src/DasherCore/OneButtonDynamicFilter.h   |    6 +++---
 Src/DasherCore/OneButtonFilter.h          |    2 +-
 Src/DasherCore/StartHandler.h             |    2 +-
 Src/DasherCore/StylusFilter.h             |    2 +-
 Src/DasherCore/TwoBoxStartHandler.cpp     |    2 +-
 Src/DasherCore/TwoBoxStartHandler.h       |    6 +++---
 Src/DasherCore/TwoButtonDynamicFilter.cpp |    2 +-
 Src/DasherCore/TwoButtonDynamicFilter.h   |    2 +-
 Src/DasherCore/TwoPushDynamicFilter.cpp   |    2 +-
 Src/DasherCore/TwoPushDynamicFilter.h     |    2 +-
 28 files changed, 42 insertions(+), 44 deletions(-)
---
diff --git a/Src/DasherCore/AlternatingDirectMode.cpp b/Src/DasherCore/AlternatingDirectMode.cpp
index 41e7275..ddf7960 100644
--- a/Src/DasherCore/AlternatingDirectMode.cpp
+++ b/Src/DasherCore/AlternatingDirectMode.cpp
@@ -88,7 +88,7 @@ bool CAlternatingDirectMode::DecorateView(CDasherView *pView, CDasherInput *pInp
 }
 
 
-void CAlternatingDirectMode::DirectKeyDown(int iTime, int iId, CDasherView *pView, CDasherModel *pModel) {
+void CAlternatingDirectMode::DirectKeyDown(unsigned long iTime, int iId, CDasherView *pView, CDasherModel *pModel) {
   int iTargetBox;
   switch(iId) {
     case 2:
diff --git a/Src/DasherCore/AlternatingDirectMode.h b/Src/DasherCore/AlternatingDirectMode.h
index 32ba0a9..3dd4f2d 100644
--- a/Src/DasherCore/AlternatingDirectMode.h
+++ b/Src/DasherCore/AlternatingDirectMode.h
@@ -34,7 +34,7 @@ namespace Dasher {
   void SetupBoxes();
 
  private:
-  void DirectKeyDown(int iTime, int iId, CDasherView *pView, CDasherModel *pModel);
+  void DirectKeyDown(unsigned long iTime, int iId, CDasherView *pView, CDasherModel *pModel);
 
   int m_iLastBox;
 };
diff --git a/Src/DasherCore/ButtonMode.cpp b/Src/DasherCore/ButtonMode.cpp
index 735dc04..2b4f24a 100644
--- a/Src/DasherCore/ButtonMode.cpp
+++ b/Src/DasherCore/ButtonMode.cpp
@@ -200,7 +200,7 @@ void CButtonMode::KeyDown(unsigned long iTime, int iId, CDasherView *pView, CDas
   CInputFilter::KeyDown(iTime, iId, pView, pInput, pModel);
 }
 
-void CButtonMode::DirectKeyDown(int iTime, int iId, CDasherView *pView, CDasherModel *pModel) {
+void CButtonMode::DirectKeyDown(unsigned long iTime, int iId, CDasherView *pView, CDasherModel *pModel) {
   CDasherButtons::DirectKeyDown(iTime, iId, pView, pModel);
  if (iId!=100) m_iLastTime = iTime;
 }
diff --git a/Src/DasherCore/ButtonMode.h b/Src/DasherCore/ButtonMode.h
index c913c21..454ac94 100644
--- a/Src/DasherCore/ButtonMode.h
+++ b/Src/DasherCore/ButtonMode.h
@@ -33,10 +33,10 @@ class CButtonMode : public CDasherButtons, protected CSettingsObserver
   bool GetSettings(SModuleSettings **pSettings, int *iCount);
  protected: 
   void SetupBoxes();
-  void DirectKeyDown(int iTime, int iId, CDasherView *pView, CDasherModel *pModel);
+  void DirectKeyDown(unsigned long iTime, int iId, CDasherView *pView, CDasherModel *pModel);
  private:
   bool m_bHighlight;
-  int m_iLastTime;
+  unsigned long m_iLastTime;
 };
 }
 /// @}
diff --git a/Src/DasherCore/ButtonMultiPress.cpp b/Src/DasherCore/ButtonMultiPress.cpp
index 5af586d..4ab679f 100644
--- a/Src/DasherCore/ButtonMultiPress.cpp
+++ b/Src/DasherCore/ButtonMultiPress.cpp
@@ -40,7 +40,7 @@ void CButtonMultiPress::KeyDown(unsigned long iTime, int iId, CDasherView *pView
       //previous presses should not be treated as such....
       RevertPresses(m_deQueueTimes.size());
       //...but should be combined with this one into a new event (type = #presses)
-      Event(iTime, iId, m_deQueueTimes.size()+1, pModel);
+      ButtonEvent(iTime, iId, m_deQueueTimes.size()+1, pModel);
       if (m_deQueueTimes.size() >= maxClickCount() - 1)
 	m_deQueueTimes.clear(); //final press
       else //may still be more presses to come
diff --git a/Src/DasherCore/ButtonMultiPress.h b/Src/DasherCore/ButtonMultiPress.h
index bdc8848..40d59e6 100644
--- a/Src/DasherCore/ButtonMultiPress.h
+++ b/Src/DasherCore/ButtonMultiPress.h
@@ -26,9 +26,11 @@
 namespace Dasher {
 /// \ingroup InputFilter
 /// @{
-/// DynamicButtons filter which detects multiple presses of the same button occurring in a short space of time
-/// (such multi-presses are then passed onto the standard 'ActionButton' method, with iType equal
-/// to the number of presses, for subclasses to handle/decide how to respond.)
+/// DynamicButtons filter which detects multiple presses of the same button
+/// occurring in a short space of time - up to maxClickCount() consecutive presses,
+/// with a gap of up to LP_MULTIPRESS_TIME ms between the start of _each_pair_ of 
+/// presses. Such multi-presses are passed onto the standard ButtonEvent method,
+/// with iType equal to the number of presses, for subclasses to decide how to respond.
 class CButtonMultiPress : public CDynamicButtons {
  public:
   CButtonMultiPress(CSettingsUser *pCreator, CDasherInterfaceBase *pInterface, CFrameRate *pFramerate, ModuleID_t iID, const char *szName);
diff --git a/Src/DasherCore/CircleStartHandler.cpp b/Src/DasherCore/CircleStartHandler.cpp
index 5acdbe7..a6017da 100644
--- a/Src/DasherCore/CircleStartHandler.cpp
+++ b/Src/DasherCore/CircleStartHandler.cpp
@@ -77,7 +77,7 @@ bool CCircleStartHandler::DecorateView(CDasherView *pView) {
   return true;
 }
 
-void CCircleStartHandler::Timer(int iTime, dasherint mouseX, dasherint mouseY,CDasherView *pView) {
+void CCircleStartHandler::Timer(unsigned long iTime, dasherint mouseX, dasherint mouseY,CDasherView *pView) {
   ComputeScreenLoc(pView);
   screenint x,y;
   pView->Dasher2Screen(mouseX, mouseY, x, y);
diff --git a/Src/DasherCore/CircleStartHandler.h b/Src/DasherCore/CircleStartHandler.h
index 34e3bd0..351471d 100644
--- a/Src/DasherCore/CircleStartHandler.h
+++ b/Src/DasherCore/CircleStartHandler.h
@@ -13,7 +13,7 @@ public:
   CCircleStartHandler(CDefaultFilter *pCreator);
   ~CCircleStartHandler();
   virtual bool DecorateView(CDasherView *pView);
-  virtual void Timer(int iTime, dasherint iX, dasherint iY, CDasherView *pView);
+  virtual void Timer(unsigned long iTime, dasherint iX, dasherint iY, CDasherView *pView);
   virtual void HandleEvent(int iParameter);
   virtual void HandleEvent(CDasherView *pView);
 
diff --git a/Src/DasherCore/DasherButtons.cpp b/Src/DasherCore/DasherButtons.cpp
index 0643cdb..135c28b 100644
--- a/Src/DasherCore/DasherButtons.cpp
+++ b/Src/DasherCore/DasherButtons.cpp
@@ -66,7 +66,7 @@ void CDasherButtons::KeyDown(unsigned long iTime, int iId, CDasherView *pView, C
 
 }
 
-void CDasherButtons::DirectKeyDown(int iTime, int iId, CDasherView *pView, CDasherModel *pModel) {
+void CDasherButtons::DirectKeyDown(unsigned long iTime, int iId, CDasherView *pView, CDasherModel *pModel) {
   if(iId == 100) // Ignore mouse events
   return;
   if(iId == 1)
diff --git a/Src/DasherCore/DasherButtons.h b/Src/DasherCore/DasherButtons.h
index ca5836c..32db423 100644
--- a/Src/DasherCore/DasherButtons.h
+++ b/Src/DasherCore/DasherButtons.h
@@ -47,7 +47,7 @@ class CDasherButtons : public CInputFilter, protected CSettingsUser
   int m_iNumBoxes, iActiveBox;
   unsigned long m_iScanTime;
   
-  virtual void DirectKeyDown(int iTime, int iId, CDasherView *pView, CDasherModel *pModel);
+  virtual void DirectKeyDown(unsigned long iTime, int iId, CDasherView *pView, CDasherModel *pModel);
 };
 }
 /// @}
diff --git a/Src/DasherCore/DasherInput.h b/Src/DasherCore/DasherInput.h
index a62320b..b5998ec 100644
--- a/Src/DasherCore/DasherInput.h
+++ b/Src/DasherCore/DasherInput.h
@@ -51,11 +51,11 @@ public:
 
   /// Handle key down events
   ///
-  virtual void KeyDown(int iTime, int iId) {};
+  virtual void KeyDown(unsigned long iTime, int iId) {};
 
   ///
   /// Handle key up events
-  virtual void KeyUp(int iTime, int iId) {};
+  virtual void KeyUp(unsigned long iTime, int iId) {};
 };
 ///Abstract superclasses for CDasherInputs which natively provide screen coordinates;
 /// thus, when dasher-coordinates are requested, they will be converted
diff --git a/Src/DasherCore/DasherInterfaceBase.cpp b/Src/DasherCore/DasherInterfaceBase.cpp
index ebaeaa4..6c92a03 100644
--- a/Src/DasherCore/DasherInterfaceBase.cpp
+++ b/Src/DasherCore/DasherInterfaceBase.cpp
@@ -729,7 +729,7 @@ void CDasherInterfaceBase::KeyDown(unsigned long iTime, int iId) {
   }
 }
 
-void CDasherInterfaceBase::KeyUp(int iTime, int iId) {
+void CDasherInterfaceBase::KeyUp(unsigned long iTime, int iId) {
   if(isLocked())
     return;
 
diff --git a/Src/DasherCore/DasherInterfaceBase.h b/Src/DasherCore/DasherInterfaceBase.h
index 71f1cf8..e7b00ca 100644
--- a/Src/DasherCore/DasherInterfaceBase.h
+++ b/Src/DasherCore/DasherInterfaceBase.h
@@ -310,7 +310,7 @@ public:
   /// Called from outside to indicate a key or mouse button has just been released
   /// \param iTime time at which button released
   /// \param iId integer identifying button. See comments for KeyDown.
-  void KeyUp(int iTime, int iId);
+  void KeyUp(unsigned long iTime, int iId);
 
   /// @}
 
diff --git a/Src/DasherCore/DynamicButtons.cpp b/Src/DasherCore/DynamicButtons.cpp
index 6861f86..f241b1c 100644
--- a/Src/DasherCore/DynamicButtons.cpp
+++ b/Src/DasherCore/DynamicButtons.cpp
@@ -43,12 +43,11 @@ bool CDynamicButtons::Timer(unsigned long iTime, CDasherView *pDasherView, CDash
     return true;
   }
   //moving forwards. Check auto speed control...
-  unsigned int uTime = static_cast<unsigned int>(iTime);
-  if (GetBoolParameter(BP_AUTO_SPEEDCONTROL) && m_uSpeedControlTime < uTime)
+  if (GetBoolParameter(BP_AUTO_SPEEDCONTROL) && m_uSpeedControlTime < iTime)
   {
 	  if (m_uSpeedControlTime > 0) //has actually been set?
         SetLongParameter(LP_MAX_BITRATE, GetLongParameter(LP_MAX_BITRATE) * (1.0 + GetLongParameter(LP_DYNAMIC_SPEED_INC)/100.0));
-	  m_uSpeedControlTime = uTime + 1000*GetLongParameter(LP_DYNAMIC_SPEED_FREQ);
+	  m_uSpeedControlTime = iTime + 1000*GetLongParameter(LP_DYNAMIC_SPEED_FREQ);
   }
   return TimerImpl(iTime, pDasherView, m_pDasherModel, pol);
 }
@@ -78,7 +77,7 @@ void CDynamicButtons::KeyUp(unsigned long iTime, int iId, CDasherView *pView, CD
   if (iId == m_iHeldId) m_bKeyDown = false;
 }
 
-void CDynamicButtons::ButtonEvent(int iTime, int iButton, int iType, CDasherModel *pModel) {
+void CDynamicButtons::ButtonEvent(unsigned long iTime, int iButton, int iType, CDasherModel *pModel) {
   
   // TODO: Check that state diagram implemented here is what we
   // decided upon
diff --git a/Src/DasherCore/DynamicButtons.h b/Src/DasherCore/DynamicButtons.h
index bb93712..3b76a1e 100644
--- a/Src/DasherCore/DynamicButtons.h
+++ b/Src/DasherCore/DynamicButtons.h
@@ -47,7 +47,7 @@ class CDynamicButtons : public CDynamicFilter, public CSettingsObserver {
   /// of button 0 or 100 act as a dedicated reverse button, and button 1 pauses; any other
   /// press type or button is passed onto ActionButton.
   /// \param iType 0=normal press, 1=long press; see also CButtonMultiPress.
-  virtual void ButtonEvent(int long iTime, int iButton, int iType, CDasherModel *pModel);
+  virtual void ButtonEvent(unsigned long iTime, int iButton, int iType, CDasherModel *pModel);
 
   ///Called to handle key events when the Filter is running forwards normally.
   /// Short presses of buttons 0, 100 and 1 have been handled already, but all
@@ -73,8 +73,8 @@ class CDynamicButtons : public CDynamicFilter, public CSettingsObserver {
   private:
     int m_iState; // 0 = paused, 1 = reversing, >=2 = running (extensible by subclasses)
     int m_iHeldId;
-    int m_iKeyDownTime;
-    unsigned int m_uSpeedControlTime;
+    unsigned long m_iKeyDownTime;
+    unsigned long m_uSpeedControlTime;
     CDasherModel *m_pModel;
 };
 }
diff --git a/Src/DasherCore/FrameRate.cpp b/Src/DasherCore/FrameRate.cpp
index 7a91457..e2b951b 100644
--- a/Src/DasherCore/FrameRate.cpp
+++ b/Src/DasherCore/FrameRate.cpp
@@ -22,7 +22,7 @@ void CFrameRate::RecordFrame(unsigned long Time)
 
   // Update values once enough samples have been collected
   if(m_iFrames == m_iSamples) {
-    int m_iTime2 = Time;
+    unsigned long m_iTime2 = Time;
 
     // If samples are collected in < 50ms, collect more
     if(m_iTime2 - m_iTime < 50)
diff --git a/Src/DasherCore/FrameRate.h b/Src/DasherCore/FrameRate.h
index 09cb05f..8f66a6f 100644
--- a/Src/DasherCore/FrameRate.h
+++ b/Src/DasherCore/FrameRate.h
@@ -64,7 +64,7 @@ private:
   ///number of frames that have been sampled
   int m_iFrames;
   ///time at which first sampled frame was rendered
-  int m_iTime;
+  unsigned long m_iTime;
   ///number of frames over which we will compute average framerate
   int m_iSamples;
 
diff --git a/Src/DasherCore/OneButtonDynamicFilter.cpp b/Src/DasherCore/OneButtonDynamicFilter.cpp
index dd50637..f319512 100644
--- a/Src/DasherCore/OneButtonDynamicFilter.cpp
+++ b/Src/DasherCore/OneButtonDynamicFilter.cpp
@@ -44,9 +44,6 @@ COneButtonDynamicFilter::COneButtonDynamicFilter(CSettingsUser *pCreator, CDashe
   : CButtonMultiPress(pCreator, pInterface, pFramerate, 6, _("One Button Dynamic Mode")) {
   m_iTarget = 0;
 
-  m_iTargetX = new int[2];
-  m_iTargetY = new int[2];
-
   m_iTargetX[0] = 100;
   m_iTargetY[0] = 100;
 
@@ -118,7 +115,7 @@ bool COneButtonDynamicFilter::TimerImpl(unsigned long Time, CDasherView *m_pDash
   return true;
 }
 
-void COneButtonDynamicFilter::ActionButton(int iTime, int iButton, int iType, CDasherModel *pModel) {
+void COneButtonDynamicFilter::ActionButton(unsigned long iTime, int iButton, int iType, CDasherModel *pModel) {
   if (iType != 0) {
     //double/long push
     reverse();
diff --git a/Src/DasherCore/OneButtonDynamicFilter.h b/Src/DasherCore/OneButtonDynamicFilter.h
index 4de1ceb..467f921 100644
--- a/Src/DasherCore/OneButtonDynamicFilter.h
+++ b/Src/DasherCore/OneButtonDynamicFilter.h
@@ -42,12 +42,12 @@ class COneButtonDynamicFilter : public CButtonMultiPress {
  private:
   unsigned int maxClickCount() {return 2;} //double-click to reverse
   virtual bool TimerImpl(unsigned long Time, CDasherView *pView, CDasherModel *m_pDasherModel, CExpansionPolicy **pol);
-  virtual void ActionButton(int iTime, int iButton, int iType, CDasherModel *pModel);
+  virtual void ActionButton(unsigned long iTime, int iButton, int iType, CDasherModel *pModel);
   
   int m_iTarget;
 
-  int *m_iTargetX;
-  int *m_iTargetY;
+  int m_iTargetX[2];
+  int m_iTargetY[2];
 };
 }
 /// @}
diff --git a/Src/DasherCore/OneButtonFilter.h b/Src/DasherCore/OneButtonFilter.h
index 66b4dcf..79dccc6 100644
--- a/Src/DasherCore/OneButtonFilter.h
+++ b/Src/DasherCore/OneButtonFilter.h
@@ -20,7 +20,7 @@ class COneButtonFilter : public CInputFilter, private CSettingsUser {
   bool bStarted;
   ///set by DecorateView: true iff we have drawn an undecorated display, else false.
   bool m_bNoDecorations;
-  int iStartTime;
+  unsigned long iStartTime;
   int iLocation;
 };
 }
diff --git a/Src/DasherCore/StartHandler.h b/Src/DasherCore/StartHandler.h
index e71f760..14f71e2 100644
--- a/Src/DasherCore/StartHandler.h
+++ b/Src/DasherCore/StartHandler.h
@@ -16,7 +16,7 @@ public:
   }
   
   virtual bool DecorateView(CDasherView *pView) = 0;
-  virtual void Timer(int iTime, dasherint iX, dasherint iY, CDasherView *pView) = 0;
+  virtual void Timer(unsigned long iTime, dasherint iX, dasherint iY, CDasherView *pView) = 0;
 
 protected:
   CDefaultFilter * const m_pFilter;
diff --git a/Src/DasherCore/StylusFilter.h b/Src/DasherCore/StylusFilter.h
index 16c7fce..8ee2222 100644
--- a/Src/DasherCore/StylusFilter.h
+++ b/Src/DasherCore/StylusFilter.h
@@ -23,7 +23,7 @@ class CStylusFilter : public CDefaultFilter {
   ///Do not make a start handler when in stylus mode
   virtual CStartHandler *MakeStartHandler();
  private:
-  int m_iKeyDownTime;
+  unsigned long m_iKeyDownTime;
 };
 }
 /// @}
diff --git a/Src/DasherCore/TwoBoxStartHandler.cpp b/Src/DasherCore/TwoBoxStartHandler.cpp
index 6b9c96a..a5305a6 100644
--- a/Src/DasherCore/TwoBoxStartHandler.cpp
+++ b/Src/DasherCore/TwoBoxStartHandler.cpp
@@ -26,7 +26,7 @@ bool CTwoBoxStartHandler::DecorateView(CDasherView *pView) {
   return true;
 }
 
-void CTwoBoxStartHandler::Timer(int iTime, dasherint iDasherX, dasherint iDasherY, CDasherView *pView) { 
+void CTwoBoxStartHandler::Timer(unsigned long iTime, dasherint iDasherX, dasherint iDasherY, CDasherView *pView) { 
   if (!GetBoolParameter(BP_DASHER_PAUSED)) return;
   
   int iBoxMin, iBoxMax;
diff --git a/Src/DasherCore/TwoBoxStartHandler.h b/Src/DasherCore/TwoBoxStartHandler.h
index 6ba6a55..35709b8 100644
--- a/Src/DasherCore/TwoBoxStartHandler.h
+++ b/Src/DasherCore/TwoBoxStartHandler.h
@@ -12,16 +12,16 @@ public:
   CTwoBoxStartHandler(CDefaultFilter *pCreator);
 
   virtual bool DecorateView(CDasherView *pView);
-  virtual void Timer(int iTime, dasherint iX, dasherint iY, CDasherView *pView);
+  virtual void Timer(unsigned long iTime, dasherint iX, dasherint iY, CDasherView *pView);
   virtual void HandleEvent(int iParameter);
 
  private:
   ///Box currently being displayed, _iff_ BP_DASHER_PAUSED is set
   bool m_bFirstBox;
   ///Time at which mouse entered whichever box is current, or numeric_limits::max() if it hasn't
-  long m_iBoxEntered;
+  unsigned long m_iBoxEntered;
   ///Time at which second box was first displayed
-  long m_iBoxStart;
+  unsigned long m_iBoxStart;
 };
 }
 /// @}
diff --git a/Src/DasherCore/TwoButtonDynamicFilter.cpp b/Src/DasherCore/TwoButtonDynamicFilter.cpp
index b05da49..ad3b4ea 100644
--- a/Src/DasherCore/TwoButtonDynamicFilter.cpp
+++ b/Src/DasherCore/TwoButtonDynamicFilter.cpp
@@ -122,7 +122,7 @@ bool CTwoButtonDynamicFilter::TimerImpl(unsigned long Time, CDasherView *m_pDash
   return true;
 }
 
-void CTwoButtonDynamicFilter::ActionButton(int iTime, int iButton, int iType, CDasherModel *pModel) {
+void CTwoButtonDynamicFilter::ActionButton(unsigned long iTime, int iButton, int iType, CDasherModel *pModel) {
   
   double dFactor(GetBoolParameter(BP_TWOBUTTON_REVERSE) ? -1.0 : 1.0);
   int iEffect; //for user log
diff --git a/Src/DasherCore/TwoButtonDynamicFilter.h b/Src/DasherCore/TwoButtonDynamicFilter.h
index 984392e..d4669b4 100644
--- a/Src/DasherCore/TwoButtonDynamicFilter.h
+++ b/Src/DasherCore/TwoButtonDynamicFilter.h
@@ -49,7 +49,7 @@ class CTwoButtonDynamicFilter : public CButtonMultiPress {
  private:
   unsigned int maxClickCount() {return GetBoolParameter(BP_2B_INVERT_DOUBLE) ? 3 : 2;}
   virtual bool TimerImpl(unsigned long Time, CDasherView *m_pDasherView, CDasherModel *m_pDasherModel, CExpansionPolicy **pol);
-  virtual void ActionButton(int iTime, int iButton, int iType, CDasherModel *pModel);
+  virtual void ActionButton(unsigned long iTime, int iButton, int iType, CDasherModel *pModel);
   double m_dLagMul;
   ///id of physical key, whose pressing we have emulated, in response
   /// to a mouse down event on one or other half of the canvas...
diff --git a/Src/DasherCore/TwoPushDynamicFilter.cpp b/Src/DasherCore/TwoPushDynamicFilter.cpp
index 446b548..e7feef7 100644
--- a/Src/DasherCore/TwoPushDynamicFilter.cpp
+++ b/Src/DasherCore/TwoPushDynamicFilter.cpp
@@ -183,7 +183,7 @@ void CTwoPushDynamicFilter::KeyUp(unsigned long Time, int iId, CDasherView *pVie
   CDynamicButtons::KeyUp(Time, iId, pView, pInput, pModel);
 }
 
-void CTwoPushDynamicFilter::ActionButton(int iTime, int iButton, int iType, CDasherModel *pModel) {
+void CTwoPushDynamicFilter::ActionButton(unsigned long iTime, int iButton, int iType, CDasherModel *pModel) {
   // Types:
   // 0 = ordinary click
   // 1 = long click
diff --git a/Src/DasherCore/TwoPushDynamicFilter.h b/Src/DasherCore/TwoPushDynamicFilter.h
index 825a5ec..6a0c7a4 100644
--- a/Src/DasherCore/TwoPushDynamicFilter.h
+++ b/Src/DasherCore/TwoPushDynamicFilter.h
@@ -41,7 +41,7 @@ class CTwoPushDynamicFilter : public CDynamicButtons /*long push, but do our own
 
  protected:
   virtual bool TimerImpl(unsigned long Time, CDasherView *m_pDasherView, CDasherModel *m_pDasherModel, CExpansionPolicy **pol);
-  virtual void ActionButton(int iTime, int iButton, int iType, CDasherModel *pModel);
+  virtual void ActionButton(unsigned long iTime, int iButton, int iType, CDasherModel *pModel);
 
   virtual void HandleEvent(int iParameter);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]