brush up tpaginator.cpp
Fixed conflicts.