- support for precompiled headers

- made password dialog more userfriendly (especially key file creation/selection)
- database file as command line argument is recognized again
- fixed bug #1825446 (commandline option -cfg does NOT take relative path)
- fixed mac buid problem (see item #1908868)


git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@174 b624d157-de02-0410-bad0-e51aec6abb33

src/import/Import.cpp

@@ -18,12 +18,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <QMessageBox>
-#include <QFile>
-#include "lib/tools.h"
-#include "main.h"
+
 #include "Import.h"
-#include "lib/FileDialogs.h"
 #include "dialogs/SimplePasswordDlg.h"
 
 QFile* ImporterBase::openFile(QWidget* parent, QString id, QStringList Filters){

src/import/Import.h

@@ -19,11 +19,6 @@
  ***************************************************************************/
 #ifndef _IMPORT_H_
 #define _IMPORT_H_
-
-#include <QWidget>
-#include <QFile>
-
-#include "Database.h"
  
 class IImport{
 	public:

src/import/Import_KWalletXml.cpp

@@ -18,11 +18,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "Import_KWalletXml.h"
-#include <QFile>
-#include <QtXml>
-#include <QMessageBox>
 
+#include "Import_KWalletXml.h"
 
 bool Import_KWalletXml::importDatabase(QWidget* GuiParent, IDatabase* db){
 	QFile* file=openFile(GuiParent,identifier(),QStringList()<<tr("XML Files (*.xml)")<<tr("All Files (*)"));

src/import/Import_KWalletXml.h

@@ -20,7 +20,7 @@
  
 #ifndef _IMPORT_KWALLET_H_
 #define _IMPORT_KWALLET_H_
-#include "Database.h"
+
 #include "Import.h"
 
 class Import_KWalletXml:public ImporterBase, public IImport{

src/import/Import_KeePassX_Xml.cpp

@@ -18,9 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
  
-#include <QStringList>
-#include <QMessageBox>
-#include <QtXml>
+
 #include "Import_KeePassX_Xml.h"
 
 bool Import_KeePassX_Xml::importDatabase(QWidget* Parent, IDatabase* database){

src/import/Import_KeePassX_Xml.h

@@ -21,7 +21,6 @@
 #ifndef _IMPORT_KPX_XML_H_
 #define _IMPORT_KPX_XML_H_
 
-#include <QDomElement>
 #include "Import.h"
 
 

src/import/Import_PwManager.cpp

@@ -18,14 +18,9 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <QFile>
-#include <iostream>
-#include <QMessageBox>
-#include <QtXml>
-#include "crypto/blowfish.h"
-#include "crypto/sha1.h"
+
 #include "Import_PwManager.h"
-using namespace std;
+
 
 bool Import_PwManager::importDatabase(QWidget* GuiParent, IDatabase* db){	
 	database=db;
@@ -115,7 +110,7 @@ bool Import_PwManager::importDatabase(QWidget* GuiParent, IDatabase* db){
 	if(!parseXmlContent((char*)xml)){
 		delete [] xml;
 		QMessageBox::critical(GuiParent,tr("Import Failed"),tr("Invalid XML data (see stdout for details).")); return false;}
-	dynamic_cast<IFilePasswordAuth*>(database)->authByPwd(password);
+	database->setKey(password,QString());
 	return true;
 }
 

src/import/Import_PwManager.h

@@ -20,9 +20,7 @@
 
 #ifndef _IMPORT_PWMANAGER_
 #define _IMPORT_PWMANAGER_
-#include <QDomElement>
-#include <QString>
-#include "Database.h"
+
 #include "Import.h"