summaryrefslogtreecommitdiffstats
path: root/kgeography/src/mapasker.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-16 09:58:43 -0600
committerTimothy Pearson <[email protected]>2011-12-16 09:58:43 -0600
commit2d7b541a4e0095d40e37aaefbf9c4a9b9d149302 (patch)
tree628c1676b27475e583cfd0c2105bb41b646654bf /kgeography/src/mapasker.cpp
parent6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3 (diff)
downloadtdeedu-2d7b541a4e0095d40e37aaefbf9c4a9b9d149302.tar.gz
tdeedu-2d7b541a4e0095d40e37aaefbf9c4a9b9d149302.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3.
Diffstat (limited to 'kgeography/src/mapasker.cpp')
-rw-r--r--kgeography/src/mapasker.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kgeography/src/mapasker.cpp b/kgeography/src/mapasker.cpp
index 9942ad70..47de1dff 100644
--- a/kgeography/src/mapasker.cpp
+++ b/kgeography/src/mapasker.cpp
@@ -12,7 +12,7 @@
#include <kmessagebox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqscrollbar.h>
#include <tqstring.h>
@@ -51,9 +51,9 @@ mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint cou
if (asker)
{
- TQBoxLayout *vbl = dynamic_cast<TQBoxLayout*>(w -> layout());
+ TQBoxLayout *vbl = dynamic_cast<TQBoxLayout*>(w -> tqlayout());
p_next = new TQLabel(w);
- p_next -> setAlignment(AlignTop | AlignHCenter);
+ p_next -> tqsetAlignment(AlignTop | AlignHCenter);
p_fill = new TQWidget(w);
p_fill -> show();
vbl -> setStretchFactor(p_fill, 1);
@@ -104,7 +104,7 @@ void mapAsker::handleMapClick(TQRgb c, const TQPoint &p)
{
TQString aux, cap;
aux = p_map -> getWhatIs(c, !p_asker);
- if (aux == "nothing") KMessageBox::error(this, i18n("You have found a bug in a map. Please contact the author and tell the %1 map has nothing associated to color %2,%3,%4.").arg(p_map -> getFile()).arg(tqRed(c)).arg(tqGreen(c)).arg(tqBlue(c)));
+ if (aux == "nothing") KMessageBox::error(this, i18n("You have found a bug in a map. Please contact the author and tell the %1 map has nothing associated to color %2,%3,%4.").tqarg(p_map -> getFile()).tqarg(tqRed(c)).tqarg(tqGreen(c)).tqarg(tqBlue(c)));
else if (p_shouldClearPopup)
{
p_popupManager.clear();
@@ -175,11 +175,11 @@ void mapAsker::nextQuestionHook(const TQString &division)
{
TQString divisionName = i18n(p_map -> getFileName().utf8(), division.utf8());
TQString text = i18n("Please click on:\n%1");
- p_next -> setText(text.arg(divisionName));
+ p_next -> setText(text.tqarg(divisionName));
}
else
{
- TQString s = TQString("Please click on:\n%1").arg(division);
+ TQString s = TQString("Please click on:\n%1").tqarg(division);
p_next -> setText(i18n(p_map -> getFileName().utf8(), s.utf8()));
}
p_currentAnswer.setQuestion(i18n(p_map -> getFileName().utf8(), division.utf8()));