| -rw-r--r-- | examples/networksettings/config.in | 2 | ||||
| -rw-r--r-- | examples/networksettings/example.pro | 19 | ||||
| -rw-r--r-- | examples/networksettings/exampleiface.cpp | 5 | ||||
| -rw-r--r-- | examples/networksettings/examplemodule.cpp | 10 | ||||
| -rw-r--r-- | examples/simple-pim/config.in | 2 | ||||
| -rw-r--r-- | examples/simple-pim/example.pro | 2 | ||||
| -rw-r--r-- | examples/simple-pim/simple.cpp | 38 |
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 @@ -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,8 +1,11 @@ #include "exampleiface.h" +#include <opie2/odebug.h> +using namespace Opie::Core; + VirtualInterface::VirtualInterface( QObject* parent, const char* name, bool status ) : Interface(parent, name, status ) { } @@ -14,13 +17,13 @@ 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 */ 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,12 +1,16 @@ -#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 ); 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 @@ config SIMPLE_PIM_EXAMPLE 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 @@ -9,9 +9,9 @@ SOURCES = simple.cpp INCLUDEPATH += $(OPIEDIR)/include 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,30 +1,41 @@ +/* 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 #include <qtoolbar.h> // toolbar #include <qlabel.h> // a label #include <qpushbutton.h> // the header file for the QPushButton #include <qlayout.h> #include <qtimer.h> // we use it for the singleShot #include <qdatetime.h> // for QDate #include <qtextview.h> // a rich text widget #include <qdialog.h> #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. */ /* * implementation of simple */ /* @@ -32,13 +43,12 @@ * It needs a constructor ( c'tor ) with at least QWidget, const char* and WFlags as parameter and a static QString appName() matching the TARGET of the .pro * * Depending on the global quick launch setting this will create * either a main method or one for our component plugin system */ -using namespace Opie::Core; OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) MainWindow::MainWindow(QWidget *parent, const char* name, WFlags fl ) : QMainWindow( parent, name, fl ) { setCaption(tr("My MainWindow") ); @@ -301,13 +311,13 @@ void MainWindow::slotShowRecord( const Opie::OPimRecord& rec) { void MainWindow::slotDate() { /* * called by the action we will show a Popup * at the current mouse position with a DateChooser * 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 */ DateBookMonth *month = new DateBookMonth(menu, 0, true ); connect(month, SIGNAL(dateClicked(int,int,int) ), this, SLOT(slotLoadForDay(int,int,int) ) ); |