diff options
Diffstat (limited to 'kpat')
| -rw-r--r-- | kpat/dealer.cpp | 8 | ||||
| -rw-r--r-- | kpat/gamestatsimpl.cpp | 2 | ||||
| -rw-r--r-- | kpat/klondike.cpp | 2 | ||||
| -rw-r--r-- | kpat/pile.cpp | 4 | ||||
| -rw-r--r-- | kpat/pwidget.cpp | 8 |
5 files changed, 12 insertions, 12 deletions
diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp index d53b7d3a..c1ae25e7 100644 --- a/kpat/dealer.cpp +++ b/kpat/dealer.cpp @@ -249,7 +249,7 @@ void Dealer::newHint(MoveHint *mh) bool Dealer::isMoving(Card *c) const { - return movingCards.tqfind(c) != movingCards.end(); + return movingCards.find(c) != movingCards.end(); } void Dealer::contentsMouseMoveEvent(TQMouseEvent* e) @@ -277,13 +277,13 @@ void Dealer::contentsMouseMoveEvent(TQMouseEvent* e) continue; if (c->source() == movingCards.first()->source()) continue; - if (sources.tqfindIndex(c->source()) != -1) + if (sources.findIndex(c->source()) != -1) continue; sources.append(c->source()); } else { if ((*it)->rtti() == Pile::RTTI) { Pile *p = static_cast<Pile*>(*it); - if (p->isEmpty() && !sources.tqcontains(p)) + if (p->isEmpty() && !sources.contains(p)) sources.append(p); } else { kdDebug(11111) << "unknown object " << *it << " " << (*it)->rtti() << endl; @@ -314,7 +314,7 @@ void Dealer::contentsMouseMoveEvent(TQMouseEvent* e) void Dealer::mark(Card *c) { c->setSelected(true); - if (!marked.tqcontains(c)) + if (!marked.contains(c)) marked.append(c); } diff --git a/kpat/gamestatsimpl.cpp b/kpat/gamestatsimpl.cpp index 59e37b79..2850da01 100644 --- a/kpat/gamestatsimpl.cpp +++ b/kpat/gamestatsimpl.cpp @@ -24,7 +24,7 @@ GameStatsImpl::GameStatsImpl(TQWidget* aParent, const char* aname) if (list.count() <= i) list.append("unknown"); list[index] = i18n((*it)->name); - list[index].tqreplace('&',""); + list[index].replace('&',""); } GameType->insertStringList(list); showGameType(0); diff --git a/kpat/klondike.cpp b/kpat/klondike.cpp index 1e0d0b79..93514d2f 100644 --- a/kpat/klondike.cpp +++ b/kpat/klondike.cpp @@ -42,7 +42,7 @@ public: } virtual TQSize cardOffset( bool _spread, bool, const Card *c) const { kdDebug(11111) << "cardOffset " << _spread << " " << (c? c->name() : "(null)") << endl; - if (cardlist.tqcontains(const_cast<Card * const>(c))) + if (cardlist.contains(const_cast<Card * const>(c))) return TQSize(+dspread(), 0); return TQSize(0, 0); } diff --git a/kpat/pile.cpp b/kpat/pile.cpp index 8d34325e..fab94efa 100644 --- a/kpat/pile.cpp +++ b/kpat/pile.cpp @@ -218,7 +218,7 @@ void Pile::moveBy(double dx, double dy) int Pile::indexOf(const Card *c) const { assert(c->source() == this); - return m_cards.tqfindIndex(const_cast<Card*>(c)); // the list is of non-const cards + return m_cards.findIndex(const_cast<Card*>(c)); // the list is of non-const cards } Card *Pile::at(int index) const @@ -338,7 +338,7 @@ void Pile::add( Card* _card, bool _facedown, bool _spread ) void Pile::remove(Card *c) { - assert(m_cards.tqcontains(c)); + assert(m_cards.contains(c)); m_cards.remove(c); } diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp index e8353dee..4fc36295 100644 --- a/kpat/pwidget.cpp +++ b/kpat/pwidget.cpp @@ -114,7 +114,7 @@ pWidget::pWidget() TQStringList list2; for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { TQString file = *it; - int rindex = file.tqfindRev('.'); + int rindex = file.findRev('.'); if (rindex != -1) { TQString ext = file.mid(rindex + 1).lower(); if (ext == "jpeg" || ext == "png" || ext == "jpg") { @@ -125,7 +125,7 @@ pWidget::pWidget() } wallpapers->setItems(list2); - wallpapers->setCurrentItem(list2.tqfindIndex("No-Ones-Laughing-3")); + wallpapers->setCurrentItem(list2.findIndex("No-Ones-Laughing-3")); changeWallpaper(); @@ -344,8 +344,8 @@ void pWidget::newGameType() if ((*it)->gameindex == id) { dill = (*it)->createGame(this); TQString name = (*it)->name; - name = name.tqreplace(TQRegExp("[&']"), ""); - name = name.tqreplace(TQRegExp("[ ]"), "_").lower(); + name = name.replace(TQRegExp("[&']"), ""); + name = name.replace(TQRegExp("[ ]"), "_").lower(); dill->setAnchorName("game_" + name); connect(dill, TQT_SIGNAL(saveGame()), TQT_SLOT(saveGame())); connect(dill, TQT_SIGNAL(gameInfo(const TQString&)), |