comparison 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
comparison
equal deleted inserted replaced
750:a884b5861e93 751:ac165b6ae67e
16 * Free Software Foundation, Inc., * 16 * Free Software Foundation, Inc., *
17 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 17 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
18 ***************************************************************************/ 18 ***************************************************************************/
19 19
20 #include "MainWindow.h" 20 #include "MainWindow.h"
21 #include <QApplication>
22 21
23 #include "UiGuiIndentServer.h" 22 #include "UiGuiIndentServer.h"
24 #include "UiGuiLogger.h" 23 #include "UiGuiLogger.h"
25 #include "UiGuiIniFileParser.h" 24 #include "UiGuiIniFileParser.h"
26 #include "UiGuiSettings.h" 25 #include "UiGuiSettings.h"
27 #include "UiGuiVersion.h" 26 #include "UiGuiVersion.h"
28 #include "UiGuiSystemInfo.h" 27 #include "UiGuiSystemInfo.h"
28 #include "IndentHandler.h"
29 #include "SettingsPaths.h"
30
31 #include <QApplication>
32 #include <QTextCodec>
29 33
30 #include <string> 34 #include <string>
31 #include <iostream> 35 #include <iostream>
32 #include <algorithm> 36 #include <algorithm>
33 #include <tclap/CmdLine.h> 37 #include <tclap/CmdLine.h>
250 server.stopServer(); 254 server.stopServer();
251 255
252 delete indentHandler; 256 delete indentHandler;
253 delete mainWindow; 257 delete mainWindow;
254 258
255 UiGuiSettings::deleteInstance(); 259 SettingsPaths::cleanAndRemoveTempDir();
256 UiGuiLogger::deleteInstance(); 260 UiGuiLogger::deleteInstance();
257 261
258 return returnValue; 262 return returnValue;
259 } 263 }