2 files changed, 6 insertions, 9 deletions

diff --git a/noncore/apps/zsafe/zsafe.h b/noncore/apps/zsafe/zsafe.h
index b5019a9..eef5cdc 100644
--- a/noncore/apps/zsafe/zsafe.h
+++ b/noncore/apps/zsafe/zsafe.h
@@ -1,65 +1,62 @@
 /****************************************************************************
 ** Form interface generated from reading ui file 'zsafe.ui'
 **
 ** Created: Sat Apr 6 17:57:42 2002
 **
 ** Author: Carsten Schneider <CarstenSchneider@t-online.de>
 **
 ** $Id$
 **
 ** Homepage: http://home.t-online.de/home/CarstenSchneider/zsafe/index.html
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 #ifndef ZSAFE_H
 #define ZSAFE_H
-

-#ifndef WIN32
-#include <stream.h>

-#endif
+
 #include <stdio.h>
 
 #include "infoform.h"
 #include "categorylist.h"
 #include "shadedlistitem.h"
 
 #include <qvariant.h>
 #include <qdialog.h>
 #include <qwidgetstack.h>
 #include <qtimer.h>
 
 class QVBoxLayout; 
 class QHBoxLayout; 
 class QGridLayout; 
 class ZListView;
 class QListViewItem;
 class QToolButton;
 class QTextBrowser;
 class QPopupMenu;
-#ifdef DESKTOP

+#ifdef DESKTOP
 // #ifndef WIN32
-class QSettings;

+class QSettings;
 // #endif
 #else
 class Config;
 #endif
 class CategoryDialog;
 class QPixmap;
 
 // number of fields for one entry
 #define FIELD_SIZE 7
 
 class ZSafe : public QDialog
 { 
     Q_OBJECT
 
 protected:
     void paintEvent( QPaintEvent * e );
     void resizeEvent ( QResizeEvent * );
 
     bool raiseFlag;
     QTimer raiseTimer;
 
 public:
     ZSafe( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = WDestructiveClose );
     ~ZSafe();
@@ -101,51 +98,51 @@ public:
     enum {
                 PWERR_GOOD,     // success
                 PWERR_OPEN,     // can't open filedescriptor / can't create file
                 PWERR_PERM,     // permissions are bad
                 PWERR_SYML,     // is a symlink
                 PWERR_STAT,     // can't get file status
                 PWERR_DATA      // can't read correct data
     };
 
     long load_buffer_length;
     long save_buffer_length;
 
     /** password for the file */
     QString m_password;
     /** globals needed for file loading */
     int lastcount, size;
     /** these three are needed in all save functions and initialized in save _init() */
     FILE *fd;
     unsigned short iv[4];
     char *buffer;
     /** these two are global because save_entry() and save_finalize() both n eed them */
     int bufferIndex;
     unsigned short plaintext[4];
 
-#ifdef DESKTOP

+#ifdef DESKTOP
 // #ifndef WIN32
-    QSettings *conf;

+    QSettings *conf;
 // #endif
 #else
     Config *conf;
 #endif
     bool expandTree;
     QPopupMenu *file;
 
     QTimer docuTimer;
 
 
     bool openDocument(const char* filename, const char* format=0);
     int loadInit(const char* filename, const char *password);
     int loadEntry(char *entry[4]);
     int loadFinalize(void);
     bool saveDocument(const char* filename, bool withPwd, const char* format=0);
     int saveInit(const char *filename, const char *password);
     int saveEntry(char *entry[4]);
     int saveFinalize(void);
     void saveConf();
     QPixmap * getPredefinedIcon(QString category);
     QString getFieldLabel (QListViewItem *_item, QString field, QString def);
     QString getFieldLabel (QString category, QString field, QString def);
     void setCategoryDialogFields(CategoryDialog *dialog);
     void setCategoryDialogFields(CategoryDialog *dialog, QString category);
diff --git a/noncore/apps/zsafe/zsafe.pro b/noncore/apps/zsafe/zsafe.pro
index a1f9e9f..65bcb79 100644
--- a/noncore/apps/zsafe/zsafe.pro
+++ b/noncore/apps/zsafe/zsafe.pro
@@ -1,17 +1,17 @@
         TEMPLATE    = app
         CONFIG   = qt warn_on release
 DESTDIR      = $(OPIEDIR)/bin
 HEADERS      = zsafe.h krc2.h category.h categorylist.h zlistview.h \
                scqtfiledlg.h 
 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 -lopie -lstdc++
+LIBS        += -Wl,-rpath,$(OPIEDIR)/lib -L$(OPIEDIR)/lib -lqpe -lopie
         TARGET   = zsafe
 
 include ( $(OPIEDIR)/include.pro )