summaryrefslogtreecommitdiff
path: root/noncore/apps/zsafe
Side-by-side diff
Diffstat (limited to 'noncore/apps/zsafe') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/zsafe/main.cpp25
-rw-r--r--noncore/apps/zsafe/zlistview.cpp11
-rw-r--r--noncore/apps/zsafe/zsafe.cpp51
3 files changed, 45 insertions, 42 deletions
diff --git a/noncore/apps/zsafe/main.cpp b/noncore/apps/zsafe/main.cpp
index 4fe319b..5f48f77 100644
--- a/noncore/apps/zsafe/main.cpp
+++ b/noncore/apps/zsafe/main.cpp
@@ -10,2 +10,8 @@
#include "zsafe.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
#ifdef DESKTOP
@@ -15,2 +21,4 @@
#endif
+
+/* STD */
#include <stdio.h>
@@ -60,6 +68,6 @@ int main( int argc, char ** argv )
#else
- int w, h;
- sscanf (argv[1], "%d", &w);
- sscanf (argv[2], "%d", &h);
- DeskW = w;
+ int w, h;
+ sscanf (argv[1], "%d", &w);
+ sscanf (argv[2], "%d", &h);
+ DeskW = w;
DeskH = h;
@@ -76,5 +84,3 @@ int main( int argc, char ** argv )
- char buf[128];
- sprintf (buf, "Width: %d Height: %d\n", DeskW, DeskH);
- qWarning (buf);
+ owarn << "Width: " << DeskW << " Height: " << DeskH << oendl;
@@ -83,3 +89,3 @@ int main( int argc, char ** argv )
#else
- if (DeskW > 240)
+ if (DeskW > 240)
{
@@ -87,4 +93,3 @@ int main( int argc, char ** argv )
DeskH += 25;
- sprintf (buf, "Changed width: %d Height: %d\n", DeskW, DeskH);
- qWarning (buf);
+ owarn << "Changed width: " << DeskW << " Height: " << DeskH << oendl;
}
diff --git a/noncore/apps/zsafe/zlistview.cpp b/noncore/apps/zsafe/zlistview.cpp
index ba02a15..7d0b8c2 100644
--- a/noncore/apps/zsafe/zlistview.cpp
+++ b/noncore/apps/zsafe/zlistview.cpp
@@ -5,5 +5,10 @@
#include "zlistview.h"
-#include <stdio.h>
#include "zsafe.h"
+/* OPIE */
+//#include <opie2/odebug.h>
+
+/* STD */
+#include <stdio.h>
+
ZListView::ZListView (ZSafe *zsafe, const char *id) : QListView(zsafe, id)
@@ -20,5 +25,3 @@ void ZListView::keyPressEvent ( QKeyEvent *e )
/*
- char buf[64];
- sprintf (buf, "key: %d\n", e->key());
- qWarning (buf);
+ owarn << "key: " << e->key() << oendl;
*/
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index 6ff05ac..ca3ff52 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -883,3 +883,3 @@ void ZSafe::findPwd()
comment = dialog->CommentField->text();
- qWarning (name);
+ owarn << name << oendl;
}
@@ -929,3 +929,3 @@ void ZSafe::findPwd()
{
- qWarning (i->text(0));
+ owarn << i->text(0) << oendl;
i->setSelected(FALSE);
@@ -943,3 +943,3 @@ void ZSafe::findPwd()
{
- qWarning (si->text(0));
+ owarn << si->text(0) << oendl;
if (si->isSelected())
@@ -960,3 +960,3 @@ void ZSafe::findPwd()
{
- qWarning ("Found");
+ owarn << "Found" << oendl;
selectedItem = si;
@@ -1230,4 +1230,3 @@ void ZSafe::removeAsciiFile()
{
- qWarning( QString("Could not remove file %1").arg(fn),
- 2000 );
+ owarn << "Could not remove file " << fn << oendl;
QMessageBox::critical( 0, tr("ZSafe"),
@@ -1280,4 +1279,3 @@ void ZSafe::writeAllEntries()
if ( !f.open( IO_WriteOnly ) ) {
- qWarning( QString("Could not write to file %1").arg(fn),
- 2000 );
+ owarn << "Could not write to file " << fn << oendl;
QMessageBox::critical( 0, "ZSafe",
@@ -1324,6 +1322,6 @@ void ZSafe::writeAllEntries()
oneEntry += "\"";
- // qWarning (oneEntry);
+ // owarn << oneEntry << oendl;
t << oneEntry << endl;
- // qWarning (si->text(0));
+ // owarn << si->text(0) << oendl;
}
@@ -1375,4 +1373,3 @@ void ZSafe::readAllEntries()
{
- qWarning( QString("Could not read file %1").arg(fn),
- 2000 );
+ owarn << "Could not read file " << fn << oendl;
QMessageBox::critical( 0, "ZSafe",
@@ -1405,3 +1402,3 @@ void ZSafe::readAllEntries()
- qWarning ("ReadAllEntries(): ");
+ owarn << "ReadAllEntries(): " << oendl;
@@ -1556,4 +1553,3 @@ void ZSafe::writeAllEntries()
if ( !f.open( IO_WriteOnly ) ) {
- qWarning( QString("Could not write to file %1").arg(fn),
- 2000 );
+ owarn << "Could not write to file " << fn << oendl;
QMessageBox::critical( 0, tr("ZSafe"),
@@ -1595,6 +1591,6 @@ void ZSafe::writeAllEntries()
oneEntry += "\"";
- // qWarning (oneEntry);
+ // owarn << oneEntry << oendl;
t << oneEntry << endl;
- // qWarning (si->text(0));
+ // owarn << si->text(0) << oendl;
}
@@ -1610,4 +1606,3 @@ void ZSafe::readAllEntries()
{
- qWarning( QString("Could not read file %1").arg(fn),
- 2000 );
+ owarn << "Could not read file " << fn << oendl;
QMessageBox::critical( 0, tr("ZSafe"),
@@ -1640,3 +1635,3 @@ void ZSafe::readAllEntries()
- qWarning ("ReadAllEntries(): ");
+ owarn << "ReadAllEntries(): " << oendl;
@@ -1764,3 +1759,3 @@ void ZSafe::resume(int)
{
- qWarning ("Resume");
+ owarn << "Resume" << oendl;
// hide the main window
@@ -1820,3 +1815,3 @@ bool ZSafe::openDocument(const char* _filename, const char* )
{
- qWarning ("Wrong password");
+ owarn << "Wrong password" << oendl;
QMessageBox::critical( 0, tr("ZSafe"),
@@ -1829,3 +1824,3 @@ bool ZSafe::openDocument(const char* _filename, const char* )
{
- qWarning ("Error loading Document");
+ owarn << "Error loading Document" << oendl;
return false;
@@ -2303,3 +2298,3 @@ void ZSafe::getDocPassword(QString title)
{
-qWarning ("getDocPassword");
+ owarn << "getDocPassword" << oendl;
// open the 'Password' dialog
@@ -2482,3 +2477,3 @@ void ZSafe::quitMe ()
{
- qWarning ("QUIT...");
+ owarn << "QUIT..." << oendl;
@@ -2686,3 +2681,3 @@ void ZSafe::addCategory()
- qWarning (category);
+ owarn << category << oendl;
@@ -3194,3 +3189,3 @@ void ZSafe::editCategory()
{
- qWarning (category);
+ owarn << category << oendl;
catItem->setText( 0, tr( category ) );
@@ -3595,3 +3590,3 @@ void ZSafe::resizeEvent ( QResizeEvent * )
{
- // qWarning ("resizeEvent");
+ // owarn << "resizeEvent" << oendl;
#ifndef DESKTOP