nomsg
git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@6 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
@@ -19,10 +19,11 @@
|
||||
***************************************************************************/
|
||||
|
||||
#include "Import_KWalletXml.h"
|
||||
#include <iostream.h>
|
||||
#include <iostream>
|
||||
#include <qobject.h>
|
||||
#include <qfile.h>
|
||||
#include <qdom.h>
|
||||
using namespace std;
|
||||
|
||||
bool Import_KWalletXml::importFile(QString FileName,PwDatabase* pwm,QString& err){
|
||||
QFile file(FileName);
|
||||
|
||||
@@ -20,12 +20,12 @@
|
||||
|
||||
#include <qobject.h>
|
||||
#include <qfile.h>
|
||||
#include <iostream.h>
|
||||
#include <iostream>
|
||||
#include <qdom.h>
|
||||
#include "crypto/blowfish.h"
|
||||
#include "crypto/sha1.h"
|
||||
#include "Import_PwManager.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
bool Import_PwManager::importFile(QString filename, QString password, PwDatabase* db, QString& err){
|
||||
database=db;
|
||||
|
||||
Reference in New Issue
Block a user