summaryrefslogtreecommitdiffstats
path: root/ksame
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:53 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:53 -0600
commit84ace1135cac57993b72fee7105b92def1638d32 (patch)
treeb8871eb76e3db4a062731b0ce7c99c24fac119e8 /ksame
parent97d1732e257f8700488d7ca1660ae7eba8fc6065 (diff)
downloadtdegames-84ace1135cac57993b72fee7105b92def1638d32.tar.gz
tdegames-84ace1135cac57993b72fee7105b92def1638d32.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 97d1732e257f8700488d7ca1660ae7eba8fc6065.
Diffstat (limited to 'ksame')
-rw-r--r--ksame/KSameWidget.cpp30
-rw-r--r--ksame/StoneWidget.cpp2
-rw-r--r--ksame/StoneWidget.h2
3 files changed, 17 insertions, 17 deletions
diff --git a/ksame/KSameWidget.cpp b/ksame/KSameWidget.cpp
index a49db4f7..3a3f1120 100644
--- a/ksame/KSameWidget.cpp
+++ b/ksame/KSameWidget.cpp
@@ -113,7 +113,7 @@ void KSameWidget::saveProperties(KConfig *conf) {
}
void KSameWidget::sizeChanged() {
- stone->setFixedSize(stone->sizeHint());
+ stone->setFixedSize(stone->tqsizeHint());
}
void KSameWidget::showNumberRemainingToggled()
@@ -121,11 +121,11 @@ void KSameWidget::showNumberRemainingToggled()
if(showNumberRemaining->isChecked()){
TQStringList list;
for(int i=1;i<=stone->colors();i++)
- list.append(TQString("%1").arg(stone->count(i)));
- TQString count = TQString(" (%1)").arg(list.join(","));
- status->changeItem(i18n("%1 Colors%2").arg(stone->colors()).arg(count),1);
+ list.append(TQString("%1").tqarg(stone->count(i)));
+ TQString count = TQString(" (%1)").tqarg(list.join(","));
+ status->changeItem(i18n("%1 Colors%2").tqarg(stone->colors()).tqarg(count),1);
}
- else status->changeItem(i18n("%1 Colors").arg(stone->colors()),1);
+ else status->changeItem(i18n("%1 Colors").tqarg(stone->colors()),1);
KConfig *cfg = kapp->config();
cfg->writeEntry("showRemaining", showNumberRemaining->isChecked());
@@ -162,7 +162,7 @@ void KSameWidget::m_new() {
bno.setRange(0, 1000000, 1);
bno.setLabel(i18n("Select a board:"));
bno.setFocus();
- bno.setFixedSize(bno.sizeHint());
+ bno.setFixedSize(bno.tqsizeHint());
bno.setValue(stone->board());
if (dlg.exec()) newGame(bno.value(),default_colors);
@@ -188,15 +188,15 @@ void KSameWidget::m_showhs() {
}
void KSameWidget::setColors(int colors) {
- status->changeItem(i18n("%1 Colors").arg(colors),1);
+ status->changeItem(i18n("%1 Colors").tqarg(colors),1);
}
void KSameWidget::setBoard(int board) {
- status->changeItem(i18n("Board: %1").arg(board, 6), 2);
+ status->changeItem(i18n("Board: %1").tqarg(board, 6), 2);
}
void KSameWidget::setMarked(int m) {
- status->changeItem(i18n("Marked: %1").arg(m, 6),3);
+ status->changeItem(i18n("Marked: %1").tqarg(m, 6),3);
m_markedStones=m;
}
@@ -209,11 +209,11 @@ void KSameWidget::setScore(int score) {
if(showNumberRemaining->isChecked()){
TQStringList list;
for(int i=1;i<=stone->colors();i++)
- list.append(TQString("%1").arg(stone->count(i)));
- TQString count = TQString(" (%1)").arg(list.join(","));
- status->changeItem(i18n("%1 Colors%2").arg(stone->colors()).arg(count),1);
+ list.append(TQString("%1").tqarg(stone->count(i)));
+ TQString count = TQString(" (%1)").tqarg(list.join(","));
+ status->changeItem(i18n("%1 Colors%2").tqarg(stone->colors()).tqarg(count),1);
}
- status->changeItem(i18n("Score: %1").arg(score, 6),4);
+ status->changeItem(i18n("Score: %1").tqarg(score, 6),4);
undo->setEnabled(stone->undoPossible());
restart->setEnabled(!stone->isOriginalBoard());
}
@@ -222,11 +222,11 @@ void KSameWidget::gameover() {
if (stone->hasBonus()) {
KNotifyClient::event(winId(), "game won",
i18n("You even removed the last stone, great job! "
- "This gave you a score of %1 in total.").arg(stone->score()));
+ "This gave you a score of %1 in total.").tqarg(stone->score()));
} else {
KNotifyClient::event(winId(), "game over",
i18n("There are no more removeable stones. "
- "You got a score of %1 in total.").arg(stone->score()));
+ "You got a score of %1 in total.").tqarg(stone->score()));
}
stone->unmark();
KScoreDialog d(KScoreDialog::Name | KScoreDialog::Score, this);
diff --git a/ksame/StoneWidget.cpp b/ksame/StoneWidget.cpp
index dc02a1bc..586aeefd 100644
--- a/ksame/StoneWidget.cpp
+++ b/ksame/StoneWidget.cpp
@@ -136,7 +136,7 @@ StoneWidget::colors() {
}
TQSize
-StoneWidget::sizeHint () const {
+StoneWidget::tqsizeHint () const {
return TQSize(field_width,field_height);
}
diff --git a/ksame/StoneWidget.h b/ksame/StoneWidget.h
index f4188419..616ef835 100644
--- a/ksame/StoneWidget.h
+++ b/ksame/StoneWidget.h
@@ -55,7 +55,7 @@ public:
int marked();
TQSize size();
int colors();
- virtual TQSize sizeHint() const;
+ virtual TQSize tqsizeHint() const;
bool undoPossible() const;