convert to Opie Debugging Framework

4 files changed, 27 insertions, 33 deletions

diff --git a/noncore/apps/zsafe/config.in b/noncore/apps/zsafe/config.in
index 6e321f3..b6d3ffe 100644
--- a/noncore/apps/zsafe/config.in
+++ b/noncore/apps/zsafe/config.in
@@ -1,5 +1,5 @@
 config ZSAFE
     boolean "zsafe (Zaurus Password Manager)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
 
diff --git a/noncore/apps/zsafe/scqtfiledlg.cpp b/noncore/apps/zsafe/scqtfiledlg.cpp
index 52b8d0d..c67bbd5 100644
--- a/noncore/apps/zsafe/scqtfiledlg.cpp
+++ b/noncore/apps/zsafe/scqtfiledlg.cpp
@@ -1,13 +1,10 @@
-/****************************************************************************
-** Form implementation generated from reading ui file 'scqtfiledlg.ui'
-**
-** Created: Sun Jun 8 15:51:12 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
 #include "scqtfiledlg.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qlistview.h>
@@ -216,41 +213,41 @@ ScQtFileDlg::~ScQtFileDlg()
 
 void ScQtFileDlg::slotCancel()
 {
-    qWarning( "ScQtFileDlg::slotCancel(): Not implemented yet!" );
+    owarn << "ScQtFileDlg::slotCancel(): Not implemented yet!" << oendl; 
 }
 
 void ScQtFileDlg::slotDirComboBoxChanged( int )
 {
-    qWarning( "ScQtFileDlg::slotDirComboBoxChanged( int ): Not implemented yet!" );
+    owarn << "ScQtFileDlg::slotDirComboBoxChanged( int ): Not implemented yet!" << oendl; 
 }
 
 void ScQtFileDlg::slotDoubleClicked(QListViewItem *)
 {
-    qWarning( "ScQtFileDlg::slotDoubleClicked(QListViewItem *): Not implemented yet!" );
+    owarn << "ScQtFileDlg::slotDoubleClicked(QListViewItem *): Not implemented yet!" << oendl; 
 }
 
 void ScQtFileDlg::slotFileTextChanged( const QString & )
 {
-    qWarning( "ScQtFileDlg::slotFileTextChanged( const QString & ): Not implemented yet!" );
+    owarn << "ScQtFileDlg::slotFileTextChanged( const QString & ): Not implemented yet!" << oendl; 
 }
 
 void ScQtFileDlg::slotMkDir()
 {
-    qWarning( "ScQtFileDlg::slotMkDir(): Not implemented yet!" );
+    owarn << "ScQtFileDlg::slotMkDir(): Not implemented yet!" << oendl; 
 }
 
 void ScQtFileDlg::slotOK()
 {
-    qWarning( "ScQtFileDlg::slotOK(): Not implemented yet!" );
+    owarn << "ScQtFileDlg::slotOK(): Not implemented yet!" << oendl; 
 }
 
 void ScQtFileDlg::slotSelectionChanged(QListViewItem *)
 {
-    qWarning( "ScQtFileDlg::slotSelectionChanged(QListViewItem *): Not implemented yet!" );
+    owarn << "ScQtFileDlg::slotSelectionChanged(QListViewItem *): Not implemented yet!" << oendl; 
 }
 
 void ScQtFileDlg::slotTypeComboBoxChanged( int )
 {
-    qWarning( "ScQtFileDlg::slotTypeComboBoxChanged( int ): Not implemented yet!" );
+    owarn << "ScQtFileDlg::slotTypeComboBoxChanged( int ): Not implemented yet!" << oendl; 
 }
 
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index 3df55eb..bf8f7f4 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -29,7 +29,8 @@
 #ifndef DESKTOP
 #ifndef NO_OPIE
 #include <opie2/ofiledialog.h>
-
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 using namespace Opie::Ui;
 #else
 #include "scqtfileedit.h"
@@ -38,8 +39,6 @@ using namespace Opie::Ui;
 
 #include <qclipboard.h>
 
-#include <stdio.h>
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -2069,7 +2068,6 @@ int ZSafe::loadInit(const char* _filename, const char *password)
 #ifndef WIN32
     size = read(fileno (fd), (unsigned char *) (charbuf + count), 8);
 #else
-    printf ("LoadInit() read1");
     size = fread ((unsigned char *) (charbuf + count), sizeof(unsigned char), 8, fd);
 #endif
 
@@ -2089,7 +2087,6 @@ int ZSafe::loadInit(const char* _filename, const char *password)
         while (count < 8) {
             count2 = read (fileno (fd), (unsigned char *) (charbuf + count), 8);
 #else
-    printf ("LoadInit() read2");
     while ((count = fread ((unsigned char *) (charbuf), sizeof(unsigned char), 8, fd)) > 0) {
         while (count < 8) {
             count2 = fread ((unsigned char *) (charbuf + count), sizeof(unsigned char), 8, fd);
@@ -2259,7 +2256,7 @@ bool ZSafe::saveDocument(const char* _filename,
        retval = saveEntry(entry);
            for (int z=0; z<i; z++) free(entry[z]);
            if (retval == PWERR_DATA) {
-              qWarning("1: Error writing file, contents not saved");
+              owarn << "1: Error writing file, contents not saved" << oendl; 
               saveFinalize();
               return false;
            }
@@ -2303,7 +2300,7 @@ bool ZSafe::saveDocument(const char* _filename,
                   free(entry[z]);
               }
               if (retval == PWERR_DATA) {
-                        qWarning("1: Error writing file, contents not saved");
+                        owarn << "1: Error writing file, contents not saved" << oendl; 
                         saveFinalize();
                         return false;
               }
@@ -2312,7 +2309,7 @@ bool ZSafe::saveDocument(const char* _filename,
         }
 
     if (saveFinalize() == PWERR_DATA) {
-                qWarning("2: Error writing file, contents not saved");
+                owarn << "2: Error writing file, contents not saved" << oendl; 
         return false;
     } else {
 #ifndef DESKTOP
@@ -3190,7 +3187,7 @@ void ZSafe::editCategory()
 
            if (cat)
            {
-              qWarning("Category found");
+              owarn << "Category found" << oendl; 
 
               // if (!icon.isEmpty() && !icon.isNull())
               if (icon != "predefined.png")
diff --git a/noncore/apps/zsafe/zsafe.pro b/noncore/apps/zsafe/zsafe.pro
index 72c8fe9..3cae706 100644
--- a/noncore/apps/zsafe/zsafe.pro
+++ b/noncore/apps/zsafe/zsafe.pro
@@ -1,5 +1,5 @@
-TEMPLATE        = app
-CONFIG         = qt warn_on 
+TEMPLATE     = app
+CONFIG       = qt warn_on 
 DESTDIR      = $(OPIEDIR)/bin
 HEADERS      = zsafe.h krc2.h category.h categorylist.h zlistview.h \
                scqtfiledlg.h
@@ -7,11 +7,11 @@ SOURCES      = main.cpp zsafe.cpp krc2.cpp category.cpp \
                categorylist.cpp zlistview.cpp shadedlistitem.cpp\
                scqtfileedit.cpp scqtfileedit.moc.cpp \
                scqtfiledlg.cpp
-INTERFACES     = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui infoform.ui wait.ui
-INCLUDEPATH    += $(OPIEDIR)/include
-DEPENDPATH    += $(OPIEDIR)/include
-LIBS        += -Wl,-rpath,$(OPIEDIR)/lib -L$(OPIEDIR)/lib -lqpe -lopiecore2 -lopieui2
-TARGET         = zsafe
+INTERFACES   = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui infoform.ui wait.ui
+INCLUDEPATH  += $(OPIEDIR)/include
+DEPENDPATH   += $(OPIEDIR)/include
+LIBS         += -lqpe -lopiecore2 -lopieui2
+TARGET       = zsafe
 
 include ( $(OPIEDIR)/include.pro )