summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--examples/networksettings/config.in2
-rw-r--r--examples/networksettings/example.pro19
-rw-r--r--examples/networksettings/exampleiface.cpp5
-rw-r--r--examples/networksettings/examplemodule.cpp10
-rw-r--r--examples/simple-pim/config.in2
-rw-r--r--examples/simple-pim/example.pro2
-rw-r--r--examples/simple-pim/simple.cpp38
-rw-r--r--rsync/qrsync.cpp13
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
@@ -1,4 +1,4 @@
1 config EXAMPLE_VPN 1 config EXAMPLE_VPN
2 boolean "opie-networksettingsplugin-example (VPN module)" 2 boolean "opie-networksettingsplugin-example (VPN module)"
3 default "n" if NETWORKSETUP 3 default "n" if NETWORKSETUP
4 depends ( LIBQPE || LIBQPE-X11 ) && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES && EXAMPLES 4 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,16 +1,13 @@
1#TEMPLATE = app
2#
3TEMPLATE = lib 1TEMPLATE = lib
4#CONFIG += qt plugin warn_on 2CONFIG += qt plugin warn_on
5 CONFIG += qt plugin warn_on
6DESTDIR = $(OPIEDIR)/plugins/networksettings 3DESTDIR = $(OPIEDIR)/plugins/networksettings
7 HEADERS = exampleiface.h examplemodule.h 4HEADERS = exampleiface.h examplemodule.h
8 SOURCES = exampleiface.cpp examplemodule.cpp 5SOURCES = exampleiface.cpp examplemodule.cpp
9 INCLUDEPATH+= $(OPIEDIR)/include $(OPIEDIR)/noncore/settings/networksettings $(OPIEDIR)/noncore/settings/networksettings/interfaces 6INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/noncore/settings/networksettings $(OPIEDIR)/noncore/settings/networksettings/interfaces
10 DEPENDPATH+= $(OPIEDIR)/include $(OPIEDIR)/noncore/settings/networksettings $(OPIEDIR)/noncore/settings/networksettings/interfaces 7DEPENDPATH += $(OPIEDIR)/include $(OPIEDIR)/noncore/settings/networksettings $(OPIEDIR)/noncore/settings/networksettings/interfaces
11LIBS += -lqpe -linterfaces 8LIBS += -lqpe -linterfaces -lopiecore2
12 TARGET = example_vpn 9TARGET = example_vpn
13 VERSION = 1.0.0 10VERSION = 1.0.0
14 11
15 12
16 13
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,5 +1,8 @@
1#include "exampleiface.h" 1#include "exampleiface.h"
2 2
3#include <opie2/odebug.h>
4using namespace Opie::Core;
5
3VirtualInterface::VirtualInterface( QObject* parent, 6VirtualInterface::VirtualInterface( QObject* parent,
4 const char* name, 7 const char* name,
5 bool status ) 8 bool status )
@@ -17,7 +20,7 @@ bool VirtualInterface::refresh() {
17 * I take wlan0 in my case 20 * I take wlan0 in my case
18 */ 21 */
19 QString old = getInterfaceName(); 22 QString old = getInterfaceName();
20 qWarning("Interface name was " + old ); 23 odebug << "Interface name was " << old << oendl;
21 setInterfaceName( "wlan0" ); 24 setInterfaceName( "wlan0" );
22 25
23 bool b =Interface::refresh(); 26 bool b =Interface::refresh();
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,9 +1,13 @@
1#include <qwidget.h> 1#include "exampleiface.h"
2#include "examplemodule.h"
3
4/* OPIE */
5#include <opie2/odebug.h>
6using namespace Opie::Core;
2 7
3#include <interfaces/interfaceinformationimp.h> 8#include <interfaces/interfaceinformationimp.h>
4 9
5#include "exampleiface.h" 10#include <qwidget.h>
6#include "examplemodule.h"
7 11
8VirtualModule::VirtualModule() { 12VirtualModule::VirtualModule() {
9 Interface* iface = new VirtualInterface( 0 ); 13 Interface* iface = new VirtualInterface( 0 );
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
@@ -1,4 +1,4 @@
1 config SIMPLE_PIM_EXAMPLE 1 config SIMPLE_PIM_EXAMPLE
2 boolean "Mainwindow with PIM and QCOP usage" 2 boolean "Mainwindow with PIM and QCOP usage"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES && LIBOPIEPIM2 4 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
@@ -12,6 +12,6 @@ DEPENDPATH += $(OPIEDIR)/include
12 12
13 13
14# we now also include opie 14# we now also include opie
15LIBS += -lqpe -lopiepim2 -lopieui2 15LIBS += -lqpe -lopiecore2 -lopiepim2 -lopieui2
16 16
17include ( $(OPIEDIR)/include.pro ) 17include ( $(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,3 +1,24 @@
1/* We use a sane order of include files, from the most special to the least special
2 That helps to reduce the number of implicit includes hence increases the reuse */
3
4/* First the local include files */
5#include "simple.h"
6
7/* Then the Ope include files.
8This includes qpe stuff which will eventually be merged with libopie2 */
9#include <opie2/odebug.h> // for odebug streams
10#include <opie2/oapplicationfactory.h> // a template + macro to save the main method and allow quick launching
11#include <opie2/otabwidget.h>
12#include <opie2/owait.h>
13#include <qpe/qpeapplication.h> // the QPEApplication
14#include <qpe/resource.h>
15#include <qpe/sound.h>
16#include <qpe/qcopenvelope_qws.h>
17#include <qpe/datebookmonth.h>
18#include <qpe/timestring.h>
19using namespace Opie::Core;
20
21/* Now the Qt includes */
1#include <qaction.h> // action 22#include <qaction.h> // action
2#include <qmenubar.h> // menubar 23#include <qmenubar.h> // menubar
3#include <qtoolbar.h> // toolbar 24#include <qtoolbar.h> // toolbar
@@ -10,18 +31,8 @@
10#include <qdialog.h> 31#include <qdialog.h>
11#include <qwhatsthis.h> // for whats this 32#include <qwhatsthis.h> // for whats this
12 33
13#include <qpe/qpeapplication.h> // the QPEApplication 34/* Add standard includes here if you need some
14#include <qpe/resource.h> 35 Examples are: stdlib.h, socket.h, etc. */
15#include <qpe/sound.h>
16#include <qpe/qcopenvelope_qws.h>
17#include <qpe/datebookmonth.h>
18#include <qpe/timestring.h>
19
20#include <opie2/oapplicationfactory.h> // a template + macro to save the main method and allow quick launching
21#include <opie2/otabwidget.h>
22#include <opie2/owait.h>
23
24#include "simple.h"
25 36
26/* 37/*
27 * implementation of simple 38 * implementation of simple
@@ -35,7 +46,6 @@
35 * either a main method or one for our component plugin system 46 * either a main method or one for our component plugin system
36 */ 47 */
37 48
38using namespace Opie::Core;
39OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) 49OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
40 50
41MainWindow::MainWindow(QWidget *parent, const char* name, WFlags fl ) 51MainWindow::MainWindow(QWidget *parent, const char* name, WFlags fl )
@@ -304,7 +314,7 @@ void MainWindow::slotDate() {
304 * at the current mouse position with a DateChooser 314 * at the current mouse position with a DateChooser
305 * to select the day 315 * to select the day
306 */ 316 */
307 qWarning("slot Date"); 317 odebug << "slot Date" << oendl;
308 QPopupMenu *menu = new QPopupMenu(); 318 QPopupMenu *menu = new QPopupMenu();
309 /* A Month to select a date from TRUE for auto close */ 319 /* A Month to select a date from TRUE for auto close */
310 DateBookMonth *month = new DateBookMonth(menu, 0, true ); 320 DateBookMonth *month = new DateBookMonth(menu, 0, true );
diff --git a/rsync/qrsync.cpp b/rsync/qrsync.cpp
index fe5f1bc..a2dbafc 100644
--- a/rsync/qrsync.cpp
+++ b/rsync/qrsync.cpp
@@ -5,6 +5,11 @@ extern "C" {
5} 5}
6#include <stdlib.h> 6#include <stdlib.h>
7 7
8/* OPIE */
9#include <opie2/odebug.h>
10using namespace Opie::Core;
11
12/* QT */
8#include <qfile.h> 13#include <qfile.h>
9 14
10static const char *rdiffNewFile = "/tmp/rdiff/result"; 15static const char *rdiffNewFile = "/tmp/rdiff/result";
@@ -45,15 +50,15 @@ void QRsync::generateDiff( QString baseFile, QString sigFile, QString deltaFile
45 50
46 result = rs_loadsig_file(sig_file, &sumset, 0); 51 result = rs_loadsig_file(sig_file, &sumset, 0);
47 if (result != RS_DONE) { 52 if (result != RS_DONE) {
48 qDebug( "rdiffGenDiff: loading of sig file failed, error=%d", result ); 53 odebug << "rdiffGenDiff: loading of sig file failed, error=" << result << "" << oendl;
49 } else { 54 } else {
50 result = rs_build_hash_table(sumset); 55 result = rs_build_hash_table(sumset);
51 if ( result != RS_DONE) { 56 if ( result != RS_DONE) {
52 qDebug( "rdiffGenDiff: building of hash table failed, error=%d", result ); 57 odebug << "rdiffGenDiff: building of hash table failed, error=" << result << "" << oendl;
53 } else { 58 } else {
54 result = rs_delta_file(sumset, new_file, delta_file, 0); 59 result = rs_delta_file(sumset, new_file, delta_file, 0);
55 if ( result != RS_DONE) { 60 if ( result != RS_DONE) {
56 qDebug( "rdiffGenDiff: writing of diff file failed, error=%d", result ); 61 odebug << "rdiffGenDiff: writing of diff file failed, error=" << result << "" << oendl;
57 } 62 }
58 } 63 }
59 } 64 }
@@ -88,7 +93,7 @@ void QRsync::applyDiff( QString baseFile, QString deltaFile )
88 fclose( new_file ); 93 fclose( new_file );
89 94
90 if (result != RS_DONE) { 95 if (result != RS_DONE) {
91 qDebug( "rdiffApplyDiff failed with result %d", result ); 96 odebug << "rdiffApplyDiff failed with result " << result << "" << oendl;
92 return; 97 return;
93 } 98 }
94 99