summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog2
-rw-r--r--kmymoney2/mymoney/storage/imymoneyserialize.h2
-rw-r--r--kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp2
-rw-r--r--kmymoney2/mymoney/storage/mymoneydatabasemgr.h4
-rw-r--r--kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp4
-rw-r--r--kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp2
-rw-r--r--kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h2
-rw-r--r--kmymoney2/mymoney/storage/mymoneystoragesql.cpp28
-rw-r--r--kmymoney2/mymoney/storage/mymoneystoragesql.h10
-rw-r--r--kmymoney2/views/kmymoneyview.cpp2
10 files changed, 29 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index b542ab4..85a1ef1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -552,7 +552,7 @@
2009-05-09 Fernando Vilas <fvilas@iname.com>
* Updated schedule test cases to pass after Tony's patch
* Fixed a few warnings about const on primitive return types
- * Made MMStorageSql inherit from KShared
+ * Made MMStorageSql inherit from TDEShared
* Changed the include order on reports test and pivottable test to make
tests compile on Slackware
diff --git a/kmymoney2/mymoney/storage/imymoneyserialize.h b/kmymoney2/mymoney/storage/imymoneyserialize.h
index dc37edd..086f040 100644
--- a/kmymoney2/mymoney/storage/imymoneyserialize.h
+++ b/kmymoney2/mymoney/storage/imymoneyserialize.h
@@ -71,7 +71,7 @@ public:
/**
* This method is used to get a SQL reader for subsequent database access
*/
- virtual KSharedPtr <MyMoneyStorageSql> connectToDatabase
+ virtual TDESharedPtr <MyMoneyStorageSql> connectToDatabase
(const KURL& url) = 0;
/**
* This method is used when a database file is open, and the data is to
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
index 8767b61..555ce4d 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
@@ -1656,7 +1656,7 @@ void MyMoneyDatabaseMgr::rollbackTransaction(void)
void MyMoneyDatabaseMgr::setCreationDate(const TQDate& val)
{ m_creationDate = val; }
-KSharedPtr <MyMoneyStorageSql> MyMoneyDatabaseMgr::connectToDatabase(const KURL& url) {
+TDESharedPtr <MyMoneyStorageSql> MyMoneyDatabaseMgr::connectToDatabase(const KURL& url) {
m_sql = new MyMoneyStorageSql (this, url);
return m_sql;
}
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.h b/kmymoney2/mymoney/storage/mymoneydatabasemgr.h
index 5135ca4..4432222 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.h
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.h
@@ -854,7 +854,7 @@ public:
/**
* This method is used to get a SQL reader for subsequent database access
*/
- virtual KSharedPtr <MyMoneyStorageSql> connectToDatabase
+ virtual TDESharedPtr <MyMoneyStorageSql> connectToDatabase
(const KURL& url);
/**
* This method is used when a database file is open, and the data is to
@@ -966,7 +966,7 @@ private:
/**
* This contains the interface with SQL reader for database access
*/
- KSharedPtr <MyMoneyStorageSql> m_sql;
+ TDESharedPtr <MyMoneyStorageSql> m_sql;
/**
* This member variable keeps the User information.
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
index d80c348..82b2cd1 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
@@ -96,7 +96,7 @@ void MyMoneyDatabaseMgrTest::testCreateDb() {
//"QSQLITE3&mode=single";
//"QMYSQL3&mode=single";
+ *it + "&mode=single";
- KSharedPtr <MyMoneyStorageSql> sql = m->connectToDatabase(m_url);
+ TDESharedPtr <MyMoneyStorageSql> sql = m->connectToDatabase(m_url);
CPPUNIT_ASSERT(0 != sql);
//tqDebug("Database driver is %s", sql->driverName().ascii());
// Clear the database, so there is a fresh start on each run.
@@ -116,7 +116,7 @@ void MyMoneyDatabaseMgrTest::testAttachDb() {
testCreateDb();
if (m_canOpen) {
MyMoneyFile::instance()->detachStorage();
- KSharedPtr <MyMoneyStorageSql> sql = m->connectToDatabase(m_url);
+ TDESharedPtr <MyMoneyStorageSql> sql = m->connectToDatabase(m_url);
CPPUNIT_ASSERT(sql);
int openStatus = sql->open(m_url, IO_ReadWrite);
CPPUNIT_ASSERT(0 == openStatus);
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
index 35122e3..d2950d5 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
@@ -110,7 +110,7 @@ MyMoneySeqAccessMgr const * MyMoneySeqAccessMgr::duplicate(void)
/**
* This method is used to get a SQL reader for subsequent database access
*/
-KSharedPtr <MyMoneyStorageSql> MyMoneySeqAccessMgr::connectToDatabase
+TDESharedPtr <MyMoneyStorageSql> MyMoneySeqAccessMgr::connectToDatabase
(const KURL& /*url*/) {
return 0;
}
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
index 5689e73..5ab597e 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
@@ -100,7 +100,7 @@ public:
/**
* This method is used to get a SQL reader for subsequent database access
*/
- KSharedPtr <MyMoneyStorageSql> connectToDatabase (const KURL& url);
+ TDESharedPtr <MyMoneyStorageSql> connectToDatabase (const KURL& url);
/**
* This method is used when a database file is open, and the data is to
* be saved in a different file or format. It will ensure that all data
diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
index 6868e64..7f325e6 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
@@ -3833,7 +3833,7 @@ MyMoneyDbDef::MyMoneyDbDef () {
//#define ISKEY true
void MyMoneyDbDef::FileInfo(void){
- TQValueList<KSharedPtr <MyMoneyDbColumn> > fields;
+ TQValueList<TDESharedPtr <MyMoneyDbColumn> > fields;
fields.append(new MyMoneyDbColumn("version", "varchar(16)"));
fields.append(new MyMoneyDbColumn("created", "date"));
fields.append(new MyMoneyDbColumn("lastModified", "date"));
@@ -3872,7 +3872,7 @@ void MyMoneyDbDef::FileInfo(void){
}
void MyMoneyDbDef::Institutions(void){
- TQValueList<KSharedPtr <MyMoneyDbColumn> > fields;
+ TQValueList<TDESharedPtr <MyMoneyDbColumn> > fields;
fields.append(new MyMoneyDbColumn("id", "varchar(32)", PRIMARYKEY, NOTNULL));
fields.append(new MyMoneyDbTextColumn("name", MyMoneyDbTextColumn::NORMAL, false, NOTNULL));
fields.append(new MyMoneyDbTextColumn("manager"));
@@ -3887,7 +3887,7 @@ void MyMoneyDbDef::Institutions(void){
}
void MyMoneyDbDef::Payees(void){
- TQValueList<KSharedPtr <MyMoneyDbColumn> > fields;
+ TQValueList<TDESharedPtr <MyMoneyDbColumn> > fields;
fields.append(new MyMoneyDbColumn("id", "varchar(32)", PRIMARYKEY, NOTNULL));
fields.append(new MyMoneyDbTextColumn("name"));
fields.append(new MyMoneyDbTextColumn("reference"));
@@ -3908,7 +3908,7 @@ void MyMoneyDbDef::Payees(void){
}
void MyMoneyDbDef::Accounts(void){
- TQValueList<KSharedPtr <MyMoneyDbColumn> > fields;
+ TQValueList<TDESharedPtr <MyMoneyDbColumn> > fields;
fields.append(new MyMoneyDbColumn("id", "varchar(32)", PRIMARYKEY, NOTNULL));
fields.append(new MyMoneyDbColumn("institutionId", "varchar(32)"));
fields.append(new MyMoneyDbColumn("parentId", "varchar(32)"));
@@ -3931,7 +3931,7 @@ void MyMoneyDbDef::Accounts(void){
}
void MyMoneyDbDef::Transactions(void){
- TQValueList<KSharedPtr <MyMoneyDbColumn> > fields;
+ TQValueList<TDESharedPtr <MyMoneyDbColumn> > fields;
fields.append(new MyMoneyDbColumn("id", "varchar(32)", PRIMARYKEY, NOTNULL));
fields.append(new MyMoneyDbColumn("txType", "char(1)"));
fields.append(new MyMoneyDbDatetimeColumn("postDate"));
@@ -3945,7 +3945,7 @@ void MyMoneyDbDef::Transactions(void){
}
void MyMoneyDbDef::Splits(void){
- TQValueList<KSharedPtr <MyMoneyDbColumn> > fields;
+ TQValueList<TDESharedPtr <MyMoneyDbColumn> > fields;
fields.append(new MyMoneyDbColumn("transactionId", "varchar(32)", PRIMARYKEY, NOTNULL));
fields.append(new MyMoneyDbColumn("txType", "char(1)"));
fields.append(new MyMoneyDbIntColumn("splitId", MyMoneyDbIntColumn::SMALL, UNSIGNED, PRIMARYKEY, NOTNULL));
@@ -3973,7 +3973,7 @@ void MyMoneyDbDef::Splits(void){
}
void MyMoneyDbDef::KeyValuePairs(void){
- TQValueList<KSharedPtr <MyMoneyDbColumn> > fields;
+ TQValueList<TDESharedPtr <MyMoneyDbColumn> > fields;
fields.append(new MyMoneyDbColumn("kvpType", "varchar(16)", false, NOTNULL));
fields.append(new MyMoneyDbColumn("kvpId", "varchar(32)"));
fields.append(new MyMoneyDbColumn("kvpKey", "varchar(255)", false, NOTNULL));
@@ -3987,7 +3987,7 @@ void MyMoneyDbDef::KeyValuePairs(void){
}
void MyMoneyDbDef::Schedules(void){
- TQValueList<KSharedPtr <MyMoneyDbColumn> > fields;
+ TQValueList<TDESharedPtr <MyMoneyDbColumn> > fields;
fields.append(new MyMoneyDbColumn("id", "varchar(32)", PRIMARYKEY, NOTNULL));
fields.append(new MyMoneyDbTextColumn("name", MyMoneyDbTextColumn::NORMAL, false, NOTNULL));
fields.append(new MyMoneyDbIntColumn("type", MyMoneyDbIntColumn::TINY, UNSIGNED, false, NOTNULL));
@@ -4014,7 +4014,7 @@ void MyMoneyDbDef::Schedules(void){
}
void MyMoneyDbDef::SchedulePaymentHistory(void){
- TQValueList<KSharedPtr <MyMoneyDbColumn> > fields;
+ TQValueList<TDESharedPtr <MyMoneyDbColumn> > fields;
fields.append(new MyMoneyDbColumn("schedId", "varchar(32)", PRIMARYKEY, NOTNULL));
fields.append(new MyMoneyDbColumn("payDate", "date", PRIMARYKEY, NOTNULL));
MyMoneyDbTable t("kmmSchedulePaymentHistory", fields);
@@ -4023,7 +4023,7 @@ void MyMoneyDbDef::SchedulePaymentHistory(void){
}
void MyMoneyDbDef::Securities(void){
- TQValueList<KSharedPtr <MyMoneyDbColumn> > fields;
+ TQValueList<TDESharedPtr <MyMoneyDbColumn> > fields;
fields.append(new MyMoneyDbColumn("id", "varchar(32)", PRIMARYKEY, NOTNULL));
fields.append(new MyMoneyDbColumn("name", "text", false, NOTNULL));
fields.append(new MyMoneyDbTextColumn("symbol"));
@@ -4038,7 +4038,7 @@ void MyMoneyDbDef::Securities(void){
}
void MyMoneyDbDef::Prices(void){
- TQValueList<KSharedPtr <MyMoneyDbColumn> > fields;
+ TQValueList<TDESharedPtr <MyMoneyDbColumn> > fields;
fields.append(new MyMoneyDbColumn("fromId", "varchar(32)", PRIMARYKEY, NOTNULL));
fields.append(new MyMoneyDbColumn("toId", "varchar(32)", PRIMARYKEY, NOTNULL));
fields.append(new MyMoneyDbColumn("priceDate", "date", PRIMARYKEY, NOTNULL));
@@ -4051,7 +4051,7 @@ void MyMoneyDbDef::Prices(void){
}
void MyMoneyDbDef::Currencies(void){
- TQValueList<KSharedPtr <MyMoneyDbColumn> > fields;
+ TQValueList<TDESharedPtr <MyMoneyDbColumn> > fields;
fields.append(new MyMoneyDbColumn("ISOcode", "char(3)", PRIMARYKEY, NOTNULL));
fields.append(new MyMoneyDbTextColumn("name", MyMoneyDbTextColumn::NORMAL, false, NOTNULL));
fields.append(new MyMoneyDbIntColumn("type", MyMoneyDbIntColumn::SMALL, UNSIGNED));
@@ -4069,7 +4069,7 @@ void MyMoneyDbDef::Currencies(void){
}
void MyMoneyDbDef::Reports(void) {
- TQValueList<KSharedPtr <MyMoneyDbColumn> > fields;
+ TQValueList<TDESharedPtr <MyMoneyDbColumn> > fields;
fields.append(new MyMoneyDbColumn("name", "varchar(255)", false, NOTNULL));
fields.append(new MyMoneyDbTextColumn("XML", MyMoneyDbTextColumn::LONG));
fields.append(new MyMoneyDbColumn("id", "varchar(32)", PRIMARYKEY, NOTNULL));
@@ -4079,7 +4079,7 @@ void MyMoneyDbDef::Reports(void) {
}
void MyMoneyDbDef::Budgets(void){
- TQValueList<KSharedPtr <MyMoneyDbColumn> > fields;
+ TQValueList<TDESharedPtr <MyMoneyDbColumn> > fields;
fields.append(new MyMoneyDbColumn("id", "varchar(32)", PRIMARYKEY, NOTNULL));
fields.append(new MyMoneyDbColumn("name", "text", false, NOTNULL));
fields.append(new MyMoneyDbColumn("start", "date", false, NOTNULL));
diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.h b/kmymoney2/mymoney/storage/mymoneystoragesql.h
index c5a2616..6bf7289 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragesql.h
+++ b/kmymoney2/mymoney/storage/mymoneystoragesql.h
@@ -121,7 +121,7 @@ class MyMoneyDbDrivers {
* The MyMoneyDbColumn class is a base type for generic db columns.
* Derived types exist for several common column types.
*/
-class MyMoneyDbColumn : public KShared {
+class MyMoneyDbColumn : public TDEShared {
public:
MyMoneyDbColumn (const TQString& iname,
const TQString& itype = TQString(),
@@ -271,7 +271,7 @@ class MyMoneyDbIndex {
class MyMoneyDbTable {
public:
MyMoneyDbTable (const TQString& iname,
- const TQValueList<KSharedPtr <MyMoneyDbColumn> >& ifields,
+ const TQValueList<TDESharedPtr <MyMoneyDbColumn> >& ifields,
const TQString& initVersion = "1.0"):
m_name(iname),
m_fields(ifields),
@@ -335,12 +335,12 @@ class MyMoneyDbTable {
*/
void addIndex(const TQString& name, const TQStringList& columns, bool unique = false);
- typedef TQValueList<KSharedPtr <MyMoneyDbColumn> >::const_iterator field_iterator;
+ typedef TQValueList<TDESharedPtr <MyMoneyDbColumn> >::const_iterator field_iterator;
inline field_iterator begin(void) const {return m_fields.constBegin();}
inline field_iterator end(void) const {return m_fields.constEnd(); }
private:
TQString m_name;
- TQValueList<KSharedPtr <MyMoneyDbColumn> > m_fields;
+ TQValueList<TDESharedPtr <MyMoneyDbColumn> > m_fields;
typedef TQValueList<MyMoneyDbIndex>::const_iterator index_iterator;
TQValueList<MyMoneyDbIndex> m_indices;
@@ -432,7 +432,7 @@ class IMyMoneySerialize;
* The MyMoneyDbColumn class is a base type for generic db columns.
* Derived types exist for several common column types.
*/
-class MyMoneyStorageSql : public IMyMoneyStorageFormat, public TQSqlDatabase, public KShared {
+class MyMoneyStorageSql : public IMyMoneyStorageFormat, public TQSqlDatabase, public TDEShared {
public:
MyMoneyStorageSql (IMyMoneySerialize *storage, const KURL& = KURL());
diff --git a/kmymoney2/views/kmymoneyview.cpp b/kmymoney2/views/kmymoneyview.cpp
index 48c676f..ce0b592 100644
--- a/kmymoney2/views/kmymoneyview.cpp
+++ b/kmymoney2/views/kmymoneyview.cpp
@@ -796,7 +796,7 @@ bool KMyMoneyView::openDatabase (const KURL& url) {
pDBMgr = new MyMoneyDatabaseMgr;
pStorage = dynamic_cast<IMyMoneySerialize*> (pDBMgr);
}
- KSharedPtr <MyMoneyStorageSql> reader = pStorage->connectToDatabase (url);
+ TDESharedPtr <MyMoneyStorageSql> reader = pStorage->connectToDatabase (url);
KURL dbURL (url);
bool retry = true;
while (retry) {
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-01 22:55:07 +0000