diff options
Diffstat (limited to 'kpat/freecell.cpp')
| -rw-r--r-- | kpat/freecell.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kpat/freecell.cpp b/kpat/freecell.cpp index ff8a5b1a..9e67633a 100644 --- a/kpat/freecell.cpp +++ b/kpat/freecell.cpp @@ -49,8 +49,8 @@ void FreecellPile::moveCards(CardList &c, Pile *to) //-------------------------------------------------------------------------// FreecellBase::FreecellBase( int decks, int stores, int freecells, int fill, bool unlimit, - KMainWindow* parent, const char* name) - : Dealer(parent,name), + KMainWindow* tqparent, const char* name) + : Dealer(tqparent,name), solver_instance(0), es_filling(fill), solver_ret(FCS_STATE_NOT_BEGAN_YET), unlimited_move(unlimit) { @@ -113,7 +113,7 @@ TQString suitToString(Card::Suit s) { case Card::Spades: return "S"; } - return TQString::null; + return TQString(); } TQString rankToString(Card::Rank r) @@ -280,8 +280,8 @@ void FreecellBase::resumeSolution() return; emit gameInfo(i18n("%1 tries - depth %2") - .arg(freecell_solver_user_get_num_times(solver_instance)) - .arg(freecell_solver_user_get_current_depth(solver_instance))); + .tqarg(freecell_solver_user_get_num_times(solver_instance)) + .tqarg(freecell_solver_user_get_current_depth(solver_instance))); if (solver_ret == FCS_STATE_WAS_SOLVED) { @@ -296,7 +296,7 @@ void FreecellBase::resumeSolution() int moves = freecell_solver_user_get_num_times(solver_instance); freeSolution(); emit gameInfo(i18n("unsolved after %1 moves") - .arg(moves)); + .tqarg(moves)); stopDemo(); return; } @@ -379,7 +379,7 @@ TQString FreecellBase::solverFormat() const tmp += suitToString(target[i]->top()->suit()) + "-" + rankToString(target[i]->top()->rank()) + " "; } if (!tmp.isEmpty()) - output += TQString::fromLatin1("Foundations: %1\n").arg(tmp); + output += TQString::tqfromLatin1("Foundations: %1\n").tqarg(tmp); tmp.truncate(0); for (uint i = 0; i < freecell.count(); i++) { @@ -389,7 +389,7 @@ TQString FreecellBase::solverFormat() const tmp += rankToString(freecell[i]->top()->rank()) + suitToString(freecell[i]->top()->suit()) + " "; } if (!tmp.isEmpty()) - output += TQString::fromLatin1("Freecells: %1\n").arg(tmp); + output += TQString::tqfromLatin1("Freecells: %1\n").tqarg(tmp); for (uint i = 0; i < store.count(); i++) { @@ -544,7 +544,7 @@ MoveHint *FreecellBase::chooseHint() { if (solver_instance && freecell_solver_user_get_moves_left(solver_instance)) { - emit gameInfo(i18n("%1 moves before finish").arg(freecell_solver_user_get_moves_left(solver_instance))); + emit gameInfo(i18n("%1 moves before finish").tqarg(freecell_solver_user_get_moves_left(solver_instance))); fcs_move_t move; if (!freecell_solver_user_get_next_move(solver_instance, &move)) { @@ -665,7 +665,7 @@ void FreecellBase::movePileToPile(CardList &c, Pile *to, PileList fss, PileList if ((count > (fcs.count() + 1)) && (count <= 2 * (fcs.count() + 1))) moveaway = count - (fcs.count() + 1); } - uint moving = QMIN(count, QMIN(c.count() - start, fcs.count() + 1)); + uint moving = TQMIN(count, TQMIN(c.count() - start, fcs.count() + 1)); assert(moving); for (uint i = 0; i < moving - 1; i++) { @@ -813,12 +813,12 @@ bool FreecellBase::checkRemove(int checkIndex, const Pile *p, const Card *c) con class Freecell : public FreecellBase { public: - Freecell( KMainWindow* parent=0, const char* name=0); + Freecell( KMainWindow* tqparent=0, const char* name=0); virtual void deal(); }; -Freecell::Freecell( KMainWindow* parent, const char* name) - : FreecellBase(1, 8, 4, FCS_ES_FILLED_BY_ANY_CARD, false, parent, name) +Freecell::Freecell( KMainWindow* tqparent, const char* name) + : FreecellBase(1, 8, 4, FCS_ES_FILLED_BY_ANY_CARD, false, tqparent, name) { for (int i = 0; i < 8; i++) store[i]->move(8 + ( cardMap::CARDX() * 11 / 10 + 1 ) * i, 8 + cardMap::CARDY() * 11 / 10); @@ -846,7 +846,7 @@ static class LocalDealerInfo3 : public DealerInfo { public: LocalDealerInfo3() : DealerInfo(I18N_NOOP("&Freecell"), 3) {} - virtual Dealer *createGame(KMainWindow *parent) { return new Freecell(parent); } + virtual Dealer *createGame(KMainWindow *tqparent) { return new Freecell(tqparent); } } ldi8; //-------------------------------------------------------------------------// |