diff options
Diffstat (limited to 'kexi')
| -rw-r--r-- | kexi/core/kexipartmanager.cpp | 4 | ||||
| -rwxr-xr-x | kexi/doc/dev/CHANGELOG-Kexi-js | 2 | ||||
| -rw-r--r-- | kexi/formeditor/widgetlibrary.cpp | 4 | ||||
| -rw-r--r-- | kexi/kexidb/driver.h | 2 | ||||
| -rw-r--r-- | kexi/kexidb/drivermanager.cpp | 4 | ||||
| -rw-r--r-- | kexi/migration/migratemanager.cpp | 4 | ||||
| -rw-r--r-- | kexi/tests/newapi/mysqlcursortest_expectedoutput | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp index 1c9e17c3c..9016add8e 100644 --- a/kexi/core/kexipartmanager.cpp +++ b/kexi/core/kexipartmanager.cpp @@ -55,7 +55,7 @@ Manager::lookup() m_partlist.clear(); m_partsByMime.clear(); m_parts.clear(); - KTrader::OfferList tlist = KTrader::self()->query("Kexi/Handler", + TDETrader::OfferList tlist = TDETrader::self()->query("Kexi/Handler", "[X-Kexi-PartVersion] == " + TQString::number(KEXI_PART_VERSION)); TDEConfig conf("kexirc", true); @@ -66,7 +66,7 @@ Manager::lookup() int offset = size; //we will insert not described parts from #offset //compute order - for(KTrader::OfferList::ConstIterator it(tlist.constBegin()); it != tlist.constEnd(); ++it) + for(TDETrader::OfferList::ConstIterator it(tlist.constBegin()); it != tlist.constEnd(); ++it) { KService::Ptr ptr = (*it); TQCString mime = ptr->property("X-Kexi-TypeMime").toCString(); diff --git a/kexi/doc/dev/CHANGELOG-Kexi-js b/kexi/doc/dev/CHANGELOG-Kexi-js index 301da9259..c5779c17f 100755 --- a/kexi/doc/dev/CHANGELOG-Kexi-js +++ b/kexi/doc/dev/CHANGELOG-Kexi-js @@ -5673,7 +5673,7 @@ TODO: move this submenu after 'Error report' Entry (requires changes to koffice_ - kexirc added - added option for KexiBrowserItem to be sorted in FIFO order (top level items - by default, others are sorted in alpha order). Visible Parts' order is now specified (by library name) - in the Kexi's main config file "kexirc" ([Parts]/Order), because KTrader sorts parts + in the Kexi's main config file "kexirc" ([Parts]/Order), because TDETrader sorts parts by name in aplha order. Unspecified Parts are appended at the end of list. This order setting is loaded and used on parts loading (KexiProject::loadHandlers()). diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index ddbc17188..c15c3a9c3 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -195,8 +195,8 @@ WidgetLibrary::loadFactoryWidgets(WidgetFactory *f) void WidgetLibrary::lookupFactories() { - KTrader::OfferList tlist = KTrader::self()->query("KFormDesigner/WidgetFactory"); - KTrader::OfferList::ConstIterator it, end( tlist.constEnd() ); + TDETrader::OfferList tlist = TDETrader::self()->query("KFormDesigner/WidgetFactory"); + TDETrader::OfferList::ConstIterator it, end( tlist.constEnd() ); for( it = tlist.constBegin(); it != end; ++it) { KService::Ptr ptr = (*it); diff --git a/kexi/kexidb/driver.h b/kexi/kexidb/driver.h index 2221fc09e..15ef6c967 100644 --- a/kexi/kexidb/driver.h +++ b/kexi/kexidb/driver.h @@ -55,7 +55,7 @@ class DriverPrivate; where: - CLASS_NAME is actual driver's class name, e.g. MySqlDriver - INTERNAL_NAME is driver name's most significant part (without quotation marks), e.g. mysql - Above information uses K_EXPORT_COMPONENT_FACTORY macro for KTrader to find the module's entry point. + Above information uses K_EXPORT_COMPONENT_FACTORY macro for TDETrader to find the module's entry point. For example, this line declares kexidb_mysqldriver.so module's entry point: \code KEXIDB_DRIVER_INFO( MySqlDriver, mysql ); diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp index c8c432e24..498c4610b 100644 --- a/kexi/kexidb/drivermanager.cpp +++ b/kexi/kexidb/drivermanager.cpp @@ -97,8 +97,8 @@ bool DriverManagerInternal::lookupDrivers() lookupDriversNeeded = false; clearError(); - KTrader::OfferList tlist = KTrader::self()->query("Kexi/DBDriver"); - KTrader::OfferList::ConstIterator it(tlist.constBegin()); + TDETrader::OfferList tlist = TDETrader::self()->query("Kexi/DBDriver"); + TDETrader::OfferList::ConstIterator it(tlist.constBegin()); for(; it != tlist.constEnd(); ++it) { KService::Ptr ptr = (*it); diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp index 876a96315..07245ba9e 100644 --- a/kexi/migration/migratemanager.cpp +++ b/kexi/migration/migratemanager.cpp @@ -100,8 +100,8 @@ bool MigrateManagerInternal::lookupDrivers() lookupDriversNeeded = false; clearError(); - KTrader::OfferList tlist = KTrader::self()->query("Kexi/MigrationDriver"); - KTrader::OfferList::ConstIterator it(tlist.constBegin()); + TDETrader::OfferList tlist = TDETrader::self()->query("Kexi/MigrationDriver"); + TDETrader::OfferList::ConstIterator it(tlist.constBegin()); for(; it != tlist.constEnd(); ++it) { KService::Ptr ptr = (*it); diff --git a/kexi/tests/newapi/mysqlcursortest_expectedoutput b/kexi/tests/newapi/mysqlcursortest_expectedoutput index 8e81970a2..66fde8299 100644 --- a/kexi/tests/newapi/mysqlcursortest_expectedoutput +++ b/kexi/tests/newapi/mysqlcursortest_expectedoutput @@ -1,7 +1,7 @@ KexiDB: DriverManagerInternal::incRefCount(): 1 -tdeio (KTrader): KServiceTypeProfile::offers( Kexi/DBDriver, ) +tdeio (TDETrader): KServiceTypeProfile::offers( Kexi/DBDriver, ) tdeio (KSycoca): Trying to open tdesycoca from /var/tmp/tdecache-jowenn/tdesycoca -tdeio (KTrader): Returning 2 offers +tdeio (TDETrader): Returning 2 offers KexiDB: KexiDB::DriverManager::lookupDrivers(): registered driver: mySQL(kexidb_mysqldriver) KexiDB: KexiDB::DriverManager::lookupDrivers(): registered driver: SQLite(kexidb_sqlitedriver) newapi: DRIVERS: |