summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2004-07-13 10:35:23 (UTC)
committer llornkcor <llornkcor>2004-07-13 10:35:23 (UTC)
commit37e0e077b51841971c3d4c25b287f4d39e750e2d (patch) (unidiff)
treec1b499dd6e544207c6ff7047acd8170d6ea63f94
parent5d2ec2e9b1dce49e914c260fe16a82ddccbaa92d (diff)
downloadopie-37e0e077b51841971c3d4c25b287f4d39e750e2d.zip
opie-37e0e077b51841971c3d4c25b287f4d39e750e2d.tar.gz
opie-37e0e077b51841971c3d4c25b287f4d39e750e2d.tar.bz2
fix ups, and move qsettings files away
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--[-rwxr-xr-x]noncore/apps/zsafe/extra/qsettings.cpp (renamed from noncore/apps/zsafe/qsettings.cpp)308
-rw-r--r--[-rwxr-xr-x]noncore/apps/zsafe/extra/qsettings.h (renamed from noncore/apps/zsafe/qsettings.h)0
-rw-r--r--noncore/apps/zsafe/zsafe.cpp147
3 files changed, 243 insertions, 212 deletions
diff --git a/noncore/apps/zsafe/qsettings.cpp b/noncore/apps/zsafe/extra/qsettings.cpp
index ee55339..def2e2d 100755..100644
--- a/noncore/apps/zsafe/qsettings.cpp
+++ b/noncore/apps/zsafe/extra/qsettings.cpp
@@ -1,152 +1,156 @@
1/* 1/*
2** $Id$ 2** $Id$
3*/ 3*/
4 4
5#include "qsettings.h" 5#include "qsettings.h"
6#include <stdio.h> 6#include <stdio.h>
7#include <qfile.h> 7#include <qfile.h>
8#include <qtextstream.h> 8#include <qtextstream.h>
9 9
10 10
11QSettings::QSettings(const QString &_fn) 11QSettings::QSettings(const QString &_fn)
12{ 12{
13 // read the prefs from the file 13 qWarning("Settings "+_fn);
14 fn = _fn; 14 // read the prefs from the file
15 15 fn = _fn;
16 QFile f(_fn); 16
17 if ( f.open(IO_ReadOnly) ) { // file opened successfully 17 QFile f(_fn);
18 QTextStream t( &f ); // use a text stream 18 if ( f.open(IO_ReadOnly) ) { // file opened successfully
19 QString s; 19 QTextStream t( &f ); // use a text stream
20 while ( !t.eof() ) { // until end of file... 20 QString s;
21 s = t.readLine(); // line of text excluding '\n' 21 while ( !t.eof() ) { // until end of file...
22 char buf[256]; 22 s = t.readLine(); // line of text excluding '\n'
23 sprintf (buf, "%s", (const char *) s); 23 char buf[256];
24 int pos = s.find (" = "); 24 sprintf (buf, "%s", (const char *) s);
25 QString key = s.left (pos); 25 int pos = s.find (" = ");
26 QString val = s.right (s.length() - pos - 3); 26 QString key = s.left (pos);
27 writeEntry (key, val); 27 QString val = s.right (s.length() - pos - 3);
28 28 writeEntry (key, val);
29 sprintf (buf, "%s|%s", (const char *)key, (const char *)val); 29
30 } 30 sprintf (buf, "%s|%s", (const char *)key, (const char *)val);
31 f.close(); 31 }
32 } 32 f.close();
33 33 }
34 34
35} 35
36 36}
37QSettings::~QSettings() 37
38{ 38QSettings::~QSettings()
39 // write out the prefs to the file 39{
40 QAsciiDictIterator <QString> it( prefs ); // iterator for dict 40 // write out the prefs to the file
41 QFile f(fn); 41 QAsciiDictIterator <QString> it( prefs ); // iterator for dict
42 f.open(IO_WriteOnly); 42 QFile f(fn);
43 QTextStream ts( &f ); 43 f.open(IO_WriteOnly);
44 44 QTextStream ts( &f );
45 while ( it.current() ) 45
46 { 46 while ( it.current() )
47 QString *key = new QString(it.currentKey()); 47 {
48 char buf[256]; 48 QString *key = new QString(it.currentKey());
49 sprintf (buf, "%s", (const char *) *( it.current())); 49 char buf[256];
50 QString *val = new QString(buf); 50 sprintf (buf, "%s", (const char *) *( it.current()));
51 sprintf (buf, "%s %s", (const char *)*key, (const char *)*val); 51 QString *val = new QString(buf);
52 ts << *key << " = " << *val << endl; 52 sprintf (buf, "%s %s", (const char *)*key, (const char *)*val);
53 ++it; 53 ts << *key << " = " << *val << endl;
54 } 54 ++it;
55 55 }
56 f.close(); 56
57 prefs.clear(); 57 f.close();
58} 58 prefs.clear();
59 59}
60void QSettings::insertSearchPath (System sys, const QString &str) 60
61{ 61void QSettings::insertSearchPath (System sys, const QString &str)
62 fn = str; 62{
63} 63 fn = str;
64 64}
65QString QSettings::readEntry (const QString &key, const QString &def) 65
66{ 66QString QSettings::readEntry (const QString &key, const QString &def)
67 67{
68 QString *s = prefs.find((const char *)key); 68
69 if (!s) 69 QString *s = prefs.find((const char *)key);
70 return def; 70 if (!s)
71 else 71 return def;
72 return *s; 72 else
73 73 return *s;
74} 74
75 75}
76int QSettings::readNumEntry (const QString &key, int def) 76
77{ 77int QSettings::readNumEntry (const QString &key, int def)
78 QString *s = prefs[key]; 78{
79 if (!s) return def; 79 QString *s = prefs[key];
80 return s->toInt(); 80 if (!s) return def;
81} 81 return s->toInt();
82 82}
83bool QSettings::readBoolEntry (const QString &key, bool def) 83
84{ 84bool QSettings::readBoolEntry (const QString &key, bool def)
85 QString *s = prefs[key]; 85{
86 if (!s) return def; 86 QString *s = prefs[key];
87 if (*s == "1") 87 if (!s) return def;
88 return true; 88 if (*s == "1")
89 else 89 return true;
90 return false; 90 else
91} 91 return false;
92 92}
93bool QSettings::writeEntry (const QString &key, int val) 93
94{ 94bool QSettings::writeEntry (const QString &key, int val)
95 char buf[64]; 95{
96 sprintf (buf, "%d", val); 96 char buf[64];
97 QString *v = new QString(buf); 97 sprintf (buf, "%d", val);
98 prefs.replace ((const char *)key, v); 98 QString *v = new QString(buf);
99 return true; 99 prefs.replace ((const char *)key, v);
100} 100 return true;
101 101}
102bool QSettings::writeEntry (const QString &key, bool val) 102
103{ 103bool QSettings::writeEntry (const QString &key, bool val)
104 QString *v; 104{
105 if (val) 105 QString *v;
106 v = new QString("1"); 106 if (val)
107 else 107 v = new QString("1");
108 v = new QString("0"); 108 else
109 prefs.replace ((const char *)key, v); 109 v = new QString("0");
110 return true; 110 prefs.replace ((const char *)key, v);
111} 111 return true;
112 112}
113bool QSettings::writeEntry (const QString &key, const QString &val) 113
114{ 114bool QSettings::writeEntry (const QString &key, const QString &val)
115 QString *v = new QString (val); 115{
116 prefs.replace ((const char *)key, v); 116 QString *v = new QString (val);
117 return true; 117 prefs.replace ((const char *)key, v);
118} 118 return true;
119 119}
120bool QSettings::writeEntry (const QString &key, const char *val) 120
121{ 121bool QSettings::writeEntry (const QString &key, const char *val)
122 QString *v = new QString (val); 122{
123 prefs.replace ((const char *)key, v); 123 QString *v = new QString (val);
124 return true; 124 prefs.replace ((const char *)key, v);
125} 125 return true;
126 126}
127bool QSettings::removeEntry (const QString &key) 127
128{ 128bool QSettings::removeEntry (const QString &key)
129 prefs.remove (key); 129{
130 return true; 130 prefs.remove (key);
131} 131 return true;
132 132}
133QStringList QSettings::entryList (const QString &key) const 133
134{ 134QStringList QSettings::entryList (const QString &key) const
135 QAsciiDictIterator <QString> it( prefs ); // iterator for dict 135{
136 QStringList list; 136 qDebug("entryList: "+key);
137 137 QStringList list;
138 while ( it.current() ) 138 if(!prefs.isEmpty()) {
139 { 139 QAsciiDictIterator <QString> it( prefs ); // iterator for dict
140 char buf[512]; 140 qDebug("ready");
141 sprintf (buf, "%s", (const char *) *( it.current())); 141 while ( it.current() )
142 QString *val = new QString(buf); 142 {
143 sprintf(buf, "%s -> %s\n", it.currentKey(), (const char *)*val ); 143 char buf[512];
144 QString *cat = new QString(it.currentKey()); 144 sprintf(buf, "%s", (const char *) *( it.current()));
145 if (cat->contains("-field", FALSE)) 145 QString *val = new QString(buf);
146 list.append (it.currentKey()); 146 sprintf(buf, "%s -> %s\n", it.currentKey(), (const char *)*val );
147 ++it; 147 QString *cat = new QString(it.currentKey());
148 148 if (cat->contains("-field", FALSE))
149 } 149 list.append (it.currentKey());
150 return list; 150 ++it;
151} 151 }
152 152 }
153 qWarning("Return here");
154 return list;
155}
156
diff --git a/noncore/apps/zsafe/qsettings.h b/noncore/apps/zsafe/extra/qsettings.h
index 95e87b5..95e87b5 100755..100644
--- a/noncore/apps/zsafe/qsettings.h
+++ b/noncore/apps/zsafe/extra/qsettings.h
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index 0864293..f3d57f8 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -11,9 +11,9 @@
11** Compile Flags: 11** Compile Flags:
12** Zaurus arm : -DNO_OPIE 12** Zaurus arm : -DNO_OPIE
13** Zaurus Opie arm: none 13** Zaurus Opie arm: none
14** Linux Desktop : -DDESKTOP 14** Linux Desktop : -DDESKTOP -DNO_OPIE
15** Windows Desktop: -DDESKTOP -DWIN32 15** Windows Desktop: -DDESKTOP -DNO_OPIE
16** 16** use qmake
17** for japanese version additional use: -DJPATCH_HDE 17** for japanese version additional use: -DJPATCH_HDE
18** 18**
19****************************************************************************/ 19****************************************************************************/
@@ -43,7 +43,7 @@ using namespace Opie::Ui;
43#include <sys/stat.h> 43#include <sys/stat.h>
44#include <fcntl.h> 44#include <fcntl.h>
45#include <stdlib.h> 45#include <stdlib.h>
46#ifndef WIN32 46#ifndef Q_WS_WIN
47#include <unistd.h> 47#include <unistd.h>
48#endif 48#endif
49#include <string.h> 49#include <string.h>
@@ -55,7 +55,7 @@ using namespace Opie::Ui;
55#ifdef DESKTOP 55#ifdef DESKTOP
56#include <qfiledialog.h> 56#include <qfiledialog.h>
57#include <qdragobject.h> 57#include <qdragobject.h>
58#ifndef WIN32 58#ifndef Q_WS_WIN
59#include <qsettings.h> 59#include <qsettings.h>
60#else 60#else
61#include "qsettings.h" 61#include "qsettings.h"
@@ -97,7 +97,7 @@ using namespace Opie::Ui;
97 97
98extern int DeskW, DeskH; 98extern int DeskW, DeskH;
99#ifdef DESKTOP 99#ifdef DESKTOP
100extern QApplication *appl; 100extern QApplication *appl;
101#else 101#else
102extern QPEApplication *appl; 102extern QPEApplication *appl;
103#endif 103#endif
@@ -108,7 +108,7 @@ extern QPEApplication *appl;
108 108
109 109
110#ifdef DESKTOP 110#ifdef DESKTOP
111#ifndef WIN32 111#ifndef Q_WS_WIN
112const QString APP_KEY="/.zsafe/"; 112const QString APP_KEY="/.zsafe/";
113#else 113#else
114const QString APP_KEY=""; 114const QString APP_KEY="";
@@ -365,7 +365,7 @@ static const char* const general_data[] = {
365 delete conf; 365 delete conf;
366 366
367#ifdef DESKTOP 367#ifdef DESKTOP
368#ifndef WIN32 368#ifndef Q_WS_WIN
369 conf = new QSettings (); 369 conf = new QSettings ();
370 conf->insertSearchPath (QSettings::Unix, QDir::homeDirPath()); 370 conf->insertSearchPath (QSettings::Unix, QDir::homeDirPath());
371#else 371#else
@@ -417,7 +417,7 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl )
417 417
418 // create a zsafe configuration object 418 // create a zsafe configuration object
419#ifdef DESKTOP 419#ifdef DESKTOP
420#ifndef WIN32 420#ifndef Q_WS_WIN
421 conf = new QSettings (); 421 conf = new QSettings ();
422 conf->insertSearchPath (QSettings::Unix, QDir::homeDirPath()); 422 conf->insertSearchPath (QSettings::Unix, QDir::homeDirPath());
423#else 423#else
@@ -429,7 +429,7 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl )
429 conf->setGroup ("zsafePrefs"); 429 conf->setGroup ("zsafePrefs");
430#endif 430#endif
431#ifdef DESKTOP 431#ifdef DESKTOP
432// #ifndef WIN32 432// #ifndef Q_WS_WIN
433 expandTree = conf->readBoolEntry(APP_KEY+"expandTree", false); 433 expandTree = conf->readBoolEntry(APP_KEY+"expandTree", false);
434// #endif 434// #endif
435#else 435#else
@@ -464,7 +464,7 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl )
464 setName( "ZSafe" ); 464 setName( "ZSafe" );
465 465
466#ifdef DESKTOP 466#ifdef DESKTOP
467#ifdef WIN32 467#ifdef Q_WS_WIN
468 setGeometry(100, 150, DeskW, DeskH-30 ); 468 setGeometry(100, 150, DeskW, DeskH-30 );
469#else 469#else
470 resize( DeskW, DeskH-30 ); 470 resize( DeskW, DeskH-30 );
@@ -498,7 +498,7 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl )
498 498
499 // check if the directory application exists, if not 499 // check if the directory application exists, if not
500 // create it 500 // create it
501// #ifndef WIN32 501// #ifndef Q_WS_WIN
502 // QString d1("Documents/application"); 502 // QString d1("Documents/application");
503// #else 503// #else
504 QString d1(QDir::homeDirPath() + "/Documents/application"); 504 QString d1(QDir::homeDirPath() + "/Documents/application");
@@ -525,7 +525,7 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl )
525 exitZs (1); 525 exitZs (1);
526 } 526 }
527 } 527 }
528// #ifndef WIN32 528// #ifndef Q_WS_WIN
529 // QString d2("Documents/application/zsafe"); 529 // QString d2("Documents/application/zsafe");
530// #else 530// #else
531 QString d2(QDir::homeDirPath() + "/Documents/application/zsafe"); 531 QString d2(QDir::homeDirPath() + "/Documents/application/zsafe");
@@ -556,7 +556,7 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl )
556 //filename = ""; 556 //filename = "";
557 557
558 QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); 558 QString ti = filename.right (filename.length() - filename.findRev ('/') - 1);
559#ifdef WIN32 559#ifdef Q_WS_WIN
560 this->setCaption("Qt ZSafe: " + ti); 560 this->setCaption("Qt ZSafe: " + ti);
561#else 561#else
562 this->setCaption("ZSafe: " + ti); 562 this->setCaption("ZSafe: " + ti);
@@ -569,7 +569,7 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl )
569 lastSearchedUsername = ""; 569 lastSearchedUsername = "";
570 lastSearchedComment = ""; 570 lastSearchedComment = "";
571 571
572 infoForm = new InfoForm(); 572 infoForm = new InfoForm(this, "show_info", TRUE);
573 categoryDialog = NULL; 573 categoryDialog = NULL;
574 infoForm->setIcon( image0); 574 infoForm->setIcon( image0);
575 575
@@ -770,8 +770,8 @@ void ZSafe::editPwd()
770 if (!isCategory(selectedItem)) 770 if (!isCategory(selectedItem))
771 { 771 {
772 // open the 'New Entry' dialog 772 // open the 'New Entry' dialog
773 NewDialog *dialog = new NewDialog(this, tr("Edit Entry"), TRUE); 773 NewDialog *dialog = new NewDialog(this, "edit_entry", TRUE);
774#ifdef WIN32 774#ifdef Q_WS_WIN
775 dialog->setCaption ("Qt " + tr("Edit Entry")); 775 dialog->setCaption ("Qt " + tr("Edit Entry"));
776 dialog->setGeometry(200, 250, 220, 310 ); 776 dialog->setGeometry(200, 250, 220, 310 );
777#endif 777#endif
@@ -795,10 +795,20 @@ void ZSafe::editPwd()
795 dialog->CommentField->insertLine(comment); 795 dialog->CommentField->insertLine(comment);
796 dialog->CommentField->setCursorPosition(0,0); 796 dialog->CommentField->setCursorPosition(0,0);
797 797
798#ifdef Q_WS_QWS
798 DialogCode result = (DialogCode) QPEApplication::execDialog( dialog ); 799 DialogCode result = (DialogCode) QPEApplication::execDialog( dialog );
799 800#endif
801
800#ifdef DESKTOP 802#ifdef DESKTOP
801 result = Accepted; 803#ifndef Q_QW_QWIN
804 dialog->show();
805#endif
806#else
807 dialog->showMaximized();
808#endif
809 int result = dialog->exec();
810#ifdef DESKTOP
811// result = QDialog::Accepted;
802#endif 812#endif
803 if (result == Accepted) 813 if (result == Accepted)
804 { 814 {
@@ -840,8 +850,8 @@ void ZSafe::newPwd()
840 QString cat = selectedItem->text(0); 850 QString cat = selectedItem->text(0);
841 851
842 // open the 'New Entry' dialog 852 // open the 'New Entry' dialog
843 NewDialog *dialog = new NewDialog(this, tr("New Entry"), TRUE); 853 NewDialog *dialog = new NewDialog(this, "new_entry", TRUE);
844#ifdef WIN32 854#ifdef Q_WS_WIN
845 dialog->setCaption ("Qt " + tr("New Entry")); 855 dialog->setCaption ("Qt " + tr("New Entry"));
846 dialog->setGeometry(200, 250, 220, 310 ); 856 dialog->setGeometry(200, 250, 220, 310 );
847#endif 857#endif
@@ -854,9 +864,20 @@ void ZSafe::newPwd()
854 dialog->Field6Label->setText(getFieldLabel (selectedItem,"6", tr("Field 5"))); 864 dialog->Field6Label->setText(getFieldLabel (selectedItem,"6", tr("Field 5")));
855retype: 865retype:
856 866
867#ifdef Q_WS_QWS
857 DialogCode result = (DialogCode) QPEApplication::execDialog( dialog ); 868 DialogCode result = (DialogCode) QPEApplication::execDialog( dialog );
869#endif
870
858#ifdef DESKTOP 871#ifdef DESKTOP
859 result = Accepted; 872#ifndef Q_QW_QWIN
873 dialog->show();
874#endif
875#else
876 dialog->showMaximized();
877#endif
878#ifdef DESKTOP
879 int result = dialog->exec();
880// result = QDialog::Accepted;
860#endif 881#endif
861 882
862 if (result == Accepted) 883 if (result == Accepted)
@@ -898,7 +919,7 @@ void ZSafe::findPwd()
898 919
899 // open the 'Search' dialog 920 // open the 'Search' dialog
900 SearchDialog *dialog = new SearchDialog(this, tr("Search"), TRUE); 921 SearchDialog *dialog = new SearchDialog(this, tr("Search"), TRUE);
901#ifdef WIN32 922#ifdef Q_WS_WIN
902 dialog->setCaption ("Qt " + tr("Search")); 923 dialog->setCaption ("Qt " + tr("Search"));
903#endif 924#endif
904 925
@@ -1078,15 +1099,15 @@ QString ZSafe::getFieldLabel (QListViewItem *_item, QString field, QString def)
1078 1099
1079 QString app_key = APP_KEY; 1100 QString app_key = APP_KEY;
1080#ifndef DESKTOP 1101#ifndef DESKTOP
1081#ifndef WIN32 1102#ifndef Q_WS_WIN
1082 conf->setGroup ("fieldDefs"); 1103 conf->setGroup ("fieldDefs");
1083#endif 1104#endif
1084#else 1105#else
1085#ifndef WIN32 1106#ifndef Q_WS_WIN
1086 app_key += "/fieldDefs/"; 1107 app_key += "/fieldDefs/";
1087#endif 1108#endif
1088#endif 1109#endif
1089// #ifndef WIN32 1110// #ifndef Q_WS_WIN
1090 QString label = conf->readEntry(app_key+category+"-field"+field,def); 1111 QString label = conf->readEntry(app_key+category+"-field"+field,def);
1091// #else 1112// #else
1092// QString label(def); 1113// QString label(def);
@@ -1104,11 +1125,11 @@ QString ZSafe::getFieldLabel (QString category, QString field, QString def)
1104#ifndef DESKTOP 1125#ifndef DESKTOP
1105 conf->setGroup ("fieldDefs"); 1126 conf->setGroup ("fieldDefs");
1106#else 1127#else
1107#ifndef WIN32 1128#ifndef Q_WS_WIN
1108 app_key += "/fieldDefs/"; 1129 app_key += "/fieldDefs/";
1109#endif 1130#endif
1110#endif 1131#endif
1111// #ifndef WIN32 1132// #ifndef Q_WS_WIN
1112 QString label = conf->readEntry(app_key+category+"-field"+field, 1133 QString label = conf->readEntry(app_key+category+"-field"+field,
1113 def); 1134 def);
1114// #else 1135// #else
@@ -1208,8 +1229,14 @@ void ZSafe::showInfo( QListViewItem *_item)
1208 text += "</body></html>"; 1229 text += "</body></html>";
1209 1230
1210 infoForm->InfoText->setText(text); 1231 infoForm->InfoText->setText(text);
1211 infoForm->hide(); 1232// infoForm->hide();
1233#ifdef Q_WS_QWS
1212 QPEApplication::showDialog( infoForm ); 1234 QPEApplication::showDialog( infoForm );
1235#endif
1236
1237#ifdef DESKTOP
1238 infoForm->show();
1239 #endif
1213 } 1240 }
1214} 1241}
1215 1242
@@ -1231,7 +1258,7 @@ void ZSafe::listViewSelected( QListViewItem *_item)
1231 ListView->setColumnText(4, getFieldLabel (selectedItem, "5", tr("Field 4"))); 1258 ListView->setColumnText(4, getFieldLabel (selectedItem, "5", tr("Field 4")));
1232 ListView->setColumnText(5, getFieldLabel (selectedItem, "6", tr("Field 5"))); 1259 ListView->setColumnText(5, getFieldLabel (selectedItem, "6", tr("Field 5")));
1233#endif 1260#endif
1234#ifdef WIN32 1261#ifdef Q_WS_WIN
1235 // set the column text dependent on the selected item 1262 // set the column text dependent on the selected item
1236 ListView->setColumnText(0, getFieldLabel (selectedItem, "1", tr("Name"))); 1263 ListView->setColumnText(0, getFieldLabel (selectedItem, "1", tr("Name")));
1237 ListView->setColumnText(1, getFieldLabel (selectedItem, "2", tr("Field 2"))); 1264 ListView->setColumnText(1, getFieldLabel (selectedItem, "2", tr("Field 2")));
@@ -1486,7 +1513,7 @@ void ZSafe::readAllEntries()
1486 QString s = t.readLine(); 1513 QString s = t.readLine();
1487 s.replace (QRegExp("\";\""), "\"|\""); 1514 s.replace (QRegExp("\";\""), "\"|\"");
1488 // char buffer[1024]; 1515 // char buffer[1024];
1489#ifndef WIN32 1516#ifndef Q_WS_WIN
1490 char buffer[s.length()+1]; 1517 char buffer[s.length()+1];
1491#else 1518#else
1492 char buffer[4048]; 1519 char buffer[4048];
@@ -1585,7 +1612,7 @@ void ZSafe::readAllEntries()
1585 QString icon; 1612 QString icon;
1586 QString fullIconPath; 1613 QString fullIconPath;
1587 QPixmap *pix; 1614 QPixmap *pix;
1588// #ifndef WIN32 1615// #ifndef Q_WS_WIN
1589 icon = conf->readEntry(APP_KEY+category); 1616 icon = conf->readEntry(APP_KEY+category);
1590// #endif 1617// #endif
1591 bool isIconAv = false; 1618 bool isIconAv = false;
@@ -1738,7 +1765,7 @@ void ZSafe::readAllEntries()
1738 s.replace (QRegExp("\";\""), "\"|\""); 1765 s.replace (QRegExp("\";\""), "\"|\"");
1739 // char buffer[1024]; 1766 // char buffer[1024];
1740 int len=s.length()+1; 1767 int len=s.length()+1;
1741#ifdef WIN32 1768#ifdef Q_WS_WIN
1742 char buffer[512]; 1769 char buffer[512];
1743#else 1770#else
1744 char buffer[len]; 1771 char buffer[len];
@@ -1818,7 +1845,7 @@ void ZSafe::readAllEntries()
1818 QString icon; 1845 QString icon;
1819 QString fullIconPath; 1846 QString fullIconPath;
1820 QPixmap *pix; 1847 QPixmap *pix;
1821// #ifndef WIN32 1848// #ifndef Q_WS_WIN
1822 icon = conf->readEntry(APP_KEY+category); 1849 icon = conf->readEntry(APP_KEY+category);
1823// #endif 1850// #endif
1824 bool isIconAv = false; 1851 bool isIconAv = false;
@@ -1896,7 +1923,7 @@ bool ZSafe::openDocument(const char* _filename, const char* )
1896{ 1923{
1897 int retval; 1924 int retval;
1898 char* entry[FIELD_SIZE]; 1925 char* entry[FIELD_SIZE];
1899// #ifndef WIN32 1926// #ifndef Q_WS_WIN
1900 int validationFlag = conf->readNumEntry(APP_KEY+"valzsafe", 1); 1927 int validationFlag = conf->readNumEntry(APP_KEY+"valzsafe", 1);
1901// #else 1928// #else
1902 // int validationFlag = 1; 1929 // int validationFlag = 1;
@@ -1937,7 +1964,7 @@ bool ZSafe::openDocument(const char* _filename, const char* )
1937 } 1964 }
1938 else 1965 else
1939 { 1966 {
1940#ifdef WIN32 1967#ifdef Q_WS_WIN
1941 this->setCaption("Qt ZSafe"); 1968 this->setCaption("Qt ZSafe");
1942#else 1969#else
1943 this->setCaption("ZSafe"); 1970 this->setCaption("ZSafe");
@@ -2054,7 +2081,7 @@ bool ZSafe::openDocument(const char* _filename, const char* )
2054 QString icon; 2081 QString icon;
2055 QString fullIconPath; 2082 QString fullIconPath;
2056 QPixmap *pix; 2083 QPixmap *pix;
2057// #ifndef WIN32 2084// #ifndef Q_WS_WIN
2058 icon = conf->readEntry(APP_KEY+category); 2085 icon = conf->readEntry(APP_KEY+category);
2059// #endif 2086// #endif
2060 bool isIconAv = false; 2087 bool isIconAv = false;
@@ -2140,7 +2167,7 @@ int ZSafe::loadInit(const char* _filename, const char *password)
2140 keylength = j; 2167 keylength = j;
2141 krc2->rc2_expandkey (key, keylength, 128); 2168 krc2->rc2_expandkey (key, keylength, 128);
2142 2169
2143#ifndef WIN32 2170#ifndef Q_WS_WIN
2144 size = read(fileno (fd), (unsigned char *) (charbuf + count), 8); 2171 size = read(fileno (fd), (unsigned char *) (charbuf + count), 8);
2145#else 2172#else
2146 size = fread ((unsigned char *) (charbuf + count), sizeof(unsigned char), 8, fd); 2173 size = fread ((unsigned char *) (charbuf + count), sizeof(unsigned char), 8, fd);
@@ -2157,7 +2184,7 @@ int ZSafe::loadInit(const char* _filename, const char *password)
2157 2184
2158 size = 0; 2185 size = 0;
2159 bufferIndex = 0; 2186 bufferIndex = 0;
2160#ifndef WIN32 2187#ifndef Q_WS_WIN
2161 while ((count = read (fileno (fd), (unsigned char *) charbuf, 8)) > 0) { 2188 while ((count = read (fileno (fd), (unsigned char *) charbuf, 8)) > 0) {
2162 while (count < 8) { 2189 while (count < 8) {
2163 count2 = read (fileno (fd), (unsigned char *) (charbuf + count), 8); 2190 count2 = read (fileno (fd), (unsigned char *) (charbuf + count), 8);
@@ -2339,7 +2366,7 @@ bool ZSafe::saveDocument(const char* _filename,
2339 saveFinalize(); 2366 saveFinalize();
2340 return false; 2367 return false;
2341 } 2368 }
2342// #ifndef WIN32 2369// #ifndef Q_WS_WIN
2343 conf->writeEntry(APP_KEY+"valzsafe", 1); 2370 conf->writeEntry(APP_KEY+"valzsafe", 1);
2344// #endif 2371// #endif
2345 saveConf(); 2372 saveConf();
@@ -2434,7 +2461,7 @@ void ZSafe::getDocPassword(QString title)
2434 // CS: !!! 2461 // CS: !!!
2435 // int pos = filename.findRev ('/'); 2462 // int pos = filename.findRev ('/');
2436 QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); 2463 QString ti = filename.right (filename.length() - filename.findRev ('/') - 1);
2437#ifdef WIN32 2464#ifdef Q_WS_WIN
2438 dialog->setCaption("Qt " + ti); 2465 dialog->setCaption("Qt " + ti);
2439#else 2466#else
2440 dialog->setCaption(ti); 2467 dialog->setCaption(ti);
@@ -2664,7 +2691,7 @@ void ZSafe::addCategory()
2664 else 2691 else
2665 { 2692 {
2666 categoryDialog = new CategoryDialog(this, tr("Category"), TRUE); 2693 categoryDialog = new CategoryDialog(this, tr("Category"), TRUE);
2667#ifdef WIN32 2694#ifdef Q_WS_WIN
2668 categoryDialog->setCaption ("Qt " + tr("Category")); 2695 categoryDialog->setCaption ("Qt " + tr("Category"));
2669#endif 2696#endif
2670 dialog = categoryDialog; 2697 dialog = categoryDialog;
@@ -2675,7 +2702,7 @@ void ZSafe::addCategory()
2675 } 2702 }
2676 2703
2677#ifdef DESKTOP 2704#ifdef DESKTOP
2678#ifndef WIN32 2705#ifndef Q_WS_WIN
2679 QStringList list = conf->entryList( APP_KEY+"/fieldDefs" ); 2706 QStringList list = conf->entryList( APP_KEY+"/fieldDefs" );
2680#else 2707#else
2681 // read all categories from the config file and store 2708 // read all categories from the config file and store
@@ -2718,7 +2745,7 @@ void ZSafe::addCategory()
2718 if (cat->contains("-field1", FALSE)) 2745 if (cat->contains("-field1", FALSE))
2719 { 2746 {
2720#ifdef DESKTOP 2747#ifdef DESKTOP
2721#ifndef WIN32 2748#ifndef Q_WS_WIN
2722 categ = cat->section ("-field1", 0, 0); 2749 categ = cat->section ("-field1", 0, 0);
2723#else 2750#else
2724 int pos = cat->find ("-field1"); 2751 int pos = cat->find ("-field1");
@@ -2786,7 +2813,7 @@ void ZSafe::addCategory()
2786 waitDialog.hide(); 2813 waitDialog.hide();
2787 } 2814 }
2788 2815
2789#ifndef WIN32 2816#ifndef Q_WS_WIN
2790 dialog->show(); 2817 dialog->show();
2791#endif 2818#endif
2792#ifndef DESKTOP 2819#ifndef DESKTOP
@@ -2825,7 +2852,7 @@ void ZSafe::addCategory()
2825 if (!pix->isNull()) 2852 if (!pix->isNull())
2826 { 2853 {
2827 // save the full pixmap name into the config file 2854 // save the full pixmap name into the config file
2828// #ifndef WIN32 2855// #ifndef Q_WS_WIN
2829 conf->writeEntry(APP_KEY+category, icon); 2856 conf->writeEntry(APP_KEY+category, icon);
2830// #endif 2857// #endif
2831 saveConf(); 2858 saveConf();
@@ -2877,7 +2904,7 @@ void ZSafe::delCategory()
2877 // Delete from the category list 2904 // Delete from the category list
2878 modified = true; 2905 modified = true;
2879 categories.remove (selectedItem->text(0)); 2906 categories.remove (selectedItem->text(0));
2880// #ifndef WIN32 2907// #ifndef Q_WS_WIN
2881 conf->removeEntry (selectedItem->text(0)); 2908 conf->removeEntry (selectedItem->text(0));
2882// #endif 2909// #endif
2883 saveConf(); 2910 saveConf();
@@ -3037,12 +3064,12 @@ void ZSafe::saveCategoryDialogFields(CategoryDialog *dialog)
3037#ifndef DESKTOP 3064#ifndef DESKTOP
3038 conf->setGroup ("fieldDefs"); 3065 conf->setGroup ("fieldDefs");
3039#else 3066#else
3040#ifndef WIN32 3067#ifndef Q_WS_WIN
3041 app_key += "/fieldDefs/"; 3068 app_key += "/fieldDefs/";
3042#endif 3069#endif
3043#endif 3070#endif
3044 QString category = dialog->CategoryField->currentText(); 3071 QString category = dialog->CategoryField->currentText();
3045// #ifndef WIN32 3072// #ifndef Q_WS_WIN
3046 conf->writeEntry(app_key+category+"-field1", dialog->Field1->text()); 3073 conf->writeEntry(app_key+category+"-field1", dialog->Field1->text());
3047 conf->writeEntry(app_key+category+"-field2", dialog->Field2->text()); 3074 conf->writeEntry(app_key+category+"-field2", dialog->Field2->text());
3048 conf->writeEntry(app_key+category+"-field3", dialog->Field3->text()); 3075 conf->writeEntry(app_key+category+"-field3", dialog->Field3->text());
@@ -3073,7 +3100,7 @@ void ZSafe::editCategory()
3073 else 3100 else
3074 { 3101 {
3075 categoryDialog = new CategoryDialog(this, tr("Category"), TRUE); 3102 categoryDialog = new CategoryDialog(this, tr("Category"), TRUE);
3076#ifdef WIN32 3103#ifdef Q_WS_WIN
3077 categoryDialog->setCaption ("Qt " + tr("Category")); 3104 categoryDialog->setCaption ("Qt " + tr("Category"));
3078#endif 3105#endif
3079 dialog = categoryDialog; 3106 dialog = categoryDialog;
@@ -3085,7 +3112,7 @@ void ZSafe::editCategory()
3085 setCategoryDialogFields(dialog); 3112 setCategoryDialogFields(dialog);
3086 3113
3087#ifdef DESKTOP 3114#ifdef DESKTOP
3088#ifndef WIN32 3115#ifndef Q_WS_WIN
3089 QStringList list = conf->entryList( APP_KEY+"/fieldDefs" ); 3116 QStringList list = conf->entryList( APP_KEY+"/fieldDefs" );
3090#else 3117#else
3091 // read all categories from the config file and store 3118 // read all categories from the config file and store
@@ -3129,7 +3156,7 @@ void ZSafe::editCategory()
3129 if (cat->contains("-field1", FALSE)) 3156 if (cat->contains("-field1", FALSE))
3130 { 3157 {
3131#ifdef DESKTOP 3158#ifdef DESKTOP
3132#ifndef WIN32 3159#ifndef Q_WS_WIN
3133 categ = cat->section ("-field1", 0, 0); 3160 categ = cat->section ("-field1", 0, 0);
3134#else 3161#else
3135 int pos = cat->find ("-field1"); 3162 int pos = cat->find ("-field1");
@@ -3272,7 +3299,7 @@ void ZSafe::editCategory()
3272 if (category != dialog->CategoryField->currentText()) 3299 if (category != dialog->CategoryField->currentText())
3273 { 3300 {
3274 categories.remove (category); 3301 categories.remove (category);
3275// #ifndef WIN32 3302// #ifndef Q_WS_WIN
3276 conf->removeEntry(category); 3303 conf->removeEntry(category);
3277// #endif 3304// #endif
3278 saveConf(); 3305 saveConf();
@@ -3298,7 +3325,7 @@ void ZSafe::editCategory()
3298 if (!pix->isNull()) 3325 if (!pix->isNull())
3299 { 3326 {
3300 // save the full pixmap name into the config file 3327 // save the full pixmap name into the config file
3301// #ifndef WIN32 3328// #ifndef Q_WS_WIN
3302 conf->writeEntry(APP_KEY+category, icon); 3329 conf->writeEntry(APP_KEY+category, icon);
3303// #endif 3330// #endif
3304 saveConf(); 3331 saveConf();
@@ -3310,7 +3337,7 @@ void ZSafe::editCategory()
3310 } 3337 }
3311 else 3338 else
3312 { 3339 {
3313// #ifndef WIN32 3340// #ifndef Q_WS_WIN
3314 conf->removeEntry (category); 3341 conf->removeEntry (category);
3315// #endif 3342// #endif
3316 saveConf(); 3343 saveConf();
@@ -3489,7 +3516,7 @@ void ZSafe::newDocument()
3489 conf->writeEntry(APP_KEY+"document", filename); 3516 conf->writeEntry(APP_KEY+"document", filename);
3490 saveConf(); 3517 saveConf();
3491 QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); 3518 QString ti = filename.right (filename.length() - filename.findRev ('/') - 1);
3492#ifdef WIN32 3519#ifdef Q_WS_WIN
3493 this->setCaption("Qt ZSafe: " + ti); 3520 this->setCaption("Qt ZSafe: " + ti);
3494#else 3521#else
3495 this->setCaption("ZSafe: " + ti); 3522 this->setCaption("ZSafe: " + ti);
@@ -3573,7 +3600,7 @@ void ZSafe::loadDocument()
3573 conf->writeEntry(APP_KEY+"document", filename); 3600 conf->writeEntry(APP_KEY+"document", filename);
3574 saveConf(); 3601 saveConf();
3575 QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); 3602 QString ti = filename.right (filename.length() - filename.findRev ('/') - 1);
3576#ifdef WIN32 3603#ifdef Q_WS_WIN
3577 this->setCaption("Qt ZSafe: " + ti); 3604 this->setCaption("Qt ZSafe: " + ti);
3578#else 3605#else
3579 this->setCaption("ZSafe: " + ti); 3606 this->setCaption("ZSafe: " + ti);
@@ -3627,7 +3654,7 @@ void ZSafe::saveDocumentAs()
3627 conf->writeEntry(APP_KEY+"document", filename); 3654 conf->writeEntry(APP_KEY+"document", filename);
3628 saveConf(); 3655 saveConf();
3629 QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); 3656 QString ti = filename.right (filename.length() - filename.findRev ('/') - 1);
3630#ifdef WIN32 3657#ifdef Q_WS_WIN
3631 this->setCaption("Qt ZSafe: " + ti); 3658 this->setCaption("Qt ZSafe: " + ti);
3632#else 3659#else
3633 this->setCaption("ZSafe: " + ti); 3660 this->setCaption("ZSafe: " + ti);
@@ -3706,7 +3733,7 @@ void ZSafe::setExpandFlag()
3706#ifndef DESKTOP 3733#ifndef DESKTOP
3707 conf->setGroup ("zsafePrefs"); 3734 conf->setGroup ("zsafePrefs");
3708#endif 3735#endif
3709// #ifndef WIN32 3736// #ifndef Q_WS_WIN
3710 conf->writeEntry (APP_KEY+"expandTree", expandTree); 3737 conf->writeEntry (APP_KEY+"expandTree", expandTree);
3711// #endif 3738// #endif
3712 saveConf(); 3739 saveConf();
@@ -3791,7 +3818,7 @@ void ZSafe::setDocument(const QString& fileref)
3791 conf->writeEntry(APP_KEY+"document", filename); 3818 conf->writeEntry(APP_KEY+"document", filename);
3792 saveConf(); 3819 saveConf();
3793 QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); 3820 QString ti = filename.right (filename.length() - filename.findRev ('/') - 1);
3794#ifdef WIN32 3821#ifdef Q_WS_WIN
3795 this->setCaption("Qt ZSafe: " + ti); 3822 this->setCaption("Qt ZSafe: " + ti);
3796#else 3823#else
3797 this->setCaption("ZSafe: " + ti); 3824 this->setCaption("ZSafe: " + ti);