summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-05 13:49:07 (UTC)
committer mickeyl <mickeyl>2004-04-05 13:49:07 (UTC)
commitf44b1d4abe82cfb74db68bffcaf240f6f6134708 (patch) (side-by-side diff)
treec150abb3cbc842fd930d3ab7543a0b34ec3145ad
parent997a521a3ee84f614e2781a663911096ffb4a91a (diff)
downloadopie-f44b1d4abe82cfb74db68bffcaf240f6f6134708.zip
opie-f44b1d4abe82cfb74db68bffcaf240f6f6134708.tar.gz
opie-f44b1d4abe82cfb74db68bffcaf240f6f6134708.tar.bz2
use opie debugging
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 @@
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,43 +1,46 @@
#include "exampleiface.h"
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
VirtualInterface::VirtualInterface( QObject* parent,
const char* name,
bool status )
: Interface(parent, name, status )
{
}
VirtualInterface::~VirtualInterface() {
}
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 */
emit updateInterface(this);
return b;
}
void VirtualInterface::start() {
// call pptp
setStatus(true);
refresh();
emit updateMessage("VPN started");
}
void VirtualInterface::stop() {
setStatus(false );
refresh();
emit updateMessage("VPN halted");
}
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,30 +1,34 @@
-#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 );
// If we set up VPN via pptp
// and networksettins was closed and now opened
// we need to hide the ppp device behind us
// One can do this by calling setHandledInterfaceNames
// setHandledInterfaceNames();
}
VirtualModule::~VirtualModule() {
m_interfaces.setAutoDelete( true );
m_interfaces.clear();
}
/*
* We're a VPN module
*/
bool VirtualModule::isOwner( Interface* 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
@@ -1,17 +1,17 @@
CONFIG += qt warn_on quick-app
TARGET = simple-pim
HEADERS = simple.h
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,62 +1,72 @@
+/* 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
*/
/*
* The factory is used for quicklaunching
* 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") );
m_desktopChannel = 0;
m_loading = 0;
initUI();
/*
* Tab widget as central
*/
m_tab = new Opie::Ui::OTabWidget(this);
setCentralWidget( m_tab );
m_todoView = new PIMListView(m_tab, "Todo view" );
m_tab->addTab( m_todoView,"todo/TodoList", tr("Todos") );
m_dateView = new PIMListView(m_tab, "Datebook view" );
m_tab->addTab( m_dateView, "datebook/DateBook", tr("Events") );
@@ -283,49 +293,49 @@ void MainWindow::slotShowRecord( const Opie::OPimRecord& rec) {
QVBoxLayout *box = new QVBoxLayout( dia );
dia->setCaption( tr("View Record") );
QTextView *view = new QTextView(dia );
view->setText( rec.toRichText() );
box->addWidget( view );
/*
* execute via QPEApplication
* this allows QPEApplication to make a sane decision
* on the size
*/
dia->showMaximized();
QPEApplication::execDialog( dia );
delete dia;
}
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) ) );
menu->insertItem( month );
menu->exec( QCursor::pos() );
/*
* we do not need to delete month because
* we delete its parent menu
*/
delete menu;
}
/*
* An anonymous namespace this symbol is only available here
* so truely private
*/
namespace {
/* not static cause namespace does that what static would do */
diff --git a/rsync/qrsync.cpp b/rsync/qrsync.cpp
index fe5f1bc..a2dbafc 100644
--- a/rsync/qrsync.cpp
+++ b/rsync/qrsync.cpp
@@ -1,110 +1,115 @@
#include "qrsync.h"
#include <stdio.h>
extern "C" {
#include "rsync.h"
}
#include <stdlib.h>
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
#include <qfile.h>
static const char *rdiffNewFile = "/tmp/rdiff/result";
static size_t block_len = RS_DEFAULT_BLOCK_LEN;
static size_t strong_len = RS_DEFAULT_STRONG_LEN;
void QRsync::generateSignature( QString baseFile, QString sigFile )
{
if ( QFile::exists( baseFile ) ) {
FILE *basis_file, *sig_file;
rs_result result;
basis_file = fopen( baseFile.latin1(), "rb" );
sig_file = fopen( sigFile.latin1(), "wb" );
result = rs_sig_file(basis_file, sig_file, block_len, strong_len, 0);
fclose( basis_file );
fclose( sig_file );
if (result != RS_DONE)
printf("error in rdiffGenSig: %d", result );
}
}
void QRsync::generateDiff( QString baseFile, QString sigFile, QString deltaFile )
{
if ( QFile::exists( baseFile ) && QFile::exists( sigFile ) ) {
FILE *sig_file, *new_file, *delta_file;
rs_result result;
rs_signature_t *sumset;
sig_file = fopen(sigFile.latin1(), "rb");
new_file = fopen(baseFile.latin1(), "rb");
delta_file = fopen(deltaFile.latin1(), "wb");
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;
}
}
}
if ( sumset )
rs_free_sumset( sumset );
fclose( new_file );
fclose( delta_file );
fclose( sig_file );
}
}
void QRsync::applyDiff( QString baseFile, QString deltaFile )
{
if ( QFile::exists( baseFile ) && QFile::exists( deltaFile ) ) {
FILE *basis_file, *delta_file, *new_file;
rs_result result;
basis_file = fopen(baseFile.latin1(), "rb");
delta_file = fopen(deltaFile.latin1(), "rb");
#ifdef Q_WS_WIN
new_file = fopen( (baseFile + ".new").latin1(), "wb" );
#else
new_file = fopen(rdiffNewFile, "wb");
#endif
result = rs_patch_file(basis_file, delta_file, new_file, 0);
fclose( basis_file );
fclose( delta_file );
fclose( new_file );
if (result != RS_DONE) {
- qDebug( "rdiffApplyDiff failed with result %d", result );
+ odebug << "rdiffApplyDiff failed with result " << result << "" << oendl;
return;
}
#ifdef Q_WS_WIN
QDir dir;
QFile backup = baseFile + "~";
dir.rename( baseFile, backup );
dir.rename( (baseFile + ".new"), baseFile );
dir.remove( backup );
#else
QString cmd = "mv ";
cmd += rdiffNewFile;
cmd += " " + baseFile;
system( cmd.latin1() );
#endif
}
}