diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-15 02:07:31 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-15 02:07:31 +0000 |
| commit | 397c8cac0ef9531701be6c2abe2a3fe5e6a7a5bd (patch) | |
| tree | 89b6e1a1b699d333e33902b11321fb570c4c75fa | |
| parent | cedd5045fbfd4dc01d2cf7027ff1474fb6eac94e (diff) | |
| download | tdebase-397c8cac.tar.gz tdebase-397c8cac.zip | |
Avoid namespace conflicts with std::List
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1231943 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kioslave/media/libmediacommon/medium.cpp | 4 | ||||
| -rw-r--r-- | kioslave/media/libmediacommon/medium.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kioslave/media/libmediacommon/medium.cpp b/kioslave/media/libmediacommon/medium.cpp index 2aa7359ad..703cb4a40 100644 --- a/kioslave/media/libmediacommon/medium.cpp +++ b/kioslave/media/libmediacommon/medium.cpp @@ -93,9 +93,9 @@ const Medium Medium::create(const TQStringList &properties) return m; } -Medium::List Medium::createList(const TQStringList &properties) +Medium::MList Medium::createList(const TQStringList &properties) { - List l; + MList l; if ( properties.size() % (PROPERTIES_COUNT+1) == 0) { diff --git a/kioslave/media/libmediacommon/medium.h b/kioslave/media/libmediacommon/medium.h index eeef12eb2..a4847ba80 100644 --- a/kioslave/media/libmediacommon/medium.h +++ b/kioslave/media/libmediacommon/medium.h @@ -27,7 +27,7 @@ class Medium { public: - typedef TQValueList<const Medium> List; + typedef TQValueList<const Medium> MList; static const uint ID = 0; static const uint NAME = 1; @@ -48,7 +48,7 @@ public: Medium(const TQString &id, const TQString &name); static const Medium create(const TQStringList &properties); - static List createList(const TQStringList &properties); + static MList createList(const TQStringList &properties); const TQStringList &properties() const { return m_properties; } |