thooge/keepassx1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QT3 -> QT4

Browse Source 
git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@5 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
tariq
2005-11-15 20:45:14 +00:00
parent 192dbba0e4
commit 28c71dfe1e
51 changed files with 977 additions and 937 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/import/Import_KWalletXml.cpp
View File

@@ -29,14 +29,14 @@ QFile file(FileName);
if(!file.exists()){
err+=QObject::trUtf8("Datei nicht gefunden");
return false;}
if(!file.open(IO_ReadOnly)){
if(!file.open(QIODevice::ReadOnly)){
err+=QObject::trUtf8("Datei konnte nicht geöffnet werden");
return false;}
int len=file.size();
if(len==0){
err+=QObject::trUtf8("Datei ist leer");
return false;}
UINT8* buffer=new UINT8[len];
Q_UINT8* buffer=new Q_UINT8[len];
file.readBlock((char*)buffer,len);
file.close();
QDomDocument doc;
@@ -44,7 +44,7 @@ QString xmlerr;
int col,line;
if(!doc.setContent(QString::fromUtf8((char*)buffer,len),false,&xmlerr,&line,&col)){
cout << "Import_PwManager::parseXmlContent():" << endl;
cout << (xmlerr+" (Line:%1 Column:%2)").arg(line).arg(col) << endl;
cout << (xmlerr+" (Line:%1 Column:%2)").arg(line).arg(col).ascii() << endl;
err+=QObject::trUtf8("Ungültiges XML-Dokument");
delete [] buffer;
return false;}
@@ -93,7 +93,7 @@ int offset=0;
if(len<48){
err+=QObject::trUtf8("Unerwartete Dateilänge");
return false;}
UINT8* buffer=new UINT8[len];
Q_UINT8* buffer=new Q_UINT8[len];
int df=file.readBlock((char*)buffer,len);
file.close();

4
src/import/Import_PwManager.cpp
View File

@@ -34,7 +34,7 @@ char* buffer=NULL;
int offset=0;
int len=0;
if(!file.exists()){err+=QObject::trUtf8("Die angegebene Datei existiert nicht."); return false;}
if(!file.open(IO_ReadOnly)){err+=QObject::trUtf8("Datei konnte nicht geöffnet werden."); return false;}
if(!file.open(QIODevice::ReadOnly)){err+=QObject::trUtf8("Datei konnte nicht geöffnet werden."); return false;}
if(len=file.size()) buffer=new char[len];
else {err+=QObject::trUtf8("Datei ist leer"); return false;}
file.readBlock(buffer,len);
@@ -116,7 +116,7 @@ QString err;
int col,line;
if(!db.setContent(QString::fromUtf8(content,strlen(content)-1),false,&err,&line,&col)){
cout << "Import_PwManager::parseXmlContent():" << endl;
cout << (err+" (Line:%1 Column:%2)").arg(line).arg(col) << endl;
cout << (err+" (Line:%1 Column:%2)").arg(line).arg(col).ascii() << endl;
return false;}
QDomElement root=db.documentElement();
if(root.tagName()!="P")return false;