Clean header includes

src/ParseExp.cpp

@@ -66,7 +66,7 @@ enum {DOUBLE_POINTED=1, INVALID_CHAR, INVALID_PARENTHESIS, INVALID_OPERATION};
 #define P(x)
 #endif
 
-double atof(char* s, int size)
+static double atof(char* s, int size)
 {
     int neg = 0;
     double res = 0;
@@ -94,7 +94,7 @@ double atof(char* s, int size)
     return res;
 }
 
-void ParseExp(char** expr, struct parse_opt* root, bool needParenthesis)
+void ParseExp::ParseExp(char** expr, struct parse_opt* root, bool needParenthesis)
 {
     char* temp;
     bool pointed = false;
@@ -256,7 +256,7 @@ void ParseExp(char** expr, struct parse_opt* root, bool needParenthesis)
     return ;
 }
 
-double EvaluateExpr(struct parse_opt* root, bool del)
+double ParseExp::EvaluateExpr(struct parse_opt* root, bool del)
 {
     double l, r;
     char type;
@@ -304,6 +304,7 @@ double EvaluateExpr(struct parse_opt* root, bool del)
 }
 
 #ifdef DEBUG
+using namespace ParseExp;
 
 int main()
 {

src/ParseExp.h

@@ -17,6 +17,8 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+namespace ParseExp {
+
 struct parse_opt {
     struct parse_opt* root;
     char type;
@@ -27,3 +29,5 @@ struct parse_opt {
 
 void ParseExp(char** expr, struct parse_opt* root, bool needParenthesis);
 double EvaluateExpr(struct parse_opt* root, bool del);
+
+};

src/controller/KissCount.cpp

@@ -17,7 +17,13 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <fstream>
+#include <iostream>
+#include <algorithm>
+
 #include "KissCount.h"
+
+#include <view/view.h>
  
 std::vector<ImportEngine*> * KissCount::_importEngines;
 std::vector<ExportEngine*> * KissCount::_exportEngines;

src/controller/KissCount.h

@@ -20,17 +20,16 @@
 #ifndef KISSCOUNT_H
 #define KISSCOUNT_H
 
-#include <fstream>
-#include <iostream>
 #include <list>
 
 #include <model/import/ImportEngine.h>
 #include <model/export/ExportEngine.h>
 #include <model/model.h>
-#include <view/wxUI.h>
 
 #include <wx/display.h>
 
+#include <view/wxUI.h>
+
 #define APP_VERSION "0.3"
 
 #define ESCAPE_CHARS(s) {                               \

src/main.cpp

@@ -17,7 +17,8 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "main.h"
+#include <wx/wx.h>
+#include <controller/KissCount.h>
 
 class MyApp: public wxApp
 {

src/main.h

@@ -1,26 +0,0 @@
-/*
-  Copyright 2010-2011 Grégory Soutadé
-
-  This file is part of KissCount.
-
-  KissCount is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  KissCount is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef MAIN_H
-#define MAIN_H
-
-#include <wx/wx.h>
-#include <controller/KissCount.h>
-
-#endif

src/model/Database.cpp

@@ -17,6 +17,11 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <fstream>
+#include <wx/filename.h>
+#include <wx/file.h>
+#include <sha1.h>
+
 #include "Database.h"
 
 static inline wxString DoubleToString(double d)

src/model/Database.h

@@ -20,15 +20,9 @@
 #ifndef DATABASE_H
 #define DATABASE_H
 
-#include <stdio.h>
-#include <fstream>
 #include <list>
 #include <wx/wxsqlite3.h>
 #include <wx/wx.h>
-#include <wx/utils.h>
-#include <wx/filename.h>
-#include <wx/file.h>
-#include <sha1.h>
 
 #include <controller/KissCount.h>
 #include "model.h"

src/model/User.cpp

@@ -17,6 +17,8 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <algorithm>
+#include <view/view.h>
 #include "User.h"
 
 User::User(Database* db) : _db(db)

src/model/User.h

@@ -23,7 +23,6 @@
 #include <map>
 #include <vector>
 #include <wx/wx.h>
-#include <wx/colour.h>
 
 #include "Category.h"
 #include "Account.h"

src/model/export/XMLExportEngine.cpp

@@ -17,6 +17,9 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libxml/encoding.h>
+#include <libxml/xmlwriter.h>
+
 #include "XMLExportEngine.h"
 
 static XMLExportEngine xmlExportEngine;

src/model/export/XMLExportEngine.h

@@ -20,9 +20,6 @@
 #ifndef XMLEXPORTENGINE_H
 #define XMLEXPORTENGINE_H
 
-#include <libxml/encoding.h>
-#include <libxml/xmlwriter.h>
-
 #include <model/model.h>
 #include <controller/KissCount.h>
 #include "ExportEngine.h"

src/model/import/GrisbiImportEngine.cpp

@@ -19,6 +19,8 @@
 
 #include "GrisbiImportEngine.h"
 
+#include <view/view.h>
+
 static GrisbiImportEngine grisbiImportEngine;
 
 void GrisbiImportEngine::LoadAccount(GrisbiImportEngine* _this, const char** attrs)

src/model/import/ImportEngine.cpp

@@ -17,6 +17,8 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <algorithm>
+
 #include "ImportEngine.h"
 
 wxString ImportEngine::NULL_IMPORT_PATTERN = wxT("(nil)");

src/view/AccountPanel.cpp

@@ -17,6 +17,9 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "grid/wxGridCellBitmapRenderer.h"
+#include "GenerateDialog.h"
+
 #include "AccountPanel.h"
 
 enum {ACCOUNT_NUMBER, ACCOUNT_NAME, ACCOUNT_INIT, ACCOUNT_CUR, ACCOUNT_FINAL, NUMBER_COLS_ACCOUNTS};

src/view/AccountPanel.h

@@ -26,16 +26,17 @@
 #include <wx/pie/pieplot.h>
 #include <wx/chartpanel.h>
 #include <wx/radiobox.h>
-#include "grid/CalendarEditor.h"
-#include "grid/wxGridCellBitmapRenderer.h"
 
 #include "view.h"
 
-#include <controller/KissCount.h>
+//#include <controller/KissCount.h>
 #include <model/model.h>
 #include "grid/GridAccount.h"
+#include "grid/CalendarEditor.h"
 #include <wx/category/categorysimpledataset.h>
 
+class GridAccount;
+
 class AccountPanel: public KissPanel
 {
 public:

src/view/ExportPanel.cpp

@@ -17,6 +17,8 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "grid/CalendarEditor.h"
+#include "grid/wxGridCellBitmapRenderer.h"
 #include "ExportPanel.h"
 
 enum {EXPORT_ID=1, SEARCH_ID, GRID_ID};

src/view/ExportPanel.h

@@ -25,8 +25,6 @@
 #include <wx/treectrl.h>
 #include <wx/scrolwin.h>
 #include "view.h"
-#include "grid/CalendarEditor.h"
-#include "grid/wxGridCellBitmapRenderer.h"
 #include "grid/GridAccount.h"
 #include "SearchBanner.h"
 #include <model/model.h>

src/view/GenerateDialog.cpp

@@ -17,6 +17,10 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <wx/choice.h>
+#include <wx/textctrl.h>
+#include <wx/gbsizer.h>
+
 #include "GenerateDialog.h"
 
 enum {BUTTON_OK_ID=1, BUTTON_CANCEL_ID, YEAR_FROM_ID, MONTH_FROM_ID, YEAR_TO_ID, MONTH_TO_ID};

src/view/GenerateDialog.h

@@ -20,15 +20,14 @@
 #ifndef GENERATEDIALOG_H
 #define GENERATEDIALOG_H
 
-#include <list>
+#include <map>
 
 #include <wx/wx.h>
-#include <wx/choice.h>
-#include <wx/textctrl.h>
 #include <controller/KissCount.h>
-#include "wxUI.h"
 #include <model/model.h>
 
+#include "wxUI.h"
+
 class wxUI;
 class KissCount;
 

src/view/ImportPanel.cpp

@@ -17,6 +17,16 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <wx/colordlg.h>
+#include <wx/fontdlg.h>
+#include <wx/treectrl.h>
+#include <wx/statbox.h>
+#include <wx/gbsizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/bmpcbox.h>
+#include <wx/grid.h>
+
 #include "ImportPanel.h"
 
 enum {OPEN_FILE_ID=1, BUTTON_OPEN_ID, NAME_ID, BUTTON_LOAD_ID, BUTTON_INTEGRATE_ID, CHECK_SAVE_ID, OPS_GRID_ID};

src/view/ImportPanel.h

@@ -21,20 +21,13 @@
 #define IMPORTPANEL_H
 
 #include <wx/wx.h>
-#include <wx/grid.h>
-#include <wx/treectrl.h>
-#include <wx/statbox.h>
-#include <wx/gbsizer.h>
-#include <wx/stattext.h>
-#include <wx/textctrl.h>
-#include <wx/bmpcbox.h>
-#include <wx/colordlg.h>
-#include <wx/fontdlg.h>
 
 #include "view.h"
 #include <model/model.h>
 #include <model/import/ImportEngine.h>
 
+#include "grid/GridAccount.h"
+
 class ImportPanel: public KissPanel
 {
 public:

src/view/KissPanel.h

@@ -24,6 +24,8 @@
 #include <wx/scrolwin.h>
 #include <wx/bmpbuttn.h>
 
+#include "wxUI.h"
+
 class wxUI;
 class KissCount;
 

src/view/PasswordDialog.cpp

@@ -17,6 +17,10 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <wx/choice.h>
+#include <wx/textctrl.h>
+#include <wx/gbsizer.h>
+
 #include "PasswordDialog.h"
 
 enum {BUTTON_OK_ID=1, BUTTON_CANCEL_ID, OLD_PASSWORD_ID, NEW_PASSWORD_ID, CONFIRM_PASSWORD_ID};

src/view/PasswordDialog.h

@@ -20,12 +20,7 @@
 #ifndef PASSWORDDIALOG_H
 #define PASSWORDDIALOG_H
 
-#include <list>
-
 #include <wx/wx.h>
-#include <wx/choice.h>
-#include <wx/textctrl.h>
-#include <controller/KissCount.h>
 #include "wxUI.h"
 #include <model/model.h>
 

src/view/PreferencesPanel.cpp

@@ -17,6 +17,23 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <wx/grid.h>
+#include <wx/treectrl.h>
+#include <wx/statbox.h>
+#include <wx/gbsizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/bmpcbox.h>
+#include <wx/colordlg.h>
+#include <wx/fontdlg.h>
+
+#include "grid/wxMyGrid.h"
+#include "grid/wxGridCellStarEditor.h"
+#include "grid/wxGridCellFastBoolEditor.h"
+#include "grid/wxGridCellButtonRenderer.h"
+#include "grid/wxGridCellButtonEditor.h"
+#include "PasswordDialog.h"
+
 #include "PreferencesPanel.h"
 
 enum {ACCOUNT_NAME, ACCOUNT_NUMBER, ACCOUNT_DEFAULT, ACCOUNT_VIRTUAL, ACCOUNT_BLOCKED, ACCOUNT_DELETE, NUMBER_COLS_ACCOUNT};

src/view/PreferencesPanel.h

@@ -21,21 +21,11 @@
 #define PREFERENCESPANEL_H
 
 #include <wx/wx.h>
-#include <wx/grid.h>
-#include <wx/treectrl.h>
-#include <wx/statbox.h>
-#include <wx/gbsizer.h>
-#include <wx/stattext.h>
-#include <wx/textctrl.h>
 #include <wx/bmpcbox.h>
-#include <wx/colordlg.h>
-#include <wx/fontdlg.h>
 
 #include "view.h"
 #include <model/model.h>
-#include "PasswordDialog.h"
 #include "SupportedLanguages.h"
-#include "grid/wxGridCellStarEditor.h"
 
 class PreferencesPanel: public KissPanel
 {

src/view/SearchBanner.h

@@ -22,6 +22,7 @@
 
 #include <wx/wx.h>
 #include <wx/grid.h>
+#include <wx/gbsizer.h>
 #include <wx/treectrl.h>
 #include <wx/scrolwin.h>
 #include "view.h"

src/view/SearchPanel.cpp

@@ -17,7 +17,12 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "AccountPanel.h"
+#include <wx/treectrl.h>
+#include <wx/scrolwin.h>
+#include "grid/CalendarEditor.h"
+#include "grid/wxGridCellBitmapRenderer.h"
+
+#include "SearchPanel.h"
 
 enum {SEARCH_ID=1, GRID_ID,
       CHANGE_ACCOUNT_ID, CHANGE_CATEGORY_ID, RENAME_ID};

src/view/SearchPanel.h

@@ -22,11 +22,7 @@
 
 #include <wx/wx.h>
 #include <wx/grid.h>
-#include <wx/treectrl.h>
-#include <wx/scrolwin.h>
 #include "view.h"
-#include "grid/CalendarEditor.h"
-#include "grid/wxGridCellBitmapRenderer.h"
 #include "grid/GridAccount.h"
 #include "AccountPanel.h"
 #include "SearchBanner.h"
@@ -34,7 +30,6 @@
 #include <model/model.h>
 
 class GridAccount;
-class SearchBanner;
 
 class SearchPanel: public KissPanel
 {

src/view/StatsPanel.cpp

@@ -17,6 +17,9 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <wx/xy/xylinerenderer.h>
+#include <wx/xy/xysimpledataset.h>
+
 #include "StatsPanel.h"
 
 enum {RANGE_ID=1, ACCOUNTS_ID};

src/view/StatsPanel.h

@@ -24,16 +24,14 @@
 #include <wx/grid.h>
 #include <wx/choice.h>
 
-#include <wx/xy/xyplot.h>
-#include <wx/xy/xylinerenderer.h>
-#include <wx/xy/xysimpledataset.h>
 #include <wx/chart.h>
 #include <wx/grid.h>
 #include <wx/pie/pieplot.h>
 #include <wx/chartpanel.h>
 #include <wx/category/categorysimpledataset.h>
+#include <wx/calctrl.h>
+#include <wx/xy/xyplot.h>
 
-#include <controller/KissCount.h>
 #include "view.h"
 #include <model/model.h>
 

src/view/UsersDialog.cpp

@@ -17,6 +17,11 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <wx/choice.h>
+#include <wx/textctrl.h>
+#include <wx/textdlg.h>
+#include <wx/gbsizer.h>
+
 #include "UsersDialog.h"
 
 enum {TEXT_PASSWORD_ID=1, BUTTON_OK_ID, BUTTON_CANCEL_ID, BUTTON_NEW_USER_ID};

src/view/UsersDialog.h

@@ -23,10 +23,6 @@
 #include <list>
 
 #include <wx/wx.h>
-#include <wx/choice.h>
-#include <wx/textctrl.h>
-#include <wx/textdlg.h>
-#include <controller/KissCount.h>
 #include "wxUI.h"
 
 class wxUI;

src/view/grid/GridAccount.h

@@ -31,6 +31,7 @@
 #include "wxGridCellFastBoolEditor.h"
 #include "wxGridCellTreeButtonRenderer.h"
 #include "wxGridCellTreeButtonEditor.h"
+#include "wxGridCellBitmapRenderer.h"
 #include "wxGridCellFormulaEditor.h"
 #include "wxGridCellTabStringRenderer.h"
 

src/view/grid/wxGridCellFormulaEditor.cpp

@@ -48,7 +48,7 @@ bool wxGridCellFormulaEditor::EndEdit (int row, int col, wxGrid *grid/*, const w
     wxString res = GetValue();
     Operation op;
     char* str, *str2;
-    struct parse_opt opt, *r;
+    struct ParseExp::parse_opt opt, *r;
     bool ret;
 
     res = res.Trim();
@@ -62,7 +62,7 @@ bool wxGridCellFormulaEditor::EndEdit (int row, int col, wxGrid *grid/*, const w
 	r = &opt;
 	str = str2;
 	try {
-	    ParseExp(&str2, r, false);
+	    ParseExp::ParseExp(&str2, r, false);
 	}
 	catch(...)
 	{
@@ -76,7 +76,7 @@ bool wxGridCellFormulaEditor::EndEdit (int row, int col, wxGrid *grid/*, const w
 
 	ret = wxGridCellTextEditor::EndEdit(row, col, grid);
 
-	grid->SetCellValue(row, col, wxString::Format(wxT("%.2lf"), EvaluateExpr(&opt, true)));
+	grid->SetCellValue(row, col, wxString::Format(wxT("%.2lf"), ParseExp::EvaluateExpr(&opt, true)));
     }
     else
     {

src/view/view.h

@@ -20,6 +20,8 @@
 #ifndef VIEW_H
 #define VIEW_H
 
+#include <wx/colour.h>
+
 namespace view {
     const wxColour OWN_CYAN(0x99, 0xCC, 0xFF);
     const wxColour OWN_YELLOW(0xFF, 0xFF, 0x99);

src/view/wxUI.cpp

@@ -17,6 +17,20 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "AccountPanel.h"
+#include "PreferencesPanel.h"
+#include "UsersDialog.h"
+#include "GenerateDialog.h"
+#include "SearchPanel.h"
+#include "StatsPanel.h"
+#include "ImportPanel.h"
+#include "ExportPanel.h"
+
+#include "grid/wxMyGrid.h"
+#include "grid/wxGridCellFastBoolEditor.h"
+#include "grid/wxGridCellButtonRenderer.h"
+#include "grid/wxGridCellButtonEditor.h"
+
 #include "wxUI.h"
 
 enum {BUTTON_CHANGE_USER_ID=-4, BUTTON_ABOUT_ID=-5, BUTTON_QUIT_ID=-6};

src/view/wxUI.h

@@ -23,19 +23,9 @@
 class ImportEngine;
 
 #include <wx/wx.h>
-#include "AccountPanel.h"
-#include "PreferencesPanel.h"
-#include "UsersDialog.h"
-#include "GenerateDialog.h"
-#include "SearchPanel.h"
-#include "StatsPanel.h"
-#include "ImportPanel.h"
-#include "ExportPanel.h"
 #include <controller/KissCount.h>
-#include "grid/wxMyGrid.h"
-#include "grid/wxGridCellFastBoolEditor.h"
-#include "grid/wxGridCellButtonRenderer.h"
-#include "grid/wxGridCellButtonEditor.h"
+
+#include "KissPanel.h"
 
 #ifdef WIN32
 #undef _
@@ -43,6 +33,7 @@ class ImportEngine;
 #endif
 
 class KissCount;
+class KissPanel;
 class AccountPanel;
 class PreferencesPanel;