[haiku-commits] r35373 - haiku/trunk/src/kits/tracker
- From: mmlr@xxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 1 Feb 2010 06:02:05 +0100 (CET)
Author: mmlr
Date: 2010-02-01 06:02:05 +0100 (Mon, 01 Feb 2010)
New Revision: 35373
Changeset: http://dev.haiku-os.org/changeset/35373/haiku
Modified:
haiku/trunk/src/kits/tracker/PoseView.cpp
haiku/trunk/src/kits/tracker/PoseView.h
Log:
Replaced the sMatchString buffer used for typeahead search by a BString. No
intended functional change.
Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp 2010-02-01 04:26:05 UTC (rev
35372)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp 2010-02-01 05:02:05 UTC (rev
35373)
@@ -6111,11 +6111,10 @@
break;
if (fSelectionList->IsEmpty())
- sMatchString[0] = '\0';
+ sMatchString.Truncate(0);
else {
BPose *pose =
fSelectionList->FirstItem();
- strncpy(sMatchString,
pose->TargetModel()->Name(), B_FILE_NAME_LENGTH - 1);
- sMatchString[B_FILE_NAME_LENGTH - 1] =
'\0';
+
sMatchString.SetTo(pose->TargetModel()->Name());
}
bool reverse =
(Window()->CurrentMessage()->FindInt32("modifiers")
@@ -6123,11 +6122,11 @@
int32 index;
BPose *pose = FindNextMatch(&index, reverse);
if (!pose) { // wrap around
- if (reverse) {
- sMatchString[0] = (char)0xff;
- sMatchString[1] = '\0';
- } else
- sMatchString[0] = '\0';
+ if (reverse)
+ sMatchString.SetTo(0x7f, 1);
+ else
+ sMatchString.Truncate(0);
+
pose = FindNextMatch(&index, reverse);
}
@@ -6170,15 +6169,15 @@
break;
}
- if (strlen(sMatchString) == 0)
+ if (sMatchString.Length() == 0)
break;
// remove last char from the typeahead buffer
- sMatchString[strlen(sMatchString) - 1] = '\0';
+ sMatchString.Truncate(sMatchString.Length() - 1);
fLastKeyTime = system_time();
- fCountView->SetTypeAhead(sMatchString);
+ fCountView->SetTypeAhead(sMatchString.String());
// select our new string
int32 index;
@@ -6231,17 +6230,14 @@
}
// add char to existing matchString or start new match
string
- // make sure we don't overfill matchstring
- if (eventTime - fLastKeyTime < (doubleClickSpeed * 2)) {
- uint32 nchars = B_FILE_NAME_LENGTH -
strlen(sMatchString);
- strncat(sMatchString, searchChar, nchars);
- } else {
- strncpy(sMatchString, searchChar,
B_FILE_NAME_LENGTH - 1);
- }
- sMatchString[B_FILE_NAME_LENGTH - 1] = '\0';
+ if (eventTime - fLastKeyTime < (doubleClickSpeed * 2))
+ sMatchString.Append(searchChar);
+ else
+ sMatchString.SetTo(searchChar);
+
fLastKeyTime = eventTime;
- fCountView->SetTypeAhead(sMatchString);
+ fCountView->SetTypeAhead(sMatchString.String());
int32 index;
BPose *pose = FindBestMatch(&index);
@@ -6267,14 +6263,14 @@
BPose *pose = fPoseList->ItemAt(index);
if (reverse) {
- if (strcasecmp(pose->TargetModel()->Name(),
sMatchString) < 0)
+ if (sMatchString.ICompare(pose->TargetModel()->Name())
> 0)
if (strcasecmp(pose->TargetModel()->Name(),
bestSoFar) >= 0
|| !bestSoFar[0]) {
strcpy(bestSoFar,
pose->TargetModel()->Name());
poseToSelect = pose;
*matchingIndex = index;
}
- } else if (strcasecmp(pose->TargetModel()->Name(),
sMatchString) > 0)
+ } else if (sMatchString.ICompare(pose->TargetModel()->Name()) <
0)
if (strcasecmp(pose->TargetModel()->Name(), bestSoFar)
<= 0
|| !bestSoFar[0]) {
strcpy(bestSoFar, pose->TargetModel()->Name());
@@ -6294,7 +6290,7 @@
BPose *poseToSelect = NULL;
float bestScore = -1;
int32 count = fPoseList->CountItems();
- size_t matchLength = strlen(sMatchString);
+ size_t matchLength = sMatchString.Length();
// loop through all poses to find match
for (int32 j = 0; j < CountColumns(); j++) {
@@ -6312,12 +6308,12 @@
text = widget->Text(this);
if (text != NULL) {
- score = ComputeTypeAheadScore(text,
sMatchString,
+ score = ComputeTypeAheadScore(text,
sMatchString.String(),
matchLength);
}
} else {
score =
ComputeTypeAheadScore(pose->TargetModel()->Name(),
- sMatchString, matchLength);
+ sMatchString.String(), matchLength);
}
if (score > bestScore) {
@@ -9869,5 +9865,4 @@
font_height BPoseView::sFontInfo = { 0, 0, 0 };
BFont BPoseView::sCurrentFont;
OffscreenBitmap *BPoseView::sOffscreen = new OffscreenBitmap;
-char BPoseView::sMatchString[] = "";
-
+BString BPoseView::sMatchString = "";
Modified: haiku/trunk/src/kits/tracker/PoseView.h
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.h 2010-02-01 04:26:05 UTC (rev
35372)
+++ haiku/trunk/src/kits/tracker/PoseView.h 2010-02-01 05:02:05 UTC (rev
35373)
@@ -713,7 +713,7 @@
static float sFontHeight;
static font_height sFontInfo;
static BFont sCurrentFont;
- static char sMatchString[B_FILE_NAME_LENGTH];
+ static BString sMatchString;
// used for typeahead - should be replaced by a
typeahead state
bigtime_t fLastKeyTime;
Other related posts:
- » [haiku-commits] r35373 - haiku/trunk/src/kits/tracker - mmlr
