From ed6a7a5fefdd8f503b79376ab92916e41e6095f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Sat, 20 Aug 2011 14:02:47 +0200 Subject: [PATCH] Rename header files in .hpp --- src/ParseExp.cpp | 2 +- src/{ParseExp.h => ParseExp.hpp} | 0 src/controller/KissCount.cpp | 4 +-- src/controller/{KissCount.h => KissCount.hpp} | 8 ++--- src/main.cpp | 2 +- src/model/{Account.h => Account.hpp} | 0 .../{AccountAmount.h => AccountAmount.hpp} | 0 src/model/{Category.h => Category.hpp} | 0 src/model/Database.cpp | 14 ++++----- src/model/{Database.h => Database.hpp} | 4 +-- src/model/Database_Update.cpp | 2 +- src/model/Operation.cpp | 2 +- src/model/{Operation.h => Operation.hpp} | 0 src/model/User.cpp | 4 +-- src/model/{User.h => User.hpp} | 10 +++---- src/model/export/ExportEngine.cpp | 2 +- .../{ExportEngine.h => ExportEngine.hpp} | 6 ++-- src/model/export/XMLExportEngine.cpp | 6 ++-- ...{XMLExportEngine.h => XMLExportEngine.hpp} | 6 ++-- src/model/import/GrisbiImportEngine.cpp | 4 +-- ...iImportEngine.h => GrisbiImportEngine.hpp} | 2 +- src/model/import/ImportEngine.cpp | 2 +- .../{ImportEngine.h => ImportEngine.hpp} | 6 ++-- src/model/import/OFXImportEngine.cpp | 2 +- ...{OFXImportEngine.h => OFXImportEngine.hpp} | 2 +- src/model/import/XMLImportEngine.cpp | 6 ++-- ...{XMLImportEngine.h => XMLImportEngine.hpp} | 2 +- src/model/{model.h => model.hpp} | 8 ++--- src/sha1.cpp | 2 +- src/view/AccountPanel.cpp | 8 ++--- src/view/{AccountPanel.h => AccountPanel.hpp} | 9 +++--- src/view/ExportPanel.cpp | 8 ++--- src/view/{ExportPanel.h => ExportPanel.hpp} | 10 +++---- src/view/GenerateDialog.cpp | 4 +-- .../{GenerateDialog.h => GenerateDialog.hpp} | 6 ++-- src/view/ImportPanel.cpp | 2 +- src/view/{ImportPanel.h => ImportPanel.hpp} | 8 ++--- src/view/{KissPanel.h => KissPanel.hpp} | 2 +- src/view/PasswordDialog.cpp | 2 +- .../{PasswordDialog.h => PasswordDialog.hpp} | 4 +-- src/view/PreferencesPanel.cpp | 16 +++++----- ...referencesPanel.h => PreferencesPanel.hpp} | 6 ++-- src/view/SearchBanner.cpp | 2 +- src/view/{SearchBanner.h => SearchBanner.hpp} | 6 ++-- src/view/SearchPanel.cpp | 12 ++++---- src/view/{SearchPanel.h => SearchPanel.hpp} | 10 +++---- src/view/StatsPanel.cpp | 2 +- src/view/{StatsPanel.h => StatsPanel.hpp} | 4 +-- ...rtedLanguages.h => SupportedLanguages.hpp} | 2 +- src/view/UsersDialog.cpp | 2 +- src/view/{UsersDialog.h => UsersDialog.hpp} | 2 +- src/view/grid/CalendarEditor.cpp | 2 +- .../{CalendarEditor.h => CalendarEditor.hpp} | 0 src/view/grid/GridAccount.cpp | 2 +- .../grid/{GridAccount.h => GridAccount.hpp} | 18 +++++------ src/view/grid/wxGridCellBitmapRenderer.cpp | 2 +- ...enderer.h => wxGridCellBitmapRenderer.hpp} | 0 src/view/grid/wxGridCellButtonEditor.cpp | 2 +- ...tonEditor.h => wxGridCellButtonEditor.hpp} | 0 src/view/grid/wxGridCellButtonRenderer.cpp | 2 +- ...enderer.h => wxGridCellButtonRenderer.hpp} | 0 ...lEditor.h => wxGridCellFastBoolEditor.hpp} | 0 src/view/grid/wxGridCellFormulaEditor.cpp | 2 +- ...laEditor.h => wxGridCellFormulaEditor.hpp} | 4 +-- src/view/grid/wxGridCellStarEditor.cpp | 2 +- ...lStarEditor.h => wxGridCellStarEditor.hpp} | 0 src/view/grid/wxGridCellTabStringRenderer.cpp | 2 +- ...erer.h => wxGridCellTabStringRenderer.hpp} | 2 +- src/view/grid/wxGridCellTreeButtonEditor.cpp | 2 +- ...ditor.h => wxGridCellTreeButtonEditor.hpp} | 4 +-- .../grid/wxGridCellTreeButtonRenderer.cpp | 2 +- ...rer.h => wxGridCellTreeButtonRenderer.hpp} | 0 src/view/grid/wxMyGrid.cpp | 2 +- src/view/grid/{wxMyGrid.h => wxMyGrid.hpp} | 0 src/view/{view.h => view.hpp} | 2 +- src/view/wxUI.cpp | 30 +++++++++---------- src/view/{wxUI.h => wxUI.hpp} | 4 +-- 77 files changed, 160 insertions(+), 161 deletions(-) rename src/{ParseExp.h => ParseExp.hpp} (100%) rename src/controller/{KissCount.h => KissCount.hpp} (97%) rename src/model/{Account.h => Account.hpp} (100%) rename src/model/{AccountAmount.h => AccountAmount.hpp} (100%) rename src/model/{Category.h => Category.hpp} (100%) rename src/model/{Database.h => Database.hpp} (99%) rename src/model/{Operation.h => Operation.hpp} (100%) rename src/model/{User.h => User.hpp} (94%) rename src/model/export/{ExportEngine.h => ExportEngine.hpp} (93%) rename src/model/export/{XMLExportEngine.h => XMLExportEngine.hpp} (92%) rename src/model/import/{GrisbiImportEngine.h => GrisbiImportEngine.hpp} (98%) rename src/model/import/{ImportEngine.h => ImportEngine.hpp} (96%) rename src/model/import/{OFXImportEngine.h => OFXImportEngine.hpp} (98%) rename src/model/import/{XMLImportEngine.h => XMLImportEngine.hpp} (98%) rename src/model/{model.h => model.hpp} (87%) rename src/view/{AccountPanel.h => AccountPanel.hpp} (94%) rename src/view/{ExportPanel.h => ExportPanel.hpp} (91%) rename src/view/{GenerateDialog.h => GenerateDialog.hpp} (94%) rename src/view/{ImportPanel.h => ImportPanel.hpp} (93%) rename src/view/{KissPanel.h => KissPanel.hpp} (98%) rename src/view/{PasswordDialog.h => PasswordDialog.hpp} (96%) rename src/view/{PreferencesPanel.h => PreferencesPanel.hpp} (96%) rename src/view/{SearchBanner.h => SearchBanner.hpp} (95%) rename src/view/{SearchPanel.h => SearchPanel.hpp} (92%) rename src/view/{StatsPanel.h => StatsPanel.hpp} (97%) rename src/view/{SupportedLanguages.h => SupportedLanguages.hpp} (93%) rename src/view/{UsersDialog.h => UsersDialog.hpp} (98%) rename src/view/grid/{CalendarEditor.h => CalendarEditor.hpp} (100%) rename src/view/grid/{GridAccount.h => GridAccount.hpp} (89%) rename src/view/grid/{wxGridCellBitmapRenderer.h => wxGridCellBitmapRenderer.hpp} (100%) rename src/view/grid/{wxGridCellButtonEditor.h => wxGridCellButtonEditor.hpp} (100%) rename src/view/grid/{wxGridCellButtonRenderer.h => wxGridCellButtonRenderer.hpp} (100%) rename src/view/grid/{wxGridCellFastBoolEditor.h => wxGridCellFastBoolEditor.hpp} (100%) rename src/view/grid/{wxGridCellFormulaEditor.h => wxGridCellFormulaEditor.hpp} (96%) rename src/view/grid/{wxGridCellStarEditor.h => wxGridCellStarEditor.hpp} (100%) rename src/view/grid/{wxGridCellTabStringRenderer.h => wxGridCellTabStringRenderer.hpp} (97%) rename src/view/grid/{wxGridCellTreeButtonEditor.h => wxGridCellTreeButtonEditor.hpp} (95%) rename src/view/grid/{wxGridCellTreeButtonRenderer.h => wxGridCellTreeButtonRenderer.hpp} (100%) rename src/view/grid/{wxMyGrid.h => wxMyGrid.hpp} (100%) rename src/view/{view.h => view.hpp} (98%) rename src/view/{wxUI.h => wxUI.hpp} (97%) diff --git a/src/ParseExp.cpp b/src/ParseExp.cpp index 9f1d157..e2d4d55 100644 --- a/src/ParseExp.cpp +++ b/src/ParseExp.cpp @@ -21,7 +21,7 @@ #include #include -#include "ParseExp.h" +#include "ParseExp.hpp" /* Algorithm diff --git a/src/ParseExp.h b/src/ParseExp.hpp similarity index 100% rename from src/ParseExp.h rename to src/ParseExp.hpp diff --git a/src/controller/KissCount.cpp b/src/controller/KissCount.cpp index 3029b3e..86434a8 100644 --- a/src/controller/KissCount.cpp +++ b/src/controller/KissCount.cpp @@ -21,9 +21,9 @@ #include #include -#include "KissCount.h" +#include "KissCount.hpp" -#include +#include std::vector * KissCount::_importEngines; std::vector * KissCount::_exportEngines; diff --git a/src/controller/KissCount.h b/src/controller/KissCount.hpp similarity index 97% rename from src/controller/KissCount.h rename to src/controller/KissCount.hpp index 1ae0554..26f0256 100644 --- a/src/controller/KissCount.h +++ b/src/controller/KissCount.hpp @@ -22,13 +22,13 @@ #include -#include -#include -#include +#include +#include +#include #include -#include +#include #define APP_VERSION "0.3" diff --git a/src/main.cpp b/src/main.cpp index f53c439..e45bbac 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include class MyApp: public wxApp { diff --git a/src/model/Account.h b/src/model/Account.hpp similarity index 100% rename from src/model/Account.h rename to src/model/Account.hpp diff --git a/src/model/AccountAmount.h b/src/model/AccountAmount.hpp similarity index 100% rename from src/model/AccountAmount.h rename to src/model/AccountAmount.hpp diff --git a/src/model/Category.h b/src/model/Category.hpp similarity index 100% rename from src/model/Category.h rename to src/model/Category.hpp diff --git a/src/model/Database.cpp b/src/model/Database.cpp index 9198f08..35d29a9 100644 --- a/src/model/Database.cpp +++ b/src/model/Database.cpp @@ -22,7 +22,7 @@ #include #include -#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 > 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* 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(); } diff --git a/src/model/Database.h b/src/model/Database.hpp similarity index 99% rename from src/model/Database.h rename to src/model/Database.hpp index 0619387..13113eb 100644 --- a/src/model/Database.h +++ b/src/model/Database.hpp @@ -24,8 +24,8 @@ #include #include -#include -#include "model.h" +#include +#include "model.hpp" #define BDD_FILE "/.kisscount/kc.bdd" #define INIT_SCRIPT RESSOURCES_ROOT "init.sql" diff --git a/src/model/Database_Update.cpp b/src/model/Database_Update.cpp index adbe6bd..d13ea44 100644 --- a/src/model/Database_Update.cpp +++ b/src/model/Database_Update.cpp @@ -17,7 +17,7 @@ along with KissCount. If not, see . */ -#include "Database.h" +#include "Database.hpp" #define ON_ERROR(m) \ wxMessageBox(wxT(m), _("Error"), wxICON_ERROR | wxOK); \ diff --git a/src/model/Operation.cpp b/src/model/Operation.cpp index faf41d2..020e0d9 100644 --- a/src/model/Operation.cpp +++ b/src/model/Operation.cpp @@ -17,7 +17,7 @@ along with KissCount. If not, see . */ -#include "Operation.h" +#include "Operation.hpp" bool sortOperations(const Operation& op1, const Operation& op2) { diff --git a/src/model/Operation.h b/src/model/Operation.hpp similarity index 100% rename from src/model/Operation.h rename to src/model/Operation.hpp diff --git a/src/model/User.cpp b/src/model/User.cpp index 7dcf688..cfe38d8 100644 --- a/src/model/User.cpp +++ b/src/model/User.cpp @@ -18,8 +18,8 @@ */ #include -#include -#include "User.h" +#include +#include "User.hpp" User::User(Database* db) : _db(db) {} diff --git a/src/model/User.h b/src/model/User.hpp similarity index 94% rename from src/model/User.h rename to src/model/User.hpp index e58cf12..ecee5b5 100644 --- a/src/model/User.h +++ b/src/model/User.hpp @@ -24,11 +24,11 @@ #include #include -#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; diff --git a/src/model/export/ExportEngine.cpp b/src/model/export/ExportEngine.cpp index 4d72fa6..2040b04 100644 --- a/src/model/export/ExportEngine.cpp +++ b/src/model/export/ExportEngine.cpp @@ -17,7 +17,7 @@ along with KissCount. If not, see . */ -#include "ExportEngine.h" +#include "ExportEngine.hpp" ExportEngine::ExportEngine() { diff --git a/src/model/export/ExportEngine.h b/src/model/export/ExportEngine.hpp similarity index 93% rename from src/model/export/ExportEngine.h rename to src/model/export/ExportEngine.hpp index 50976f9..bed3a8e 100644 --- a/src/model/export/ExportEngine.h +++ b/src/model/export/ExportEngine.hpp @@ -20,9 +20,9 @@ #ifndef EXPORTENGINE_H #define EXPORTENGINE_H -#include -#include -#include +#include +#include +#include class KissCount; diff --git a/src/model/export/XMLExportEngine.cpp b/src/model/export/XMLExportEngine.cpp index cdbae4a..9dc9c31 100644 --- a/src/model/export/XMLExportEngine.cpp +++ b/src/model/export/XMLExportEngine.cpp @@ -20,7 +20,7 @@ #include #include -#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* 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()); diff --git a/src/model/export/XMLExportEngine.h b/src/model/export/XMLExportEngine.hpp similarity index 92% rename from src/model/export/XMLExportEngine.h rename to src/model/export/XMLExportEngine.hpp index 4de446d..50d3313 100644 --- a/src/model/export/XMLExportEngine.h +++ b/src/model/export/XMLExportEngine.hpp @@ -20,9 +20,9 @@ #ifndef XMLEXPORTENGINE_H #define XMLEXPORTENGINE_H -#include -#include -#include "ExportEngine.h" +#include +#include +#include "ExportEngine.hpp" class XMLExportEngine : public ExportEngine { public: diff --git a/src/model/import/GrisbiImportEngine.cpp b/src/model/import/GrisbiImportEngine.cpp index ae755b4..4c03e3c 100644 --- a/src/model/import/GrisbiImportEngine.cpp +++ b/src/model/import/GrisbiImportEngine.cpp @@ -17,9 +17,9 @@ along with KissCount. If not, see . */ -#include "GrisbiImportEngine.h" +#include "GrisbiImportEngine.hpp" -#include +#include static GrisbiImportEngine grisbiImportEngine; diff --git a/src/model/import/GrisbiImportEngine.h b/src/model/import/GrisbiImportEngine.hpp similarity index 98% rename from src/model/import/GrisbiImportEngine.h rename to src/model/import/GrisbiImportEngine.hpp index ec238ea..ea8d6ed 100644 --- a/src/model/import/GrisbiImportEngine.h +++ b/src/model/import/GrisbiImportEngine.hpp @@ -22,7 +22,7 @@ #include -#include "ImportEngine.h" +#include "ImportEngine.hpp" class GrisbiImportEngine : public ImportEngine { public: diff --git a/src/model/import/ImportEngine.cpp b/src/model/import/ImportEngine.cpp index 2e746f8..41638fc 100644 --- a/src/model/import/ImportEngine.cpp +++ b/src/model/import/ImportEngine.cpp @@ -19,7 +19,7 @@ #include -#include "ImportEngine.h" +#include "ImportEngine.hpp" wxString ImportEngine::NULL_IMPORT_PATTERN = wxT("(nil)"); diff --git a/src/model/import/ImportEngine.h b/src/model/import/ImportEngine.hpp similarity index 96% rename from src/model/import/ImportEngine.h rename to src/model/import/ImportEngine.hpp index 2e5db80..0edd61c 100644 --- a/src/model/import/ImportEngine.h +++ b/src/model/import/ImportEngine.hpp @@ -20,9 +20,9 @@ #ifndef IMPORTENGINE_H #define IMPORTENGINE_H -#include -#include -#include +#include +#include +#include class KissCount; diff --git a/src/model/import/OFXImportEngine.cpp b/src/model/import/OFXImportEngine.cpp index 25e6073..185654c 100644 --- a/src/model/import/OFXImportEngine.cpp +++ b/src/model/import/OFXImportEngine.cpp @@ -17,7 +17,7 @@ along with KissCount. If not, see . */ -#include "OFXImportEngine.h" +#include "OFXImportEngine.hpp" static OFXImportEngine ofxImportEngine; diff --git a/src/model/import/OFXImportEngine.h b/src/model/import/OFXImportEngine.hpp similarity index 98% rename from src/model/import/OFXImportEngine.h rename to src/model/import/OFXImportEngine.hpp index 3c3324f..18dc170 100644 --- a/src/model/import/OFXImportEngine.h +++ b/src/model/import/OFXImportEngine.hpp @@ -20,7 +20,7 @@ #ifndef OFXIMPORTENGINE_H #define OFXIMPORTENGINE_H -#include "ImportEngine.h" +#include "ImportEngine.hpp" #include class OFXImportEngine : public ImportEngine { diff --git a/src/model/import/XMLImportEngine.cpp b/src/model/import/XMLImportEngine.cpp index ed10c69..f702f25 100644 --- a/src/model/import/XMLImportEngine.cpp +++ b/src/model/import/XMLImportEngine.cpp @@ -17,7 +17,7 @@ along with KissCount. If not, see . */ -#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; diff --git a/src/model/import/XMLImportEngine.h b/src/model/import/XMLImportEngine.hpp similarity index 98% rename from src/model/import/XMLImportEngine.h rename to src/model/import/XMLImportEngine.hpp index 2ab355b..fac0f90 100644 --- a/src/model/import/XMLImportEngine.h +++ b/src/model/import/XMLImportEngine.hpp @@ -22,7 +22,7 @@ #include -#include "ImportEngine.h" +#include "ImportEngine.hpp" class XMLImportEngine : public ImportEngine { public: diff --git a/src/model/model.h b/src/model/model.hpp similarity index 87% rename from src/model/model.h rename to src/model/model.hpp index 4d11dc9..8699a6c 100644 --- a/src/model/model.h +++ b/src/model/model.hpp @@ -25,9 +25,9 @@ class Database; class Account; class Operation; -#include -#include -#include -#include +#include +#include +#include +#include #endif diff --git a/src/sha1.cpp b/src/sha1.cpp index 8cc4df7..a0bbee7 100644 --- a/src/sha1.cpp +++ b/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 #include "sha1.h" diff --git a/src/view/AccountPanel.cpp b/src/view/AccountPanel.cpp index 7b69026..b01985b 100644 --- a/src/view/AccountPanel.cpp +++ b/src/view/AccountPanel.cpp @@ -17,10 +17,10 @@ along with KissCount. If not, see . */ -#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")); diff --git a/src/view/AccountPanel.h b/src/view/AccountPanel.hpp similarity index 94% rename from src/view/AccountPanel.h rename to src/view/AccountPanel.hpp index 9ec0920..fc55281 100644 --- a/src/view/AccountPanel.h +++ b/src/view/AccountPanel.hpp @@ -27,12 +27,11 @@ #include #include -#include "view.h" +#include "view.hpp" -//#include -#include -#include "grid/GridAccount.h" -#include "grid/CalendarEditor.h" +#include +#include "grid/GridAccount.hpp" +#include "grid/CalendarEditor.hpp" #include class GridAccount; diff --git a/src/view/ExportPanel.cpp b/src/view/ExportPanel.cpp index d401158..4fb4f07 100644 --- a/src/view/ExportPanel.cpp +++ b/src/view/ExportPanel.cpp @@ -17,9 +17,9 @@ along with KissCount. If not, see . */ -#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); diff --git a/src/view/ExportPanel.h b/src/view/ExportPanel.hpp similarity index 91% rename from src/view/ExportPanel.h rename to src/view/ExportPanel.hpp index e446a30..2b87dcc 100644 --- a/src/view/ExportPanel.h +++ b/src/view/ExportPanel.hpp @@ -24,11 +24,11 @@ #include #include #include -#include "view.h" -#include "grid/GridAccount.h" -#include "SearchBanner.h" -#include -#include +#include "view.hpp" +#include "grid/GridAccount.hpp" +#include "SearchBanner.hpp" +#include +#include class GridAccount; class SearchBanner; diff --git a/src/view/GenerateDialog.cpp b/src/view/GenerateDialog.cpp index 409eca6..0404cee 100644 --- a/src/view/GenerateDialog.cpp +++ b/src/view/GenerateDialog.cpp @@ -21,7 +21,7 @@ #include #include -#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; diff --git a/src/view/GenerateDialog.h b/src/view/GenerateDialog.hpp similarity index 94% rename from src/view/GenerateDialog.h rename to src/view/GenerateDialog.hpp index 0038aae..63b879d 100644 --- a/src/view/GenerateDialog.h +++ b/src/view/GenerateDialog.hpp @@ -23,10 +23,10 @@ #include #include -#include -#include +#include +#include -#include "wxUI.h" +#include "wxUI.hpp" class wxUI; class KissCount; diff --git a/src/view/ImportPanel.cpp b/src/view/ImportPanel.cpp index 7a2a52b..5ebd355 100644 --- a/src/view/ImportPanel.cpp +++ b/src/view/ImportPanel.cpp @@ -27,7 +27,7 @@ #include #include -#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}; diff --git a/src/view/ImportPanel.h b/src/view/ImportPanel.hpp similarity index 93% rename from src/view/ImportPanel.h rename to src/view/ImportPanel.hpp index 2b0861b..388c505 100644 --- a/src/view/ImportPanel.h +++ b/src/view/ImportPanel.hpp @@ -22,11 +22,11 @@ #include -#include "view.h" -#include -#include +#include "view.hpp" +#include +#include -#include "grid/GridAccount.h" +#include "grid/GridAccount.hpp" class ImportPanel: public KissPanel { diff --git a/src/view/KissPanel.h b/src/view/KissPanel.hpp similarity index 98% rename from src/view/KissPanel.h rename to src/view/KissPanel.hpp index bef0add..af5bdd8 100644 --- a/src/view/KissPanel.h +++ b/src/view/KissPanel.hpp @@ -24,7 +24,7 @@ #include #include -#include "wxUI.h" +#include "wxUI.hpp" class wxUI; class KissCount; diff --git a/src/view/PasswordDialog.cpp b/src/view/PasswordDialog.cpp index 37e5651..7311892 100644 --- a/src/view/PasswordDialog.cpp +++ b/src/view/PasswordDialog.cpp @@ -21,7 +21,7 @@ #include #include -#include "PasswordDialog.h" +#include "PasswordDialog.hpp" enum {BUTTON_OK_ID=1, BUTTON_CANCEL_ID, OLD_PASSWORD_ID, NEW_PASSWORD_ID, CONFIRM_PASSWORD_ID}; diff --git a/src/view/PasswordDialog.h b/src/view/PasswordDialog.hpp similarity index 96% rename from src/view/PasswordDialog.h rename to src/view/PasswordDialog.hpp index 94ee363..d589715 100644 --- a/src/view/PasswordDialog.h +++ b/src/view/PasswordDialog.hpp @@ -21,8 +21,8 @@ #define PASSWORDDIALOG_H #include -#include "wxUI.h" -#include +#include "wxUI.hpp" +#include class wxUI; class KissCount; diff --git a/src/view/PreferencesPanel.cpp b/src/view/PreferencesPanel.cpp index 6dd0e54..ba2b5c2 100644 --- a/src/view/PreferencesPanel.cpp +++ b/src/view/PreferencesPanel.cpp @@ -27,14 +27,14 @@ #include #include -#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); diff --git a/src/view/PreferencesPanel.h b/src/view/PreferencesPanel.hpp similarity index 96% rename from src/view/PreferencesPanel.h rename to src/view/PreferencesPanel.hpp index 51724de..791c34b 100644 --- a/src/view/PreferencesPanel.h +++ b/src/view/PreferencesPanel.hpp @@ -23,9 +23,9 @@ #include #include -#include "view.h" -#include -#include "SupportedLanguages.h" +#include "view.hpp" +#include +#include "SupportedLanguages.hpp" class PreferencesPanel: public KissPanel { diff --git a/src/view/SearchBanner.cpp b/src/view/SearchBanner.cpp index f918cb2..3d15323 100644 --- a/src/view/SearchBanner.cpp +++ b/src/view/SearchBanner.cpp @@ -17,7 +17,7 @@ along with KissCount. If not, see . */ -#include "SearchBanner.h" +#include "SearchBanner.hpp" enum {DESCRIPTION_ID=1, CALENDAR_FROM_ID, CALENDAR_TO_ID}; diff --git a/src/view/SearchBanner.h b/src/view/SearchBanner.hpp similarity index 95% rename from src/view/SearchBanner.h rename to src/view/SearchBanner.hpp index dbc7c56..a35cfe4 100644 --- a/src/view/SearchBanner.h +++ b/src/view/SearchBanner.hpp @@ -25,10 +25,10 @@ #include #include #include -#include "view.h" -#include "grid/CalendarEditor.h" +#include "view.hpp" +#include "grid/CalendarEditor.hpp" -#include +#include typedef void (*OnButtonEnter)(void* caller, wxCommandEvent& event); diff --git a/src/view/SearchPanel.cpp b/src/view/SearchPanel.cpp index c71c448..f370372 100644 --- a/src/view/SearchPanel.cpp +++ b/src/view/SearchPanel.cpp @@ -19,10 +19,10 @@ #include #include -#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) diff --git a/src/view/SearchPanel.h b/src/view/SearchPanel.hpp similarity index 92% rename from src/view/SearchPanel.h rename to src/view/SearchPanel.hpp index c6fb51c..a523fb9 100644 --- a/src/view/SearchPanel.h +++ b/src/view/SearchPanel.hpp @@ -22,12 +22,12 @@ #include #include -#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 +#include class GridAccount; diff --git a/src/view/StatsPanel.cpp b/src/view/StatsPanel.cpp index e4d442b..7225ff7 100644 --- a/src/view/StatsPanel.cpp +++ b/src/view/StatsPanel.cpp @@ -20,7 +20,7 @@ #include #include -#include "StatsPanel.h" +#include "StatsPanel.hpp" enum {RANGE_ID=1, ACCOUNTS_ID}; diff --git a/src/view/StatsPanel.h b/src/view/StatsPanel.hpp similarity index 97% rename from src/view/StatsPanel.h rename to src/view/StatsPanel.hpp index 4f7bafc..9cc303c 100644 --- a/src/view/StatsPanel.h +++ b/src/view/StatsPanel.hpp @@ -32,8 +32,8 @@ #include #include -#include "view.h" -#include +#include "view.hpp" +#include class StatsPanel: public KissPanel { diff --git a/src/view/SupportedLanguages.h b/src/view/SupportedLanguages.hpp similarity index 93% rename from src/view/SupportedLanguages.h rename to src/view/SupportedLanguages.hpp index 4b29ca7..f8ff305 100644 --- a/src/view/SupportedLanguages.h +++ b/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} }; } diff --git a/src/view/UsersDialog.cpp b/src/view/UsersDialog.cpp index 2255108..0ae9f71 100644 --- a/src/view/UsersDialog.cpp +++ b/src/view/UsersDialog.cpp @@ -22,7 +22,7 @@ #include #include -#include "UsersDialog.h" +#include "UsersDialog.hpp" enum {TEXT_PASSWORD_ID=1, BUTTON_OK_ID, BUTTON_CANCEL_ID, BUTTON_NEW_USER_ID}; diff --git a/src/view/UsersDialog.h b/src/view/UsersDialog.hpp similarity index 98% rename from src/view/UsersDialog.h rename to src/view/UsersDialog.hpp index 9f22819..8f02303 100644 --- a/src/view/UsersDialog.h +++ b/src/view/UsersDialog.hpp @@ -23,7 +23,7 @@ #include #include -#include "wxUI.h" +#include "wxUI.hpp" class wxUI; class KissCount; diff --git a/src/view/grid/CalendarEditor.cpp b/src/view/grid/CalendarEditor.cpp index 2f5186c..41fab4e 100644 --- a/src/view/grid/CalendarEditor.cpp +++ b/src/view/grid/CalendarEditor.cpp @@ -17,7 +17,7 @@ along with KissCount. If not, see . */ -#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) { diff --git a/src/view/grid/CalendarEditor.h b/src/view/grid/CalendarEditor.hpp similarity index 100% rename from src/view/grid/CalendarEditor.h rename to src/view/grid/CalendarEditor.hpp diff --git a/src/view/grid/GridAccount.cpp b/src/view/grid/GridAccount.cpp index 14540f0..1944012 100644 --- a/src/view/grid/GridAccount.cpp +++ b/src/view/grid/GridAccount.cpp @@ -17,7 +17,7 @@ along with KissCount. If not, see . */ -#include "GridAccount.h" +#include "GridAccount.hpp" #define SET_ROW_COLOR(row, backcolor, forecolor) for(int i=0; i #include #include -#include -#include -#include -#include "wxGridCellFastBoolEditor.h" -#include "wxGridCellTreeButtonRenderer.h" -#include "wxGridCellTreeButtonEditor.h" -#include "wxGridCellBitmapRenderer.h" -#include "wxGridCellFormulaEditor.h" -#include "wxGridCellTabStringRenderer.h" +#include +#include +#include +#include "wxGridCellFastBoolEditor.hpp" +#include "wxGridCellTreeButtonRenderer.hpp" +#include "wxGridCellTreeButtonEditor.hpp" +#include "wxGridCellBitmapRenderer.hpp" +#include "wxGridCellFormulaEditor.hpp" +#include "wxGridCellTabStringRenderer.hpp" class KissCount; diff --git a/src/view/grid/wxGridCellBitmapRenderer.cpp b/src/view/grid/wxGridCellBitmapRenderer.cpp index 84149e0..b1bf2be 100644 --- a/src/view/grid/wxGridCellBitmapRenderer.cpp +++ b/src/view/grid/wxGridCellBitmapRenderer.cpp @@ -17,7 +17,7 @@ along with KissCount. If not, see . */ -#include "wxGridCellBitmapRenderer.h" +#include "wxGridCellBitmapRenderer.hpp" wxGridCellBitmapRenderer::wxGridCellBitmapRenderer(wxBitmap& bitmap) : _bitmap(bitmap) { diff --git a/src/view/grid/wxGridCellBitmapRenderer.h b/src/view/grid/wxGridCellBitmapRenderer.hpp similarity index 100% rename from src/view/grid/wxGridCellBitmapRenderer.h rename to src/view/grid/wxGridCellBitmapRenderer.hpp diff --git a/src/view/grid/wxGridCellButtonEditor.cpp b/src/view/grid/wxGridCellButtonEditor.cpp index d7024fe..7e1f290 100644 --- a/src/view/grid/wxGridCellButtonEditor.cpp +++ b/src/view/grid/wxGridCellButtonEditor.cpp @@ -17,7 +17,7 @@ along with KissCount. If not, see . */ -#include "wxGridCellButtonEditor.h" +#include "wxGridCellButtonEditor.hpp" enum {BUTTON_ID = 1} ; diff --git a/src/view/grid/wxGridCellButtonEditor.h b/src/view/grid/wxGridCellButtonEditor.hpp similarity index 100% rename from src/view/grid/wxGridCellButtonEditor.h rename to src/view/grid/wxGridCellButtonEditor.hpp diff --git a/src/view/grid/wxGridCellButtonRenderer.cpp b/src/view/grid/wxGridCellButtonRenderer.cpp index 98951fe..2f32f75 100644 --- a/src/view/grid/wxGridCellButtonRenderer.cpp +++ b/src/view/grid/wxGridCellButtonRenderer.cpp @@ -17,7 +17,7 @@ along with KissCount. If not, see . */ -#include "wxGridCellButtonRenderer.h" +#include "wxGridCellButtonRenderer.hpp" wxGridCellButtonRenderer::wxGridCellButtonRenderer(const wxString& text) : _text(text) { diff --git a/src/view/grid/wxGridCellButtonRenderer.h b/src/view/grid/wxGridCellButtonRenderer.hpp similarity index 100% rename from src/view/grid/wxGridCellButtonRenderer.h rename to src/view/grid/wxGridCellButtonRenderer.hpp diff --git a/src/view/grid/wxGridCellFastBoolEditor.h b/src/view/grid/wxGridCellFastBoolEditor.hpp similarity index 100% rename from src/view/grid/wxGridCellFastBoolEditor.h rename to src/view/grid/wxGridCellFastBoolEditor.hpp diff --git a/src/view/grid/wxGridCellFormulaEditor.cpp b/src/view/grid/wxGridCellFormulaEditor.cpp index 9a61635..6e144a3 100644 --- a/src/view/grid/wxGridCellFormulaEditor.cpp +++ b/src/view/grid/wxGridCellFormulaEditor.cpp @@ -17,7 +17,7 @@ along with KissCount. If not, see . */ -#include "wxGridCellFormulaEditor.h" +#include "wxGridCellFormulaEditor.hpp" wxGridCellFormulaEditor::wxGridCellFormulaEditor(const wxString& formula) : _formula(formula) {} diff --git a/src/view/grid/wxGridCellFormulaEditor.h b/src/view/grid/wxGridCellFormulaEditor.hpp similarity index 96% rename from src/view/grid/wxGridCellFormulaEditor.h rename to src/view/grid/wxGridCellFormulaEditor.hpp index 50ee5aa..28d7ad9 100644 --- a/src/view/grid/wxGridCellFormulaEditor.h +++ b/src/view/grid/wxGridCellFormulaEditor.hpp @@ -23,8 +23,8 @@ #include #include #include -#include "GridAccount.h" -#include "../../ParseExp.h" +#include "GridAccount.hpp" +#include "../../ParseExp.hpp" class wxGridCellFormulaEditor : public wxGridCellTextEditor { public: diff --git a/src/view/grid/wxGridCellStarEditor.cpp b/src/view/grid/wxGridCellStarEditor.cpp index 0642f0f..61af891 100644 --- a/src/view/grid/wxGridCellStarEditor.cpp +++ b/src/view/grid/wxGridCellStarEditor.cpp @@ -17,7 +17,7 @@ along with KissCount. If not, see . */ -#include "wxGridCellStarEditor.h" +#include "wxGridCellStarEditor.hpp" void wxGridCellStarEditor::BeginEdit (int row, int col, wxGrid *grid) { static bool inModification = false; diff --git a/src/view/grid/wxGridCellStarEditor.h b/src/view/grid/wxGridCellStarEditor.hpp similarity index 100% rename from src/view/grid/wxGridCellStarEditor.h rename to src/view/grid/wxGridCellStarEditor.hpp diff --git a/src/view/grid/wxGridCellTabStringRenderer.cpp b/src/view/grid/wxGridCellTabStringRenderer.cpp index 3c4d514..44bbced 100644 --- a/src/view/grid/wxGridCellTabStringRenderer.cpp +++ b/src/view/grid/wxGridCellTabStringRenderer.cpp @@ -17,7 +17,7 @@ along with KissCount. If not, see . */ -#include "wxGridCellTabStringRenderer.h" +#include "wxGridCellTabStringRenderer.hpp" void wxGridCellTabStringRenderer::Draw (wxGrid &grid, wxGridCellAttr &attr, wxDC &dc, const wxRect &rect, int row, int col, bool isSelected) { diff --git a/src/view/grid/wxGridCellTabStringRenderer.h b/src/view/grid/wxGridCellTabStringRenderer.hpp similarity index 97% rename from src/view/grid/wxGridCellTabStringRenderer.h rename to src/view/grid/wxGridCellTabStringRenderer.hpp index 53d7715..7293d57 100644 --- a/src/view/grid/wxGridCellTabStringRenderer.h +++ b/src/view/grid/wxGridCellTabStringRenderer.hpp @@ -24,7 +24,7 @@ #include #include -#include "GridAccount.h" +#include "GridAccount.hpp" class wxGridCellTabStringRenderer : public wxGridCellStringRenderer { diff --git a/src/view/grid/wxGridCellTreeButtonEditor.cpp b/src/view/grid/wxGridCellTreeButtonEditor.cpp index 7361490..a371515 100644 --- a/src/view/grid/wxGridCellTreeButtonEditor.cpp +++ b/src/view/grid/wxGridCellTreeButtonEditor.cpp @@ -17,7 +17,7 @@ along with KissCount. If not, see . */ -#include "wxGridCellTreeButtonEditor.h" +#include "wxGridCellTreeButtonEditor.hpp" wxGridCellEditor* wxGridCellTreeButtonEditor::Clone () const { diff --git a/src/view/grid/wxGridCellTreeButtonEditor.h b/src/view/grid/wxGridCellTreeButtonEditor.hpp similarity index 95% rename from src/view/grid/wxGridCellTreeButtonEditor.h rename to src/view/grid/wxGridCellTreeButtonEditor.hpp index 3109f18..617852a 100644 --- a/src/view/grid/wxGridCellTreeButtonEditor.h +++ b/src/view/grid/wxGridCellTreeButtonEditor.hpp @@ -24,8 +24,8 @@ #include #include -#include "GridAccount.h" -#include "wxGridCellTreeButtonRenderer.h" +#include "GridAccount.hpp" +#include "wxGridCellTreeButtonRenderer.hpp" class wxGridCellTreeButtonEditor : public wxGridCellEditor { diff --git a/src/view/grid/wxGridCellTreeButtonRenderer.cpp b/src/view/grid/wxGridCellTreeButtonRenderer.cpp index 828b837..7ac783b 100644 --- a/src/view/grid/wxGridCellTreeButtonRenderer.cpp +++ b/src/view/grid/wxGridCellTreeButtonRenderer.cpp @@ -17,7 +17,7 @@ along with KissCount. If not, see . */ -#include "wxGridCellTreeButtonRenderer.h" +#include "wxGridCellTreeButtonRenderer.hpp" wxGridCellTreeButtonRenderer::wxGridCellTreeButtonRenderer(bool collapsed) : _collapsed(collapsed) { diff --git a/src/view/grid/wxGridCellTreeButtonRenderer.h b/src/view/grid/wxGridCellTreeButtonRenderer.hpp similarity index 100% rename from src/view/grid/wxGridCellTreeButtonRenderer.h rename to src/view/grid/wxGridCellTreeButtonRenderer.hpp diff --git a/src/view/grid/wxMyGrid.cpp b/src/view/grid/wxMyGrid.cpp index 72b8319..30150fc 100644 --- a/src/view/grid/wxMyGrid.cpp +++ b/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 ) diff --git a/src/view/grid/wxMyGrid.h b/src/view/grid/wxMyGrid.hpp similarity index 100% rename from src/view/grid/wxMyGrid.h rename to src/view/grid/wxMyGrid.hpp diff --git a/src/view/view.h b/src/view/view.hpp similarity index 98% rename from src/view/view.h rename to src/view/view.hpp index e0b19ec..b40054d 100644 --- a/src/view/view.h +++ b/src/view/view.hpp @@ -46,6 +46,6 @@ namespace view { #define LANG_ROOT RESSOURCES_ROOT "po/" -#include "KissPanel.h" +#include "KissPanel.hpp" #endif diff --git a/src/view/wxUI.cpp b/src/view/wxUI.cpp index 06c521c..a8daa2d 100644 --- a/src/view/wxUI.cpp +++ b/src/view/wxUI.cpp @@ -17,21 +17,21 @@ along with KissCount. If not, see . */ -#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"); diff --git a/src/view/wxUI.h b/src/view/wxUI.hpp similarity index 97% rename from src/view/wxUI.h rename to src/view/wxUI.hpp index ff23f82..9b934c6 100644 --- a/src/view/wxUI.h +++ b/src/view/wxUI.hpp @@ -23,9 +23,9 @@ class ImportEngine; #include -#include +#include -#include "KissPanel.h" +#include "KissPanel.hpp" #ifdef WIN32 #undef _