diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:33:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:33:07 -0600 |
| commit | 3c299dfe48c0060272c2966fff599b3b417e2ee4 (patch) | |
| tree | f248b71f55539d6689a4cbe086d5d8cc146c8998 /juk/ktrm.cpp | |
| parent | f59dfa08651a47f21d004e8e4cb5020b8035287e (diff) | |
| download | tdemultimedia-3c299dfe48c0060272c2966fff599b3b417e2ee4.tar.gz tdemultimedia-3c299dfe48c0060272c2966fff599b3b417e2ee4.zip | |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'juk/ktrm.cpp')
| -rw-r--r-- | juk/ktrm.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/juk/ktrm.cpp b/juk/ktrm.cpp index 3838d8bc..09a77546 100644 --- a/juk/ktrm.cpp +++ b/juk/ktrm.cpp @@ -43,7 +43,7 @@ class KTRMLookup; extern "C" { #if HAVE_MUSICBRAINZ >= 4 - static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFiletqStatus status); + static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus status); #else static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId); #endif @@ -205,14 +205,14 @@ private: class KTRMEvent : public TQCustomEvent { public: - enum tqStatus { + enum Status { Recognized, Unrecognized, Collision, Error }; - KTRMEvent(int fileId, tqStatus status) : + KTRMEvent(int fileId, Status status) : TQCustomEvent(id), m_fileId(fileId), m_status(status) {} @@ -222,7 +222,7 @@ public: return m_fileId; } - tqStatus status() const + Status status() const { return m_status; } @@ -231,7 +231,7 @@ public: private: int m_fileId; - tqStatus m_status; + Status m_status; }; /** @@ -242,7 +242,7 @@ private: class KTRMEventHandler : public TQObject { public: - static void send(int fileId, KTRMEvent::tqStatus status) + static void send(int fileId, KTRMEvent::Status status) { KApplication::postEvent(instance(), new KTRMEvent(fileId, status)); } @@ -303,7 +303,7 @@ protected: * Callback fuction for TunePimp lookup events. */ #if HAVE_MUSICBRAINZ >= 4 -static void TRMNotifyCallback(tunepimp_t /*pimp*/, void* /*data*/, TPCallbackEnum type, int fileId, TPFiletqStatus status) +static void TRMNotifyCallback(tunepimp_t /*pimp*/, void* /*data*/, TPCallbackEnum type, int fileId, TPFileStatus status) #else static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId) #endif @@ -313,7 +313,7 @@ static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, #if HAVE_MUSICBRAINZ < 4 track_t track = tp_GetTrack(pimp, fileId); - TPFiletqStatus status = tr_GettqStatus(track); + TPFileStatus status = tr_GetStatus(track); #endif switch(status) { @@ -496,7 +496,7 @@ void KTRMLookup::unrecognized() tr_Lock(track); tr_GetTRM(track, trm, 255); if ( !trm[0] ) { - tr_SettqStatus(track, ePending); + tr_SetStatus(track, ePending); tp_Wake(KTRMRequestHandler::instance()->tunePimp(), track); } else |