diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 04:44:41 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 04:44:41 +0000 |
| commit | a374efce3a207b39514be3c52264091400ce297e (patch) | |
| tree | 77bdf654b55826d4f59b53a5621310206bcaead1 /kgeography/src/map.cpp | |
| parent | f81a494f3957d5cf38c787973415597941934727 (diff) | |
| download | tdeedu-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/map.cpp')
| -rw-r--r-- | kgeography/src/map.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kgeography/src/map.cpp b/kgeography/src/map.cpp index 9cef054f..57d79e9b 100644 --- a/kgeography/src/map.cpp +++ b/kgeography/src/map.cpp @@ -26,7 +26,7 @@ KGmap::KGmap() KGmap::~KGmap() { - TQMap<QRgb, division*>::iterator it; + TQMap<TQRgb, division*>::iterator it; it = p_colorMap.begin(); while (it != p_colorMap.end()) { @@ -39,8 +39,8 @@ KGmap::~KGmap() bool KGmap::addDivision(division *c) { bool b; - if (p_nameMap.find(c -> getName()) == p_nameMap.end() && - p_colorMap.find(c -> getRGB()) == p_colorMap.end()) + if (p_nameMap.tqfind(c -> getName()) == p_nameMap.end() && + p_colorMap.tqfind(c -> getRGB()) == p_colorMap.end()) { p_colorMap.insert(c -> getRGB(), c); p_nameMap.insert(c -> getName(), c); @@ -125,11 +125,11 @@ TQString KGmap::getRandomDivision(bool clickDivisionMode) const else return aux[i] -> getName(); } -TQString KGmap::getWhatIs(QRgb c, bool all) const +TQString KGmap::getWhatIs(TQRgb c, bool all) const { // this is only asked from mapasker.cpp hence the true in canAsk - TQMap<QRgb, division*>::const_iterator it; - it = p_colorMap.find(c); + TQMap<TQRgb, division*>::const_iterator it; + it = p_colorMap.tqfind(c); if (it == p_colorMap.end()) return "nothing"; else { @@ -142,7 +142,7 @@ TQString KGmap::getWhatIs(QRgb c, bool all) const TQColor KGmap::getColor(const TQString &s) const { TQValueList<division*> divisions; - TQValueList<QRgb> colors; + TQValueList<TQRgb> colors; division *d; int i; |