use opie debugging

7 files changed, 46 insertions, 32 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
@@ -3,2 +3,2 @@
     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,14 +1,11 @@
-#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
 
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
@@ -2,2 +2,5 @@
 
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 VirtualInterface::VirtualInterface( QObject* parent,
@@ -19,3 +22,3 @@ bool VirtualInterface::refresh() {
     QString old = getInterfaceName();
-    qWarning("Interface name was " + old );
+    odebug << "Interface name was " << old << oendl;
     setInterfaceName( "wlan0" );
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,2 +1,7 @@
-#include <qwidget.h>
+#include "exampleiface.h"
+#include "examplemodule.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
@@ -4,4 +9,3 @@
 
-#include "exampleiface.h"
-#include "examplemodule.h"
+#include <qwidget.h>
 
diff --git a/examples/simple-pim/config.in b/examples/simple-pim/config.in
index aa1a426..9e6adc9 100644
--- a/examples/simple-pim/config.in
+++ b/examples/simple-pim/config.in
@@ -3,2 +3,2 @@
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES && LIBOPIEPIM2
+    depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES && LIBOPIE2CORE && LIBOPIE2PIM
diff --git a/examples/simple-pim/example.pro b/examples/simple-pim/example.pro
index ebcdb2b..b8b2c69 100644
--- a/examples/simple-pim/example.pro
+++ b/examples/simple-pim/example.pro
@@ -14,3 +14,3 @@ DEPENDPATH  += $(OPIEDIR)/include
 # we now also include opie
-LIBS += -lqpe -lopiepim2 -lopieui2
+LIBS += -lqpe -lopiecore2 -lopiepim2 -lopieui2
 
diff --git a/examples/simple-pim/simple.cpp b/examples/simple-pim/simple.cpp
index 50905bf..efd5070 100644
--- a/examples/simple-pim/simple.cpp
+++ b/examples/simple-pim/simple.cpp
@@ -1 +1,22 @@
+/* We use a sane order of include files, from the most special to the least special
+   That helps to reduce the number of implicit includes hence increases the reuse */
+
+/* First the local include files */
+#include "simple.h"
+
+/* Then the Ope include files.
+This includes qpe stuff which will eventually be merged with libopie2 */
+#include <opie2/odebug.h> // for odebug streams
+#include <opie2/oapplicationfactory.h> // a template + macro to save the main method and allow quick launching
+#include <opie2/otabwidget.h>
+#include <opie2/owait.h>
+#include <qpe/qpeapplication.h> // the QPEApplication
+#include <qpe/resource.h>
+#include <qpe/sound.h>
+#include <qpe/qcopenvelope_qws.h>
+#include <qpe/datebookmonth.h>
+#include <qpe/timestring.h>
+using namespace Opie::Core;
+
+/* Now the Qt includes */
 #include <qaction.h> // action
@@ -12,14 +33,4 @@
 
-#include <qpe/qpeapplication.h> // the QPEApplication
-#include <qpe/resource.h>
-#include <qpe/sound.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/datebookmonth.h>
-#include <qpe/timestring.h>
-
-#include <opie2/oapplicationfactory.h> // a template + macro to save the main method and allow quick launching
-#include <opie2/otabwidget.h>
-#include <opie2/owait.h>
-
-#include "simple.h"
+/* Add standard includes here if you need some
+   Examples are: stdlib.h, socket.h, etc. */
 
@@ -37,3 +48,2 @@
 
-using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
@@ -306,3 +316,3 @@ void MainWindow::slotDate() {
      */
-    qWarning("slot Date");
+    odebug << "slot Date" << oendl;
     QPopupMenu *menu = new QPopupMenu();