summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-27 21:38:57 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-27 21:38:57 +0000
commit3f6123639423caade4d83c6d4d75b109447952a1 (patch)
tree303c076c7cd079120b5033334e4f774ad4a7180f
parent4d088ec3f91c335760a3a233b33123541ece7141 (diff)
downloadamarok-3f612363.tar.gz
amarok-3f612363.zip
Fix a number of accidental tqStatus string conversions
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--amarok/src/engine/nmm/HostList.cpp2
-rw-r--r--amarok/src/ktrm.cpp2
-rw-r--r--amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/amarok/src/engine/nmm/HostList.cpp b/amarok/src/engine/nmm/HostList.cpp
index e6213643..32fb19c8 100644
--- a/amarok/src/engine/nmm/HostList.cpp
+++ b/amarok/src/engine/nmm/HostList.cpp
@@ -45,7 +45,7 @@ HostList::HostList( TQWidget *parent, const char *name )
addColumn( i18n("Audio" ) );
addColumn( i18n("Volume" ), 113 );
header()->setResizeEnabled(false, 3);
- addColumn( i18n("tqStatus" ) );
+ addColumn( i18n("Status" ) );
addColumn( i18n("Playback" ) );
setColumnAlignment( HostListItem::Hostname, TQt::AlignCenter );
diff --git a/amarok/src/ktrm.cpp b/amarok/src/ktrm.cpp
index ccc777ae..cc6e86bf 100644
--- a/amarok/src/ktrm.cpp
+++ b/amarok/src/ktrm.cpp
@@ -326,7 +326,7 @@ static void TRMNotifyCallback(tunepimp_t pimp, void */*data*/, TPCallbackEnum ty
track_t track = tp_GetTrack(pimp, fileId);
TPFiletqStatus status = tr_GettqStatus(track);
#endif
- //debug() << "tqStatus is: " << status << endl;
+ //debug() << "Status is: " << status << endl;
switch(status) {
case eRecognized:
diff --git a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb
index 79e40d17..3f7b7e85 100644
--- a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb
+++ b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb
@@ -147,7 +147,7 @@ module Mongrel
# message in the status we have to do a bit of parsing.
def status
if not @status
- stat = @head["tqStatus"]
+ stat = @head["Status"]
stat = stat.split(' ')[0] if stat
@status = stat || "200"