Csv importer - align file names

Done in a separate commit
This commit is contained in:
Geert Janssens 2018-03-08 17:12:31 +01:00
parent e71f561236
commit 751a3fec43
27 changed files with 108 additions and 109 deletions

View File

@ -15,17 +15,17 @@ SET(csv_import_SOURCES
csv-account-import.c
gnc-csv-account-map.c
gnc-csv-gnumeric-popup.c
gnc-csv-tokenizer.cpp
gnc-csv-import-settings.cpp
gnc-csv-price-import-settings.cpp
gnc-csv-trans-import-settings.cpp
gnc-dummy-tokenizer.cpp
gnc-fw-tokenizer.cpp
gnc-price-import.cpp
gnc-price-props.cpp
gnc-imp-props-price.cpp
gnc-imp-props-tx.cpp
gnc-imp-settings-csv.cpp
gnc-imp-settings-csv-price.cpp
gnc-imp-settings-csv-tx.cpp
gnc-import-price.cpp
gnc-import-tx.cpp
gnc-tokenizer.cpp
gnc-trans-props.cpp
gnc-tx-import.cpp
gnc-tokenizer-csv.cpp
gnc-tokenizer-dummy.cpp
gnc-tokenizer-fw.cpp
)
# Add dependency on config.h
@ -45,17 +45,17 @@ SET(csv_import_noinst_HEADERS
csv-account-import.h
gnc-csv-account-map.h
gnc-csv-gnumeric-popup.h
gnc-csv-tokenizer.hpp
gnc-csv-import-settings.hpp
gnc-csv-price-import-settings.hpp
gnc-csv-trans-import-settings.hpp
gnc-dummy-tokenizer.hpp
gnc-fw-tokenizer.hpp
gnc-price-import.hpp
gnc-price-props.hpp
gnc-imp-props-price.hpp
gnc-imp-props-tx.hpp
gnc-imp-settings-csv.hpp
gnc-imp-settings-csv-price.hpp
gnc-imp-settings-csv-tx.hpp
gnc-import-price.hpp
gnc-import-tx.hpp
gnc-tokenizer.hpp
gnc-trans-props.hpp
gnc-tx-import.hpp
gnc-tokenizer-csv.hpp
gnc-tokenizer-dummy.hpp
gnc-tokenizer-fw.hpp
)
ADD_LIBRARY(gncmod-csv-import ${csv_import_noinst_HEADERS}

View File

@ -1,5 +1,5 @@
/*******************************************************************\
* assistant-csv-price-import.c -- An assistant for importing *
* assistant-csv-price-import.cpp -- An assistant for importing *
* Prices from a file. *
* *
* Copyright (C) 2017 Robert Fewell *
@ -52,10 +52,10 @@ extern "C"
#include "go-charmap-sel.h"
}
#include "gnc-csv-price-import-settings.hpp"
#include "gnc-price-import.hpp"
#include "gnc-fw-tokenizer.hpp"
#include "gnc-csv-tokenizer.hpp"
#include "gnc-imp-settings-csv-price.hpp"
#include "gnc-import-price.hpp"
#include "gnc-tokenizer-fw.hpp"
#include "gnc-tokenizer-csv.hpp"
#define MIN_COL_WIDTH 70
#define GNC_PREFS_GROUP "dialogs.import.csv"

View File

@ -59,10 +59,10 @@ extern "C"
#include "go-charmap-sel.h"
}
#include "gnc-csv-trans-import-settings.hpp"
#include "gnc-tx-import.hpp"
#include "gnc-fw-tokenizer.hpp"
#include "gnc-csv-tokenizer.hpp"
#include "gnc-imp-settings-csv-tx.hpp"
#include "gnc-import-tx.hpp"
#include "gnc-tokenizer-fw.hpp"
#include "gnc-tokenizer-csv.hpp"
#include <boost/locale.hpp>

View File

@ -1,6 +1,6 @@
/********************************************************************\
* gnc-price-props.cpp - encapsulate price properties for use *
* in the csv importer *
* gnc-imp-props-price.cpp - encapsulate price properties for use *
* in the csv importer *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
@ -37,7 +37,7 @@ extern "C" {
#include <string>
#include <boost/regex.hpp>
#include <boost/regex/icu.hpp>
#include "gnc-price-props.hpp"
#include "gnc-imp-props-price.hpp"
G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_IMPORT;

View File

@ -1,6 +1,6 @@
/********************************************************************\
* gnc-price-props.hpp - encapsulate price properties for use *
* in the csv importer *
* gnc-imp-props-price.hpp - encapsulate price properties for use *
* in the csv importer *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
@ -58,7 +58,7 @@ enum class GncPricePropType {
enum Result { FAILED, ADDED, DUPLICATED, REPLACED };
/** Maps all column types to a string representation.
* The actual definition is in gnc-price-props.cpp.
* The actual definition is in gnc-imp-props-price.cpp.
* Attention: that definition should be adjusted for any
* changes to enum class GncPricePropType ! */
extern std::map<GncPricePropType, const char*> gnc_price_col_type_strs;

View File

@ -1,5 +1,5 @@
/********************************************************************\
* gnc-csv-imp-trans.cpp - import transactions from csv files *
* gnc-imp-props-tx.cpp - import transactions from csv files *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
@ -41,7 +41,7 @@ extern "C" {
#include <string>
#include <boost/regex.hpp>
#include <boost/regex/icu.hpp>
#include "gnc-trans-props.hpp"
#include "gnc-imp-props-tx.hpp"
G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_IMPORT;

View File

@ -1,6 +1,6 @@
/********************************************************************\
* gnc-trans-props.hpp - encapsulate transaction properties for use *
* in the csv importer *
* gnc-imp-props-tx.hpp - encapsulate transaction properties for *
* use in the csv importer *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *

View File

@ -1,5 +1,5 @@
/*******************************************************************\
* gnc-csv-price-import-settings.cpp -- Price CSV Import Settings *
* gnc-imp-settings-csv-price.cpp -- Price CSV Import Settings *
* *
* Copyright (C) 2017 Robert Fewell *
* *
@ -20,14 +20,14 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/
/** @file gnc-csv-price-import-settings.cpp
/** @file gnc-imp-settings-csv-price.cpp
@brief CSV Import Settings
@author Copyright (c) 2014 Robert Fewell
@author Copyright (c) 2016 Geert Janssens
*/
#include "gnc-csv-import-settings.hpp"
#include "gnc-csv-price-import-settings.hpp"
#include "gnc-imp-settings-csv.hpp"
#include "gnc-imp-settings-csv-price.hpp"
#include <sstream>
extern "C"

View File

@ -1,5 +1,5 @@
/*******************************************************************\
* gnc-csv-price-import-settings.hpp -- Price CSV Import Settings *
* gnc-imp-settings-csv-price.hpp -- Price CSV Import Settings *
* *
* Copyright (C) 2017 Robert Fewell *
* *
@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/
/** @file gnc-csv-price-import-settings.hpp
/** @file gnc-imp-settings-csv-price.hpp
@brief CSV Import Settings
@author Copyright (c) 2014 Robert Fewell
@author Copyright (c) 2016 Geert Janssens
@ -36,9 +36,9 @@ extern "C" {
#include <string>
#include <vector>
#include "gnc-price-props.hpp"
#include "gnc-imp-props-price.hpp"
#include "gnc-tokenizer.hpp"
#include "gnc-csv-import-settings.hpp"
#include "gnc-imp-settings-csv.hpp"
struct CsvPriceImpSettings : public CsvImportSettings
{

View File

@ -1,5 +1,5 @@
/*******************************************************************\
* gnc-csv-trans-import-settings.cpp -- Trans CSV Import Settings *
* gnc-imp-settings-csv-tx.cpp -- Trans CSV Import Settings *
* *
* Copyright (C) 2014 Robert Fewell *
* *
@ -20,14 +20,14 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/
/** @file gnc-csv-trans-import-settings.cpp
/** @file gnc-imp-settings-csv-tx.cpp
@brief CSV Import Settings
@author Copyright (c) 2014 Robert Fewell
@author Copyright (c) 2016 Geert Janssens
*/
#include "gnc-csv-import-settings.hpp"
#include "gnc-csv-trans-import-settings.hpp"
#include "gnc-imp-settings-csv.hpp"
#include "gnc-imp-settings-csv-tx.hpp"
#include <sstream>
extern "C"

View File

@ -1,5 +1,5 @@
/*******************************************************************\
* gnc-csv-trans-import-settings.hpp -- Trans CSV Import Settings *
* gnc-imp-settings-csv-tx.hpp -- Trans CSV Import Settings *
* *
* Copyright (C) 2017 Robert Fewell *
* *
@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/
/** @file gnc-csv-trans-import-settings.hpp
/** @file gnc-imp-settings-csv-tx.hpp
@brief CSV Import Settings
@author Copyright (c) 2014 Robert Fewell
@author Copyright (c) 2016 Geert Janssens
@ -36,9 +36,9 @@ extern "C" {
#include <string>
#include <vector>
#include "gnc-trans-props.hpp"
#include "gnc-imp-props-tx.hpp"
#include "gnc-tokenizer.hpp"
#include "gnc-csv-import-settings.hpp"
#include "gnc-imp-settings-csv.hpp"
struct CsvTransImpSettings : public CsvImportSettings
{

View File

@ -1,5 +1,5 @@
/*******************************************************************\
* gnc-csv-import-settings.cpp -- Save and Load CSV Import Settings *
* gnc-imp-settings-csv.cpp -- Save and Load CSV Import Settings *
* *
* Copyright (C) 2014 Robert Fewell *
* *
@ -20,13 +20,13 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/
/** @file gnc-csv-import-settings.cpp
/** @file gnc-imp-settings-csv.cpp
@brief CSV Import Settings
@author Copyright (c) 2014 Robert Fewell
@author Copyright (c) 2016 Geert Janssens
*/
#include "gnc-csv-import-settings.hpp"
#include "gnc-imp-settings-csv.hpp"
#include <sstream>
extern "C"

View File

@ -1,5 +1,5 @@
/*******************************************************************\
* gnc-csv-import-settings.hpp -- Save and Load CSV Import Settings *
* gnc-imp-settings-csv.hpp -- Save and Load CSV Import Settings *
* *
* Copyright (C) 2014 Robert Fewell *
* *
@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/
/** @file gnc-csv-import-settings.hpp
/** @file gnc-imp-settings-csv.hpp
@brief CSV Import Settings
@author Copyright (c) 2014 Robert Fewell
@author Copyright (c) 2016 Geert Janssens

View File

@ -1,5 +1,5 @@
/********************************************************************\
* gnc-price-import.cpp - import prices from csv files *
* gnc-import-price.cpp - import prices from csv files *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
@ -38,11 +38,11 @@ extern "C" {
#include <boost/regex.hpp>
#include <boost/regex/icu.hpp>
#include "gnc-price-import.hpp"
#include "gnc-price-props.hpp"
#include "gnc-csv-tokenizer.hpp"
#include "gnc-fw-tokenizer.hpp"
#include "gnc-csv-price-import-settings.hpp"
#include "gnc-import-price.hpp"
#include "gnc-imp-props-price.hpp"
#include "gnc-tokenizer-csv.hpp"
#include "gnc-tokenizer-fw.hpp"
#include "gnc-imp-settings-csv-price.hpp"
G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_IMPORT;

View File

@ -1,5 +1,5 @@
/********************************************************************\
* gnc-price-import.hpp - import prices from csv files *
* gnc-import-price.hpp - import prices from csv files *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
@ -22,7 +22,7 @@
/** @file
@brief Class to import prices from CSV or fixed width files
*
gnc-price-import.hpp
gnc-import-price.hpp
@author Copyright (c) 2015 Geert Janssens <geert@kobaltwit.be>
@author Copyright (c) 2017 Robert Fewell
*/
@ -41,8 +41,8 @@ extern "C" {
#include <memory>
#include "gnc-tokenizer.hpp"
#include "gnc-price-props.hpp"
#include "gnc-csv-price-import-settings.hpp"
#include "gnc-imp-props-price.hpp"
#include "gnc-imp-settings-csv-price.hpp"
#include <boost/optional.hpp>
/* A set of currency formats that the user sees. */

View File

@ -1,5 +1,5 @@
/********************************************************************\
* gnc-tx-import.cpp - import transactions from csv or fixed-width *
* gnc-import-tx.cpp - import transactions from csv or fixed-width *
* files *
* *
* This program is free software; you can redistribute it and/or *
@ -35,11 +35,11 @@ extern "C" {
#include <boost/regex.hpp>
#include <boost/regex/icu.hpp>
#include "gnc-tx-import.hpp"
#include "gnc-trans-props.hpp"
#include "gnc-csv-tokenizer.hpp"
#include "gnc-fw-tokenizer.hpp"
#include "gnc-csv-trans-import-settings.hpp"
#include "gnc-import-tx.hpp"
#include "gnc-imp-props-tx.hpp"
#include "gnc-tokenizer-csv.hpp"
#include "gnc-tokenizer-fw.hpp"
#include "gnc-imp-settings-csv-tx.hpp"
G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_IMPORT;

View File

@ -1,5 +1,5 @@
/********************************************************************\
* gnc-tx-import.hpp - import transactions from csv files *
* gnc-import-tx.hpp - import transactions from csv files *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
@ -22,7 +22,7 @@
/** @file
@brief Class to import transactions from CSV or fixed width files
*
gnc-tx-import.hpp
gnc-import-tx.hpp
@author Copyright (c) 2015 Geert Janssens <geert@kobaltwit.be>
*/
@ -42,8 +42,8 @@ extern "C" {
#include <memory>
#include "gnc-tokenizer.hpp"
#include "gnc-trans-props.hpp"
#include "gnc-csv-trans-import-settings.hpp"
#include "gnc-imp-props-tx.hpp"
#include "gnc-imp-settings-csv-tx.hpp"
#include <boost/optional.hpp>

View File

@ -1,4 +1,4 @@
#include "gnc-csv-tokenizer.hpp"
#include "gnc-tokenizer-csv.hpp"
#include <iostream>
#include <fstream> // fstream

View File

@ -1,5 +1,5 @@
/********************************************************************\
* gnc-csv-tokenizer.hpp - takes a csv file and converts it into a *
* gnc-tokenizer-csv.hpp - takes a csv file and converts it into a *
* two-dimensional vector of strings (table)*
* *
* This program is free software; you can redistribute it and/or *
@ -27,7 +27,7 @@
However, no gnucash specific interpretation is done yet, that's up
to the code using this class.
*
gnc-csv-tokenizer.hpp
gnc-tokenizer-csv.hpp
@author Copyright (c) 2015 Geert Janssens <geert@kobaltwit.be>
*/

View File

@ -1,4 +1,4 @@
#include "gnc-dummy-tokenizer.hpp"
#include "gnc-tokenizer-dummy.hpp"
#include <iostream>
#include <fstream> // fstream

View File

@ -1,8 +1,7 @@
/********************************************************************\
* gnc-dummy-tokenizer.hpp - takes a file and converts it into a *
* gnc-tokenizer-dummy.hpp - takes a file and converts it into a *
* two-dimensional vector of strings (table) *
* splitting the contents on fixed width *
* positions *
* each row will only have one single column *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
@ -29,7 +28,7 @@
This is just a dummy that can be used as long as the file format isn't
specified yet by the user.
*
gnc-dummy-tokenizer.hpp
gnc-tokenizer-dummy.hpp
@author Copyright (c) 2016 Geert Janssens <geert@kobaltwit.be>
*/

View File

@ -1,4 +1,4 @@
#include "gnc-fw-tokenizer.hpp"
#include "gnc-tokenizer-fw.hpp"
#include <iostream>
#include <fstream> // fstream

View File

@ -1,5 +1,5 @@
/********************************************************************\
* gnc-fw-tokenizer.hpp - takes a file and converts it into a *
* gnc-tokenizer-fw.hpp - takes a file and converts it into a *
* two-dimensional vector of strings (table) *
* splitting the contents on fixed width *
* positions *
@ -30,7 +30,7 @@
However, no gnucash specific interpretation is done yet, that's up
to the code using this class.
*
gnc-fw-tokenizer.hpp
gnc-tokenizer-fw.hpp
@author Copyright (c) 2015 Geert Janssens <geert@kobaltwit.be>
*/

View File

@ -1,7 +1,7 @@
#include "gnc-tokenizer.hpp"
#include "gnc-csv-tokenizer.hpp"
#include "gnc-dummy-tokenizer.hpp"
#include "gnc-fw-tokenizer.hpp"
#include "gnc-tokenizer-csv.hpp"
#include "gnc-tokenizer-dummy.hpp"
#include "gnc-tokenizer-fw.hpp"
#include <iostream>
#include <fstream> // fstream

View File

@ -26,8 +26,8 @@
#include <guid.hpp>
#include "../gnc-tokenizer.hpp"
#include "../gnc-csv-tokenizer.hpp"
#include "../gnc-fw-tokenizer.hpp"
#include "../gnc-tokenizer-csv.hpp"
#include "../gnc-tokenizer-fw.hpp"
#include <gtest/gtest.h>
#include <iostream>
#include <fstream> // fstream

View File

@ -24,8 +24,8 @@
#include <guid.hpp>
#include "../gnc-tokenizer.hpp"
#include "../gnc-csv-tokenizer.hpp"
#include "../gnc-fw-tokenizer.hpp"
#include "../gnc-tokenizer-csv.hpp"
#include "../gnc-tokenizer-fw.hpp"
#include <gtest/gtest.h>
#include <iostream>
#include <fstream> // fstream
@ -34,7 +34,7 @@
#include <stdlib.h> /* getenv */
/* Add specific headers for this class */
#include "../gnc-tx-import.hpp"
#include "../gnc-import-tx.hpp"
//typedef struct
//{

View File

@ -307,19 +307,19 @@ gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
gnucash/import-export/csv-imp/csv-account-import.c
gnucash/import-export/csv-imp/gnc-csv-account-map.c
gnucash/import-export/csv-imp/gnc-csv-gnumeric-popup.c
gnucash/import-export/csv-imp/gnc-csv-import-settings.cpp
gnucash/import-export/csv-imp/gnc-csv-price-import-settings.cpp
gnucash/import-export/csv-imp/gnc-csv-tokenizer.cpp
gnucash/import-export/csv-imp/gnc-csv-trans-import-settings.cpp
gnucash/import-export/csv-imp/gnc-dummy-tokenizer.cpp
gnucash/import-export/csv-imp/gnc-fw-tokenizer.cpp
gnucash/import-export/csv-imp/gnc-import-price.cpp
gnucash/import-export/csv-imp/gnc-import-tx.cpp
gnucash/import-export/csv-imp/gnc-imp-props-price.cpp
gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp
gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp
gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
gnucash/import-export/csv-imp/gncmod-csv-import.c
gnucash/import-export/csv-imp/gnc-plugin-csv-import.c
gnucash/import-export/csv-imp/gnc-price-import.cpp
gnucash/import-export/csv-imp/gnc-price-props.cpp
gnucash/import-export/csv-imp/gnc-tokenizer.cpp
gnucash/import-export/csv-imp/gnc-trans-props.cpp
gnucash/import-export/csv-imp/gnc-tx-import.cpp
gnucash/import-export/csv-imp/gnc-tokenizer-csv.cpp
gnucash/import-export/csv-imp/gnc-tokenizer-dummy.cpp
gnucash/import-export/csv-imp/gnc-tokenizer-fw.cpp
gnucash/import-export/customer-import/dialog-customer-import.c
gnucash/import-export/customer-import/dialog-customer-import-gui.c
gnucash/import-export/customer-import/gncmod-customer-import.c