summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp4
-rw-r--r--libopie2/examples/opiedb/sqltest/main.cpp42
-rw-r--r--libopie2/examples/opiedb/sqltest/spaltenweise.cpp6
-rw-r--r--libopie2/examples/opiedb/sqltest/zeilenweise.cpp6
-rw-r--r--libopie2/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp39
-rw-r--r--libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp97
-rw-r--r--libopie2/examples/opieui/oversatileviewdemo/main.cpp6
-rw-r--r--libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp10
-rw-r--r--libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp26
9 files changed, 165 insertions, 71 deletions
diff --git a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
index 0b8e1fe..c0369ef 100644
--- a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
+++ b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
@@ -23,13 +23,13 @@ class DemoApp : public OApplication
23{ 23{
24Q_OBJECT 24Q_OBJECT
25public: 25public:
26 DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2 debug demo" ) 26 DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2 debug demo" )
27 { 27 {
28 // you have access to your OApplication object via oApp 28 // you have access to your OApplication object via oApp
29 qDebug( "Process-wide OApplication object @ %0x", oApp ); 29 odebug << "Process-wide OApplication object @ " << oApp << "" << oendl;
30 30
31 // you have access to global settings via OGlobalSettings 31 // you have access to global settings via OGlobalSettings
32 int mode = OGlobalSettings::debugMode(); 32 int mode = OGlobalSettings::debugMode();
33 33
34 QVBox* vbox = new QVBox(); 34 QVBox* vbox = new QVBox();
35 setMainWidget( vbox ); 35 setMainWidget( vbox );
@@ -86,13 +86,13 @@ public:
86 } 86 }
87 87
88public slots: 88public slots:
89 void chooseMethod(int method) 89 void chooseMethod(int method)
90 { 90 {
91 m = method; 91 m = method;
92 qDebug( "choosing method: %d", method ); 92 odebug << "choosing method: " << method << "" << oendl;
93 OConfig* g = OGlobal::config(); 93 OConfig* g = OGlobal::config();
94 g->setGroup( "General" ); 94 g->setGroup( "General" );
95 g->writeEntry( "debugMode", m ); 95 g->writeEntry( "debugMode", m );
96 e->setText( OGlobalSettings::debugOutput() ); 96 e->setText( OGlobalSettings::debugOutput() );
97 g->write(); 97 g->write();
98 } 98 }
diff --git a/libopie2/examples/opiedb/sqltest/main.cpp b/libopie2/examples/opiedb/sqltest/main.cpp
index adca5fd..24b7b21 100644
--- a/libopie2/examples/opiedb/sqltest/main.cpp
+++ b/libopie2/examples/opiedb/sqltest/main.cpp
@@ -1,29 +1,61 @@
1#include <qdir.h> 1/*
2 =. This file is part of the Opie Project
3 .=l. Copyright (C) 2004 Opie Team <opie@handhelds.org>
4 .>+-=
5 _;:, .> :=|. This library is free software; you can
6.> <`_, > . <= redistribute it and/or modify it under
7:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
8.="- .-=="i, .._ License as published by the Free Software
9 - . .-<_> .<> Foundation; either version 2 of the License,
10 ._= =} : or (at your option) any later version.
11 .%`+i> _;_.
12 .i_,=:_. -<s. This library is distributed in the hope that
13 + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
14 : .. .:, . . . without even the implied warranty of
15 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
16 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
17..}^=.= = ; Library General Public License for more
18++= -. .` .: details.
19 : = ...= . :.=-
20 -. .:....=;==+<; You should have received a copy of the GNU
21 -_. . . )=. = Library General Public License along with
22 -- :-=` this library; see the file COPYING.LIB.
23 If not, write to the Free Software Foundation,
24 Inc., 59 Temple Place - Suite 330,
25 Boston, MA 02111-1307, USA.
2 26
3#include <qpe/qpeapplication.h> 27*/
28
29/* OPIE */
4#include <opie2/osqlmanager.h> 30#include <opie2/osqlmanager.h>
5#include <opie2/osqlquery.h> 31#include <opie2/osqlquery.h>
6#include <opie2/osqldriver.h> 32#include <opie2/osqldriver.h>
7#include <opie2/osqlresult.h> 33#include <opie2/osqlresult.h>
34#include <opie2/odebug.h>
35
36#include <qpe/qpeapplication.h>
37
38/* QT */
39#include <qdir.h>
8 40
9using namespace Opie::DB; 41using namespace Opie::DB;
10int main( int argc, char* argv[] ) { 42int main( int argc, char* argv[] ) {
11 43
12QPEApplication app( argc, argv ); 44QPEApplication app( argc, argv );
13OSQLManager man; 45OSQLManager man;
14man.registerPath( QDir::currentDirPath() ); 46man.registerPath( QDir::currentDirPath() );
15OSQLBackEnd::ValueList list = man.queryBackEnd(); 47OSQLBackEnd::ValueList list = man.queryBackEnd();
16 48
17OSQLDriver *driver = man.standard(); 49OSQLDriver *driver = man.standard();
18 qWarning("testmain" + driver->id() ); 50 owarn << "testmain" + driver->id() << oendl;
19 driver->setUrl("/home/ich/test2vhgytry"); 51 driver->setUrl("/home/ich/test2vhgytry");
20 if ( driver->open() ) { 52 if ( driver->open() ) {
21 qWarning("could open"); 53 owarn << "could open" << oendl;
22 }else 54 }else
23 qWarning("wasn't able to open"); 55 owarn << "wasn't able to open" << oendl;
24 OSQLRawQuery raw("select * from t2" ); 56 OSQLRawQuery raw("select * from t2" );
25 OSQLResult res = driver->query( &raw ); 57 OSQLResult res = driver->query( &raw );
26 58
27 OSQLRawQuery raw2( "insert into t2 VALUES(ROWID,'Meine Mutter') "); 59 OSQLRawQuery raw2( "insert into t2 VALUES(ROWID,'Meine Mutter') ");
28 res = driver->query(&raw2); 60 res = driver->query(&raw2);
29 61
diff --git a/libopie2/examples/opiedb/sqltest/spaltenweise.cpp b/libopie2/examples/opiedb/sqltest/spaltenweise.cpp
index e1a4d5d..c11724c 100644
--- a/libopie2/examples/opiedb/sqltest/spaltenweise.cpp
+++ b/libopie2/examples/opiedb/sqltest/spaltenweise.cpp
@@ -13,18 +13,18 @@ int main( int argc, char* argv[] ) {
13 QPEApplication app( argc, argv ); 13 QPEApplication app( argc, argv );
14 OSQLManager man; 14 OSQLManager man;
15 man.registerPath( QDir::currentDirPath() ); 15 man.registerPath( QDir::currentDirPath() );
16 OSQLBackEnd::ValueList list = man.queryBackEnd(); 16 OSQLBackEnd::ValueList list = man.queryBackEnd();
17 17
18 OSQLDriver *driver = man.standard(); 18 OSQLDriver *driver = man.standard();
19 qWarning("testmain" + driver->id() ); 19 owarn << "testmain" + driver->id() << oendl;
20 driver->setUrl("/home/ich/spaltenweise"); 20 driver->setUrl("/home/ich/spaltenweise");
21 if ( driver->open() ) { 21 if ( driver->open() ) {
22 qWarning("could open"); 22 owarn << "could open" << oendl;
23 }else 23 }else
24 qWarning("wasn't able to open"); 24 owarn << "wasn't able to open" << oendl;
25 OSQLRawQuery *raw = new OSQLRawQuery("create table todolist(" 25 OSQLRawQuery *raw = new OSQLRawQuery("create table todolist("
26 "uid,categories,completed," 26 "uid,categories,completed,"
27 "progress,summary,HasDate," 27 "progress,summary,HasDate,"
28 "DateDay,DateMonth,DateYear," 28 "DateDay,DateMonth,DateYear,"
29 "priority,description)" ); 29 "priority,description)" );
30 30
diff --git a/libopie2/examples/opiedb/sqltest/zeilenweise.cpp b/libopie2/examples/opiedb/sqltest/zeilenweise.cpp
index 2d11ac5..126e797 100644
--- a/libopie2/examples/opiedb/sqltest/zeilenweise.cpp
+++ b/libopie2/examples/opiedb/sqltest/zeilenweise.cpp
@@ -13,18 +13,18 @@ int main( int argc, char* argv[] ) {
13QPEApplication app( argc, argv ); 13QPEApplication app( argc, argv );
14OSQLManager man; 14OSQLManager man;
15man.registerPath( QDir::currentDirPath() ); 15man.registerPath( QDir::currentDirPath() );
16OSQLBackEnd::ValueList list = man.queryBackEnd(); 16OSQLBackEnd::ValueList list = man.queryBackEnd();
17 17
18OSQLDriver *driver = man.standard(); 18OSQLDriver *driver = man.standard();
19 qWarning("testmain" + driver->id() ); 19 owarn << "testmain" + driver->id() << oendl;
20 driver->setUrl("/home/ich/zeilenweise"); 20 driver->setUrl("/home/ich/zeilenweise");
21 if ( driver->open() ) { 21 if ( driver->open() ) {
22 qWarning("could open"); 22 owarn << "could open" << oendl;
23 }else 23 }else
24 qWarning("wasn't able to open"); 24 owarn << "wasn't able to open" << oendl;
25 OSQLRawQuery raw2("BEGIN TRANSACTION"); 25 OSQLRawQuery raw2("BEGIN TRANSACTION");
26 OSQLRawQuery *raw = new OSQLRawQuery("create table todolist(uid,key,value)"); 26 OSQLRawQuery *raw = new OSQLRawQuery("create table todolist(uid,key,value)");
27 OSQLResult res = driver->query( &raw2 ); 27 OSQLResult res = driver->query( &raw2 );
28 res = driver->query( raw ); 28 res = driver->query( raw );
29 delete raw; 29 delete raw;
30 for (int i = 0; i< 10000; i++ ) { 30 for (int i = 0; i< 10000; i++ ) {
diff --git a/libopie2/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp b/libopie2/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp
index 8d421fd..bdf2149 100644
--- a/libopie2/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp
+++ b/libopie2/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp
@@ -1,34 +1,65 @@
1/*
2 =. This file is part of the Opie Project
3 .=l. Copyright (C) 2004 Opie Team <opie@handhelds.org>
4 .>+-=
5 _;:, .> :=|. This library is free software; you can
6.> <`_, > . <= redistribute it and/or modify it under
7:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
8.="- .-=="i, .._ License as published by the Free Software
9 - . .-<_> .<> Foundation; either version 2 of the License,
10 ._= =} : or (at your option) any later version.
11 .%`+i> _;_.
12 .i_,=:_. -<s. This library is distributed in the hope that
13 + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
14 : .. .:, . . . without even the implied warranty of
15 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
16 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
17..}^=.= = ; Library General Public License for more
18++= -. .` .: details.
19 : = ...= . :.=-
20 -. .:....=;==+<; You should have received a copy of the GNU
21 -_. . . )=. = Library General Public License along with
22 -- :-=` this library; see the file COPYING.LIB.
23 If not, write to the Free Software Foundation,
24 Inc., 59 Temple Place - Suite 330,
25 Boston, MA 02111-1307, USA.
26
27*/
28
29/* OPIE */
1#include <opie2/osoundsystem.h> 30#include <opie2/osoundsystem.h>
31#include <opie2/odebug.h>
2 32
3using namespace Opie::MM; 33using namespace Opie::MM;
4 34
5int main( int argc, char** argv ) 35int main( int argc, char** argv )
6{ 36{
7 qDebug( "OPIE Sound System Demo" ); 37 odebug << "OPIE Sound System Demo" << oendl;
8 38
9 OSoundSystem* sound = OSoundSystem::instance(); 39 OSoundSystem* sound = OSoundSystem::instance();
10 40
11 OSoundSystem::CardIterator it = sound->iterator(); 41 OSoundSystem::CardIterator it = sound->iterator();
12/* 42/*
13 while ( it.current() ) 43 while ( it.current() )
14 { 44 {
15 qDebug( "DEMO: OSoundSystem contains Interface '%s'", (const char*) it.current()->name() ); 45 odebug << "DEMO: OSoundSystem contains Interface '" << it.current()->name() << "'" << oendl;
16 ++it; 46 ++it;
17 } 47 }
18 48
19*/ 49*/
20 OSoundCard* card = it.current(); 50 OSoundCard* card = it.current();
21 51
22 OMixerInterface* mixer = card->mixer(); 52 OMixerInterface* mixer = card->mixer();
23 53
24 QStringList channels = mixer->allChannels(); 54 QStringList channels = mixer->allChannels();
25 55
26 for ( QStringList::Iterator it = channels.begin(); it != channels.end(); ++it ) 56 for ( QStringList::Iterator it = channels.begin(); it != channels.end(); ++it )
27 { 57 {
28 qDebug( "OSSDEMO: Mixer has channel %s", (const char*) *it ); 58 odebug << "OSSDEMO: Mixer has channel " << *it << "" << oendl;
29 qDebug( "OSSDEMO: +--- volume %d (left) | %d (right)", mixer->volume( *it ) & 0xff, mixer->volume( *it ) >> 8 ); 59 odebug << "OSSDEMO: +--- volume " << ( mixer->volume( *it ) & 0xff )
60 << " (left) | " << ( mixer->volume( *it ) >> 8 ) << " (right)" << oendl;
30 } 61 }
31 62
32 return 0; 63 return 0;
33 64
34} 65}
diff --git a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
index 4f8af60..65866af 100644
--- a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
+++ b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
@@ -1,95 +1,126 @@
1/*
2 =. This file is part of the Opie Project
3 .=l. Copyright (C) 2004 Opie Team <opie@handhelds.org>
4 .>+-=
5 _;:, .> :=|. This library is free software; you can
6.> <`_, > . <= redistribute it and/or modify it under
7:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
8.="- .-=="i, .._ License as published by the Free Software
9 - . .-<_> .<> Foundation; either version 2 of the License,
10 ._= =} : or (at your option) any later version.
11 .%`+i> _;_.
12 .i_,=:_. -<s. This library is distributed in the hope that
13 + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
14 : .. .:, . . . without even the implied warranty of
15 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
16 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
17..}^=.= = ; Library General Public License for more
18++= -. .` .: details.
19 : = ...= . :.=-
20 -. .:....=;==+<; You should have received a copy of the GNU
21 -_. . . )=. = Library General Public License along with
22 -- :-=` this library; see the file COPYING.LIB.
23 If not, write to the Free Software Foundation,
24 Inc., 59 Temple Place - Suite 330,
25 Boston, MA 02111-1307, USA.
26
27*/
28
29/* OPIE */
1#include <opie2/onetwork.h> 30#include <opie2/onetwork.h>
2#include <opie2/ostation.h> 31#include <opie2/ostation.h>
3#include <opie2/omanufacturerdb.h> 32#include <opie2/omanufacturerdb.h>
33#include <opie2/odebug.h>
4 34
35/* STD */
5#include <unistd.h> 36#include <unistd.h>
6 37
7using namespace Opie::Net; 38using namespace Opie::Net;
8 39
9int main( int argc, char** argv ) 40int main( int argc, char** argv )
10{ 41{
11 qDebug( "OPIE Network Demo" ); 42 odebug << "OPIE Network Demo" << oendl;
12 43
13 ONetwork* net = ONetwork::instance(); 44 ONetwork* net = ONetwork::instance();
14 45
15 ONetwork::InterfaceIterator it = net->iterator(); 46 ONetwork::InterfaceIterator it = net->iterator();
16 47
17 while ( it.current() ) 48 while ( it.current() )
18 { 49 {
19 qDebug( "DEMO: ONetwork contains Interface '%s'", (const char*) it.current()->name() ); 50 odebug << "DEMO: ONetwork contains Interface '" << it.current()->name() << "'" << oendl;
20 qDebug( "DEMO: Datalink code is '%d'", it.current()->dataLinkType() ); 51 odebug << "DEMO: Datalink code is '" << it.current()->dataLinkType() << "'" << oendl;
21 qDebug( "DEMO: MAC Address is '%s'", (const char*) it.current()->macAddress().toString() ); 52 odebug << "DEMO: MAC Address is '" << it.current()->macAddress().toString() << "'" << oendl;
22 qDebug( "DEMO: MAC Address is '%s'", (const char*) it.current()->macAddress().toString(true) ); 53 odebug << "DEMO: MAC Address is '" << it.current()->macAddress().toString(true) << "'" << oendl;
23 qDebug( "DEMO: MAC Manufacturer seems to be '%s'", (const char*) it.current()->macAddress().manufacturer() ); 54 odebug << "DEMO: MAC Manufacturer seems to be '" << it.current()->macAddress().manufacturer() << "'" << oendl;
24 qDebug( "DEMO: Manufacturertest1 = '%s'", (const char*) OManufacturerDB::instance()->lookupExt( "08:00:87" ) ); 55 odebug << "DEMO: Manufacturertest1 = '" << OManufacturerDB::instance()->lookupExt( "08:00:87" ) << "'" << oendl;
25 qDebug( "DEMO: Manufacturertest2 = '%s'", (const char*) OManufacturerDB::instance()->lookupExt( "E2:0C:0F" ) ); 56 odebug << "DEMO: Manufacturertest2 = '" << OManufacturerDB::instance()->lookupExt( "E2:0C:0F" ) << "'" << oendl;
26 qDebug( "Demo: IPv4 Address is '%s'", (const char*) it.current()->ipV4Address() ); 57 odebug << "Demo: IPv4 Address is '" << it.current()->ipV4Address() << "'" << oendl;
27 if ( it.current()->isWireless() ) 58 if ( it.current()->isWireless() )
28 { 59 {
29 OWirelessNetworkInterface* iface = static_cast<OWirelessNetworkInterface*>( it.current() ); 60 OWirelessNetworkInterface* iface = static_cast<OWirelessNetworkInterface*>( it.current() );
30 qDebug( "DEMO: '%s' seems to feature the wireless extensions.", (const char*) iface->name() ); 61 odebug << "DEMO: '" << iface->name() << "' seems to feature the wireless extensions." << oendl;
31 qDebug( "DEMO: Current SSID is '%s'", (const char*) iface->SSID() ); 62 odebug << "DEMO: Current SSID is '" << iface->SSID() << "'" << oendl;
32 qDebug( "DEMO: Antenna is tuned to '%f', that is channel %d", iface->frequency(), iface->channel() ); 63 odebug << "DEMO: Antenna is tuned to '" << iface->frequency() << "', that is channel " << iface->channel() << "" << oendl;
33 64
34 //if ( iface->mode() == OWirelessNetworkInterface::adhoc ) 65 //if ( iface->mode() == OWirelessNetworkInterface::adhoc )
35 //{ 66 //{
36 //qDebug( "DEMO: Associated AP has MAC Address '%s'", (const char*) iface->associatedAP().toString() ); 67 //odebug << "DEMO: Associated AP has MAC Address '" << iface->associatedAP().toString() << "'" << oendl;
37 //} 68 //}
38 69
39 /* 70 /*
40 71
41 // nickname 72 // nickname
42 qDebug( "DEMO: Current NickName is '%s'", (const char*) iface->nickName() ); 73 odebug << "DEMO: Current NickName is '" << iface->nickName() << "'" << oendl;
43 iface->setNickName( "MyNickName" ); 74 iface->setNickName( "MyNickName" );
44 if ( iface->nickName() != "MyNickName" ) 75 if ( iface->nickName() != "MyNickName" )
45 qDebug( "DEMO: Warning! Can't change nickname" ); 76 odebug << "DEMO: Warning! Can't change nickname" << oendl;
46 else 77 else
47 qDebug( "DEMO: Nickname change successful." ); 78 odebug << "DEMO: Nickname change successful." << oendl;
48 79
49 /* 80 /*
50 81
51 // operation mode 82 // operation mode
52 qDebug( "DEMO: Current OperationMode is '%s'", (const char*) iface->mode() ); 83 odebug << "DEMO: Current OperationMode is '" << iface->mode() << "'" << oendl;
53 iface->setMode( "adhoc" ); 84 iface->setMode( "adhoc" );
54 if ( iface->mode() != "adhoc" ) 85 if ( iface->mode() != "adhoc" )
55 qDebug( "DEMO: Warning! Can't change operation mode" ); 86 odebug << "DEMO: Warning! Can't change operation mode" << oendl;
56 else 87 else
57 qDebug( "DEMO: Operation Mode change successful." ); 88 odebug << "DEMO: Operation Mode change successful." << oendl;
58 89
59 // RF channel 90 // RF channel
60 qDebug( "DEMO: Current Channel is '%d'", iface->channel() ); 91 odebug << "DEMO: Current Channel is '" << iface->channel() << "'" << oendl;
61 iface->setChannel( 1 ); 92 iface->setChannel( 1 );
62 if ( iface->channel() != 1 ) 93 if ( iface->channel() != 1 )
63 qDebug( "DEMO: Warning! Can't change RF channel" ); 94 odebug << "DEMO: Warning! Can't change RF channel" << oendl;
64 else 95 else
65 qDebug( "DEMO: RF channel change successful." ); 96 odebug << "DEMO: RF channel change successful." << oendl;
66 97
67 iface->setMode( "managed" ); 98 iface->setMode( "managed" );
68 99
69 */ 100 */
70 101
71 /* 102 /*
72 103
73 // network scan 104 // network scan
74 105
75 OStationList* stations = iface->scanNetwork(); 106 OStationList* stations = iface->scanNetwork();
76 if ( stations ) 107 if ( stations )
77 { 108 {
78 qDebug( "DEMO: # of stations around = %d", stations->count() ); 109 odebug << "DEMO: # of stations around = " << stations->count() << "" << oendl;
79 OStation* station; 110 OStation* station;
80 for ( station = stations->first(); station != 0; station = stations->next() ) 111 for ( station = stations->first(); station != 0; station = stations->next() )
81 { 112 {
82 qDebug( "DEMO: station dump following..." ); 113 odebug << "DEMO: station dump following..." << oendl;
83 station->dump(); 114 station->dump();
84 } 115 }
85 } 116 }
86 117
87 else 118 else
88 { 119 {
89 qDebug( "DEMO: Warning! Scan didn't work!" ); 120 odebug << "DEMO: Warning! Scan didn't work!" << oendl;
90 } 121 }
91 122
92 /* 123 /*
93 124
94 // first some wrong calls to check if this is working 125 // first some wrong calls to check if this is working
95 iface->setPrivate( "seppel", 10 ); 126 iface->setPrivate( "seppel", 10 );
@@ -103,41 +134,41 @@ int main( int argc, char** argv )
103 /* 134 /*
104 135
105 OMacAddress addr = OMacAddress::fromString( "12:34:56:AB:CD:EF" ); 136 OMacAddress addr = OMacAddress::fromString( "12:34:56:AB:CD:EF" );
106 iface->setUp( false ); 137 iface->setUp( false );
107 iface->setMacAddress( addr ); 138 iface->setMacAddress( addr );
108 iface->setUp( true ); 139 iface->setUp( true );
109 qDebug( "DEMO: MAC Address now is '%s'", (const char*) iface->macAddress().toString() ); 140 odebug << "DEMO: MAC Address now is '" << iface->macAddress().toString() << "'" << oendl;
110 141
111 */ 142 */
112 143
113 // monitor test 144 // monitor test
114 145
115
116 146
117 qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); 147
148 odebug << "DEMO: current interface mode is '" << iface->mode() << "'" << oendl;
118 iface->setMode( "monitor" ); 149 iface->setMode( "monitor" );
119 qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); 150 odebug << "DEMO: current interface mode is '" << iface->mode() << "'" << oendl;
120 151
121 sleep( 1 ); 152 sleep( 1 );
122 153
123 iface->setChannel( 1 ); 154 iface->setChannel( 1 );
124 iface->setMode( "managed" ); 155 iface->setMode( "managed" );
125 156
126 //sleep( 1 ); 157 //sleep( 1 );
127 qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); 158 odebug << "DEMO: current interface mode is '" << iface->mode() << "'" << oendl;
128 159
129 /*iface->setMode( "adhoc" ); 160 /*iface->setMode( "adhoc" );
130 sleep( 1 ); 161 sleep( 1 );
131 qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); 162 odebug << "DEMO: current interface mode is '" << iface->mode() << "'" << oendl;
132 iface->setMode( "managed" ); 163 iface->setMode( "managed" );
133 sleep( 1 ); 164 sleep( 1 );
134 qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); 165 odebug << "DEMO: current interface mode is '" << iface->mode() << "'" << oendl;
135 iface->setMode( "master" ); 166 iface->setMode( "master" );
136 sleep( 1 ); 167 sleep( 1 );
137 qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() );*/ 168 odebug << "DEMO: current interface mode is '" << iface->mode() << "'" << oendl; */
138 169
139 } 170 }
140 ++it; 171 ++it;
141 } 172 }
142 173
143 return 0; 174 return 0;
diff --git a/libopie2/examples/opieui/oversatileviewdemo/main.cpp b/libopie2/examples/opieui/oversatileviewdemo/main.cpp
index bcda14c..e48395a 100644
--- a/libopie2/examples/opieui/oversatileviewdemo/main.cpp
+++ b/libopie2/examples/opieui/oversatileviewdemo/main.cpp
@@ -20,13 +20,13 @@
20using namespace Opie::Core; 20using namespace Opie::Core;
21using namespace Opie::Ui; 21using namespace Opie::Ui;
22 22
23int main( int argc, char **argv ) 23int main( int argc, char **argv )
24{ 24{
25 OApplication a( argc, argv, "Opie UI Demo" ); 25 OApplication a( argc, argv, "Opie UI Demo" );
26 qDebug( "." ); 26 odebug << "." << oendl;
27 OpieUIDemo e; 27 OpieUIDemo e;
28 qDebug( "." ); 28 odebug << "." << oendl;
29 a.showMainWidget(&e); 29 a.showMainWidget(&e);
30 qDebug( "." ); 30 odebug << "." << oendl;
31 return a.exec(); 31 return a.exec();
32} 32}
diff --git a/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp b/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp
index 754a744..a2cdd5a 100644
--- a/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp
+++ b/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp
@@ -96,13 +96,13 @@ void OpieUIDemo::demo( int d )
96 } 96 }
97 97
98} 98}
99 99
100void OpieUIDemo::demoOCompletionBox() 100void OpieUIDemo::demoOCompletionBox()
101{ 101{
102 qDebug( "ocompletionbox" ); 102 odebug << "ocompletionbox" << oendl;
103 103
104 OCompletionBox* box = new OCompletionBox( 0 ); 104 OCompletionBox* box = new OCompletionBox( 0 );
105 box->insertItem( "This CompletionBox" ); 105 box->insertItem( "This CompletionBox" );
106 box->insertItem( "Says 'Hello World'" ); 106 box->insertItem( "Says 'Hello World'" );
107 box->insertItem( "Here are some" ); 107 box->insertItem( "Here are some" );
108 box->insertItem( "Additional Items" ); 108 box->insertItem( "Additional Items" );
@@ -112,13 +112,13 @@ void OpieUIDemo::demoOCompletionBox()
112 box->popup(); 112 box->popup();
113 113
114} 114}
115 115
116void OpieUIDemo::demoOLineEdit() 116void OpieUIDemo::demoOLineEdit()
117{ 117{
118 qDebug( "olineedit" ); 118 odebug << "olineedit" << oendl;
119 119
120 OLineEdit *edit = new OLineEdit( 0, "lineedit" ); 120 OLineEdit *edit = new OLineEdit( 0, "lineedit" );
121 121
122 edit->setCompletionMode( OGlobalSettings::CompletionPopup ); 122 edit->setCompletionMode( OGlobalSettings::CompletionPopup );
123 OCompletion* comp = edit->completionObject(); 123 OCompletion* comp = edit->completionObject();
124 124
@@ -132,13 +132,13 @@ void OpieUIDemo::demoOLineEdit()
132 edit->show(); 132 edit->show();
133 133
134} 134}
135 135
136void OpieUIDemo::demoOComboBox() 136void OpieUIDemo::demoOComboBox()
137{ 137{
138 qDebug( "ocombobox" ); 138 odebug << "ocombobox" << oendl;
139 139
140 OComboBox *combo = new OComboBox( true, 0, "combobox" ); 140 OComboBox *combo = new OComboBox( true, 0, "combobox" );
141 141
142 combo->setCompletionMode( OGlobalSettings::CompletionPopup ); 142 combo->setCompletionMode( OGlobalSettings::CompletionPopup );
143 OCompletion* comp = combo->completionObject(); 143 OCompletion* comp = combo->completionObject();
144 144
@@ -157,13 +157,13 @@ void OpieUIDemo::demoOComboBox()
157 combo->show(); 157 combo->show();
158 158
159} 159}
160 160
161void OpieUIDemo::demoOEditListBox() 161void OpieUIDemo::demoOEditListBox()
162{ 162{
163 qDebug( "oeditlistbox" ); 163 odebug << "oeditlistbox" << oendl;
164 164
165 OEditListBox* edit = new OEditListBox( "OEditListBox", 0, "editlistbox" ); 165 OEditListBox* edit = new OEditListBox( "OEditListBox", 0, "editlistbox" );
166 166
167 edit->lineEdit()->setCompletionMode( OGlobalSettings::CompletionPopup ); 167 edit->lineEdit()->setCompletionMode( OGlobalSettings::CompletionPopup );
168 OCompletion* comp = edit->lineEdit()->completionObject(); 168 OCompletion* comp = edit->lineEdit()->completionObject();
169 QStringList clist; 169 QStringList clist;
@@ -182,13 +182,13 @@ void OpieUIDemo::demoOEditListBox()
182 edit->show(); 182 edit->show();
183 183
184} 184}
185 185
186void OpieUIDemo::demoOSelector() 186void OpieUIDemo::demoOSelector()
187{ 187{
188 qDebug( "oselector" ); 188 odebug << "oselector" << oendl;
189 189
190 OHSSelector* sel = new OHSSelector( 0, "gradientselector" ); 190 OHSSelector* sel = new OHSSelector( 0, "gradientselector" );
191 //#sel->resize( QSize( 200, 30 ) ); 191 //#sel->resize( QSize( 200, 30 ) );
192 //#sel->setColors( QColor( 90, 190, 60 ), QColor( 200, 55, 255 ) ); 192 //#sel->setColors( QColor( 90, 190, 60 ), QColor( 200, 55, 255 ) );
193 //#sel->setText( "Dark", "Light" ); 193 //#sel->setText( "Dark", "Light" );
194 194
diff --git a/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp b/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp
index b6d59aa..e8bbdb1 100644
--- a/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp
+++ b/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp
@@ -99,62 +99,62 @@ OVersatileViewDemo::OVersatileViewDemo( QWidget* parent, const char* name, WFlag
99OVersatileViewDemo::~OVersatileViewDemo() 99OVersatileViewDemo::~OVersatileViewDemo()
100{ 100{
101} 101}
102 102
103void OVersatileViewDemo::selectionChanged() 103void OVersatileViewDemo::selectionChanged()
104{ 104{
105 qDebug( "received signal selectionChanged()" ); 105 odebug << "received signal selectionChanged()" << oendl;
106} 106}
107void OVersatileViewDemo::selectionChanged( OVersatileViewItem * item ) 107void OVersatileViewDemo::selectionChanged( OVersatileViewItem * item )
108{ 108{
109 qDebug( "received signal selectionChanged(OVersatileViewItem*)" ); 109 odebug << "received signal selectionChanged(OVersatileViewItem*)" << oendl;
110} 110}
111void OVersatileViewDemo::currentChanged( OVersatileViewItem * item ) 111void OVersatileViewDemo::currentChanged( OVersatileViewItem * item )
112{ 112{
113 qDebug( "received signal currentChanged( OVersatileViewItem * )" ); 113 odebug << "received signal currentChanged( OVersatileViewItem * )" << oendl;
114} 114}
115void OVersatileViewDemo::clicked( OVersatileViewItem * item ) 115void OVersatileViewDemo::clicked( OVersatileViewItem * item )
116{ 116{
117 qDebug( "received signal clicked( OVersatileViewItem * )" ); 117 odebug << "received signal clicked( OVersatileViewItem * )" << oendl;
118} 118}
119void OVersatileViewDemo::pressed( OVersatileViewItem * item ) 119void OVersatileViewDemo::pressed( OVersatileViewItem * item )
120{ 120{
121 qDebug( "received signal pressed( OVersatileViewItem * )" ); 121 odebug << "received signal pressed( OVersatileViewItem * )" << oendl;
122} 122}
123 123
124void OVersatileViewDemo::doubleClicked( OVersatileViewItem *item ) 124void OVersatileViewDemo::doubleClicked( OVersatileViewItem *item )
125{ 125{
126 qDebug( "received signal doubleClicked( OVersatileViewItem *item )" ); 126 odebug << "received signal doubleClicked( OVersatileViewItem *item )" << oendl;
127} 127}
128void OVersatileViewDemo::returnPressed( OVersatileViewItem *item ) 128void OVersatileViewDemo::returnPressed( OVersatileViewItem *item )
129{ 129{
130 qDebug( "received signal returnPressed( OVersatileViewItem *item )" ); 130 odebug << "received signal returnPressed( OVersatileViewItem *item )" << oendl;
131} 131}
132 132
133void OVersatileViewDemo::onItem( OVersatileViewItem *item ) 133void OVersatileViewDemo::onItem( OVersatileViewItem *item )
134{ 134{
135 qDebug( "received signal onItem( OVersatileViewItem *item )" ); 135 odebug << "received signal onItem( OVersatileViewItem *item )" << oendl;
136} 136}
137void OVersatileViewDemo::onViewport() 137void OVersatileViewDemo::onViewport()
138{ 138{
139 qDebug( "received signal onViewport()" ); 139 odebug << "received signal onViewport()" << oendl;
140} 140}
141 141
142void OVersatileViewDemo::expanded( OVersatileViewItem *item ) 142void OVersatileViewDemo::expanded( OVersatileViewItem *item )
143{ 143{
144 qDebug( "received signal expanded( OVersatileViewItem *item )" ); 144 odebug << "received signal expanded( OVersatileViewItem *item )" << oendl;
145} 145}
146 146
147void OVersatileViewDemo::collapsed( OVersatileViewItem *item ) 147void OVersatileViewDemo::collapsed( OVersatileViewItem *item )
148{ 148{
149 qDebug( "received signal collapsed( OVersatileViewItem *item )" ); 149 odebug << "received signal collapsed( OVersatileViewItem *item )" << oendl;
150} 150}
151 151
152void OVersatileViewDemo::moved() 152void OVersatileViewDemo::moved()
153{ 153{
154 qDebug( "received signal moved( OVersatileViewItem *item )" ); 154 odebug << "received signal moved( OVersatileViewItem *item )" << oendl;
155} 155}
156 156
157void OVersatileViewDemo::contextMenuRequested( OVersatileViewItem *item, const QPoint& pos, int col ) 157void OVersatileViewDemo::contextMenuRequested( OVersatileViewItem *item, const QPoint& pos, int col )
158{ 158{
159 qDebug( "received signal contextMenuRequested( OVersatileViewItem *item )" ); 159 odebug << "received signal contextMenuRequested( OVersatileViewItem *item )" << oendl;
160} 160}