From 9de74898055b831e209046a07daa5525d16923a0 Mon Sep 17 00:00:00 2001
From: sniperbeamer <sniperbeamer@b624d157-de02-0410-bad0-e51aec6abb33>
Date: Tue, 4 Mar 2008 22:57:56 +0000
Subject: [PATCH] Don't delete QApplication as it causes problems (big font
 size)

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@171 b624d157-de02-0410-bad0-e51aec6abb33
---
 src/lib/tools.h   |  2 +-
 src/main.cpp      | 18 +++++++-----------
 src/main_unix.cpp |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/lib/tools.h b/src/lib/tools.h
index fcfb54a..950ab4f 100644
--- a/src/lib/tools.h
+++ b/src/lib/tools.h
@@ -38,4 +38,4 @@ QString decodeFileError(QFile::FileError Code);
 QString makePathRelative(const QString& Abs,const QString& Cur);
 QString getImageFile(const QString& name);
 
-#endif //TOOLS_H
\ No newline at end of file
+#endif //TOOLS_H
diff --git a/src/main.cpp b/src/main.cpp
index 13f3554..1adc4d3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -62,12 +62,15 @@ void initAppPaths(int argc, char **argv);
 
 int main(int argc, char **argv)
 {
-	QApplication* app=new QApplication(argc,argv);
+	QApplication* app;
+#if defined(Q_WS_X11) && defined(GLOBAL_AUTOTYPE)
+	app = new KeepassApplication(argc,argv);
+#else
+	app = new QApplication(argc,argv);
+#endif
 	initAppPaths(argc,argv);
 	CmdLineArgs args;
-	args.parse(app->arguments());
-	delete app;
-	app=NULL;
+	args.parse(QApplication::arguments());
 	qDebug(CSTR(AppDir));
 	qDebug(CSTR(DataDir));
 	//Load Config
@@ -130,13 +133,6 @@ int main(int argc, char **argv)
 		}
 	}*/
 	
-#if defined(Q_WS_X11) && defined(GLOBAL_AUTOTYPE)
-	if(!app) new KeepassApplication(argc,argv);
-#else
-	if(!app) new QApplication(argc,argv);
-#endif
-
-
 	//Internationalization
 	QLocale loc;
 	if(!args.language().size())
diff --git a/src/main_unix.cpp b/src/main_unix.cpp
index 34e5507..fff6c27 100644
--- a/src/main_unix.cpp
+++ b/src/main_unix.cpp
@@ -71,4 +71,4 @@ void initAppPaths(int argc,char** argv) {
 	AppDir.truncate(AppDir.lastIndexOf("/"));
 	DataDir=AppDir+"/../share/keepassx";
 	HomeDir = QDir::homePath()+"/.keepassx";
-}
\ No newline at end of file
+}