1 files changed, 19 insertions, 19 deletions

diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 1e16b97..3e1a650 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -70,25 +70,25 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWi
 
     Interfaces i;
     QStringList list = i.getInterfaceList();
     QMap<QString, Interface*>::Iterator it;
     for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni )
     {
         /*
          * we skipped it in getAllInterfaces now
          * we need to ignore it as well
          */
         if (m_handledIfaces.contains( *ni) )
         {
-            qDebug("Not up iface handled by module");
+            odebug << "Not up iface handled by module" << oendl; 
             continue;
         }
         bool found = false;
         for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it )
         {
             if(it.key() == (*ni))
                 found = true;
         }
         if(!found)
         {
             if(!(*ni).contains("_"))
             {
@@ -210,25 +210,25 @@ void MainWindowImp::getAllInterfaces()
             if((loc = line.find(":")) != -1)
             {
                 ifaces += line.left(loc);
             }
         }
     }
 
     for (QStringList::Iterator it = ifaces.begin(); it != ifaces.end(); ++it)
     {
         int flags = 0;
         if ( m_handledIfaces.contains( (*it) ) )
         {
-            qDebug(" %s is handled by a module", (*it).latin1() );
+            odebug << " " << (*it).latin1() << " is handled by a module" << oendl; 
             continue;
         }
         //    int family;
         i = NULL;
 
         strcpy(ifr.ifr_name, (*it).latin1());
 
         struct ifreq ifcopy;
         ifcopy = ifr;
         result = ioctl(sockfd, SIOCGIFFLAGS, &ifcopy);
         flags = ifcopy.ifr_flags;
         i = new Interface(this, ifr.ifr_name, false);
@@ -240,141 +240,141 @@ void MainWindowImp::getAllInterfaces()
 
         if ((flags & IFF_BROADCAST) == IFF_BROADCAST)
             i->setHardwareName("Ethernet");
         else if ((flags & IFF_POINTOPOINT) == IFF_POINTOPOINT)
             i->setHardwareName("Point to Point");
         else if ((flags & IFF_MULTICAST) == IFF_MULTICAST)
             i->setHardwareName("Multicast");
         else if ((flags & IFF_LOOPBACK) == IFF_LOOPBACK)
             i->setHardwareName("Loopback");
         else
             i->setHardwareName("Unknown");
 
-        qWarning("Adding interface %s to interfaceNames\n", ifr.ifr_name);
+        owarn << "Adding interface " << ifr.ifr_name << " to interfaceNames\n" << oendl; 
         interfaceNames.insert(i->getInterfaceName(), i);
         updateInterface(i);
         connect(i, SIGNAL(updateInterface(Interface*)),
                 this, SLOT(updateInterface(Interface*)));
     }
     // now lets ask the plugins too ;)
     QMap<Module*, QLibrary*>::Iterator it;
     QList<Interface> ilist;
     for( it = libraries.begin(); it != libraries.end(); ++it )
     {
         if(it.key())
         {
             ilist = it.key()->getInterfaces();
             for( i = ilist.first(); i != 0; i = ilist.next() )
             {
-                qWarning("Adding interface %s to interfaceNames\n", i->getInterfaceName().latin1() );
+                owarn << "Adding interface " << i->getInterfaceName().latin1() << " to interfaceNames\n" << oendl; 
                 interfaceNames.insert(i->getInterfaceName(), i);
                 updateInterface(i);
                 connect(i, SIGNAL(updateInterface(Interface*)),
                         this, SLOT(updateInterface(Interface*)));
             }
         }
     }
 }
 
 /**
  * Load all modules that are found in the path
  * @param path a directory that is scaned for any plugins that can be loaded
  *  and attempts to load them
  */
 void MainWindowImp::loadModules(const QString &path)
 {
 #ifdef DEBUG
-    qDebug("MainWindowImp::loadModules: %s", path.latin1());
+    odebug << "MainWindowImp::loadModules: " << path.latin1() << "" << oendl; 
 #endif
     QDir d(path);
     if(!d.exists())
         return;
 
     // Don't want sym links
     d.setFilter( QDir::Files | QDir::NoSymLinks );
     const QFileInfoList *list = d.entryInfoList();
     QFileInfoListIterator it( *list );
     QFileInfo *fi;
     while ( (fi=it.current()) )
     {
 #ifdef QWS
         if(fi->fileName().contains(".so"))
         {
 #else
         if(fi->fileName().contains(".so") && fi->fileName().contains("networksettings_"))
         {
 #endif
             loadPlugin(path + "/" + fi->fileName());
-            qDebug("loaded plugin: >%s< ",QString(path + "/" + fi->fileName()).latin1());
+            odebug << "loaded plugin: >" << QString(path + "/" + fi->fileName()).latin1() << "< " << oendl; 
         }
         ++it;
     }
 }
 
 /**
  * Attempt to load a function and resolve a function.
  * @param pluginFileName - the name of the file in which to attempt to load
  * @param resolveString - function pointer to resolve
  * @return pointer to the function with name resolveString or NULL
  */
 Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString)
 {
 #ifdef DEBUG
-    qDebug("MainWindowImp::loadPlugin: %s: resolving %s", pluginFileName.latin1(), resolveString.latin1());
+    odebug << "MainWindowImp::loadPlugin: " << pluginFileName.latin1() << ": resolving " << resolveString.latin1() << "" << oendl; 
 #endif
 #ifdef QWS
     QLibrary *lib = new QLibrary(pluginFileName);
     void *functionPointer = lib->resolve(resolveString);
     if( !functionPointer )
     {
 #ifdef DEBUG
-        qDebug("MainWindowImp::loadPlugin: Warning: %s is not a plugin", pluginFileName.latin1());
+        odebug << "MainWindowImp::loadPlugin: Warning: " << pluginFileName.latin1() << " is not a plugin" << oendl; 
 #endif
         delete lib;
         return NULL;
     }
     // Try to get an object.
     Module *object = ((Module* (*)()) functionPointer)();
     if(object == NULL)
     {
 #ifdef DEBUG
-        qDebug("MainWindowImp: Couldn't create object, but did load library!");
+        odebug << "MainWindowImp: Couldn't create object, but did load library!" << oendl; 
 #endif
         delete lib;
         return NULL;
     }
 
     m_handledIfaces += object->handledInterfaceNames();
     // Store for deletion later
     libraries.insert(object, lib);
     return object;
 
 #else
     QLibrary *lib = loader->library(pluginFileName);
     if( !lib || !lib->hasSymbol(resolveString) )
     {
-        qDebug(QString("MainWindowImp::loadPlugin: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1());
+        odebug << QString("MainWindowImp::loadPlugin: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1() << oendl; 
         return NULL;
     }
     // Try to get an object.
     Module *object = ((Module* (*)()) lib->symbol(resolveString))();
     if(object == NULL)
     {
 #ifdef DEBUG
-        qDebug("MainWindowImp: Couldn't create object, but did load library!");
+        odebug << "MainWindowImp: Couldn't create object, but did load library!" << oendl; 
 #endif
         return NULL;
     }
 #ifdef DEBUG
-    qDebug("MainWindowImp::loadPlugin:: Found object, storing.");
+    odebug << "MainWindowImp::loadPlugin:: Found object, storing." << oendl; 
 #endif
     // Store for deletion later
     libraries.insert(object, lib);
     return object;
 #endif
 }
 
 /**
  * The Add button was clicked.  Bring up the add dialog and if OK is hit
  * load the plugin and append it to the list
  */
 void MainWindowImp::addClicked()
@@ -402,25 +402,25 @@ void MainWindowImp::addClicked()
     {
         QListViewItem *item = addNewConnection.registeredServicesList->currentItem();
         if(!item)
             return;
 
         for( it = libraries.begin(); it != libraries.end(); ++it )
         {
             if(it.key())
             {
                 Interface *i = (it.key())->addNewInterface(item->text(0));
                 if(i)
                 {
-                    qDebug("iface name %s",i->getInterfaceName().latin1());
+                    odebug << "iface name " << i->getInterfaceName().latin1() << "" << oendl; 
                     interfaceNames.insert(i->getInterfaceName(), i);
                     updateInterface(i);
                 }
             }
         }
     }
 }
 
 /**
  * Prompt the user to see if they really want to do this.
  * If they do then remove from the list and unload.
  */
@@ -504,25 +504,25 @@ void MainWindowImp::informationClicked()
     //   if(!i->isAttached()){
     //     QMessageBox::information(this, "Sorry","No information about\na disconnected interface.", QMessageBox::Ok);
     //     return;
     //   }
 
     if(i->getModuleOwner())
     {
         QWidget *moduleInformation = i->getModuleOwner()->information(i);
         if(moduleInformation != NULL)
         {
             QPEApplication::showWidget( moduleInformation );
 #ifdef DEBUG
-            qDebug("MainWindowImp::informationClicked:: Module owner has created, we showed.");
+            odebug << "MainWindowImp::informationClicked:: Module owner has created, we showed." << oendl; 
 #endif
             return;
         }
     }
     InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog  | Qt::WStyle_ContextHelp);
     QPEApplication::showWidget( information );
 }
 
 /**
  * Update this interface.  If no QListViewItem exists create one.
  * @param Interface* pointer to the interface that needs to be updated.
  */
@@ -641,25 +641,25 @@ void MainWindowImp::removeProfile()
         profiles = QStringList::split(" ", profiles.join(" ").replace(QRegExp(profileToRemove), ""));
         profilesList->clear();
         for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it)
             profilesList->insertItem((*it));
 
         // Remove any interface settings and mappings.
         Interfaces interfaces;
         // Go through them one by one
         QMap<Interface*, QListViewItem*>::Iterator it;
         for( it = items.begin(); it != items.end(); ++it )
         {
             QString interfaceName = it.key()->getInterfaceName();
-            qDebug(interfaceName.latin1());
+            odebug << interfaceName.latin1() << oendl; 
             if(interfaces.setInterface(interfaceName + "_" + profileToRemove))
             {
                 interfaces.removeInterface();
                 if(interfaces.setMapping(interfaceName))
                 {
                     if(profilesList->count() == 1)
                         interfaces.removeMapping();
                     else
                     {
                         interfaces.removeMap("map", interfaceName + "_" + profileToRemove);
                     }
                 }
@@ -710,39 +710,39 @@ void MainWindowImp::changeProfile()
 
 
 void MainWindowImp::makeChannel()
 {
     channel = new QCopChannel( "QPE/Application/networksettings", this );
     connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
              this, SLOT(receive(const QCString&,const QByteArray&)) );
 }
 
 void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
 {
     bool found = false;
-    qDebug("MainWindowImp::receive QCop msg >"+msg+"<");
+    odebug << "MainWindowImp::receive QCop msg >"+msg+"<" << oendl; 
     if (msg == "raise")
     {
         raise();
         return;
     }
 
     QString dest = msg.left(msg.find("("));
     QCString param = msg.right(msg.length() - msg.find("(") - 1);
     param = param.left( param.length() - 1 );
-    qDebug("dest >%s< param >"+param+"<",dest.latin1());
+    odebug << "dest >" << dest.latin1() << "< param >"+param+"<" << oendl; 
 
     QMap<Module*, QLibrary*>::Iterator it;
     for( it = libraries.begin(); it != libraries.end(); ++it )
     {
-        qDebug("plugin >%s<", it.key()->type().latin1() );
+        odebug << "plugin >" << it.key()->type().latin1() << "<" << oendl; 
         if(it.key()->type() == dest)
         {
             it.key()->receive( param, arg );
             found = true;
         }
     }
 
 
     if (found) QPEApplication::setKeepRunning();
-    else qDebug("Huh what do ya want");
+    else odebug << "Huh what do ya want" << oendl; 
 }