GNOME.org
 

[dasher] whitespace

commit a9b2ecc9ece62074798d311494e4d92bad716b05
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Sat May 14 12:13:58 2011 +0100

    whitespace
    
    I think this undoes those added in the last merge?
    egrep '[[:blank:]]$' *
    is useful...

 Src/DasherCore/Alphabet/AlphIO.cpp      |    4 ++--
 Src/DasherCore/Alphabet/AlphInfo.cpp    |    2 +-
 Src/DasherCore/Alphabet/AlphabetMap.cpp |    4 ++--
 Src/DasherCore/DasherNode.cpp           |    2 +-
 Src/DasherCore/DasherView.cpp           |    6 +++---
 Src/DasherCore/DasherViewSquare.cpp     |    4 ++--
 Src/DasherCore/DasherViewSquare.h       |    2 +-
 Src/DasherCore/SocketInputBase.h        |   12 ++++++------
 Src/DasherCore/TimeSpan.h               |    2 +-
 Src/DasherCore/UserButton.h             |    2 +-
 10 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/Src/DasherCore/Alphabet/AlphIO.cpp b/Src/DasherCore/Alphabet/AlphIO.cpp
index 4e41ebc..4b0cdde 100644
--- a/Src/DasherCore/Alphabet/AlphIO.cpp
+++ b/Src/DasherCore/Alphabet/AlphIO.cpp
@@ -535,7 +535,7 @@ void CAlphIO::XML_StartElement(void *userData, const XML_Char *name, const XML_C
     }
 
     SGroupInfo *&prevSibling(Me->m_vGroups.empty() ? Me->InputInfo->m_pBaseGroup : Me->m_vGroups.back()->pChild);
-    
+
     if (pNewGroup->iColour==-1 && pNewGroup->bVisible) {
       //no colour specified. Try to colour cycle, but make sure we choose
       // a different colour from both its parent and any previous sibling
@@ -548,7 +548,7 @@ void CAlphIO::XML_StartElement(void *userData, const XML_Char *name, const XML_C
         break; //different from parent and previous sibling (if any!), so ok
       }
     }
-    
+
     pNewGroup->iStart = Me->InputInfo->m_vCharacters.size()+1;
 
     pNewGroup->pChild = NULL;
diff --git a/Src/DasherCore/Alphabet/AlphInfo.cpp b/Src/DasherCore/Alphabet/AlphInfo.cpp
index 4abd0d3..910ede9 100644
--- a/Src/DasherCore/Alphabet/AlphInfo.cpp
+++ b/Src/DasherCore/Alphabet/AlphInfo.cpp
@@ -15,7 +15,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Dasher; if not, write to the Free Software 
+// along with Dasher; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "AlphIO.h"
diff --git a/Src/DasherCore/Alphabet/AlphabetMap.cpp b/Src/DasherCore/Alphabet/AlphabetMap.cpp
index c30f0f5..e3944ce 100644
--- a/Src/DasherCore/Alphabet/AlphabetMap.cpp
+++ b/Src/DasherCore/Alphabet/AlphabetMap.cpp
@@ -48,7 +48,7 @@ static utf8_length m_utf8_count_array;
 utf8_length::utf8_length()
 {
   int i;
-  
+
   memset(utf8_count_array, 0, sizeof(utf8_count_array));
   for (i = 0x00; i <= 0x7f; ++i) utf8_count_array[i] = 1;
   for (i = 0xc0; i <= 0xdf; ++i) utf8_count_array[i] = 2;
@@ -125,7 +125,7 @@ inline int CAlphabetMap::SymbolStream::findNext() {
     std::cerr << "Read invalid UTF-8 character 0x" << hex << buf[pos]
     << dec << std::endl;
 #endif
-    ++pos;    
+    ++pos;
   }
 }
 
diff --git a/Src/DasherCore/DasherNode.cpp b/Src/DasherCore/DasherNode.cpp
index 5f918fe..c36a68c 100644
--- a/Src/DasherCore/DasherNode.cpp
+++ b/Src/DasherCore/DasherNode.cpp
@@ -50,7 +50,7 @@ CDasherNode::CDasherNode(CDasherNode *pParent, int iOffset, unsigned int iLbnd,
     DASHER_ASSERT(!pParent->GetFlag(NF_ALLCHILDREN));
     pParent->Children().push_back(this);
   }
-	
+
   iNumNodes++;
 }
 
diff --git a/Src/DasherCore/DasherView.cpp b/Src/DasherCore/DasherView.cpp
index 377fbed..e1eaa95 100644
--- a/Src/DasherCore/DasherView.cpp
+++ b/Src/DasherCore/DasherView.cpp
@@ -15,7 +15,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Dasher; if not, write to the Free Software 
+// along with Dasher; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "../Common/Common.h"
@@ -141,7 +141,7 @@ void CDasherView::DasherPolyarrow(myint *x, myint *y, int n, int iWidth, int iCo
   ScreenPoints[n+2].y = ScreenPoints[n-1].y + iXvec + iYvec;
 
   Screen()->Polyline(ScreenPoints, n+3, iWidth, (iColour==-1) ? 0 : iColour);
-  
+
   delete[]ScreenPoints;
 }
 
@@ -179,7 +179,7 @@ void CDasherView::DasherDrawCentredRectangle(myint iDasherX, myint iDasherY, scr
 void CDasherView::DrawText(const std::string & str, myint x, myint y, int Size, int iColor) {
   screenint X, Y;
   Dasher2Screen(x, y, X, Y);
-  
+
   Screen()->DrawString(str, X, Y, Size, iColor);
 }
 
diff --git a/Src/DasherCore/DasherViewSquare.cpp b/Src/DasherCore/DasherViewSquare.cpp
index a08c9bd..71f62c7 100644
--- a/Src/DasherCore/DasherViewSquare.cpp
+++ b/Src/DasherCore/DasherViewSquare.cpp
@@ -534,7 +534,7 @@ void CDasherViewSquare::DisjointRender(CDasherNode *pRender, myint y1, myint y2,
 
         if (newy2-newy1 < iDasherMaxX) //fill in to it's left...
           DasherDrawRectangle(std::min(Range,iDasherMaxX), std::max(y1,iDasherMinY), newy2-newy1, std::min(y2,iDasherMaxY), myColor, -1, 0);
-        DisjointRender(pChild, newy1, newy2, pPrevText, 
+        DisjointRender(pChild, newy1, newy2, pPrevText,
                         policy, dMaxCost, pOutput);
         //leave pRender->onlyChildRendered set, so remaining children are skipped
       }
@@ -679,7 +679,7 @@ beginning:
   // _supposed_ to be the same colour as their parent, will have no outlines...
   // (thankfully having 2 "phases" means this doesn't happen in standard
   // colour schemes)
-  if (pRender->GetFlag(NF_VISIBLE)) { 
+  if (pRender->GetFlag(NF_VISIBLE)) {
 	//outline width 0 = fill only; >0 = fill + outline; <0 = outline only
 	int fillColour = GetLongParameter(LP_OUTLINE_WIDTH)>=0 ? myColor : -1;
 	int lineWidth = abs(GetLongParameter(LP_OUTLINE_WIDTH));
diff --git a/Src/DasherCore/DasherViewSquare.h b/Src/DasherCore/DasherViewSquare.h
index bfb4319..cf41bdd 100644
--- a/Src/DasherCore/DasherViewSquare.h
+++ b/Src/DasherCore/DasherViewSquare.h
@@ -148,7 +148,7 @@ private:
   /// exactly the area contained within the node.
   /// @param pOutput The innermost node covering the crosshair (if any)
   void DisjointRender(CDasherNode * Render, myint y1, myint y2, CTextString *prevText, CExpansionPolicy &policy, double dMaxCost, CDasherNode *&pOutput);
-  
+
   /// (Recursively) render a node and all contained subnodes, in overlapping shapes
   /// (according to LP_SHAPE_TYPE: 1=rects, 2=triangles, 3=truncated triangles,
   /// 4=quadrics, 5=semicircles)
diff --git a/Src/DasherCore/SocketInputBase.h b/Src/DasherCore/SocketInputBase.h
index 80a023a..a923551 100644
--- a/Src/DasherCore/SocketInputBase.h
+++ b/Src/DasherCore/SocketInputBase.h
@@ -20,7 +20,7 @@ namespace Dasher {
   class CSocketInputBase;
 
 using namespace std;
-/// \ingroup Input 
+/// \ingroup Input
 /// \{
 class CSocketInputBase : public CScreenCoordInput {
 
@@ -56,12 +56,12 @@ public:
   /// Gets the last coordinates received; if only one coordinate is being read, this is put
   /// into iDasherY (and iDasherX set to 0).
   bool GetScreenCoords(screenint &iScreenX, screenint &iScreenY, CDasherView *pView) {
-    
+
     //update max values for reader thread...(note any changes here won't be incorporated
     // until values are next received over socket, but never mind)
     dasherMaxCoordinateValues[0] = pView->Screen()->GetWidth();
     dasherMaxCoordinateValues[1] = pView->Screen()->GetHeight();
-    
+
     if (coordinateCount==1) {
       iScreenX = 0;
       iScreenY = dasherCoordinates[0];
@@ -78,7 +78,7 @@ public:
   void Activate() {
     StartListening();
   };
-  
+
   void Deactivate() {
     StopListening();
   };
@@ -123,9 +123,9 @@ protected:
   virtual void ReportErrnoError(std::string prefix); // override as appropriate for each platform
 
   virtual void ReportError(std::string s); // override as appropriate for each platform
-    
+
   virtual void SocketDebugMsg(const char *pszFormat, ...);
-  
+
 };
 }
 /// \}
diff --git a/Src/DasherCore/TimeSpan.h b/Src/DasherCore/TimeSpan.h
index 47f6a8d..6c4b750 100644
--- a/Src/DasherCore/TimeSpan.h
+++ b/Src/DasherCore/TimeSpan.h
@@ -1,5 +1,5 @@
 
-// Object that keeps track of a time span.  
+// Object that keeps track of a time span.
 // Span starts when the object is created, and
 // ends when someone asks it for its XML representation.
 // User can also call stop to cause timer to stop and
diff --git a/Src/DasherCore/UserButton.h b/Src/DasherCore/UserButton.h
index a7cf566..5ddf93d 100644
--- a/Src/DasherCore/UserButton.h
+++ b/Src/DasherCore/UserButton.h
@@ -28,7 +28,7 @@ class CUserButton {
     else
       return 0;
   }
-    
+
  protected:
   int m_iId;
   int m_iType;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]