diff --git a/.gitignore b/.gitignore index ec03eed..446dd89 100644 --- a/.gitignore +++ b/.gitignore @@ -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/ diff --git a/checked_cast.h b/checked_cast.h index dd459b7..ea23192 100644 --- a/checked_cast.h +++ b/checked_cast.h @@ -18,6 +18,7 @@ #endif #include +#include /* // Converts T value to RESULT_TYPE, which must be a signed number. RESULT_TYPE is by default diff --git a/groups.cpp b/groups.cpp index 4abb230..8bb65a9 100644 --- a/groups.cpp +++ b/groups.cpp @@ -2786,3 +2786,8 @@ void Groups::processRemovedWord(int windex) //------------------------------------------------------------- +template GroupCategory::self_type* GroupCategory::categories(int index); +template const GroupCategory::self_type* GroupCategory::categories(int index) const; +template GroupCategory::self_type* GroupCategory::categories(int index); +template const GroupCategory::self_type* GroupCategory::categories(int index) const; + diff --git a/zcolorcombobox.h b/zcolorcombobox.h index 04e8826..b176428 100644 --- a/zcolorcombobox.h +++ b/zcolorcombobox.h @@ -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;