From 98a12d05a48814bec3870b9a6d5865475cfa1c95 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 4 Jan 2011 02:22:38 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1211429 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kgeography/src/answer.cpp | 6 +++--- kgeography/src/answersdialog.cpp | 4 ++-- kgeography/src/askwidget.cpp | 2 +- kgeography/src/capitaldivisionasker.cpp | 2 +- kgeography/src/division.cpp | 2 +- kgeography/src/divisioncapitalasker.cpp | 2 +- kgeography/src/divisionflagasker.cpp | 2 +- kgeography/src/kgeography.cpp | 8 ++++---- kgeography/src/mapasker.cpp | 8 ++++---- kgeography/src/mapsdatatranslation.cpp | 24 ++++++++++++------------ kgeography/src/mapwidget.cpp | 4 ++-- kgeography/src/mapwidget.h | 2 +- kgeography/src/mypopup.cpp | 8 ++++---- 13 files changed, 37 insertions(+), 37 deletions(-) (limited to 'kgeography/src') diff --git a/kgeography/src/answer.cpp b/kgeography/src/answer.cpp index f4931df3..ddc00f91 100644 --- a/kgeography/src/answer.cpp +++ b/kgeography/src/answer.cpp @@ -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 -> setAlignment(Qt::AlignHCenter); + l -> tqsetAlignment(Qt::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] -> colorGroup().highlight(); - fore = widgets[0] -> colorGroup().highlightedText(); + back = widgets[0] -> tqcolorGroup().highlight(); + fore = widgets[0] -> tqcolorGroup().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 c6d9d292..eb8eb5da 100644 --- a/kgeography/src/answersdialog.cpp +++ b/kgeography/src/answersdialog.cpp @@ -40,7 +40,7 @@ answersDialog::answersDialog(TQWidget *parent, const TQValueVector & bigFont.setPointSize(24); l1 = new TQLabel(question, p_container); l1 -> setFont(bigFont); - l1 -> setAlignment(Qt::AlignCenter); + l1 -> tqsetAlignment(Qt::AlignCenter); lay->addMultiCellWidget(l1, 0, 0, 0, 4); // Headers @@ -68,7 +68,7 @@ answersDialog::answersDialog(TQWidget *parent, const TQValueVector & 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.").arg(correctAnswers).arg(totalAnswers), p_container); - l1 -> setAlignment(Qt::AlignCenter); + l1 -> tqsetAlignment(Qt::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 87d1d09a..c2cca166 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 -> setAlignment(AlignTop | AlignHCenter); + p_answers -> tqsetAlignment(AlignTop | AlignHCenter); resetAnswers(); p_answers -> show(); } diff --git a/kgeography/src/capitaldivisionasker.cpp b/kgeography/src/capitaldivisionasker.cpp index ffea1407..eb8db182 100644 --- a/kgeography/src/capitaldivisionasker.cpp +++ b/kgeography/src/capitaldivisionasker.cpp @@ -29,7 +29,7 @@ bool capitalDivisionAsker::nextBoxAskerQuestionHook(const TQString &division, in p_currentAnswer.setQuestion(i18n(p_map -> getFileName().utf8(), p_capital.utf8())); p_currentAnswer.setCorrectAnswer(i18n(p_map -> getFileName().utf8(), division.utf8())); - TQString sw = i18n("There are two ways of dealing with the translation of \"%1 is the capital of...\". The first option simply replaces %1 with the translated name of the relevant city. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"%1 is the capital of...\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); + TQString sw = i18n("There are two ways of dealing with the translation of \"%1 is the capital of...\". The first option simply tqreplaces %1 with the translated name of the relevant city. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"%1 is the capital of...\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); if (sw == "1") { TQString capitalName = i18n(p_map -> getFileName().utf8(), p_capital.utf8()); diff --git a/kgeography/src/division.cpp b/kgeography/src/division.cpp index 7ef70353..36eb9776 100644 --- a/kgeography/src/division.cpp +++ b/kgeography/src/division.cpp @@ -72,7 +72,7 @@ void division::setName(const TQString &name) void division::setRGB(int r, int g, int b) { - p_color = qRgb(r, g, b); + p_color = tqRgb(r, g, b); } bool division::setFlagFile(const TQString &path) diff --git a/kgeography/src/divisioncapitalasker.cpp b/kgeography/src/divisioncapitalasker.cpp index b87437a2..96e76bed 100644 --- a/kgeography/src/divisioncapitalasker.cpp +++ b/kgeography/src/divisioncapitalasker.cpp @@ -25,7 +25,7 @@ bool divisionCapitalAsker::nextBoxAskerQuestionHook(const TQString &division, in bool b; if (isAnswer) { - TQString sw = i18n("There are two ways of dealing with the translation of \"The capital of %1 is...\". The first option simply replaces %1 with the translated name of the relevant region. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"The capital of %1 is...\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); + TQString sw = i18n("There are two ways of dealing with the translation of \"The capital of %1 is...\". The first option simply tqreplaces %1 with the translated name of the relevant region. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"The capital of %1 is...\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); if (sw == "1") { TQString divisionName = i18n(p_map -> getFileName().utf8(), division.utf8()); diff --git a/kgeography/src/divisionflagasker.cpp b/kgeography/src/divisionflagasker.cpp index 79641b25..5c3ab035 100644 --- a/kgeography/src/divisionflagasker.cpp +++ b/kgeography/src/divisionflagasker.cpp @@ -28,7 +28,7 @@ bool divisionFlagAsker::nextBoxAskerQuestionHook(const TQString &division, int i p_rb[i] -> setPixmap(im); if (isAnswer) { - TQString sw = i18n("There are two ways of dealing with the translation of \"The flag of %1 is...\". The first option simply replaces %1 with the translated name of the relevant region. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"The flag of %1 is...\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); + TQString sw = i18n("There are two ways of dealing with the translation of \"The flag of %1 is...\". The first option simply tqreplaces %1 with the translated name of the relevant region. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"The flag of %1 is...\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); if (sw == "1") { TQString divisionName = i18n(p_map -> getFileName().utf8(), division.utf8()); diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp index 33740e66..2ef691b5 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,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 -> 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); @@ -287,7 +287,7 @@ void kgeography::setMap(KGmap *m) delete p_map; p_map = m; - TQString sw = i18n("There are two ways of dealing with the translation of \"Current map: %1\". The first option simply replaces %1 with the translated name of the relevant region. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"Current map: %1\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); + TQString sw = i18n("There are two ways of dealing with the translation of \"Current map: %1\". The first option simply tqreplaces %1 with the translated name of the relevant region. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"Current map: %1\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); if (sw == "1") { TQString mapName = i18n(p_map -> getFileName().utf8(), p_map -> getName().utf8()); diff --git a/kgeography/src/mapasker.cpp b/kgeography/src/mapasker.cpp index 27c7c83d..3513a3e7 100644 --- a/kgeography/src/mapasker.cpp +++ b/kgeography/src/mapasker.cpp @@ -51,9 +51,9 @@ mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint cou if (asker) { - TQBoxLayout *vbl = dynamic_cast(w -> layout()); + TQBoxLayout *vbl = dynamic_cast(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(QRgb 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(qRed(c)).arg(qGreen(c)).arg(qBlue(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(); @@ -170,7 +170,7 @@ void mapAsker::setScrollBarsMaximumSize(int w, int h) void mapAsker::nextQuestionHook(const TQString &division) { - TQString sw = i18n("There are two ways of dealing with the translation of \"Please click on: %1\". The first option simply replaces %1 with the translated name of the relevant region/city. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"Please click on: %1\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); + TQString sw = i18n("There are two ways of dealing with the translation of \"Please click on: %1\". The first option simply tqreplaces %1 with the translated name of the relevant region/city. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"Please click on: %1\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); if (sw == "1") { TQString divisionName = i18n(p_map -> getFileName().utf8(), division.utf8()); diff --git a/kgeography/src/mapsdatatranslation.cpp b/kgeography/src/mapsdatatranslation.cpp index 23fb3418..081ca98c 100644 --- a/kgeography/src/mapsdatatranslation.cpp +++ b/kgeography/src/mapsdatatranslation.cpp @@ -64,10 +64,10 @@ i18n("africa.kgm", "The flag of Côte d'Ivoire is..."); i18n("africa.kgm", "Yamoussoukro"); i18n("africa.kgm", "Yamoussoukro is the capital of..."); i18n("africa.kgm", "Cyprus"); -i18n("africa.kgm", "Democratic Republic of the Congo"); -i18n("africa.kgm", "The capital of Democratic Republic of the Congo is..."); -i18n("africa.kgm", "Please click on:\nDemocratic Republic of the Congo"); -i18n("africa.kgm", "The flag of Democratic Republic of the Congo is..."); +i18n("africa.kgm", "Detqmocratic Republic of the Congo"); +i18n("africa.kgm", "The capital of Detqmocratic Republic of the Congo is..."); +i18n("africa.kgm", "Please click on:\nDetqmocratic Republic of the Congo"); +i18n("africa.kgm", "The flag of Detqmocratic Republic of the Congo is..."); i18n("africa.kgm", "Kinshasa"); i18n("africa.kgm", "Kinshasa is the capital of..."); i18n("africa.kgm", "Djibouti"); @@ -3417,10 +3417,10 @@ i18n("world.kgm", "Please click on:\nCôte d'Ivoire"); i18n("world.kgm", "The flag of Côte d'Ivoire is..."); i18n("world.kgm", "Yamoussoukro"); i18n("world.kgm", "Yamoussoukro is the capital of..."); -i18n("world.kgm", "Democratic Republic of the Congo"); -i18n("world.kgm", "The capital of Democratic Republic of the Congo is..."); -i18n("world.kgm", "Please click on:\nDemocratic Republic of the Congo"); -i18n("world.kgm", "The flag of Democratic Republic of the Congo is..."); +i18n("world.kgm", "Detqmocratic Republic of the Congo"); +i18n("world.kgm", "The capital of Detqmocratic Republic of the Congo is..."); +i18n("world.kgm", "Please click on:\nDetqmocratic Republic of the Congo"); +i18n("world.kgm", "The flag of Detqmocratic Republic of the Congo is..."); i18n("world.kgm", "Kinshasa"); i18n("world.kgm", "Kinshasa is the capital of..."); i18n("world.kgm", "Djibouti"); @@ -4384,10 +4384,10 @@ i18n("world.kgm", "Please click on:\nSingapore"); i18n("world.kgm", "The flag of Singapore is..."); i18n("world.kgm", "Singapore"); i18n("world.kgm", "Singapore is the capital of..."); -i18n("world.kgm", "Democratic People's Republic of Korea"); -i18n("world.kgm", "The capital of Democratic People's Republic of Korea is..."); -i18n("world.kgm", "Please click on:\nDemocratic People's Republic of Korea"); -i18n("world.kgm", "The flag of Democratic People's Republic of Korea is..."); +i18n("world.kgm", "Detqmocratic People's Republic of Korea"); +i18n("world.kgm", "The capital of Detqmocratic People's Republic of Korea is..."); +i18n("world.kgm", "Please click on:\nDetqmocratic People's Republic of Korea"); +i18n("world.kgm", "The flag of Detqmocratic People's Republic of Korea is..."); i18n("world.kgm", "Pyeongyang"); i18n("world.kgm", "Pyeongyang is the capital of..."); i18n("world.kgm", "Republic of Korea"); diff --git a/kgeography/src/mapwidget.cpp b/kgeography/src/mapwidget.cpp index f551940f..94521903 100644 --- a/kgeography/src/mapwidget.cpp +++ b/kgeography/src/mapwidget.cpp @@ -61,9 +61,9 @@ void mapWidget::setMapZoom(bool b) } } -TQSize mapWidget::sizeHint() const +TQSize mapWidget::tqsizeHint() const { - return maximumSize(); + return tqmaximumSize(); } void mapWidget::updateHPosition(int value) diff --git a/kgeography/src/mapwidget.h b/kgeography/src/mapwidget.h index 1bc37cb3..5005fba1 100644 --- a/kgeography/src/mapwidget.h +++ b/kgeography/src/mapwidget.h @@ -26,7 +26,7 @@ Q_OBJECT void setMapMove(bool b); void setMapZoom(bool b); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize mapSize() const; public slots: diff --git a/kgeography/src/mypopup.cpp b/kgeography/src/mypopup.cpp index b9f1c78e..e8d2d369 100644 --- a/kgeography/src/mypopup.cpp +++ b/kgeography/src/mypopup.cpp @@ -33,7 +33,7 @@ myPopup::myPopup(TQWidget *parent, const TQString &text, const TQString &text2, if (!text2.isNull()) { TQLabel *l2 = new TQLabel(text2, vbox); - l2 -> setAlignment(Qt::AlignCenter); + l2 -> tqsetAlignment(Qt::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 -> setAlignment(Qt::AlignCenter); + flag -> tqsetAlignment(Qt::AlignCenter); } - l -> setAlignment(Qt::AlignCenter); + l -> tqsetAlignment(Qt::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(sizeHint()); + setFixedSize(tqsizeHint()); } void myPopup::mousePressEvent(TQMouseEvent *) -- cgit v1.2.1