summaryrefslogtreecommitdiffstats
path: root/kgeography/src/mapchooser.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/mapchooser.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/mapchooser.cpp')
-rw-r--r--kgeography/src/mapchooser.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kgeography/src/mapchooser.cpp b/kgeography/src/mapchooser.cpp
index 11410d39..1920e328 100644
--- a/kgeography/src/mapchooser.cpp
+++ b/kgeography/src/mapchooser.cpp
@@ -19,7 +19,7 @@
#include "mapchooser.h"
-mapChooser::mapChooser(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Choose Map to Use"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true)
+mapChooser::mapChooser(TQWidget *tqparent) : KDialogBase(tqparent, 0, true, i18n("Choose Map to Use"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true)
{
TQHBox *mainHB;
TQStringList list;
@@ -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").arg(*it).arg(p_reader.getError()));
+ KMessageBox::error(this, i18n("Error parsing %1: %2").tqarg(*it).tqarg(p_reader.getError()));
delete p_reader.getMap();
}
else
@@ -85,8 +85,8 @@ void mapChooser::putImage(const TQString &mapName)
KGmap *m;
m = p_maps[mapName];
TQImage image(m -> getMapFile());
- image = image.smoothScale(300, 225, TQImage::ScaleMin);
- p_image -> setPaletteBackgroundPixmap(image);
+ image = image.smoothScale(300, 225, TQ_ScaleMin);
+ p_image -> setPaletteBackgroundPixmap(TQPixmap(image));
p_image -> setFixedSize(image.size());
}