summaryrefslogtreecommitdiffstats
path: root/kgeography/src/kgeography.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 04:44:41 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 04:44:41 +0000
commita374efce3a207b39514be3c52264091400ce297e (patch)
tree77bdf654b55826d4f59b53a5621310206bcaead1 /kgeography/src/kgeography.cpp
parentf81a494f3957d5cf38c787973415597941934727 (diff)
downloadtdeedu-a374efce3a207b39514be3c52264091400ce297e.tar.gz
tdeedu-a374efce3a207b39514be3c52264091400ce297e.zip
TQt4 port kdeedu
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kgeography/src/kgeography.cpp')
-rw-r--r--kgeography/src/kgeography.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp
index 33740e66..de850afb 100644
--- a/kgeography/src/kgeography.cpp
+++ b/kgeography/src/kgeography.cpp
@@ -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 -> setAlignment(AlignCenter);
+ p_currentMap -> tqsetAlignment(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,22 +59,22 @@ 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 -> layout() -> setSpacing(KDialog::spacingHint());
- p_underLeftWidget -> layout() -> setMargin(KDialog::marginHint());
+ p_underLeftWidget -> tqlayout() -> setSpacing(KDialog::spacingHint());
+ p_underLeftWidget -> tqlayout() -> setMargin(KDialog::marginHint());
p_leftWidget -> setStretchFactor(p_underLeftWidget, 1);
setCentralWidget(p_bigWidget);
- connect(p_consult, TQT_SIGNAL(clicked()), this, TQT_SLOT(consult()));
- connect(p_askMap, TQT_SIGNAL(clicked()), this, TQT_SLOT(askMap()));
- connect(p_askCapitalDivisions, TQT_SIGNAL(clicked()), this, TQT_SLOT(askCapitalDivisions()));
- connect(p_askDivisionCapitals, TQT_SIGNAL(clicked()), this, TQT_SLOT(askDivisionCapitals()));
- connect(p_askFlagDivisions, TQT_SIGNAL(clicked()), this, TQT_SLOT(askFlagDivisions()));
- connect(p_askDivisionFlags, TQT_SIGNAL(clicked()), this, TQT_SLOT(askDivisionFlags()));
+ connect(p_consult, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(consult()));
+ connect(p_askMap, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askMap()));
+ connect(p_askCapitalDivisions, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askCapitalDivisions()));
+ connect(p_askDivisionCapitals, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askDivisionCapitals()));
+ connect(p_askFlagDivisions, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askFlagDivisions()));
+ connect(p_askDivisionFlags, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askDivisionFlags()));
- KAction *a = KStdAction::open(this, TQT_SLOT(openMap()), actionCollection(), "openMap");
+ KAction *a = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openMap()), actionCollection(), "openMap");
a -> setText(i18n("&Open Map..."));
- KStdAction::quit(this, TQT_SLOT(close()), actionCollection(), "quit");
+ KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "quit");
p_zoom = new KToggleAction(i18n("&Zoom"), "viewmagfit", 0, 0, 0, actionCollection(), "zoom_select");
p_zoom -> setEnabled(false);
@@ -85,7 +85,7 @@ kgeography::kgeography() : KMainWindow(), p_firstShow(true), p_mustShowResultsDi
p_move = new KToggleAction(i18n("&Move"), "move", 0, 0, 0, actionCollection(), "move");
p_move -> setEnabled(false);
- new KAction(i18n("Disclaimer"), 0, this, TQT_SLOT(disclaimer()), actionCollection(), "disclaimer");
+ new KAction(i18n("Disclaimer"), 0, TQT_TQOBJECT(this), TQT_SLOT(disclaimer()), actionCollection(), "disclaimer");
setupGUI(Keys | ToolBar | Save | Create);
@@ -113,7 +113,7 @@ void kgeography::showEvent(TQShowEvent *)
}
else
{
- KMessageBox::error(this, i18n("Could not open last used map. Error parsing %1: %2").arg(file).arg(reader.getError()));
+ KMessageBox::error(this, i18n("Could not open last used map. Error parsing %1: %2").tqarg(file).tqarg(reader.getError()));
delete reader.getMap();
openMap();
}
@@ -132,7 +132,7 @@ void kgeography::showEvent(TQShowEvent *)
}
// if anyone can explain why with the slot works and now without
// i'll be glad to learn
- TQTimer::singleShot(0, this, TQT_SLOT(resizeMainWindow()));
+ TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(resizeMainWindow()));
// resizeMainWindow();
p_firstShow = false;
@@ -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)").arg(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)").tqarg(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)").arg(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)").tqarg(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)").arg(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)").tqarg(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)").arg(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)").tqarg(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)").arg(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)").tqarg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
if (ok)
{
removeOldAskWidget();
@@ -275,7 +275,7 @@ void kgeography::putAskWidget()
connect(p_askWidget, TQT_SIGNAL(setMoveActionEnabled(bool)), p_move, TQT_SLOT(setEnabled(bool)));
connect(p_askWidget, TQT_SIGNAL(setMoveActionChecked(bool)), p_move, TQT_SLOT(setChecked(bool)));
connect(p_move, TQT_SIGNAL(toggled(bool)), p_askWidget, TQT_SLOT(setMovement(bool)));
- connect(p_askWidget, TQT_SIGNAL(questionsEnded()), this, TQT_SLOT(showResultsDialog()));
+ connect(p_askWidget, TQT_SIGNAL(questionsEnded()), TQT_TQOBJECT(this), TQT_SLOT(showResultsDialog()));
}
void kgeography::setMap(KGmap *m)
@@ -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.arg(mapName));
+ p_currentMap -> setText(text.tqarg(mapName));
}
else
{
- TQString s = TQString("<qt>Current map:<br><b>%1</b></qt>").arg(p_map -> getName());
+ TQString s = TQString("<qt>Current map:<br><b>%1</b></qt>").tqarg(p_map -> getName());
p_currentMap -> setText(i18n(p_map -> getFileName().utf8(), s.utf8()));
}
p_consult -> setEnabled(true);