use opie debugging

4 files changed, 20 insertions, 16 deletions

diff --git a/examples/networksettings/config.in b/examples/networksettings/config.in
index 4bbbb4e..e1a68cc 100644
--- a/examples/networksettings/config.in
+++ b/examples/networksettings/config.in
@@ -1,4 +1,4 @@
   config EXAMPLE_VPN
     boolean "opie-networksettingsplugin-example (VPN module)"
     default "n" if NETWORKSETUP
-    depends ( LIBQPE || LIBQPE-X11 ) && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES && EXAMPLES
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES && EXAMPLES
diff --git a/examples/networksettings/example.pro b/examples/networksettings/example.pro
index 835dbd0..7bfa1ed 100644
--- a/examples/networksettings/example.pro
+++ b/examples/networksettings/example.pro
@@ -1,17 +1,14 @@
-#TEMPLATE        = app
-#
 TEMPLATE        = lib
-#CONFIG          += qt plugin warn_on 
-CONFIG		+= qt plugin warn_on 
+CONFIG        += qt plugin warn_on
 DESTDIR         = $(OPIEDIR)/plugins/networksettings
-HEADERS		= exampleiface.h examplemodule.h 
-SOURCES		= exampleiface.cpp examplemodule.cpp
-INCLUDEPATH	+= $(OPIEDIR)/include $(OPIEDIR)/noncore/settings/networksettings  $(OPIEDIR)/noncore/settings/networksettings/interfaces
-DEPENDPATH	+= $(OPIEDIR)/include $(OPIEDIR)/noncore/settings/networksettings  $(OPIEDIR)/noncore/settings/networksettings/interfaces
-LIBS            += -lqpe -linterfaces
-TARGET		= example_vpn
-VERSION		= 1.0.0
+HEADERS        = exampleiface.h examplemodule.h
+SOURCES        = exampleiface.cpp examplemodule.cpp
+INCLUDEPATH    += $(OPIEDIR)/include $(OPIEDIR)/noncore/settings/networksettings  $(OPIEDIR)/noncore/settings/networksettings/interfaces
+DEPENDPATH    += $(OPIEDIR)/include $(OPIEDIR)/noncore/settings/networksettings  $(OPIEDIR)/noncore/settings/networksettings/interfaces
+LIBS            += -lqpe -linterfaces -lopiecore2
+TARGET        = example_vpn
+VERSION        = 1.0.0
 
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/examples/networksettings/exampleiface.cpp b/examples/networksettings/exampleiface.cpp
index 5267a9c..8012bb2 100644
--- a/examples/networksettings/exampleiface.cpp
+++ b/examples/networksettings/exampleiface.cpp
@@ -1,43 +1,46 @@
 #include "exampleiface.h"
 
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 VirtualInterface::VirtualInterface( QObject* parent,
                                     const char* name,
                                     bool status )
     : Interface(parent, name, status )
 {
 }
 
 VirtualInterface::~VirtualInterface() {
 }
 
 bool VirtualInterface::refresh() {
 /* we do VPN over ppp
  * so replace the interfaceName with
  * something actual existing
  * I take wlan0 in my case
  */
     QString old = getInterfaceName();
-    qWarning("Interface name was " + old );
+    odebug << "Interface name was " << old << oendl;
     setInterfaceName( "wlan0" );
 
     bool b =Interface::refresh();
     setInterfaceName( old );
 
 /*  new and old interface name */
     emit updateInterface(this);
     return b;
 }
 
 
 void VirtualInterface::start() {
 // call pptp
     setStatus(true);
     refresh();
     emit updateMessage("VPN started");
 }
 
 void VirtualInterface::stop() {
     setStatus(false );
     refresh();
     emit updateMessage("VPN halted");
 }
diff --git a/examples/networksettings/examplemodule.cpp b/examples/networksettings/examplemodule.cpp
index d7fd718..703e6bd 100644
--- a/examples/networksettings/examplemodule.cpp
+++ b/examples/networksettings/examplemodule.cpp
@@ -1,71 +1,75 @@
-#include <qwidget.h>
+#include "exampleiface.h"
+#include "examplemodule.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
 #include <interfaces/interfaceinformationimp.h>
 
-#include "exampleiface.h"
-#include "examplemodule.h"
+#include <qwidget.h>
 
 VirtualModule::VirtualModule() {
     Interface* iface = new VirtualInterface( 0 );
     iface->setHardwareName( "vpn" );
     iface->setInterfaceName( "Test VPN" );
     m_interfaces.append( iface );
 
 //  If we set up VPN via pptp
 //  and networksettins was closed and now opened
 //  we need to hide the ppp device behind us
 //  One can do  this by calling setHandledInterfaceNames
 //    setHandledInterfaceNames();
 }
 
 VirtualModule::~VirtualModule() {
     m_interfaces.setAutoDelete( true );
     m_interfaces.clear();
 }
 
 
 /*
  * We're a VPN module
  */
 bool VirtualModule::isOwner(  Interface* iface ) {
  /* check if it is our device */
     return  m_interfaces.find(  iface ) != -1;
 }
 
 QWidget*  VirtualModule::configure( Interface* ) {
 /* We don't have any Config for now */
     return 0l;
 }
 
 QWidget* VirtualModule::information(  Interface* iface ) {
     return  new InterfaceInformationImp(0, "Interface info", iface );
 }
 
 QList<Interface> VirtualModule::getInterfaces() {
     return m_interfaces;
 }
 
 void VirtualModule::possibleNewInterfaces( QMap<QString, QString>& map) {
     map.insert( QObject::tr("VPN PPTP"),
                 QObject::tr("Add new Point to Point Tunnel Protocol connection" ) );
 }
 
 
 Interface* VirtualModule::addNewInterface( const QString& ) {
  /* check the str if we support more interfaces */
 /*
     Interface* iface = new VirtualInterface( 0 );
     iface->setModuleOwner( this );
     return iface;*/
 
 // if we would support saving interfaces we could add
 // them here
 
     return 0;
 }
 
 
 bool VirtualModule::remove( Interface* ) {
 /* we do not support removing our interface */
     return false;
 }