[haiku-commits] haiku: hrev45663 - src/apps/terminal

  • From: anevilyak@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 11 May 2013 05:22:25 +0200 (CEST)

hrev45663 adds 1 changeset to branch 'master'
old head: 09cbc86d0d94f06f5bf65071fccddf83060ed10c
new head: 7de99f83417fa30af420669e56f8cdb5342c3e61
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=7de99f8+%5E09cbc86

----------------------------------------------------------------------------

7de99f8: Fix Terminal build.

                                      [ Rene Gollent <anevilyak@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev45663
Commit:      7de99f83417fa30af420669e56f8cdb5342c3e61
URL:         http://cgit.haiku-os.org/haiku/commit/?id=7de99f8
Author:      Rene Gollent <anevilyak@xxxxxxxxx>
Date:        Sat May 11 03:21:51 2013 UTC

----------------------------------------------------------------------------

3 files changed, 5 insertions(+), 4 deletions(-)
src/apps/terminal/TermView.cpp       | 6 +++---
src/apps/terminal/TermView.h         | 2 +-
src/apps/terminal/TermViewStates.cpp | 1 +

----------------------------------------------------------------------------

diff --git a/src/apps/terminal/TermView.cpp b/src/apps/terminal/TermView.cpp
index 16590e5..610208e 100644
--- a/src/apps/terminal/TermView.cpp
+++ b/src/apps/terminal/TermView.cpp
@@ -485,7 +485,7 @@ TermView::_LineOffset(int32 index)
 
 
 // convert view coordinates to terminal text buffer position
-inline TermPos
+TermPos
 TermView::_ConvertToTerminal(const BPoint &p)
 {
        return TermPos(p.x >= 0 ? (int32)p.x / fFontWidth : -1, _LineAt(p.y));
@@ -2626,14 +2626,14 @@ TermView::_CheckHighlightRegion(int32 row, int32 
firstColumn,
                        }
                        continue;
                }
-       
+
                if (row == highlight->End().y && firstColumn < 
highlight->End().x
                                && lastColumn >= highlight->End().x) {
                        // region starts in the highlight, but exceeds the end
                        lastColumn = highlight->End().x - 1;
                        return highlight;
                }
-       
+
                TermPos pos(firstColumn, row);
                if (highlight->RangeContains(pos))
                        return highlight;
diff --git a/src/apps/terminal/TermView.h b/src/apps/terminal/TermView.h
index 5fc9c34..a1ab24e 100644
--- a/src/apps/terminal/TermView.h
+++ b/src/apps/terminal/TermView.h
@@ -176,7 +176,7 @@ private:
                        // point and text offset conversion
        inline  int32                           _LineAt(float y);
        inline  float                           _LineOffset(int32 index);
-       inline  TermPos                         _ConvertToTerminal(const 
BPoint& point);
+                       TermPos                         
_ConvertToTerminal(const BPoint& point);
        inline  BPoint                          _ConvertFromTerminal(const 
TermPos& pos);
 
        inline  void                            _InvalidateTextRect(int32 x1, 
int32 y1,
diff --git a/src/apps/terminal/TermViewStates.cpp 
b/src/apps/terminal/TermViewStates.cpp
index 8a85173..9591983 100644
--- a/src/apps/terminal/TermViewStates.cpp
+++ b/src/apps/terminal/TermViewStates.cpp
@@ -17,6 +17,7 @@
 #include "TermViewStates.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/stat.h>
 
 #include <Catalog.h>


Other related posts: