summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/zsafe/zsafe.h13
-rw-r--r--noncore/apps/zsafe/zsafe.pro2
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
@@ -4,50 +4,47 @@
** 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
{
@@ -113,27 +110,27 @@ public:
/** 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);
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 )