Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -196,3 +196,19 @@ ModelManifest.xml
/tr2.bat
/tr.bat
/test

# Qt build artifacts
*.o
*.a
moc_*.cpp
moc_*.h
ui_*.h
qrc_*.cpp
*.pro.user
*.pro.user.*
.qmake.stash
Makefile*
zkanji
zkanji.ini
data/
import_data/
1 change: 1 addition & 0 deletions checked_cast.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#endif

#include <cassert>
#include <cstdint>

/*
// Converts T value to RESULT_TYPE, which must be a signed number. RESULT_TYPE is by default
Expand Down
5 changes: 5 additions & 0 deletions groups.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2786,3 +2786,8 @@ void Groups::processRemovedWord(int windex)

//-------------------------------------------------------------

template GroupCategory<KanjiGroup>::self_type* GroupCategory<KanjiGroup>::categories(int index);
template const GroupCategory<KanjiGroup>::self_type* GroupCategory<KanjiGroup>::categories(int index) const;
template GroupCategory<WordGroup>::self_type* GroupCategory<WordGroup>::categories(int index);
template const GroupCategory<WordGroup>::self_type* GroupCategory<WordGroup>::categories(int index) const;

4 changes: 2 additions & 2 deletions zcolorcombobox.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ private slots:
int oldindex;

using QComboBox::activated;
using QComboBox::activated;
using QComboBox::currentIndexChanged;
// using QComboBox::activated;
// using QComboBox::currentIndexChanged;
using QComboBox::currentIndexChanged;
using QComboBox::currentTextChanged;

Expand Down