i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some gcc 4 warnings.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32394 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-08-14 20:50:59 +00:00
parent f2b1ae9a76
commit 7cd672ff50
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/terminal/BasicTerminalBuffer.cpp
+4 -4
View File
@@ -510,8 +510,8 @@ BasicTerminalBuffer::Find(const char* _pattern, const TermPos& start,
// check word match // check word match
if (matchWord) { if (matchWord) {
TermPos tempPos(matchStart); TermPos tempPos(matchStart);
if (_PreviousChar(tempPos, c) && !c.IsSpace() if ((_PreviousChar(tempPos, c) && !c.IsSpace())
|| _NextChar(tempPos = matchEnd, c) && !c.IsSpace()) { || (_NextChar(tempPos = matchEnd, c) && !c.IsSpace())) {
//debug_printf(" but no word match!\n"); //debug_printf(" but no word match!\n");
continue; continue;
} }
@@ -1079,8 +1079,8 @@ BasicTerminalBuffer::_ResizeRewrap(int32 width, int32 height,
if (fCursor.y + historySize == sourceIndex if (fCursor.y + historySize == sourceIndex
&& fCursor.x >= sourceX && fCursor.x >= sourceX
&& (fCursor.x < sourceX + toCopy && (fCursor.x < sourceX + toCopy
|| destLeft >= sourceLeft || (destLeft >= sourceLeft
&& sourceX + sourceLeft <= fCursor.x)) { && sourceX + sourceLeft <= fCursor.x))) {
cursor.x = destLine->length + fCursor.x - sourceX; cursor.x = destLine->length + fCursor.x - sourceX;
cursor.y = destTotalLines; cursor.y = destTotalLines;
src/apps/terminal/TermPos.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
inline bool operator<=(const TermPos& other) const inline bool operator<=(const TermPos& other) const
{ {
return y < other.y || y == other.y && x <= other.x; return y < other.y || (y == other.y && x <= other.x);
} }
inline bool operator>=(const TermPos& other) const inline bool operator>=(const TermPos& other) const
src/apps/terminal/TermView.cpp
+1 -1
View File
@@ -1341,7 +1341,7 @@ void
TermView::MessageReceived(BMessage *msg) TermView::MessageReceived(BMessage *msg)
{ {
entry_ref ref; entry_ref ref;
char *ctrl_l = "\x0c"; const char *ctrl_l = "\x0c";
// first check for any dropped message // first check for any dropped message
if (msg->WasDropped()) { if (msg->WasDropped()) {