summaryrefslogtreecommitdiffstats
path: root/kgeography
diff options
context:
space:
mode:
Diffstat (limited to 'kgeography')
-rw-r--r--kgeography/src/answer.cpp8
-rw-r--r--kgeography/src/answersdialog.cpp8
-rw-r--r--kgeography/src/askwidget.cpp4
-rw-r--r--kgeography/src/boxasker.cpp2
-rw-r--r--kgeography/src/capitaldivisionasker.cpp4
-rw-r--r--kgeography/src/divisioncapitalasker.cpp4
-rw-r--r--kgeography/src/divisionflagasker.cpp4
-rw-r--r--kgeography/src/flagdivisionasker.cpp2
-rw-r--r--kgeography/src/kgeography.cpp24
-rw-r--r--kgeography/src/mapasker.cpp12
-rw-r--r--kgeography/src/mapchooser.cpp4
-rw-r--r--kgeography/src/mapparser.cpp32
-rw-r--r--kgeography/src/mapwidget.cpp4
-rw-r--r--kgeography/src/mapwidget.h2
-rw-r--r--kgeography/src/mypopup.cpp10
15 files changed, 62 insertions, 62 deletions
diff --git a/kgeography/src/answer.cpp b/kgeography/src/answer.cpp
index 428ceb20..30afa989 100644
--- a/kgeography/src/answer.cpp
+++ b/kgeography/src/answer.cpp
@@ -10,7 +10,7 @@
#include <tqimage.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kdialog.h>
@@ -93,7 +93,7 @@ void userAnswer::putWidgets(TQWidget *w, TQGridLayout *lay, int row) const
TQLabel *l;
l = new TQLabel(w);
l -> setPixmap(v -> toImage());
- l -> tqsetAlignment(TQt::AlignHCenter);
+ l -> setAlignment(TQt::AlignHCenter);
l -> setMargin(KDialog::marginHint() / 2);
widgets[i] = l;
}
@@ -104,8 +104,8 @@ void userAnswer::putWidgets(TQWidget *w, TQGridLayout *lay, int row) const
if (!p_correct)
{
TQColor back, fore;
- back = widgets[0] -> tqcolorGroup().highlight();
- fore = widgets[0] -> tqcolorGroup().highlightedText();
+ back = widgets[0] -> colorGroup().highlight();
+ fore = widgets[0] -> colorGroup().highlightedText();
for (int i = 0; i < 3; i++)
{
widgets[i] -> setPaletteBackgroundColor(back);
diff --git a/kgeography/src/answersdialog.cpp b/kgeography/src/answersdialog.cpp
index 7ff19bde..ce7de036 100644
--- a/kgeography/src/answersdialog.cpp
+++ b/kgeography/src/answersdialog.cpp
@@ -11,7 +11,7 @@
#include <klocale.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqscrollview.h>
#include "answer.h"
@@ -40,7 +40,7 @@ answersDialog::answersDialog(TQWidget *parent, const TQValueVector<userAnswer> &
bigFont.setPointSize(24);
l1 = new TQLabel(question, p_container);
l1 -> setFont(bigFont);
- l1 -> tqsetAlignment(TQt::AlignCenter);
+ l1 -> setAlignment(TQt::AlignCenter);
lay->addMultiCellWidget(l1, 0, 0, 0, 4);
// Headers
@@ -67,8 +67,8 @@ answersDialog::answersDialog(TQWidget *parent, const TQValueVector<userAnswer> &
lay -> addItem(new TQSpacerItem(20, 20, TQSizePolicy::Fixed, TQSizePolicy::Fixed), totalAnswers + 3, 2);
- l1 = new TQLabel(i18n("You answered correctly %1 out of %2 questions.").tqarg(correctAnswers).tqarg(totalAnswers), p_container);
- l1 -> tqsetAlignment(TQt::AlignCenter);
+ l1 = new TQLabel(i18n("You answered correctly %1 out of %2 questions.").arg(correctAnswers).arg(totalAnswers), p_container);
+ l1 -> setAlignment(TQt::AlignCenter);
lay->addMultiCellWidget(l1, totalAnswers + 4, totalAnswers + 4, 0, 4);
p_sv -> addChild(p_container);
diff --git a/kgeography/src/askwidget.cpp b/kgeography/src/askwidget.cpp
index 95ca4fcd..87d1d09a 100644
--- a/kgeography/src/askwidget.cpp
+++ b/kgeography/src/askwidget.cpp
@@ -21,7 +21,7 @@ askWidget::askWidget(TQWidget *parent, KGmap *m, TQWidget *w, uint count, bool s
if (showLabel)
{
p_answers = new TQLabel(w);
- p_answers -> tqsetAlignment(AlignTop | AlignHCenter);
+ p_answers -> setAlignment(AlignTop | AlignHCenter);
resetAnswers();
p_answers -> show();
}
@@ -98,7 +98,7 @@ void askWidget::resetAnswers()
void askWidget::updateLabel()
{
- p_answers -> setText(i18n("Correct answers: %1/%2").tqarg(p_correctAnswers).tqarg(p_correctAnswers + p_incorrectAnswers));
+ p_answers -> setText(i18n("Correct answers: %1/%2").arg(p_correctAnswers).arg(p_correctAnswers + p_incorrectAnswers));
}
#include "askwidget.moc"
diff --git a/kgeography/src/boxasker.cpp b/kgeography/src/boxasker.cpp
index 9fb0c90b..1d8b784d 100644
--- a/kgeography/src/boxasker.cpp
+++ b/kgeography/src/boxasker.cpp
@@ -16,7 +16,7 @@
#include <kpushbutton.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqradiobutton.h>
#include <tqvbuttongroup.h>
diff --git a/kgeography/src/capitaldivisionasker.cpp b/kgeography/src/capitaldivisionasker.cpp
index c2698eb0..ffea1407 100644
--- a/kgeography/src/capitaldivisionasker.cpp
+++ b/kgeography/src/capitaldivisionasker.cpp
@@ -34,11 +34,11 @@ bool capitalDivisionAsker::nextBoxAskerQuestionHook(const TQString &division, in
{
TQString capitalName = i18n(p_map -> getFileName().utf8(), p_capital.utf8());
TQString text = i18n("%1 is the capital of...");
- setQuestion(text.tqarg(capitalName));
+ setQuestion(text.arg(capitalName));
}
else
{
- TQString s = TQString("%1 is the capital of...").tqarg(p_capital);
+ TQString s = TQString("%1 is the capital of...").arg(p_capital);
setQuestion(i18n(p_map -> getFileName().utf8(), s.utf8()));
}
p_rb[i] -> setText(i18n(p_map -> getFileName().utf8(), division.utf8()));
diff --git a/kgeography/src/divisioncapitalasker.cpp b/kgeography/src/divisioncapitalasker.cpp
index 2b136a58..b87437a2 100644
--- a/kgeography/src/divisioncapitalasker.cpp
+++ b/kgeography/src/divisioncapitalasker.cpp
@@ -30,11 +30,11 @@ bool divisionCapitalAsker::nextBoxAskerQuestionHook(const TQString &division, in
{
TQString divisionName = i18n(p_map -> getFileName().utf8(), division.utf8());
TQString text = i18n("The capital of %1 is...");
- setQuestion(text.tqarg(divisionName));
+ setQuestion(text.arg(divisionName));
}
else
{
- TQString s = TQString("The capital of %1 is...").tqarg(division);
+ TQString s = TQString("The capital of %1 is...").arg(division);
setQuestion(i18n(p_map -> getFileName().utf8(), s.utf8()));
}
p_currentAnswer.setQuestion(i18n(p_map -> getFileName().utf8(), division.utf8()));
diff --git a/kgeography/src/divisionflagasker.cpp b/kgeography/src/divisionflagasker.cpp
index 0b5d72be..79641b25 100644
--- a/kgeography/src/divisionflagasker.cpp
+++ b/kgeography/src/divisionflagasker.cpp
@@ -33,11 +33,11 @@ bool divisionFlagAsker::nextBoxAskerQuestionHook(const TQString &division, int i
{
TQString divisionName = i18n(p_map -> getFileName().utf8(), division.utf8());
TQString text = i18n("The flag of %1 is...");
- setQuestion(text.tqarg(divisionName));
+ setQuestion(text.arg(divisionName));
}
else
{
- TQString s = TQString("The flag of %1 is...").tqarg(division);
+ TQString s = TQString("The flag of %1 is...").arg(division);
setQuestion(i18n(p_map -> getFileName().utf8(), s.utf8()));
}
p_currentAnswer.setCorrectAnswer(im);
diff --git a/kgeography/src/flagdivisionasker.cpp b/kgeography/src/flagdivisionasker.cpp
index 125fc64d..4dc7aa23 100644
--- a/kgeography/src/flagdivisionasker.cpp
+++ b/kgeography/src/flagdivisionasker.cpp
@@ -11,7 +11,7 @@
#include <klocale.h>
#include <tqimage.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqradiobutton.h>
#include "flagdivisionasker.h"
diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp
index de850afb..6636b8de 100644
--- a/kgeography/src/kgeography.cpp
+++ b/kgeography/src/kgeography.cpp
@@ -18,7 +18,7 @@
#include <kmenubar.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvbox.h>
#include <tqsize.h>
#include <tqtimer.h>
@@ -45,7 +45,7 @@ kgeography::kgeography() : KMainWindow(), p_firstShow(true), p_mustShowResultsDi
TQVBox *p_leftWidget = new TQVBox(p_bigWidget);
p_currentMap = new TQLabel(p_leftWidget);
- p_currentMap -> tqsetAlignment(AlignCenter);
+ p_currentMap -> setAlignment(AlignCenter);
p_consult = new KPushButton(i18n("&Browse Map"), p_leftWidget);
TQWhatsThis::add(p_consult, i18n("In this section left click on any part of the map to learn about the divisions" ));
p_askMap = new KPushButton(i18n("&Click Division in Map..."), p_leftWidget);
@@ -59,8 +59,8 @@ kgeography::kgeography() : KMainWindow(), p_firstShow(true), p_mustShowResultsDi
p_askDivisionFlags = new KPushButton(i18n("G&uess Flag of Division..."), p_leftWidget);
TQWhatsThis::add(p_askDivisionFlags, i18n("In this quiz you have to guess the flag of a division given its name"));
p_underLeftWidget = new TQVBox(p_leftWidget);
- p_underLeftWidget -> tqlayout() -> setSpacing(KDialog::spacingHint());
- p_underLeftWidget -> tqlayout() -> setMargin(KDialog::marginHint());
+ p_underLeftWidget -> layout() -> setSpacing(KDialog::spacingHint());
+ p_underLeftWidget -> layout() -> setMargin(KDialog::marginHint());
p_leftWidget -> setStretchFactor(p_underLeftWidget, 1);
setCentralWidget(p_bigWidget);
@@ -113,7 +113,7 @@ void kgeography::showEvent(TQShowEvent *)
}
else
{
- KMessageBox::error(this, i18n("Could not open last used map. Error parsing %1: %2").tqarg(file).tqarg(reader.getError()));
+ KMessageBox::error(this, i18n("Could not open last used map. Error parsing %1: %2").arg(file).arg(reader.getError()));
delete reader.getMap();
openMap();
}
@@ -169,7 +169,7 @@ void kgeography::askCapitalDivisions()
int i;
bool ok;
showResultsDialog();
- i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
+ i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
if (ok)
{
removeOldAskWidget();
@@ -185,7 +185,7 @@ void kgeography::askDivisionCapitals()
int i;
bool ok;
showResultsDialog();
- i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
+ i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
if (ok)
{
removeOldAskWidget();
@@ -201,7 +201,7 @@ void kgeography::askMap()
int i;
bool ok;
showResultsDialog();
- i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(true)), 1, 1, p_map -> count(true), 1, &ok);
+ i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(true)), 1, 1, p_map -> count(true), 1, &ok);
if (ok)
{
removeOldAskWidget();
@@ -219,7 +219,7 @@ void kgeography::askFlagDivisions()
int i;
bool ok;
showResultsDialog();
- i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
+ i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
if (ok)
{
removeOldAskWidget();
@@ -235,7 +235,7 @@ void kgeography::askDivisionFlags()
int i;
bool ok;
showResultsDialog();
- i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
+ i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
if (ok)
{
removeOldAskWidget();
@@ -292,11 +292,11 @@ void kgeography::setMap(KGmap *m)
{
TQString mapName = i18n(p_map -> getFileName().utf8(), p_map -> getName().utf8());
TQString text = i18n("<qt>Current map:<br><b>%1<b></qt>");
- p_currentMap -> setText(text.tqarg(mapName));
+ p_currentMap -> setText(text.arg(mapName));
}
else
{
- TQString s = TQString("<qt>Current map:<br><b>%1</b></qt>").tqarg(p_map -> getName());
+ TQString s = TQString("<qt>Current map:<br><b>%1</b></qt>").arg(p_map -> getName());
p_currentMap -> setText(i18n(p_map -> getFileName().utf8(), s.utf8()));
}
p_consult -> setEnabled(true);
diff --git a/kgeography/src/mapasker.cpp b/kgeography/src/mapasker.cpp
index 47de1dff..9942ad70 100644
--- a/kgeography/src/mapasker.cpp
+++ b/kgeography/src/mapasker.cpp
@@ -12,7 +12,7 @@
#include <kmessagebox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.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 -> tqlayout());
+ TQBoxLayout *vbl = dynamic_cast<TQBoxLayout*>(w -> layout());
p_next = new TQLabel(w);
- p_next -> tqsetAlignment(AlignTop | AlignHCenter);
+ p_next -> setAlignment(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.").tqarg(p_map -> getFile()).tqarg(tqRed(c)).tqarg(tqGreen(c)).tqarg(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.").arg(p_map -> getFile()).arg(tqRed(c)).arg(tqGreen(c)).arg(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.tqarg(divisionName));
+ p_next -> setText(text.arg(divisionName));
}
else
{
- TQString s = TQString("Please click on:\n%1").tqarg(division);
+ TQString s = TQString("Please click on:\n%1").arg(division);
p_next -> setText(i18n(p_map -> getFileName().utf8(), s.utf8()));
}
p_currentAnswer.setQuestion(i18n(p_map -> getFileName().utf8(), division.utf8()));
diff --git a/kgeography/src/mapchooser.cpp b/kgeography/src/mapchooser.cpp
index d1945e2d..8c6e6d48 100644
--- a/kgeography/src/mapchooser.cpp
+++ b/kgeography/src/mapchooser.cpp
@@ -15,7 +15,7 @@
#include <tqhbox.h>
#include <tqimage.h>
-#include <tqlayout.h>
+#include <layout.h>
#include "mapchooser.h"
@@ -36,7 +36,7 @@ mapChooser::mapChooser(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Ch
{
if (!p_reader.parseMap(*it))
{
- KMessageBox::error(this, i18n("Error parsing %1: %2").tqarg(*it).tqarg(p_reader.getError()));
+ KMessageBox::error(this, i18n("Error parsing %1: %2").arg(*it).arg(p_reader.getError()));
delete p_reader.getMap();
}
else
diff --git a/kgeography/src/mapparser.cpp b/kgeography/src/mapparser.cpp
index 40a1c59e..f50e1b5d 100644
--- a/kgeography/src/mapparser.cpp
+++ b/kgeography/src/mapparser.cpp
@@ -37,7 +37,7 @@ bool mapReader::parseMap(const TQString &path)
}
else
{
- p_error = i18n("%1 does not exist.").tqarg(path);
+ p_error = i18n("%1 does not exist.").arg(path);
}
return false;
}
@@ -74,19 +74,19 @@ bool mapParser::startElement(const TQString&, const TQString &name, const TQStri
if (prev.isEmpty())
{
b = name == "map";
- if (!b) p_error = i18n("The map description file should begin with the %1 tag").tqarg("map");
+ if (!b) p_error = i18n("The map description file should begin with the %1 tag").arg("map");
}
else if (prev == "map")
{
if (name != "mapFile" && name != "name" && name != "division")
{
b = false;
- p_error = i18n("%1 is not a valid tag inside tag %2. Valid tags are %3, %4 and %5").tqarg(name).tqarg(prev).tqarg("mapFile").tqarg("name").tqarg("division");
+ p_error = i18n("%1 is not a valid tag inside tag %2. Valid tags are %3, %4 and %5").arg(name).arg(prev).arg("mapFile").arg("name").arg("division");
}
else if ((name == "mapFile" && p_mapFileSet) || (name == "name" && p_mapNameSet))
{
b = false;
- p_error = i18n("%1 tag has already been set").tqarg(name);
+ p_error = i18n("%1 tag has already been set").arg(name);
}
p_colorSet = false;
if (name == "division")
@@ -102,21 +102,21 @@ bool mapParser::startElement(const TQString&, const TQString &name, const TQStri
prev == "ignore")
{
b = false;
- p_error = i18n("There can not be a tag inside %1 tag").tqarg(prev);
+ p_error = i18n("There can not be a tag inside %1 tag").arg(prev);
}
else if (prev == "division")
{
if (name != "color" && name != "name" && name != "ignore" && name != "flag" && name != "capital")
{
b = false;
- p_error = i18n("%1 is not a valid tag inside tag %2. Valid tags are %3, %4, %5, %6 and %7").tqarg(name).tqarg(prev).tqarg("color").tqarg("name").tqarg("ignore").tqarg("capital").tqarg("flag");
+ p_error = i18n("%1 is not a valid tag inside tag %2. Valid tags are %3, %4, %5, %6 and %7").arg(name).arg(prev).arg("color").arg("name").arg("ignore").arg("capital").arg("flag");
}
else if ((name == "name" && p_divisionNameSet) || (name == "color" && p_colorSet) ||
(name == "ignore" && p_divisionIgnoreSet) || (name == "flag" && p_flagFileSet) ||
(name == "capital" && p_capitalSet))
{
b = false;
- p_error = i18n("%1 tag has already been set").tqarg(name);
+ p_error = i18n("%1 tag has already been set").arg(name);
}
p_red = -1;
p_green = -1;
@@ -146,7 +146,7 @@ bool mapParser::endElement(const TQString &, const TQString &, const TQString &)
{
b = p_map -> setMapFile(p_path + p_contents);
p_mapFileSet = true;
- if (!b) p_error = i18n("File %1 does not exist").tqarg(p_path + p_contents);
+ if (!b) p_error = i18n("File %1 does not exist").arg(p_path + p_contents);
}
else if (aux == "division")
{
@@ -154,9 +154,9 @@ bool mapParser::endElement(const TQString &, const TQString &, const TQString &)
b = p_divisionNameSet;
if (!b) p_error = i18n("There is a division without name");
b = b && p_map -> addDivision(p_division);
- if (!b) p_error = i18n("There is already either a division called %1 or a division with the same colors as %2").tqarg(p_division -> getName()).tqarg(p_division -> getName());
+ if (!b) p_error = i18n("There is already either a division called %1 or a division with the same colors as %2").arg(p_division -> getName()).arg(p_division -> getName());
b = b && (p_capitalSet || !p_division -> canAsk(false));
- if (!b) p_error = i18n("Division %1 has no capital").tqarg(p_division -> getName());
+ if (!b) p_error = i18n("Division %1 has no capital").arg(p_division -> getName());
}
else if (p_previousTags == ":map:division:name")
{
@@ -173,17 +173,17 @@ bool mapParser::endElement(const TQString &, const TQString &, const TQString &)
if (p_red == -1)
{
b = false;
- p_error = i18n("Tag %1 has not the %2 tag.").tqarg("<color>").tqarg("<red>");
+ p_error = i18n("Tag %1 has not the %2 tag.").arg("<color>").arg("<red>");
}
else if (p_green == -1)
{
b = false;
- p_error = i18n("Tag %1 has not the %2 tag.").tqarg("<color>").tqarg("<green>");
+ p_error = i18n("Tag %1 has not the %2 tag.").arg("<color>").arg("<green>");
}
else if (p_blue == -1)
{
b = false;
- p_error = i18n("Tag %1 has not the %2 tag.").tqarg("<color>").tqarg("<blue>");
+ p_error = i18n("Tag %1 has not the %2 tag.").arg("<color>").arg("<blue>");
}
else p_colorSet = true;
}
@@ -217,14 +217,14 @@ bool mapParser::endElement(const TQString &, const TQString &, const TQString &)
else
{
b = false;
- p_error = i18n("Invalid value in tag %1").tqarg("<ignore>");
+ p_error = i18n("Invalid value in tag %1").arg("<ignore>");
}
}
else if (aux == "flag")
{
b = p_division -> setFlagFile(p_path + "flags/" + p_contents);
p_flagFileSet = true;
- if (!b) p_error = i18n("Could not find flag file %1").tqarg(p_path + "flags/" + p_contents);
+ if (!b) p_error = i18n("Could not find flag file %1").arg(p_path + "flags/" + p_contents);
}
else if (aux == "map")
{
@@ -258,7 +258,7 @@ bool mapParser::endDocument()
}
else if (!p_mapNameSet) aux = "name";
else if (!p_mapFileSet) aux = "mapFile";
- p_error = i18n("Tag %1 is missing.").tqarg(aux);
+ p_error = i18n("Tag %1 is missing.").arg(aux);
return false;
}
diff --git a/kgeography/src/mapwidget.cpp b/kgeography/src/mapwidget.cpp
index e039952c..c40a6dbd 100644
--- a/kgeography/src/mapwidget.cpp
+++ b/kgeography/src/mapwidget.cpp
@@ -61,9 +61,9 @@ void mapWidget::setMapZoom(bool b)
}
}
-TQSize mapWidget::tqsizeHint() const
+TQSize mapWidget::sizeHint() const
{
- return tqmaximumSize();
+ return maximumSize();
}
void mapWidget::updateHPosition(int value)
diff --git a/kgeography/src/mapwidget.h b/kgeography/src/mapwidget.h
index a54463b1..5b024bb0 100644
--- a/kgeography/src/mapwidget.h
+++ b/kgeography/src/mapwidget.h
@@ -27,7 +27,7 @@ Q_OBJECT
void setMapMove(bool b);
void setMapZoom(bool b);
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
TQSize mapSize() const;
public slots:
diff --git a/kgeography/src/mypopup.cpp b/kgeography/src/mypopup.cpp
index b37264df..49d99327 100644
--- a/kgeography/src/mypopup.cpp
+++ b/kgeography/src/mypopup.cpp
@@ -9,7 +9,7 @@
***************************************************************************/
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqimage.h>
#include <tqpixmap.h>
@@ -33,7 +33,7 @@ myPopup::myPopup(TQWidget *parent, const TQString &text, const TQString &text2,
if (!text2.isNull())
{
TQLabel *l2 = new TQLabel(text2, vbox);
- l2 -> tqsetAlignment(TQt::AlignCenter);
+ l2 -> setAlignment(TQt::AlignCenter);
vboxLayout -> addWidget(l2);
}
@@ -43,10 +43,10 @@ myPopup::myPopup(TQWidget *parent, const TQString &text, const TQString &text2,
lay -> addWidget(flag);
TQImage flagImg(flagFile);
flag -> setPixmap(flagImg.smoothScale(flagImg.width() / 5, flagImg. height() / 5));
- flag -> tqsetAlignment(TQt::AlignCenter);
+ flag -> setAlignment(TQt::AlignCenter);
}
- l -> tqsetAlignment(TQt::AlignCenter);
+ l -> setAlignment(TQt::AlignCenter);
TQFont f = l -> font();
f.setBold(true);
l -> setFont(f);
@@ -55,7 +55,7 @@ myPopup::myPopup(TQWidget *parent, const TQString &text, const TQString &text2,
setFrameStyle(TQFrame::Box | TQFrame::Plain);
setLineWidth(2);
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
}
void myPopup::mousePressEvent(TQMouseEvent *)
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-26 14:49:24 +0000