diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-02 22:38:52 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-02 22:38:52 +0000 |
| commit | 458efa7b0c935cbaafa2791021a5f8f7241aa876 (patch) | |
| tree | 624583f2873febe23770bee3fa94b5c24bd59f4f /src/base/Event.h | |
| parent | 747037b72944ae2c02962b7c5c96e0a7f8852e38 (diff) | |
| download | rosegarden-458efa7b0c935cbaafa2791021a5f8f7241aa876.tar.gz rosegarden-458efa7b0c935cbaafa2791021a5f8f7241aa876.zip | |
Initial TQt4 port of Rosegarden
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1230242 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/base/Event.h')
| -rw-r--r-- | src/base/Event.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/base/Event.h b/src/base/Event.h index f236681..987929c 100644 --- a/src/base/Event.h +++ b/src/base/Event.h @@ -363,12 +363,12 @@ private: } // returned iterator (in i) only valid if return map value is non-zero - PropertyMap *find(const PropertyName &name, PropertyMap::iterator &i); + PropertyMap *tqfind(const PropertyName &name, PropertyMap::iterator &i); - const PropertyMap *find(const PropertyName &name, + const PropertyMap *tqfind(const PropertyName &name, PropertyMap::const_iterator &i) const { PropertyMap::iterator j; - PropertyMap *map = const_cast<Event *>(this)->find(name, j); + PropertyMap *map = const_cast<Event *>(this)->tqfind(name, j); i = j; return map; } @@ -400,7 +400,7 @@ Event::get(const PropertyName &name, typename PropertyDefn<P>::basic_type &val) #endif PropertyMap::const_iterator i; - const PropertyMap *map = find(name, i); + const PropertyMap *map = tqfind(name, i); if (map) { @@ -434,7 +434,7 @@ Event::get(const PropertyName &name) const #endif PropertyMap::const_iterator i; - const PropertyMap *map = find(name, i); + const PropertyMap *map = tqfind(name, i); if (map) { @@ -464,7 +464,7 @@ Event::isPersistent(const PropertyName &name) const // throw (NoData) { PropertyMap::const_iterator i; - const PropertyMap *map = find(name, i); + const PropertyMap *map = tqfind(name, i); if (map) { return (map == m_data->m_properties); @@ -481,7 +481,7 @@ Event::setPersistence(const PropertyName &name, bool persistent) { unshare(); PropertyMap::iterator i; - PropertyMap *map = find(name, i); + PropertyMap *map = tqfind(name, i); if (map) { insert(*i, persistent); @@ -506,7 +506,7 @@ Event::set(const PropertyName &name, typename PropertyDefn<P>::basic_type value, unshare(); PropertyMap::iterator i; - PropertyMap *map = find(name, i); + PropertyMap *map = tqfind(name, i); if (map) { bool persistentBefore = (map == m_data->m_properties); @@ -547,7 +547,7 @@ Event::setMaybe(const PropertyName &name, typename PropertyDefn<P>::basic_type v unshare(); PropertyMap::iterator i; - PropertyMap *map = find(name, i); + PropertyMap *map = tqfind(name, i); if (map) { if (map == m_data->m_properties) return; // persistent, so ignore it |