Rename header files in .hpp

src/ParseExp.cpp

@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <iostream>
 
-#include "ParseExp.h"
+#include "ParseExp.hpp"
 
 /*
   Algorithm

src/controller/KissCount.cpp

@@ -21,9 +21,9 @@
 #include <iostream>
 #include <algorithm>
 
-#include "KissCount.h"
+#include "KissCount.hpp"
 
-#include <view/view.h>
+#include <view/view.hpp>
  
 std::vector<ImportEngine*> * KissCount::_importEngines;
 std::vector<ExportEngine*> * KissCount::_exportEngines;

src/controller/KissCount.hpp

@@ -22,13 +22,13 @@
 
 #include <list>
 
-#include <model/import/ImportEngine.h>
-#include <model/export/ExportEngine.h>
-#include <model/model.h>
+#include <model/import/ImportEngine.hpp>
+#include <model/export/ExportEngine.hpp>
+#include <model/model.hpp>
 
 #include <wx/display.h>
 
-#include <view/wxUI.h>
+#include <view/wxUI.hpp>
 
 #define APP_VERSION "0.3"
 

src/main.cpp

@@ -18,7 +18,7 @@
 */
 
 #include <wx/wx.h>
-#include <controller/KissCount.h>
+#include <controller/KissCount.hpp>
 
 class MyApp: public wxApp
 {

src/model/Database.cpp

@@ -22,7 +22,7 @@
 #include <wx/file.h>
 #include <sha1.h>
 
-#include "Database.h"
+#include "Database.hpp"
 
 static inline wxString DoubleToString(double d)
 {
@@ -373,7 +373,7 @@ void Database::LoadYear(User* user, int year)
         op.parent = set.GetAsString(wxT("parent"));
         op.account = set.GetAsString(wxT("account"));
         op.day = set.GetInt(wxT("day"));
-        op.month = set.GetInt(wxT("month"));
+        op.month = set.GetInt(wxT("monthpp"));
         op.year = set.GetInt(wxT("year"));
         op.amount = set.GetDouble(wxT("amount"));
         op.description = set.GetAsString(wxT("description"));
@@ -464,7 +464,7 @@ bool Database::GetOperation(const wxString& id, Operation* op)
     op->parent = set.GetAsString(wxT("parent"));
     op->account = set.GetAsString(wxT("account"));
     op->day = set.GetInt(wxT("day"));
-    op->month = set.GetInt(wxT("month"));
+    op->month = set.GetInt(wxT("monthpp"));
     op->year = set.GetInt(wxT("year"));
     op->amount = set.GetDouble(wxT("amount"));
     op->description = set.GetAsString(wxT("description"));
@@ -710,7 +710,7 @@ bool Database::LoadOperation(User* user, const wxString& id)
         op.parent = set.GetAsString(wxT("parent"));
         op.account = set.GetAsString(wxT("account"));
         op.day = set.GetInt(wxT("day"));
-        op.month = set.GetInt(wxT("month"));
+        op.month = set.GetInt(wxT("monthpp"));
         op.year = set.GetInt(wxT("year"));
         op.amount = set.GetDouble(wxT("amount"));
         op.description = set.GetAsString(wxT("description"));
@@ -1146,7 +1146,7 @@ std::map<int, std::vector<int> > Database::GetAllOperations(User* user)
 
             while (set2.NextRow())
 	    {
-                res[year].push_back(set2.GetInt(wxT("month")));
+                res[year].push_back(set2.GetInt(wxT("monthpp")));
 	    }
             set2.Finalize();
 	}
@@ -1499,7 +1499,7 @@ std::vector<Operation>* Database::Search(User* user, wxString* description, wxDa
         op.parent = set.GetAsString(wxT("parent"));
         op.account = set.GetAsString(wxT("account"));
         op.day = set.GetInt(wxT("day"));
-        op.month = set.GetInt(wxT("month"));
+        op.month = set.GetInt(wxT("monthpp"));
         op.year = set.GetInt(wxT("year"));
         op.amount = set.GetDouble(wxT("amount"));
         op.description = set.GetAsString(wxT("description"));
@@ -1543,7 +1543,7 @@ void Database::GetStats(User* user, const wxString& monthFrom, const wxString& y
 
 		while (set.NextRow())
 		{
-		    (*accountAmounts)[accountIt->id][set.GetInt(wxT("year"))][set.GetInt(wxT("month"))] = set.GetInt(wxT("amount"));
+		    (*accountAmounts)[accountIt->id][set.GetInt(wxT("year"))][set.GetInt(wxT("monthpp"))] = set.GetInt(wxT("amount"));
 		}
 		set.Finalize();
 	    }

src/model/Database.hpp

@@ -24,8 +24,8 @@
 #include <wx/wxsqlite3.h>
 #include <wx/wx.h>
 
-#include <controller/KissCount.h>
-#include "model.h"
+#include <controller/KissCount.hpp>
+#include "model.hpp"
 
 #define BDD_FILE     "/.kisscount/kc.bdd"
 #define INIT_SCRIPT  RESSOURCES_ROOT "init.sql"

src/model/Database_Update.cpp

@@ -17,7 +17,7 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "Database.h"
+#include "Database.hpp"
 
 #define ON_ERROR(m)						\
     wxMessageBox(wxT(m), _("Error"), wxICON_ERROR | wxOK);	\

src/model/Operation.cpp

@@ -17,7 +17,7 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "Operation.h"
+#include "Operation.hpp"
 
 bool sortOperations(const Operation& op1, const Operation& op2)
 {

src/model/User.cpp

@@ -18,8 +18,8 @@
 */
 
 #include <algorithm>
-#include <view/view.h>
-#include "User.h"
+#include <view/view.hpp>
+#include "User.hpp"
 
 User::User(Database* db) : _db(db)
 {}

src/model/User.hpp

@@ -24,11 +24,11 @@
 #include <vector>
 #include <wx/wx.h>
 
-#include "Category.h"
-#include "Account.h"
-#include "Operation.h"
-#include "Database.h"
-#include "import/ImportEngine.h"
+#include "Category.hpp"
+#include "Account.hpp"
+#include "Operation.hpp"
+#include "Database.hpp"
+#include "import/ImportEngine.hpp"
 
 class Database;
 class ImportPattern;

src/model/export/ExportEngine.cpp

@@ -17,7 +17,7 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ExportEngine.h"
+#include "ExportEngine.hpp"
 
 ExportEngine::ExportEngine()
 {

src/model/export/ExportEngine.hpp

@@ -20,9 +20,9 @@
 #ifndef EXPORTENGINE_H
 #define EXPORTENGINE_H
 
-#include <model/model.h>
-#include <controller/KissCount.h>
-#include <model/AccountAmount.h>
+#include <model/model.hpp>
+#include <controller/KissCount.hpp>
+#include <model/AccountAmount.hpp>
 
 class KissCount;
 

src/model/export/XMLExportEngine.cpp

@@ -20,7 +20,7 @@
 #include <libxml/encoding.h>
 #include <libxml/xmlwriter.h>
 
-#include "XMLExportEngine.h"
+#include "XMLExportEngine.hpp"
 
 static XMLExportEngine xmlExportEngine;
 
@@ -76,7 +76,7 @@ bool XMLExportEngine::SaveAccountAmounts()
     {
 	xmlTextWriterStartElement(_writer, (const xmlChar*) "account_amount");
 	xmlTextWriterWriteAttribute(_writer, (const xmlChar*) "account", (const xmlChar*) it->first.account.utf8_str().data());
-	xmlTextWriterWriteFormatAttribute(_writer, (const xmlChar*) "month", "%d", it->first.month);
+	xmlTextWriterWriteFormatAttribute(_writer, (const xmlChar*) "monthpp", "%d", it->first.month);
 	xmlTextWriterWriteFormatAttribute(_writer, (const xmlChar*) "year", "%d", it->first.year);
 	xmlTextWriterWriteFormatAttribute(_writer, (const xmlChar*) "amount", "%.2lf", it->second);
 	xmlTextWriterEndElement(_writer);
@@ -128,7 +128,7 @@ bool XMLExportEngine::SaveOperations(std::vector<Operation>* operations)
 	xmlTextWriterWriteAttribute(_writer, (const xmlChar*) "id", (const xmlChar*) it->id.utf8_str().data());
 	xmlTextWriterWriteAttribute(_writer, (const xmlChar*) "parent", (const xmlChar*) it->parent.utf8_str().data());
 	xmlTextWriterWriteFormatAttribute(_writer, (const xmlChar*) "day", "%d", it->day);
-	xmlTextWriterWriteFormatAttribute(_writer, (const xmlChar*) "month", "%d", it->month);
+	xmlTextWriterWriteFormatAttribute(_writer, (const xmlChar*) "monthpp", "%d", it->month);
 	xmlTextWriterWriteFormatAttribute(_writer, (const xmlChar*) "year", "%d", it->year);
 	xmlTextWriterWriteFormatAttribute(_writer, (const xmlChar*) "amount", "%.2lf", it->amount);
 	xmlTextWriterWriteAttribute(_writer, (const xmlChar*) "description", (const xmlChar*) it->description.utf8_str().data());

src/model/export/XMLExportEngine.hpp

@@ -20,9 +20,9 @@
 #ifndef XMLEXPORTENGINE_H
 #define XMLEXPORTENGINE_H
 
-#include <model/model.h>
-#include <controller/KissCount.h>
-#include "ExportEngine.h"
+#include <model/model.hpp>
+#include <controller/KissCount.hpp>
+#include "ExportEngine.hpp"
 
 class XMLExportEngine : public ExportEngine {
 public:

src/model/import/GrisbiImportEngine.cpp

@@ -17,9 +17,9 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "GrisbiImportEngine.h"
+#include "GrisbiImportEngine.hpp"
 
-#include <view/view.h>
+#include <view/view.hpp>
 
 static GrisbiImportEngine grisbiImportEngine;
 

src/model/import/GrisbiImportEngine.hpp

@@ -22,7 +22,7 @@
 
 #include <libxml/parser.h>
 
-#include "ImportEngine.h"
+#include "ImportEngine.hpp"
 
 class GrisbiImportEngine : public ImportEngine {
 public:

src/model/import/ImportEngine.cpp

@@ -19,7 +19,7 @@
 
 #include <algorithm>
 
-#include "ImportEngine.h"
+#include "ImportEngine.hpp"
 
 wxString ImportEngine::NULL_IMPORT_PATTERN = wxT("(nil)");
 

src/model/import/ImportEngine.hpp

@@ -20,9 +20,9 @@
 #ifndef IMPORTENGINE_H
 #define IMPORTENGINE_H
 
-#include <model/model.h>
-#include <controller/KissCount.h>
-#include <model/AccountAmount.h>
+#include <model/model.hpp>
+#include <controller/KissCount.hpp>
+#include <model/AccountAmount.hpp>
 
 class KissCount;
 

src/model/import/OFXImportEngine.cpp

@@ -17,7 +17,7 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "OFXImportEngine.h"
+#include "OFXImportEngine.hpp"
 
 static OFXImportEngine ofxImportEngine;
 

src/model/import/OFXImportEngine.hpp

@@ -20,7 +20,7 @@
 #ifndef OFXIMPORTENGINE_H
 #define OFXIMPORTENGINE_H
 
-#include "ImportEngine.h"
+#include "ImportEngine.hpp"
 #include <libofx/libofx.h>
 
 class OFXImportEngine : public ImportEngine {

src/model/import/XMLImportEngine.cpp

@@ -17,7 +17,7 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "XMLImportEngine.h"
+#include "XMLImportEngine.hpp"
 
 static XMLImportEngine xmlImportEngine;
 
@@ -80,7 +80,7 @@ void XMLImportEngine::LoadAccountAmount(XMLImportEngine* _this, const char** att
 	if (!strcmp(attrs[i], "account"))
 	    accountAmount.account = wxString(attrs[i+1], wxConvUTF8);
 
-	else if (!strcmp(attrs[i], "month"))
+	else if (!strcmp(attrs[i], "monthpp"))
 	{
 	    wxString(attrs[i+1], wxConvUTF8).ToLong(&v);
 	    accountAmount.month = v;
@@ -169,7 +169,7 @@ void XMLImportEngine::LoadOperation(XMLImportEngine* _this, const char** attrs)
 	    op.day = v;
 	}
 
-	else if (!strcmp(attrs[i], "month"))
+	else if (!strcmp(attrs[i], "monthpp"))
 	{
 	    wxString(attrs[i+1], wxConvUTF8).ToLong(&v);
 	    op.month = v;

src/model/import/XMLImportEngine.hpp

@@ -22,7 +22,7 @@
 
 #include <libxml/parser.h>
 
-#include "ImportEngine.h"
+#include "ImportEngine.hpp"
 
 class XMLImportEngine : public ImportEngine {
 public:

src/model/model.hpp

@@ -25,9 +25,9 @@ class Database;
 class Account;
 class Operation;
 
-#include <model/User.h>
-#include <model/Database.h>
-#include <model/Account.h>
-#include <model/Operation.h>
+#include <model/User.hpp>
+#include <model/Database.hpp>
+#include <model/Account.hpp>
+#include <model/Operation.hpp>
 
 #endif

src/sha1.cpp

@@ -26,7 +26,7 @@
  */
 
 /* this is only to get definitions for memcpy(), ntohl() and htonl() */
-//#include "../git-compat-util.h"
+//#include "../git-compat-util.hpp"
 extern "C" {
 #include <string.h>
 #include "sha1.h"

src/view/AccountPanel.cpp

@@ -17,10 +17,10 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "grid/wxGridCellBitmapRenderer.h"
-#include "GenerateDialog.h"
+#include "grid/wxGridCellBitmapRenderer.hpp"
+#include "GenerateDialog.hpp"
 
-#include "AccountPanel.h"
+#include "AccountPanel.hpp"
 
 enum {ACCOUNT_NUMBER, ACCOUNT_NAME, ACCOUNT_INIT, ACCOUNT_CUR, ACCOUNT_FINAL, NUMBER_COLS_ACCOUNTS};
 enum {CUR_CREDIT, CUR_DEBIT, TOTAL_CREDIT, TOTAL_DEBIT, BALANCE, STATS_ROW, CATS_STATS, NON_FIX};
@@ -730,7 +730,7 @@ void AccountPanel::OnTreeRightClick(wxTreeEvent& event)
 {
     wxMenu menu(0);
 
-    menu.Append(MENU_GENERATE_ID, _("Generate month"));
+    menu.Append(MENU_GENERATE_ID, _("Generate monthpp"));
     menu.AppendSeparator();
     if (_tree.GetCount() > 1)
         menu.Append(MENU_DELETE_ID, _("Delete"));

src/view/AccountPanel.hpp

@@ -27,12 +27,11 @@
 #include <wx/chartpanel.h>
 #include <wx/radiobox.h>
 
-#include "view.h"
+#include "view.hpp"
 
-//#include <controller/KissCount.h>
-#include <model/model.h>
-#include "grid/GridAccount.h"
-#include "grid/CalendarEditor.h"
+#include <model/model.hpp>
+#include "grid/GridAccount.hpp"
+#include "grid/CalendarEditor.hpp"
 #include <wx/category/categorysimpledataset.h>
 
 class GridAccount;

src/view/ExportPanel.cpp

@@ -17,9 +17,9 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "grid/CalendarEditor.h"
-#include "grid/wxGridCellBitmapRenderer.h"
-#include "ExportPanel.h"
+#include "grid/CalendarEditor.hpp"
+#include "grid/wxGridCellBitmapRenderer.hpp"
+#include "ExportPanel.hpp"
 
 enum {EXPORT_ID=1, SEARCH_ID, GRID_ID};
 
@@ -43,7 +43,7 @@ ExportPanel::ExportPanel(KissCount* kiss, wxUI *parent) : KissPanel(kiss, parent
 
     SetSizer(vbox);
   
-    _searchButton = new wxButton(this, SEARCH_ID, _("Search"));
+    _searchButton = new wxButton(this, SEARCH_ID, _("Searchpp"));
 
     _banner = new SearchBanner(kiss, this, this, OnEnter);
 

src/view/ExportPanel.hpp

@@ -24,11 +24,11 @@
 #include <wx/grid.h>
 #include <wx/treectrl.h>
 #include <wx/scrolwin.h>
-#include "view.h"
-#include "grid/GridAccount.h"
-#include "SearchBanner.h"
-#include <model/model.h>
-#include <model/export/ExportEngine.h>
+#include "view.hpp"
+#include "grid/GridAccount.hpp"
+#include "SearchBanner.hpp"
+#include <model/model.hpp>
+#include <model/export/ExportEngine.hpp>
 
 class GridAccount;
 class SearchBanner;

src/view/GenerateDialog.cpp

@@ -21,7 +21,7 @@
 #include <wx/textctrl.h>
 #include <wx/gbsizer.h>
 
-#include "GenerateDialog.h"
+#include "GenerateDialog.hpp"
 
 enum {BUTTON_OK_ID=1, BUTTON_CANCEL_ID, YEAR_FROM_ID, MONTH_FROM_ID, YEAR_TO_ID, MONTH_TO_ID};
 
@@ -32,7 +32,7 @@ EVT_CHOICE(YEAR_FROM_ID, GenerateDialog::OnYearFromChange)
 EVT_CHOICE(YEAR_TO_ID, GenerateDialog::OnYearToChange)
 END_EVENT_TABLE()
 
-GenerateDialog::GenerateDialog(KissCount* kiss, wxUI *parent, int month, int year) : wxDialog(&(*parent), wxID_ANY, _("Generate month")), _kiss(kiss), _wxUI(parent)
+GenerateDialog::GenerateDialog(KissCount* kiss, wxUI *parent, int month, int year) : wxDialog(&(*parent), wxID_ANY, _("Generate monthpp")), _kiss(kiss), _wxUI(parent)
 {
     wxGridBagSizer *gridBagSizer;
     wxStaticText* label;

src/view/GenerateDialog.hpp

@@ -23,10 +23,10 @@
 #include <map>
 
 #include <wx/wx.h>
-#include <controller/KissCount.h>
-#include <model/model.h>
+#include <controller/KissCount.hpp>
+#include <model/model.hpp>
 
-#include "wxUI.h"
+#include "wxUI.hpp"
 
 class wxUI;
 class KissCount;

src/view/ImportPanel.cpp

@@ -27,7 +27,7 @@
 #include <wx/bmpcbox.h>
 #include <wx/grid.h>
 
-#include "ImportPanel.h"
+#include "ImportPanel.hpp"
 
 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.hpp

@@ -22,11 +22,11 @@
 
 #include <wx/wx.h>
 
-#include "view.h"
-#include <model/model.h>
-#include <model/import/ImportEngine.h>
+#include "view.hpp"
+#include <model/model.hpp>
+#include <model/import/ImportEngine.hpp>
 
-#include "grid/GridAccount.h"
+#include "grid/GridAccount.hpp"
 
 class ImportPanel: public KissPanel
 {

src/view/KissPanel.hpp

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

src/view/PasswordDialog.cpp

@@ -21,7 +21,7 @@
 #include <wx/textctrl.h>
 #include <wx/gbsizer.h>
 
-#include "PasswordDialog.h"
+#include "PasswordDialog.hpp"
 
 enum {BUTTON_OK_ID=1, BUTTON_CANCEL_ID, OLD_PASSWORD_ID, NEW_PASSWORD_ID, CONFIRM_PASSWORD_ID};
 

src/view/PasswordDialog.hpp

@@ -21,8 +21,8 @@
 #define PASSWORDDIALOG_H
 
 #include <wx/wx.h>
-#include "wxUI.h"
-#include <model/model.h>
+#include "wxUI.hpp"
+#include <model/model.hpp>
 
 class wxUI;
 class KissCount;

src/view/PreferencesPanel.cpp

@@ -27,14 +27,14 @@
 #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 "grid/wxMyGrid.hpp"
+#include "grid/wxGridCellStarEditor.hpp"
+#include "grid/wxGridCellFastBoolEditor.hpp"
+#include "grid/wxGridCellButtonRenderer.hpp"
+#include "grid/wxGridCellButtonEditor.hpp"
+#include "PasswordDialog.hpp"
 
-#include "PreferencesPanel.h"
+#include "PreferencesPanel.hpp"
 
 enum {ACCOUNT_NAME, ACCOUNT_NUMBER, ACCOUNT_DEFAULT, ACCOUNT_VIRTUAL, ACCOUNT_BLOCKED, ACCOUNT_DELETE, NUMBER_COLS_ACCOUNT};
 enum {CATEGORY_NAME, CATEGORY_BACKGROUND_COLOR, CATEGORY_FOREGROUND_COLOR, CATEGORY_FONT, CATEGORY_DELETE, NUMBER_COLS_CATEGORY};
@@ -78,7 +78,7 @@ PreferencesPanel::PreferencesPanel(KissCount* kiss, wxUI *parent) : KissPanel(ki
     staticCategories = new wxStaticBox(this, wxID_ANY, _("Categories"));
     staticLanguage = new wxStaticBox(this, wxID_ANY, _("Language"));
     staticOperationOrder = new wxStaticBox(this, wxID_ANY, _("Operation order"));
-    staticSharedWith = new wxStaticBox(this, wxID_ANY, _("Shared with"));
+    staticSharedWith = new wxStaticBox(this, wxID_ANY, _("Shared withpp"));
 
     // User
     staticBoxSizer = new wxStaticBoxSizer (staticUser, wxVERTICAL);

src/view/PreferencesPanel.hpp

@@ -23,9 +23,9 @@
 #include <wx/wx.h>
 #include <wx/bmpcbox.h>
 
-#include "view.h"
-#include <model/model.h>
-#include "SupportedLanguages.h"
+#include "view.hpp"
+#include <model/model.hpp>
+#include "SupportedLanguages.hpp"
 
 class PreferencesPanel: public KissPanel
 {

src/view/SearchBanner.cpp

@@ -17,7 +17,7 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "SearchBanner.h"
+#include "SearchBanner.hpp"
 
 enum {DESCRIPTION_ID=1, CALENDAR_FROM_ID, CALENDAR_TO_ID};
 

src/view/SearchBanner.hpp

@@ -25,10 +25,10 @@
 #include <wx/gbsizer.h>
 #include <wx/treectrl.h>
 #include <wx/scrolwin.h>
-#include "view.h"
-#include "grid/CalendarEditor.h"
+#include "view.hpp"
+#include "grid/CalendarEditor.hpp"
 
-#include <model/model.h>
+#include <model/model.hpp>
 
 typedef void (*OnButtonEnter)(void* caller, wxCommandEvent& event);
 

src/view/SearchPanel.cpp

@@ -19,10 +19,10 @@
 
 #include <wx/treectrl.h>
 #include <wx/scrolwin.h>
-#include "grid/CalendarEditor.h"
-#include "grid/wxGridCellBitmapRenderer.h"
+#include "grid/CalendarEditor.hpp"
+#include "grid/wxGridCellBitmapRenderer.hpp"
 
-#include "SearchPanel.h"
+#include "SearchPanel.hpp"
 
 enum {SEARCH_ID=1, GRID_ID,
       CHANGE_ACCOUNT_ID, CHANGE_CATEGORY_ID, RENAME_ID};
@@ -50,7 +50,7 @@ SearchPanel::SearchPanel(KissCount* kiss, wxUI *parent) : KissPanel(kiss, parent
 
     SetSizer(vbox);
   
-    _searchButton = new wxButton(this, SEARCH_ID, _("Search"));
+    _searchButton = new wxButton(this, SEARCH_ID, _("Searchpp"));
 
     _banner = new SearchBanner(kiss, this, this, OnEnter);
 
@@ -99,7 +99,7 @@ wxBitmapButton* SearchPanel::GetButton(int id)
 
 wxString SearchPanel::GetToolTip()
 {
-    return _("Search");
+    return _("Searchpp");
 }
 
 void SearchPanel::OnEnter(void* caller, wxCommandEvent& event)
@@ -256,7 +256,7 @@ void SearchPanel::OnButtonRename(wxCommandEvent& event)
 
 void SearchPanel::OnShow(wxShowEvent& event)
 {
-    _wxUI->SetTitle(_kiss->GetUser()->_name + wxT(" - ") + _("Search"));
+    _wxUI->SetTitle(_kiss->GetUser()->_name + wxT(" - ") + _("Searchpp"));
 }
 
 void SearchPanel::OnOperationModified(wxGridEvent& event)

src/view/SearchPanel.hpp

@@ -22,12 +22,12 @@
 
 #include <wx/wx.h>
 #include <wx/grid.h>
-#include "view.h"
-#include "grid/GridAccount.h"
-#include "AccountPanel.h"
-#include "SearchBanner.h"
+#include "view.hpp"
+#include "grid/GridAccount.hpp"
+#include "AccountPanel.hpp"
+#include "SearchBanner.hpp"
 
-#include <model/model.h>
+#include <model/model.hpp>
 
 class GridAccount;
 

src/view/StatsPanel.cpp

@@ -20,7 +20,7 @@
 #include <wx/xy/xylinerenderer.h>
 #include <wx/xy/xysimpledataset.h>
 
-#include "StatsPanel.h"
+#include "StatsPanel.hpp"
 
 enum {RANGE_ID=1, ACCOUNTS_ID};
 

src/view/StatsPanel.hpp

@@ -32,8 +32,8 @@
 #include <wx/calctrl.h>
 #include <wx/xy/xyplot.h>
 
-#include "view.h"
-#include <model/model.h>
+#include "view.hpp"
+#include <model/model.hpp>
 
 class StatsPanel: public KissPanel
 {

src/view/SupportedLanguages.hpp

@@ -34,7 +34,7 @@ namespace SupportedLanguages {
     const int NB_SUPPORTED_LANGUAGES = 2;
 
     static const language languages[NB_SUPPORTED_LANGUAGES] = {
-        { wxT("English"), wxT(ICONS_PATH "/United Kingdom.png"), wxLANGUAGE_ENGLISH},
+        { wxT("Englishpp"), wxT(ICONS_PATH "/United Kingdom.png"), wxLANGUAGE_ENGLISH},
         { wxT("Français"), wxT(ICONS_PATH "/France.png"), wxLANGUAGE_FRENCH}
     };
 }

src/view/UsersDialog.cpp

@@ -22,7 +22,7 @@
 #include <wx/textdlg.h>
 #include <wx/gbsizer.h>
 
-#include "UsersDialog.h"
+#include "UsersDialog.hpp"
 
 enum {TEXT_PASSWORD_ID=1, BUTTON_OK_ID, BUTTON_CANCEL_ID, BUTTON_NEW_USER_ID};
 

src/view/UsersDialog.hpp

@@ -23,7 +23,7 @@
 #include <list>
 
 #include <wx/wx.h>
-#include "wxUI.h"
+#include "wxUI.hpp"
 
 class wxUI;
 class KissCount;

src/view/grid/CalendarEditor.cpp

@@ -17,7 +17,7 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "CalendarEditor.h"
+#include "CalendarEditor.hpp"
 
 CalendarEditor::CalendarEditor(int day, int month, int year) : _day(day), _month(month), _year(year), _parent(0), _days(0), _editor(0)
 {

src/view/grid/GridAccount.cpp

@@ -17,7 +17,7 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "GridAccount.h"
+#include "GridAccount.hpp"
 
 #define SET_ROW_COLOR(row, backcolor, forecolor)  for(int i=0; i<NUMBER_COLS_OPS; i++) \
     {									\

src/view/grid/GridAccount.hpp

@@ -25,15 +25,15 @@
 #include <list>
 #include <vector>
 #include <algorithm>
-#include <view/AccountPanel.h>
-#include <model/model.h>
-#include <controller/KissCount.h>
-#include "wxGridCellFastBoolEditor.h"
-#include "wxGridCellTreeButtonRenderer.h"
-#include "wxGridCellTreeButtonEditor.h"
-#include "wxGridCellBitmapRenderer.h"
-#include "wxGridCellFormulaEditor.h"
-#include "wxGridCellTabStringRenderer.h"
+#include <view/AccountPanel.hpp>
+#include <model/model.hpp>
+#include <controller/KissCount.hpp>
+#include "wxGridCellFastBoolEditor.hpp"
+#include "wxGridCellTreeButtonRenderer.hpp"
+#include "wxGridCellTreeButtonEditor.hpp"
+#include "wxGridCellBitmapRenderer.hpp"
+#include "wxGridCellFormulaEditor.hpp"
+#include "wxGridCellTabStringRenderer.hpp"
 
 class KissCount;
 

src/view/grid/wxGridCellBitmapRenderer.cpp

@@ -17,7 +17,7 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "wxGridCellBitmapRenderer.h"
+#include "wxGridCellBitmapRenderer.hpp"
 
 wxGridCellBitmapRenderer::wxGridCellBitmapRenderer(wxBitmap& bitmap) : _bitmap(bitmap)
 {

src/view/grid/wxGridCellButtonEditor.cpp

@@ -17,7 +17,7 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "wxGridCellButtonEditor.h"
+#include "wxGridCellButtonEditor.hpp"
 
 enum {BUTTON_ID = 1} ;
 

src/view/grid/wxGridCellButtonRenderer.cpp

@@ -17,7 +17,7 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "wxGridCellButtonRenderer.h"
+#include "wxGridCellButtonRenderer.hpp"
 
 wxGridCellButtonRenderer::wxGridCellButtonRenderer(const wxString& text) : _text(text)
 {

src/view/grid/wxGridCellFormulaEditor.cpp

@@ -17,7 +17,7 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "wxGridCellFormulaEditor.h"
+#include "wxGridCellFormulaEditor.hpp"
 
 wxGridCellFormulaEditor::wxGridCellFormulaEditor(const wxString& formula) : _formula(formula)
 {}

src/view/grid/wxGridCellFormulaEditor.hpp

@@ -23,8 +23,8 @@
 #include <wx/wx.h>
 #include <wx/grid.h>
 #include <wx/dc.h>
-#include "GridAccount.h"
-#include "../../ParseExp.h"
+#include "GridAccount.hpp"
+#include "../../ParseExp.hpp"
 class wxGridCellFormulaEditor : public wxGridCellTextEditor
 {
 public:

src/view/grid/wxGridCellStarEditor.cpp

@@ -17,7 +17,7 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "wxGridCellStarEditor.h"
+#include "wxGridCellStarEditor.hpp"
 
 void wxGridCellStarEditor::BeginEdit (int row, int col, wxGrid *grid) {
     static bool inModification = false;

src/view/grid/wxGridCellTabStringRenderer.cpp

@@ -17,7 +17,7 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "wxGridCellTabStringRenderer.h"
+#include "wxGridCellTabStringRenderer.hpp"
 
 void wxGridCellTabStringRenderer::Draw (wxGrid &grid, wxGridCellAttr &attr, wxDC &dc, const wxRect &rect, int row, int col, bool isSelected)
 {

src/view/grid/wxGridCellTabStringRenderer.hpp

@@ -24,7 +24,7 @@
 #include <wx/bitmap.h>
 #include <wx/dc.h>
 
-#include "GridAccount.h"
+#include "GridAccount.hpp"
 
 class wxGridCellTabStringRenderer : public wxGridCellStringRenderer
 {

src/view/grid/wxGridCellTreeButtonEditor.cpp

@@ -17,7 +17,7 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "wxGridCellTreeButtonEditor.h"
+#include "wxGridCellTreeButtonEditor.hpp"
 
 wxGridCellEditor* wxGridCellTreeButtonEditor::Clone () const
 {

src/view/grid/wxGridCellTreeButtonEditor.hpp

@@ -24,8 +24,8 @@
 #include <wx/grid.h>
 #include <wx/dc.h>
 
-#include "GridAccount.h"
-#include "wxGridCellTreeButtonRenderer.h"
+#include "GridAccount.hpp"
+#include "wxGridCellTreeButtonRenderer.hpp"
 
 class wxGridCellTreeButtonEditor : public wxGridCellEditor
 {

src/view/grid/wxGridCellTreeButtonRenderer.cpp

@@ -17,7 +17,7 @@
   along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "wxGridCellTreeButtonRenderer.h"
+#include "wxGridCellTreeButtonRenderer.hpp"
 
 wxGridCellTreeButtonRenderer::wxGridCellTreeButtonRenderer(bool collapsed) : _collapsed(collapsed)
 {

src/view/grid/wxMyGrid.cpp

@@ -1,4 +1,4 @@
-#include "wxMyGrid.h"
+#include "wxMyGrid.hpp"
 
 BEGIN_EVENT_TABLE(wxMyGrid, wxGrid)
 EVT_GRID_CELL_LEFT_CLICK(wxMyGrid::OnCellLeftClick ) 

src/view/view.hpp

@@ -46,6 +46,6 @@ namespace view {
 
 #define LANG_ROOT RESSOURCES_ROOT "po/"
 
-#include "KissPanel.h"
+#include "KissPanel.hpp"
 
 #endif

src/view/wxUI.cpp

@@ -17,21 +17,21 @@
   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 "AccountPanel.hpp"
+#include "PreferencesPanel.hpp"
+#include "UsersDialog.hpp"
+#include "GenerateDialog.hpp"
+#include "SearchPanel.hpp"
+#include "StatsPanel.hpp"
+#include "ImportPanel.hpp"
+#include "ExportPanel.hpp"
 
-#include "grid/wxMyGrid.h"
-#include "grid/wxGridCellFastBoolEditor.h"
-#include "grid/wxGridCellButtonRenderer.h"
-#include "grid/wxGridCellButtonEditor.h"
+#include "grid/wxMyGrid.hpp"
+#include "grid/wxGridCellFastBoolEditor.hpp"
+#include "grid/wxGridCellButtonRenderer.hpp"
+#include "grid/wxGridCellButtonEditor.hpp"
 
-#include "wxUI.h"
+#include "wxUI.hpp"
 
 enum {BUTTON_CHANGE_USER_ID=-4, BUTTON_ABOUT_ID=-5, BUTTON_QUIT_ID=-6};
 
@@ -112,7 +112,7 @@ bool wxUI::SetLanguage(long language)
 	_locale->AddCatalogLookupPathPrefix(wxT(LANG_ROOT));
 #endif
  
-	_locale->AddCatalog(wxT("french"));
+	_locale->AddCatalog(wxT("frenchpp"));
 	_locale->AddCatalog(wxT("kisscount"));
 
 	_language = (wxLanguage) language;
@@ -135,7 +135,7 @@ bool wxUI::SetLanguage(long language)
 
     months[0] = _("january");
     months[1] = _("february");
-    months[2] = _("march");
+    months[2] = _("marchpp");
     months[3] = _("april");
     months[4] = _("may");
     months[5] = _("june");

src/view/wxUI.hpp

@@ -23,9 +23,9 @@
 class ImportEngine;
 
 #include <wx/wx.h>
-#include <controller/KissCount.h>
+#include <controller/KissCount.hpp>
 
-#include "KissPanel.h"
+#include "KissPanel.hpp"
 
 #ifdef WIN32
 #undef _