diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:42:26 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:42:26 -0600 |
| commit | 786304c6211f35ddc4cdd54b7aa7985fef4a2e70 (patch) | |
| tree | c881806a53e2864b7e183f4930f0b20abf657c38 /kexi/kexidb | |
| parent | 0dda6e85e171acf1a73dc8d3d1f67b4fcc9b1ae7 (diff) | |
| download | koffice-786304c6211f35ddc4cdd54b7aa7985fef4a2e70.tar.gz koffice-786304c6211f35ddc4cdd54b7aa7985fef4a2e70.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kexi/kexidb')
| -rw-r--r-- | kexi/kexidb/driver.h | 2 | ||||
| -rw-r--r-- | kexi/kexidb/drivermanager.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kexi/kexidb/driver.h b/kexi/kexidb/driver.h index 2221fc09..15ef6c96 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 c8c432e2..498c4610 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); |