diff options
Diffstat (limited to 'kioslave/media/mediamanager/medialist.cpp')
| -rw-r--r-- | kioslave/media/mediamanager/medialist.cpp | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/kioslave/media/mediamanager/medialist.cpp b/kioslave/media/mediamanager/medialist.cpp index 974eddbf6..bb0de6248 100644 --- a/kioslave/media/mediamanager/medialist.cpp +++ b/kioslave/media/mediamanager/medialist.cpp @@ -27,14 +27,14 @@ MediaList::MediaList() m_media.setAutoDelete(true); } -const QPtrList<Medium> MediaList::list() const +const TQPtrList<Medium> MediaList::list() const { kdDebug(1219) << "MediaList::list()" << endl; return m_media; } -const Medium *MediaList::findById(const QString &id) const +const Medium *MediaList::findById(const TQString &id) const { kdDebug(1219) << "MediaList::findById(" << id << ")" << endl; @@ -43,7 +43,7 @@ const Medium *MediaList::findById(const QString &id) const return m_idMap[id]; } -const Medium *MediaList::findByName(const QString &name) const +const Medium *MediaList::findByName(const TQString &name) const { kdDebug(1219) << "MediaList::findByName(" << name << ")" << endl; @@ -52,7 +52,7 @@ const Medium *MediaList::findByName(const QString &name) const return m_nameMap[name]; } -const Medium *MediaList::findByClearUdi(const QString &name) +const Medium *MediaList::findByClearUdi(const TQString &name) { kdDebug(1219) << "MediaList::findByClearUdi(" << name << ")" << endl; @@ -65,17 +65,17 @@ const Medium *MediaList::findByClearUdi(const QString &name) } -QString MediaList::addMedium(Medium *medium, bool allowNotification) +TQString MediaList::addMedium(Medium *medium, bool allowNotification) { kdDebug(1219) << "MediaList::addMedium(@" << medium->id() << ")" << endl; - QString id = medium->id(); - if ( m_idMap.contains(id) ) return QString::null; + TQString id = medium->id(); + if ( m_idMap.contains(id) ) return TQString::null; m_media.append( medium ); m_idMap[id] = medium; - QString name = medium->name(); + TQString name = medium->name(); if ( !m_nameMap.contains(name) ) { m_nameMap[name] = medium; @@ -87,15 +87,15 @@ QString MediaList::addMedium(Medium *medium, bool allowNotification) return name; } - QString base_name = name+"_"; + TQString base_name = name+"_"; int i = 1; - while ( m_nameMap.contains(base_name+QString::number(i)) ) + while ( m_nameMap.contains(base_name+TQString::number(i)) ) { i++; } - name = base_name+QString::number(i); + name = base_name+TQString::number(i); medium->setName(name); m_nameMap[name] = medium; @@ -105,14 +105,14 @@ QString MediaList::addMedium(Medium *medium, bool allowNotification) return name; } -bool MediaList::removeMedium(const QString &id, bool allowNotification) +bool MediaList::removeMedium(const TQString &id, bool allowNotification) { kdDebug(1219) << "MediaList::removeMedium(" << id << ")" << endl; if ( !m_idMap.contains(id) ) return false; Medium *medium = m_idMap[id]; - QString name = medium->name(); + TQString name = medium->name(); m_idMap.remove(id); m_nameMap.remove( medium->name() ); @@ -132,10 +132,10 @@ bool MediaList::changeMediumState(const Medium &medium, bool allowNotification) if ( medium.isMountable() ) { - QString device_node = medium.deviceNode(); - QString clear_device_udi = medium.clearDeviceUdi(); - QString mount_point = medium.mountPoint(); - QString fs_type = medium.fsType(); + TQString device_node = medium.deviceNode(); + TQString clear_device_udi = medium.clearDeviceUdi(); + TQString mount_point = medium.mountPoint(); + TQString fs_type = medium.fsType(); bool mounted = medium.isMounted(); m->mountableState( device_node, clear_device_udi, mount_point, @@ -166,12 +166,12 @@ bool MediaList::changeMediumState(const Medium &medium, bool allowNotification) return true; } -bool MediaList::changeMediumState(const QString &id, - const QString &baseURL, +bool MediaList::changeMediumState(const TQString &id, + const TQString &baseURL, bool allowNotification, - const QString &mimeType, - const QString &iconName, - const QString &label) + const TQString &mimeType, + const TQString &iconName, + const TQString &label) { kdDebug(1219) << "MediaList::changeMediumState(" << id << ", " << baseURL << ", " << mimeType << ", " << iconName << ")" @@ -204,14 +204,14 @@ bool MediaList::changeMediumState(const QString &id, return true; } -bool MediaList::changeMediumState(const QString &id, - const QString &deviceNode, - const QString &mountPoint, - const QString &fsType, bool mounted, +bool MediaList::changeMediumState(const TQString &id, + const TQString &deviceNode, + const TQString &mountPoint, + const TQString &fsType, bool mounted, bool allowNotification, - const QString &mimeType, - const QString &iconName, - const QString &label) + const TQString &mimeType, + const TQString &iconName, + const TQString &label) { kdDebug(1219) << "MediaList::changeMediumState(" << id << ", " << deviceNode << ", " << mountPoint << ", " << fsType << ", " @@ -245,11 +245,11 @@ bool MediaList::changeMediumState(const QString &id, return true; } -bool MediaList::changeMediumState(const QString &id, bool mounted, +bool MediaList::changeMediumState(const TQString &id, bool mounted, bool allowNotification, - const QString &mimeType, - const QString &iconName, - const QString &label) + const TQString &mimeType, + const TQString &iconName, + const TQString &label) { kdDebug(1219) << "MediaList::changeMediumState(" << id << ", " << mounted << ", " << mimeType << ", " << iconName << ")" @@ -282,7 +282,7 @@ bool MediaList::changeMediumState(const QString &id, bool mounted, return true; } -bool MediaList::setUserLabel(const QString &name, const QString &label) +bool MediaList::setUserLabel(const TQString &name, const TQString &label) { kdDebug(1219) << "MediaList::setUserLabel(" << name << ", " << label << ")" << endl; |