Updated dependencies

  NS2->app requires OT2Lib and NS2Lib
  OT2Lib requires NS2Lib

  Most plugins only require NS2Lib
  Except
  BTPlugin which requires als OT2Lib

  Also renamed owarn -> odebug

1 files changed, 7 insertions, 7 deletions

diff --git a/noncore/settings/networksettings2/opietooth2/OTHCISocket.cpp b/noncore/settings/networksettings2/opietooth2/OTHCISocket.cpp
index 471c3bf..1997b44 100644
--- a/noncore/settings/networksettings2/opietooth2/OTHCISocket.cpp
+++ b/noncore/settings/networksettings2/opietooth2/OTHCISocket.cpp
@@ -25,37 +25,37 @@ using namespace Opietooth2;
 OTHCISocket::OTHCISocket( OTDriver * D ) :
                             QObject( D, D->devname() ) {
     BStatusSet = false;
     Driver = D;
     HCIReadNotifier = 0;
 }
 
 OTHCISocket::~OTHCISocket() {
     close();
 }
 
 void OTHCISocket::close() {
-    owarn << "OTHCISocket::close()" << oendl;
+    odebug << "OTHCISocket::close()" << oendl;
     if( HCIReadNotifier ) {
         delete HCIReadNotifier;
     }
 
     if( HCISocket.isValid() ) {
         HCISocket.close();
     }
 }
 
 bool OTHCISocket::open() {
 
-    owarn << "OTHCISocket::open()" << oendl;
+    odebug << "OTHCISocket::open()" << oendl;
     int s;
 
     s = ::socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
 
     if (s < 0) {
       emit error( tr( "Error creating socket on %1 : %2 %3").
                     arg( Driver->devname() ).
                     arg( errno ).
                     arg( strerror(errno) )
                 );
       return false;
     }
@@ -142,25 +142,25 @@ void OTHCISocket::slotSocketActivated() {
       unsigned char eventCode = buf[1];
       unsigned char len = buf[2];
 
       if (psize-3 == len) {
 
         QByteArray databuf;
         databuf.duplicate((char*)(buf+3), len);
         emit event(eventCode, databuf);
         if (eventCode == EVT_CMD_STATUS) {
           updateStatus( databuf );
         }
       } else {
-        owarn << "Error reading hci packet: packetSize("
+        odebug << "Error reading hci packet: packetSize("
               << psize
               << ")-3 != dataSize("
               << len
               << ")" 
               << oendl;
       }
     } else if (err == QSocketDevice::NoError) {
       slotConnectionClosed();
     } else {
         HCISocket.close();
         slotSocketError(err);
     }
@@ -174,25 +174,25 @@ void OTHCISocket::updateStatus(const QByteArray& data) {
     Q_UINT16 opcode;
 
     BStatusSet = true;
 
     stream >> status >> dummy >> opcode;
     //kdDebug() << "updatestatus opcode=" << uint32_t(opcode) << endl;
     LastStatus = status;
     LastStatusOgf = cmd_opcode_ogf(opcode);
     LastStatusOcf = cmd_opcode_ocf(opcode);
 }
 
 void OTHCISocket::slotConnectionClosed() {
-    owarn << "HCI connection closed." << oendl;
+    odebug << "HCI connection closed." << oendl;
     emit connectionClosed();
 }
 
 void OTHCISocket::readEvent() {
 
     if (HCIReadNotifier) {
         slotSocketActivated();
     }
 }
 
 bool OTHCISocket::sendCommand( unsigned char ogf,
                                unsigned short ocf, 
@@ -221,53 +221,53 @@ bool OTHCISocket::sendCommand( unsigned char ogf,
 
 bool OTHCISocket::readStatus( unsigned char ogf, 
                               unsigned short ocf, 
                               int *status, 
                               int timeout_ms) {
     QTimer timer;
 
     timer.start(timeout_ms, true);
     BStatusSet = false;
 
     while (timer.isActive() && HCISocket.isValid()) {
 
-        owarn << "OTHCISocket::readStatus()" << oendl;
+        odebug << "OTHCISocket::readStatus()" << oendl;
         bool timeout = false;
 
         if( HCISocket.bytesAvailable() == 0) {
           int rv = HCISocket.waitForMore(timeout_ms);
           timeout = (rv == 0);
         }
 
         if (!timeout) {
           slotSocketActivated();
         }
 
         if( BStatusSet == true && 
             ogf == LastStatusOgf && 
             ocf == LastStatusOcf) {
             *status = LastStatus;
-            owarn << "OTHCISocket::readStatus(ogf="
+            odebug << "OTHCISocket::readStatus(ogf="
                   << ogf
                   << ",ocf="
                   << ocf
                   << ",timeout="
                   << LastStatus
                   << ")"
                   << oendl;
             return true;
         }
     }
 
-    owarn << "OTHCISocket::readStatus(ogf="
+    odebug << "OTHCISocket::readStatus(ogf="
           << ogf
           << ",ocf="
           << ocf
           << ",timeout="
           << LastStatus
           << ") : timeout "
           << oendl;
     return false;
 }
 
 int OTHCISocket::socket() {
     return HCISocket.socket();