-rw-r--r-- | examples/networksettings/config.in | 2 | ||||
-rw-r--r-- | examples/networksettings/example.pro | 5 | ||||
-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 | ||||
-rw-r--r-- | rsync/qrsync.cpp | 13 |
8 files changed, 48 insertions, 29 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,17 +1,14 @@ | |||
1 | #TEMPLATE = app | ||
2 | # | ||
3 | TEMPLATE = lib | 1 | TEMPLATE = lib |
4 | #CONFIG += qt plugin warn_on | ||
5 | CONFIG += qt plugin warn_on | 2 | CONFIG += qt plugin warn_on |
6 | DESTDIR = $(OPIEDIR)/plugins/networksettings | 3 | DESTDIR = $(OPIEDIR)/plugins/networksettings |
7 | HEADERS = exampleiface.h examplemodule.h | 4 | HEADERS = exampleiface.h examplemodule.h |
8 | SOURCES = exampleiface.cpp examplemodule.cpp | 5 | SOURCES = exampleiface.cpp examplemodule.cpp |
9 | INCLUDEPATH+= $(OPIEDIR)/include $(OPIEDIR)/noncore/settings/networksettings $(OPIEDIR)/noncore/settings/networksettings/interfaces | 6 | INCLUDEPATH+= $(OPIEDIR)/include $(OPIEDIR)/noncore/settings/networksettings $(OPIEDIR)/noncore/settings/networksettings/interfaces |
10 | DEPENDPATH+= $(OPIEDIR)/include $(OPIEDIR)/noncore/settings/networksettings $(OPIEDIR)/noncore/settings/networksettings/interfaces | 7 | DEPENDPATH+= $(OPIEDIR)/include $(OPIEDIR)/noncore/settings/networksettings $(OPIEDIR)/noncore/settings/networksettings/interfaces |
11 | LIBS += -lqpe -linterfaces | 8 | LIBS += -lqpe -linterfaces -lopiecore2 |
12 | TARGET = example_vpn | 9 | TARGET = example_vpn |
13 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
14 | 11 | ||
15 | 12 | ||
16 | 13 | ||
17 | include ( $(OPIEDIR)/include.pro ) | 14 | 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 @@ | |||
1 | #include "exampleiface.h" | 1 | #include "exampleiface.h" |
2 | 2 | ||
3 | #include <opie2/odebug.h> | ||
4 | using namespace Opie::Core; | ||
5 | |||
3 | VirtualInterface::VirtualInterface( QObject* parent, | 6 | VirtualInterface::VirtualInterface( QObject* parent, |
4 | const char* name, | 7 | const char* name, |
5 | bool status ) | 8 | bool status ) |
6 | : Interface(parent, name, status ) | 9 | : Interface(parent, name, status ) |
7 | { | 10 | { |
8 | } | 11 | } |
9 | 12 | ||
10 | VirtualInterface::~VirtualInterface() { | 13 | VirtualInterface::~VirtualInterface() { |
11 | } | 14 | } |
12 | 15 | ||
13 | bool VirtualInterface::refresh() { | 16 | bool VirtualInterface::refresh() { |
14 | /* we do VPN over ppp | 17 | /* we do VPN over ppp |
15 | * so replace the interfaceName with | 18 | * so replace the interfaceName with |
16 | * something actual existing | 19 | * something actual existing |
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(); |
24 | setInterfaceName( old ); | 27 | setInterfaceName( old ); |
25 | 28 | ||
26 | /* new and old interface name */ | 29 | /* new and old interface name */ |
27 | emit updateInterface(this); | 30 | emit updateInterface(this); |
28 | return b; | 31 | return b; |
29 | } | 32 | } |
30 | 33 | ||
31 | 34 | ||
32 | void VirtualInterface::start() { | 35 | void VirtualInterface::start() { |
33 | // call pptp | 36 | // call pptp |
34 | setStatus(true); | 37 | setStatus(true); |
35 | refresh(); | 38 | refresh(); |
36 | emit updateMessage("VPN started"); | 39 | emit updateMessage("VPN started"); |
37 | } | 40 | } |
38 | 41 | ||
39 | void VirtualInterface::stop() { | 42 | void VirtualInterface::stop() { |
40 | setStatus(false ); | 43 | setStatus(false ); |
41 | refresh(); | 44 | refresh(); |
42 | emit updateMessage("VPN halted"); | 45 | emit updateMessage("VPN halted"); |
43 | } | 46 | } |
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 @@ | |||
1 | #include <qwidget.h> | 1 | #include "exampleiface.h" |
2 | #include "examplemodule.h" | ||
3 | |||
4 | /* OPIE */ | ||
5 | #include <opie2/odebug.h> | ||
6 | using 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 | ||
8 | VirtualModule::VirtualModule() { | 12 | VirtualModule::VirtualModule() { |
9 | Interface* iface = new VirtualInterface( 0 ); | 13 | Interface* iface = new VirtualInterface( 0 ); |
10 | iface->setHardwareName( "vpn" ); | 14 | iface->setHardwareName( "vpn" ); |
11 | iface->setInterfaceName( "Test VPN" ); | 15 | iface->setInterfaceName( "Test VPN" ); |
12 | m_interfaces.append( iface ); | 16 | m_interfaces.append( iface ); |
13 | 17 | ||
14 | // If we set up VPN via pptp | 18 | // If we set up VPN via pptp |
15 | // and networksettins was closed and now opened | 19 | // and networksettins was closed and now opened |
16 | // we need to hide the ppp device behind us | 20 | // we need to hide the ppp device behind us |
17 | // One can do this by calling setHandledInterfaceNames | 21 | // One can do this by calling setHandledInterfaceNames |
18 | // setHandledInterfaceNames(); | 22 | // setHandledInterfaceNames(); |
19 | } | 23 | } |
20 | 24 | ||
21 | VirtualModule::~VirtualModule() { | 25 | VirtualModule::~VirtualModule() { |
22 | m_interfaces.setAutoDelete( true ); | 26 | m_interfaces.setAutoDelete( true ); |
23 | m_interfaces.clear(); | 27 | m_interfaces.clear(); |
24 | } | 28 | } |
25 | 29 | ||
26 | 30 | ||
27 | /* | 31 | /* |
28 | * We're a VPN module | 32 | * We're a VPN module |
29 | */ | 33 | */ |
30 | bool VirtualModule::isOwner( Interface* iface ) { | 34 | 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 @@ | |||
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 | |||
@@ -1,17 +1,17 @@ | |||
1 | CONFIG += qt warn_on quick-app | 1 | CONFIG += qt warn_on quick-app |
2 | 2 | ||
3 | 3 | ||
4 | TARGET = simple-pim | 4 | TARGET = simple-pim |
5 | 5 | ||
6 | HEADERS = simple.h | 6 | HEADERS = simple.h |
7 | SOURCES = simple.cpp | 7 | SOURCES = simple.cpp |
8 | 8 | ||
9 | 9 | ||
10 | INCLUDEPATH += $(OPIEDIR)/include | 10 | INCLUDEPATH += $(OPIEDIR)/include |
11 | DEPENDPATH += $(OPIEDIR)/include | 11 | DEPENDPATH += $(OPIEDIR)/include |
12 | 12 | ||
13 | 13 | ||
14 | # we now also include opie | 14 | # we now also include opie |
15 | LIBS += -lqpe -lopiepim2 -lopieui2 | 15 | LIBS += -lqpe -lopiecore2 -lopiepim2 -lopieui2 |
16 | 16 | ||
17 | include ( $(OPIEDIR)/include.pro ) | 17 | 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 @@ | |||
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. | ||
8 | This 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> | ||
19 | using 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 |
4 | #include <qlabel.h> // a label | 25 | #include <qlabel.h> // a label |
5 | #include <qpushbutton.h> // the header file for the QPushButton | 26 | #include <qpushbutton.h> // the header file for the QPushButton |
6 | #include <qlayout.h> | 27 | #include <qlayout.h> |
7 | #include <qtimer.h> // we use it for the singleShot | 28 | #include <qtimer.h> // we use it for the singleShot |
8 | #include <qdatetime.h> // for QDate | 29 | #include <qdatetime.h> // for QDate |
9 | #include <qtextview.h> // a rich text widget | 30 | #include <qtextview.h> // a rich text widget |
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 |
28 | */ | 39 | */ |
29 | 40 | ||
30 | /* | 41 | /* |
31 | * The factory is used for quicklaunching | 42 | * The factory is used for quicklaunching |
32 | * 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 | 43 | * 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 |
33 | * | 44 | * |
34 | * Depending on the global quick launch setting this will create | 45 | * Depending on the global quick launch setting this will create |
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 | ||
38 | using namespace Opie::Core; | ||
39 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) | 49 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) |
40 | 50 | ||
41 | MainWindow::MainWindow(QWidget *parent, const char* name, WFlags fl ) | 51 | MainWindow::MainWindow(QWidget *parent, const char* name, WFlags fl ) |
42 | : QMainWindow( parent, name, fl ) { | 52 | : QMainWindow( parent, name, fl ) { |
43 | setCaption(tr("My MainWindow") ); | 53 | setCaption(tr("My MainWindow") ); |
44 | 54 | ||
45 | m_desktopChannel = 0; | 55 | m_desktopChannel = 0; |
46 | m_loading = 0; | 56 | m_loading = 0; |
47 | 57 | ||
48 | initUI(); | 58 | initUI(); |
49 | 59 | ||
50 | 60 | ||
51 | /* | 61 | /* |
52 | * Tab widget as central | 62 | * Tab widget as central |
53 | */ | 63 | */ |
54 | m_tab = new Opie::Ui::OTabWidget(this); | 64 | m_tab = new Opie::Ui::OTabWidget(this); |
55 | 65 | ||
56 | setCentralWidget( m_tab ); | 66 | setCentralWidget( m_tab ); |
57 | 67 | ||
58 | m_todoView = new PIMListView(m_tab, "Todo view" ); | 68 | m_todoView = new PIMListView(m_tab, "Todo view" ); |
59 | m_tab->addTab( m_todoView,"todo/TodoList", tr("Todos") ); | 69 | m_tab->addTab( m_todoView,"todo/TodoList", tr("Todos") ); |
60 | 70 | ||
61 | m_dateView = new PIMListView(m_tab, "Datebook view" ); | 71 | m_dateView = new PIMListView(m_tab, "Datebook view" ); |
62 | m_tab->addTab( m_dateView, "datebook/DateBook", tr("Events") ); | 72 | m_tab->addTab( m_dateView, "datebook/DateBook", tr("Events") ); |
@@ -283,49 +293,49 @@ void MainWindow::slotShowRecord( const Opie::OPimRecord& rec) { | |||
283 | QVBoxLayout *box = new QVBoxLayout( dia ); | 293 | QVBoxLayout *box = new QVBoxLayout( dia ); |
284 | dia->setCaption( tr("View Record") ); | 294 | dia->setCaption( tr("View Record") ); |
285 | 295 | ||
286 | 296 | ||
287 | QTextView *view = new QTextView(dia ); | 297 | QTextView *view = new QTextView(dia ); |
288 | view->setText( rec.toRichText() ); | 298 | view->setText( rec.toRichText() ); |
289 | box->addWidget( view ); | 299 | box->addWidget( view ); |
290 | /* | 300 | /* |
291 | * execute via QPEApplication | 301 | * execute via QPEApplication |
292 | * this allows QPEApplication to make a sane decision | 302 | * this allows QPEApplication to make a sane decision |
293 | * on the size | 303 | * on the size |
294 | */ | 304 | */ |
295 | dia->showMaximized(); | 305 | dia->showMaximized(); |
296 | QPEApplication::execDialog( dia ); | 306 | QPEApplication::execDialog( dia ); |
297 | delete dia; | 307 | delete dia; |
298 | } | 308 | } |
299 | 309 | ||
300 | 310 | ||
301 | void MainWindow::slotDate() { | 311 | void MainWindow::slotDate() { |
302 | /* | 312 | /* |
303 | * called by the action we will show a Popup | 313 | * called by the action we will show a Popup |
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 ); |
311 | connect(month, SIGNAL(dateClicked(int,int,int) ), | 321 | connect(month, SIGNAL(dateClicked(int,int,int) ), |
312 | this, SLOT(slotLoadForDay(int,int,int) ) ); | 322 | this, SLOT(slotLoadForDay(int,int,int) ) ); |
313 | 323 | ||
314 | menu->insertItem( month ); | 324 | menu->insertItem( month ); |
315 | 325 | ||
316 | menu->exec( QCursor::pos() ); | 326 | menu->exec( QCursor::pos() ); |
317 | 327 | ||
318 | /* | 328 | /* |
319 | * we do not need to delete month because | 329 | * we do not need to delete month because |
320 | * we delete its parent menu | 330 | * we delete its parent menu |
321 | */ | 331 | */ |
322 | 332 | ||
323 | delete menu; | 333 | delete menu; |
324 | } | 334 | } |
325 | 335 | ||
326 | /* | 336 | /* |
327 | * An anonymous namespace this symbol is only available here | 337 | * An anonymous namespace this symbol is only available here |
328 | * so truely private | 338 | * so truely private |
329 | */ | 339 | */ |
330 | namespace { | 340 | namespace { |
331 | /* not static cause namespace does that what static would do */ | 341 | /* 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 @@ | |||
1 | #include "qrsync.h" | 1 | #include "qrsync.h" |
2 | #include <stdio.h> | 2 | #include <stdio.h> |
3 | extern "C" { | 3 | extern "C" { |
4 | #include "rsync.h" | 4 | #include "rsync.h" |
5 | } | 5 | } |
6 | #include <stdlib.h> | 6 | #include <stdlib.h> |
7 | 7 | ||
8 | /* OPIE */ | ||
9 | #include <opie2/odebug.h> | ||
10 | using namespace Opie::Core; | ||
11 | |||
12 | /* QT */ | ||
8 | #include <qfile.h> | 13 | #include <qfile.h> |
9 | 14 | ||
10 | static const char *rdiffNewFile = "/tmp/rdiff/result"; | 15 | static const char *rdiffNewFile = "/tmp/rdiff/result"; |
11 | static size_t block_len = RS_DEFAULT_BLOCK_LEN; | 16 | static size_t block_len = RS_DEFAULT_BLOCK_LEN; |
12 | static size_t strong_len = RS_DEFAULT_STRONG_LEN; | 17 | static size_t strong_len = RS_DEFAULT_STRONG_LEN; |
13 | 18 | ||
14 | 19 | ||
15 | void QRsync::generateSignature( QString baseFile, QString sigFile ) | 20 | void QRsync::generateSignature( QString baseFile, QString sigFile ) |
16 | { | 21 | { |
17 | 22 | ||
18 | if ( QFile::exists( baseFile ) ) { | 23 | if ( QFile::exists( baseFile ) ) { |
19 | FILE *basis_file, *sig_file; | 24 | FILE *basis_file, *sig_file; |
20 | rs_result result; | 25 | rs_result result; |
21 | 26 | ||
22 | basis_file = fopen( baseFile.latin1(), "rb" ); | 27 | basis_file = fopen( baseFile.latin1(), "rb" ); |
23 | sig_file = fopen( sigFile.latin1(), "wb" ); | 28 | sig_file = fopen( sigFile.latin1(), "wb" ); |
24 | 29 | ||
25 | result = rs_sig_file(basis_file, sig_file, block_len, strong_len, 0); | 30 | result = rs_sig_file(basis_file, sig_file, block_len, strong_len, 0); |
26 | 31 | ||
27 | fclose( basis_file ); | 32 | fclose( basis_file ); |
28 | fclose( sig_file ); | 33 | fclose( sig_file ); |
29 | if (result != RS_DONE) | 34 | if (result != RS_DONE) |
30 | printf("error in rdiffGenSig: %d", result ); | 35 | printf("error in rdiffGenSig: %d", result ); |
31 | } | 36 | } |
32 | } | 37 | } |
33 | 38 | ||
34 | 39 | ||
35 | void QRsync::generateDiff( QString baseFile, QString sigFile, QString deltaFile ) | 40 | void QRsync::generateDiff( QString baseFile, QString sigFile, QString deltaFile ) |
36 | { | 41 | { |
37 | if ( QFile::exists( baseFile ) && QFile::exists( sigFile ) ) { | 42 | if ( QFile::exists( baseFile ) && QFile::exists( sigFile ) ) { |
38 | FILE *sig_file, *new_file, *delta_file; | 43 | FILE *sig_file, *new_file, *delta_file; |
39 | rs_result result; | 44 | rs_result result; |
40 | rs_signature_t *sumset; | 45 | rs_signature_t *sumset; |
41 | 46 | ||
42 | sig_file = fopen(sigFile.latin1(), "rb"); | 47 | sig_file = fopen(sigFile.latin1(), "rb"); |
43 | new_file = fopen(baseFile.latin1(), "rb"); | 48 | new_file = fopen(baseFile.latin1(), "rb"); |
44 | delta_file = fopen(deltaFile.latin1(), "wb"); | 49 | delta_file = fopen(deltaFile.latin1(), "wb"); |
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 | } |
60 | 65 | ||
61 | if ( sumset ) | 66 | if ( sumset ) |
62 | rs_free_sumset( sumset ); | 67 | rs_free_sumset( sumset ); |
63 | fclose( new_file ); | 68 | fclose( new_file ); |
64 | fclose( delta_file ); | 69 | fclose( delta_file ); |
65 | fclose( sig_file ); | 70 | fclose( sig_file ); |
66 | 71 | ||
67 | } | 72 | } |
68 | } | 73 | } |
69 | 74 | ||
70 | void QRsync::applyDiff( QString baseFile, QString deltaFile ) | 75 | void QRsync::applyDiff( QString baseFile, QString deltaFile ) |
71 | { | 76 | { |
72 | if ( QFile::exists( baseFile ) && QFile::exists( deltaFile ) ) { | 77 | if ( QFile::exists( baseFile ) && QFile::exists( deltaFile ) ) { |
73 | FILE *basis_file, *delta_file, *new_file; | 78 | FILE *basis_file, *delta_file, *new_file; |
74 | rs_result result; | 79 | rs_result result; |
75 | 80 | ||
76 | basis_file = fopen(baseFile.latin1(), "rb"); | 81 | basis_file = fopen(baseFile.latin1(), "rb"); |
77 | delta_file = fopen(deltaFile.latin1(), "rb"); | 82 | delta_file = fopen(deltaFile.latin1(), "rb"); |
78 | #ifdef Q_WS_WIN | 83 | #ifdef Q_WS_WIN |
79 | new_file = fopen( (baseFile + ".new").latin1(), "wb" ); | 84 | new_file = fopen( (baseFile + ".new").latin1(), "wb" ); |
80 | #else | 85 | #else |
81 | new_file = fopen(rdiffNewFile, "wb"); | 86 | new_file = fopen(rdiffNewFile, "wb"); |
82 | #endif | 87 | #endif |
83 | 88 | ||
84 | result = rs_patch_file(basis_file, delta_file, new_file, 0); | 89 | result = rs_patch_file(basis_file, delta_file, new_file, 0); |
85 | 90 | ||
86 | fclose( basis_file ); | 91 | fclose( basis_file ); |
87 | fclose( delta_file ); | 92 | fclose( delta_file ); |
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 | ||
95 | 100 | ||
96 | #ifdef Q_WS_WIN | 101 | #ifdef Q_WS_WIN |
97 | QDir dir; | 102 | QDir dir; |
98 | QFile backup = baseFile + "~"; | 103 | QFile backup = baseFile + "~"; |
99 | dir.rename( baseFile, backup ); | 104 | dir.rename( baseFile, backup ); |
100 | dir.rename( (baseFile + ".new"), baseFile ); | 105 | dir.rename( (baseFile + ".new"), baseFile ); |
101 | dir.remove( backup ); | 106 | dir.remove( backup ); |
102 | #else | 107 | #else |
103 | QString cmd = "mv "; | 108 | QString cmd = "mv "; |
104 | cmd += rdiffNewFile; | 109 | cmd += rdiffNewFile; |
105 | cmd += " " + baseFile; | 110 | cmd += " " + baseFile; |
106 | system( cmd.latin1() ); | 111 | system( cmd.latin1() ); |
107 | #endif | 112 | #endif |
108 | } | 113 | } |
109 | 114 | ||
110 | } | 115 | } |