From: <ibr...@us...> - 2013-11-22 22:01:25
|
Revision: 4948 http://sourceforge.net/p/tora/code/4948 Author: ibre5041 Date: 2013-11-22 22:01:21 +0000 (Fri, 22 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/tora/src/core/toresultdata.cpp trunk/tora/src/core/toresultdata.h trunk/tora/src/core/toresulttableviewedit.h Modified: trunk/tora/src/core/toresultdata.cpp =================================================================== --- trunk/tora/src/core/toresultdata.cpp 2013-11-21 19:56:22 UTC (rev 4947) +++ trunk/tora/src/core/toresultdata.cpp 2013-11-22 22:01:21 UTC (rev 4948) @@ -201,7 +201,7 @@ toConnection &conn = connection(); //conn std::list<QString> priKeys = conn.primaryKeys(); SQL = "SELECT "; - std::list<QString>::iterator ite; + //std::list<QString>::iterator ite; //conn for(ite=priKeys.begin();ite!=priKeys.end();ite++) // SQL = SQL + *ite + ","; SQL = SQL + "%2.* FROM %1.%2"; @@ -230,20 +230,6 @@ Edit->clearData(); } -void toResultData::exportData(std::map<QString, QString> &data, - const QString &prefix) -{ - ; // stub -} - - -void toResultData::importData(std::map<QString, QString> &data, - const QString &prefix) -{ - ; // stub -} - - void toResultData::closeEvent(QCloseEvent *event) { if (maybeSave()) Modified: trunk/tora/src/core/toresultdata.h =================================================================== --- trunk/tora/src/core/toresultdata.h 2013-11-21 19:56:22 UTC (rev 4947) +++ trunk/tora/src/core/toresultdata.h 2013-11-22 22:01:21 UTC (rev 4948) @@ -131,28 +131,7 @@ return true; } - /** - * Export data to a map. - * - * @param data A map that can be used to recreate the data of a chart. - * @param prefix Prefix to add to the map. - */ - virtual void exportData(std::map<QString, QString> &data, - const QString &prefix); - - - /** - * Import data - * - * @param data Data to read from a map. - * @param prefix Prefix to read data from. - */ - virtual void importData(std::map<QString, QString> &data, - const QString &prefix); - - - /** * Prompt to save if modified. * */ Modified: trunk/tora/src/core/toresulttableviewedit.h =================================================================== --- trunk/tora/src/core/toresulttableviewedit.h 2013-11-21 19:56:22 UTC (rev 4947) +++ trunk/tora/src/core/toresulttableviewedit.h 2013-11-22 22:01:21 UTC (rev 4948) @@ -84,6 +84,7 @@ QString Owner, Table; + // this code is duplicate to toResultModelEdit unsigned commitDelete(ChangeSet &change, toConnection &conn); unsigned commitAdd(ChangeSet &change, toConnection &conn); unsigned commitUpdate(ChangeSet &change, toConnection &conn); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |