[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kio-upnp-ms] /: modify some debug information
From: Nikhil Marathe <nsm.nikhil () gmail ! com>
Date: 2011-08-18 11:12:06
Message-ID: 20110818111206.DEEDCA60A9 () git ! kde ! org
[Download RAW message or body]
Git commit fe9c39189c35ed8f7f03d8d8153c7a2f8ba10bcd by Nikhil Marathe.
Committed on 18/08/2011 at 13:09.
Pushed by nikhilm into branch 'master'.
modify some debug information
M +4 -2 persistentaction.cpp
M +1 -11 controlpointthread.cpp
http://commits.kde.org/kio-upnp-ms/fe9c39189c35ed8f7f03d8d8153c7a2f8ba10bcd
diff --git a/controlpointthread.cpp b/controlpointthread.cpp
index b98882c..ae569ae 100644
--- a/controlpointthread.cpp
+++ b/controlpointthread.cpp
@@ -154,8 +154,6 @@ void ControlPointThread::run()
void ControlPointThread::rootDeviceOnline(HClientDevice *device) // SLOT
{
- kDebug() << "Received device " << device->info().udn().toString();
-
// NOTE: as a reference!
MediaServerDevice &dev = m_devices[device->info().udn().toSimpleUuid()];
dev.device = device;
@@ -214,9 +212,7 @@ void ControlPointThread::rootDeviceOffline(HClientDevice *device) \
// SLOT const int removedDevices = m_devices.remove( uuid );
if( removedDevices > 0 ) {
- kDebug() << "Removing" << uuid;
if( m_currentDevice.device->info().udn() == device->info().udn() ) {
- kDebug() << "Was current device - invalidating";
m_currentDevice.device = NULL;
m_currentDevice.info = HDeviceInfo();
}
@@ -229,8 +225,6 @@ void ControlPointThread::rootDeviceOffline(HClientDevice *device) \
// SLOT
*/
bool ControlPointThread::updateDeviceInfo( const KUrl& url )
{
- kDebug() << "Updating device info for " << url;
-
QString udn = QLatin1String("uuid:") + url.host();
// the device is definitely present, so we let the scan fill in
@@ -247,7 +241,6 @@ bool ControlPointThread::updateDeviceInfo( const KUrl& url )
// all devices don't support it
// Thanks to Tuomo Penttinen for pointing that out
if( !m_controlPoint->scan(specific) ) {
- kDebug() << m_controlPoint->errorDescription();
emit error( KIO::ERR_COULD_NOT_MOUNT, i18n( "Device %1 is offline", \
url.host() ) ); return false;
}
@@ -313,7 +306,6 @@ bool ControlPointThread::ensureDevice( const KUrl &url )
QHash<QString, ControlPointThread::MediaServerDevice>::ConstIterator it =
m_devices.find( url.host() );
if( it != m_devices.constEnd() ) {
- kDebug() << "We already know of device" << url.host();
m_currentDevice = it.value();
Q_ASSERT( m_currentDevice.cache );
return true;
@@ -806,7 +798,7 @@ void ControlPointThread::searchResolvedPath( const QString &id, \
uint start, uint
void ControlPointThread::createSearchListing(const HClientActionOp &op) // SLOT
{
- kDebug() << "DONE";
+ kDebug() << "createSearchListing";
HActionArguments output = op.outputArguments();
bool ok = disconnect( this, SIGNAL( browseResult(const \
Herqq::Upnp::HClientActionOp &) ),
this, SLOT( createSearchListing(const \
Herqq::Upnp::HClientActionOp &) ) ); @@ -896,8 +888,6 @@ void \
ControlPointThread::slotEmitSearchEntry( const QString &id, const QString & // \
delete the property
setProperty( (QLatin1String("upnp_id_") + id).toLatin1().constData(), QVariant() \
);
- kDebug() << "RESOLVED PATH" << path;
- kDebug() << "BASE SEARCH PATH " << m_baseSearchPath;
entry.insert( KIO::UDSEntry::UDS_NAME, QString(path).remove( m_baseSearchPath ) \
); emit listEntry( entry );
m_searchListingCounter--;
diff --git a/persistentaction.cpp b/persistentaction.cpp
index e4418ed..a91f782 100644
--- a/persistentaction.cpp
+++ b/persistentaction.cpp
@@ -49,6 +49,7 @@ PersistentAction::PersistentAction( Herqq::Upnp::HClientAction \
*action, QObject
void PersistentAction::timeout()
{
+ kDebug() << "TIMEOUT";
m_timer->stop();
// disconnect so that we don't get multiple invokeComplete calls in case it just \
finishes
bool ok = disconnect( m_action, SIGNAL( \
invokeComplete(Herqq::Upnp::HClientAction*, const Herqq::Upnp::HClientActionOp&) ), \
@@ -72,7 +73,7 @@ void PersistentAction::invoke( const Herqq::Upnp::HActionArguments \
&args )
void PersistentAction::invoke()
{
- kDebug() << "Beginning invoke" << m_action->info().name() << "Try number" << \
m_tries; + kDebug() << "Beginning invoke" << m_action << m_action->info().name() \
<< "Try number" << m_tries;
bool ok = connect( m_action, SIGNAL( invokeComplete(Herqq::Upnp::HClientAction*, \
const Herqq::Upnp::HClientActionOp &) ),
this, SLOT( invokeComplete(Herqq::Upnp::HClientAction*, const \
Herqq::Upnp::HClientActionOp &) )); Q_ASSERT(ok);
@@ -83,7 +84,7 @@ void PersistentAction::invoke()
void PersistentAction::invokeComplete(Herqq::Upnp::HClientAction *action, const \
Herqq::Upnp::HClientActionOp &invocationOp) // SLOT {
- kDebug() << "INVOKE COMPLETE";
+ kDebug() << "INVOKE COMPLETE" << action;
m_timer->stop();
if( invocationOp.returnValue() != Herqq::Upnp::UpnpSuccess ) {
@@ -110,6 +111,7 @@ void PersistentAction::invokeComplete(Herqq::Upnp::HClientAction \
*action, const }
}
+ kDebug() << "EVERYTHING FINE";
bool ok = disconnect( m_action, SIGNAL( \
invokeComplete(Herqq::Upnp::HClientAction*, const \
Herqq::Upnp::HClientActionOp&) ),
this, SLOT( invokeComplete(Herqq::Upnp::HClientAction*, const \
Herqq::Upnp::HClientActionOp &) ) ); Q_ASSERT( ok );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic