Skip to content

Commit 4dd6032

Browse files
jafljafl
committed
upgrade to latest JArray
1 parent 6f34266 commit 4dd6032

13 files changed

+35
-35
lines changed

‎code_crusader/code/AboutDialogIconTask.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ AboutDialogIconTask::AboutDialogIconTask
4343
:
4444
JXAnimationTask(widget)
4545
{
46-
itsImageList = jnew JPtrArray<JXImage>(JPtrArrayT::kForgetAll, 3);
46+
itsImageList = jnew JPtrArray<JXImage>(JPtrArrayT::kForgetAll, kAboutIconCount);
4747

4848
JXImageCache* cache = widget->GetDisplay()->GetImageCache();
4949
for (JIndex i=1; i<=kAboutIconCount; i++)

‎code_crusader/code/FileListTable.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ FileListTable::FileListTable
5454
itsChangedDuringParseCount(0),
5555
itsLastUniqueID(JFAID::kMinID)
5656
{
57-
itsFileInfo = jnew JArray<FileInfo>(10);
57+
itsFileInfo = jnew JArray<FileInfo>(1024);
5858

5959
ListenTo(GetFullNameDataList());
6060
}
@@ -108,10 +108,10 @@ FileListTable::Update
108108
dir->PrepareForTreeUpdate(reparseAll);
109109
}
110110

111-
JPtrArray<JString> allSuffixList(JPtrArrayT::kDeleteAll, 7);
111+
JPtrArray<JString> allSuffixList(JPtrArrayT::kDeleteAll, 100);
112112
GetPrefsManager()->GetAllFileSuffixes(&allSuffixList);
113113

114-
JPtrArray<JString> projectFileList(JPtrArrayT::kDeleteAll, 7);
114+
JPtrArray<JString> projectFileList(JPtrArrayT::kDeleteAll, 100);
115115
fileTree->CollectFilesForParse(allSuffixList, &projectFileList);
116116

117117
boost::fibers::buffered_channel<JBroadcaster::Message*> pgChannel(kJBufferedChannelCapacity);
@@ -131,8 +131,7 @@ FileListTable::Update
131131
// create array to track which files still exist
132132

133133
const JSize origFileCount = itsFileInfo->GetItemCount();
134-
JArray<bool> fileUsage;
135-
fileUsage.SetMinSize(JMax(2*origFileCount, (JSize) 1000));
134+
JArray<bool> fileUsage(JMax(2*origFileCount, (JSize) 1000));
136135
for (JIndex i=1; i<=origFileCount; i++)
137136
{
138137
fileUsage.AppendItem(false);

‎code_crusader/code/FunctionMenu.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ FunctionMenu::FunctionMenuX
8383
itsTE = te;
8484
itsCaretItemIndex = 0;
8585

86-
itsLineIndexList = jnew JArray<JIndex>(7);
87-
itsLineLangList = jnew JArray<Language>(7);
86+
itsLineIndexList = jnew JArray<JIndex>(100);
87+
itsLineLangList = jnew JArray<Language>(100);
8888

8989
SetEmptyMenuItems();
9090
SetUpdateAction(kDisableNone);

‎code_crusader/code/PrefsManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1634,7 +1634,7 @@ PrefsManager::ConvertHTMLSuffixesToFileTypes
16341634
JArray<PrefsManager::FileTypeInfo>*
16351635
PrefsManager::CreateFileTypeList()
16361636
{
1637-
auto* list = jnew JArray<FileTypeInfo>(8);
1637+
auto* list = jnew JArray<FileTypeInfo>(256);
16381638
list->SetSortOrder(JListT::kSortAscending);
16391639
list->SetCompareFunction(CompareFileTypeSpecAndLength);
16401640
return list;

‎code_crusader/code/StringCompleter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ StringCompleter::StringCompleter
4444
itsNeedsUpdateTask(nullptr),
4545
itsUpdatingFlag(false)
4646
{
47-
itsStringList = jnew JPtrArray<JString>(JPtrArrayT::kForgetAll, 12);
47+
itsStringList = jnew JPtrArray<JString>(JPtrArrayT::kForgetAll, 4096);
4848
itsStringList->SetSortOrder(JListT::kSortAscending);
4949

5050
itsStringList->SetCompareFunction(
@@ -270,7 +270,7 @@ StringCompleter::Complete
270270
return 0;
271271
}
272272

273-
JPtrArray<JString> matchList(JPtrArrayT::kForgetAll, 7);
273+
JPtrArray<JString> matchList(JPtrArrayT::kForgetAll, 100);
274274
*maxPrefix = *(itsStringList->GetItem(startIndex));
275275

276276
JSize matchCount = 0;

‎code_crusader/code/StylerBase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ StylerBase::StylerBase
6464
itsFileType(fileType),
6565
itsDialogTitle(editDialogTitle)
6666
{
67-
itsTypeStyles = jnew JArray<JFontStyle>(6);
67+
itsTypeStyles = jnew JArray<JFontStyle>(64);
6868

6969
#ifndef CODE_CRUSADER_UNIT_TEST
7070
itsDefColor = GetPrefsManager()->GetColor(PrefsManager::kTextColorIndex);

‎code_crusader/code/SymbolList.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ SymbolList::SymbolList
5858
itsChangedDuringParseFlag = false;
5959
itsBeganEmptyFlag = false;
6060

61-
itsSymbolList = jnew JArray<SymbolInfo>(kLgBlockSize);
61+
itsSymbolList = jnew JArray<SymbolInfo>(kMinSize);
6262
itsSymbolList->SetSortOrder(JListT::kSortAscending);
6363
itsSymbolList->SetCompareFunction(CompareSymbols);
6464

@@ -189,7 +189,9 @@ SymbolList::FindSymbol
189189
// find all symbols that match
190190

191191
matchList->RemoveAll();
192-
JArray<JIndex> allMatchList;
192+
matchList->SetMinSize(50);
193+
194+
JArray<JIndex> allMatchList(50);
193195

194196
SymbolInfo target;
195197
target.name = const_cast<JString*>(&name);
@@ -436,6 +438,7 @@ SymbolList::FindAllSymbols
436438
// find all symbols that match
437439

438440
matchList->RemoveAll();
441+
matchList->SetMinSize(50);
439442

440443
JString prefix;
441444
for (const auto* name : list)
@@ -1007,7 +1010,7 @@ SymbolList::ReadSetup
10071010
fullyQualifiedFileScope, fileID, lineIndex));
10081011
}
10091012

1010-
itsSymbolList->SetMinLgSize(kLgBlockSize);
1013+
itsSymbolList->SetMinSize(kMinSize);
10111014

10121015
if (vers < 51)
10131016
{

‎code_crusader/code/SymbolList.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class SymbolList : public JContainer, public CtagsUser
2222
{
2323
public:
2424

25-
static const JSize kLgBlockSize = 12;
25+
static const JSize kMinSize = 4096;
2626

2727
struct ContextNamespace
2828
{

‎code_crusader/code/SymbolTable.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ SymbolTable::SymbolTable
6363
itsSymbolList = symbolList;
6464
itsMaxStringWidth = 0;
6565

66-
itsVisibleList = jnew JArray<JIndex>(SymbolList::kLgBlockSize);
66+
itsVisibleList = jnew JArray<JIndex>(SymbolList::kMinSize);
6767

6868
itsVisibleListLockedFlag = false;
6969
itsNameFilter = nullptr;
@@ -344,7 +344,7 @@ SymbolTable::SetDisplayList
344344
)
345345
{
346346
*itsVisibleList = list;
347-
itsVisibleList->SetMinLgSize(SymbolList::kLgBlockSize);
347+
itsVisibleList->SetMinLgSize(SymbolList::kMinSize);
348348
itsVisibleListLockedFlag = true;
349349
ScrollTo(0,0);
350350
RebuildTable();

‎code_crusader/code/SymbolTypeList.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ SymbolTypeList::CreateSymTypeList
256256
italic(false, true, 0, false),
257257
bold_gray(true, false, 0, false, JColorManager::GetGrayColor(50));
258258

259-
itsSymbolTypeList = jnew JArray<SymbolTypeInfo>(7);
259+
itsSymbolTypeList = jnew JArray<SymbolTypeInfo>(128);
260260

261261
ADD_S (kUnknownST, kOtherLang, JFontStyle(JColorManager::GetGrayColor(50)))
262262

0 commit comments

Comments
 (0)