8 files changed, 55 insertions, 36 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
@@ -2,3 +2,3 @@
     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,15 +1,12 @@
-#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
@@ -1,4 +1,7 @@
 #include "exampleiface.h"
 
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 VirtualInterface::VirtualInterface( QObject* parent,
                                     const char* name,
@@ -18,5 +21,5 @@ 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,8 +1,12 @@
-#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() {
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
@@ -2,3 +2,3 @@
     boolean "Mainwindow with PIM and QCOP usage"
     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
@@ -13,5 +13,5 @@ DEPENDPATH  += $(OPIEDIR)/include
 
 # we now also include opie
-LIBS += -lqpe -lopiepim2 -lopieui2
+LIBS += -lqpe -lopiecore2 -lopiepim2 -lopieui2
 
 include ( $(OPIEDIR)/include.pro )
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,2 +1,23 @@
+/* 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
 #include <qmenubar.h> // menubar
@@ -11,16 +32,6 @@
 #include <qwhatsthis.h> // for whats this
 
-#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. */
 
 /*
@@ -36,5 +47,4 @@
  */
 
-using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
 
@@ -305,5 +315,5 @@ void MainWindow::slotDate() {
      * to select the day
      */
-    qWarning("slot Date");
+    odebug << "slot Date" << oendl;
     QPopupMenu *menu = new QPopupMenu();
     /* A Month to select a date from TRUE for auto close */
diff --git a/rsync/qrsync.cpp b/rsync/qrsync.cpp
index fe5f1bc..a2dbafc 100644
--- a/rsync/qrsync.cpp
+++ b/rsync/qrsync.cpp
@@ -6,4 +6,9 @@ extern "C" {
 #include <stdlib.h>
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qfile.h>
 
@@ -46,13 +51,13 @@ void QRsync::generateDiff( QString baseFile, QString sigFile, QString deltaFile
 	result = rs_loadsig_file(sig_file, &sumset, 0);
 	if (result != RS_DONE) {
-	    qDebug( "rdiffGenDiff: loading of sig file failed, error=%d", result );
+	    odebug << "rdiffGenDiff: loading of sig file failed, error=" << result << "" << oendl; 
 	} else {
 	    result = rs_build_hash_table(sumset);
 	    if ( result != RS_DONE) {
-		qDebug( "rdiffGenDiff: building of hash table failed, error=%d", result );
+		odebug << "rdiffGenDiff: building of hash table failed, error=" << result << "" << oendl; 
 	    } else {
 		result = rs_delta_file(sumset, new_file, delta_file, 0);
 		if ( result != RS_DONE) {
-		    qDebug( "rdiffGenDiff: writing of diff file failed, error=%d", result );
+		    odebug << "rdiffGenDiff: writing of diff file failed, error=" << result << "" << oendl; 
 		}
 	    }
@@ -89,5 +94,5 @@ void QRsync::applyDiff( QString baseFile, QString deltaFile )
 
 	if (result != RS_DONE) {
-	    qDebug( "rdiffApplyDiff failed with result %d", result );
+	    odebug << "rdiffApplyDiff failed with result " << result << "" << oendl; 
 	    return;
 	}