diff src/main.cpp @ 751:ac165b6ae67e

Done some refactoring: - Moved includes into the cpp files where possible and using class pre-declarations if possible - Made class member variable names begin with an underscore - Made by uic created header files be used as class members instead of inherting them - Renamed some variables to reflect their purpose better - Added some NULL initializations and added some comments - Rearranged some include and declaration code parts to be consistent and better readable - Updated for QScintilla 2.4.5 - Made UiGuiSettings be accessed via a shared pointer only git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@1028 59b1889a-e5ac-428c-b0c7-476e01d41282
author thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282>
date Thu, 14 Oct 2010 19:52:47 +0000
parents edde9cbb2ce4
children e64c04dc6f61
line wrap: on
line diff
--- a/src/main.cpp	Sat Oct 02 12:48:56 2010 +0000
+++ b/src/main.cpp	Thu Oct 14 19:52:47 2010 +0000
@@ -18,7 +18,6 @@
  ***************************************************************************/
 
 #include "MainWindow.h"
-#include <QApplication>
 
 #include "UiGuiIndentServer.h"
 #include "UiGuiLogger.h"
@@ -26,6 +25,11 @@
 #include "UiGuiSettings.h"
 #include "UiGuiVersion.h"
 #include "UiGuiSystemInfo.h"
+#include "IndentHandler.h"
+#include "SettingsPaths.h"
+
+#include <QApplication>
+#include <QTextCodec>
 
 #include <string>
 #include <iostream>
@@ -252,7 +256,7 @@
     delete indentHandler;
 	delete mainWindow;
 
-    UiGuiSettings::deleteInstance();
+    SettingsPaths::cleanAndRemoveTempDir();
     UiGuiLogger::deleteInstance();
 
     return returnValue;