diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
| commit | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch) | |
| tree | fb31321c80b12ee8e2237bdcf8c228fe44e67772 /kexi/kexidb | |
| parent | fe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff) | |
| download | koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kexi/kexidb')
| -rw-r--r-- | kexi/kexidb/drivermanager.cpp | 4 | ||||
| -rw-r--r-- | kexi/kexidb/utils.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp index b57132977..512bf8ad0 100644 --- a/kexi/kexidb/drivermanager.cpp +++ b/kexi/kexidb/drivermanager.cpp @@ -92,8 +92,8 @@ bool DriverManagerInternal::lookupDrivers() connect(tqApp,TQT_SIGNAL(aboutToQuit()),this,TQT_SLOT(slotAppQuits())); } //TODO: for QT-only version check for TDEInstance wrapper -// KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without TDEInstance (KGlobal::instance()==0)!" << endl; -// setError("Driver Manager cannot work without TDEInstance (KGlobal::instance()==0)!"); +// KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without TDEInstance (TDEGlobal::instance()==0)!" << endl; +// setError("Driver Manager cannot work without TDEInstance (TDEGlobal::instance()==0)!"); lookupDriversNeeded = false; clearError(); diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp index 594773af9..d6652f6d0 100644 --- a/kexi/kexidb/utils.cpp +++ b/kexi/kexidb/utils.cpp @@ -613,12 +613,12 @@ TQString KexiDB::formatNumberForVisibleDecimalPlaces(double value, int decimalPl i--; if (s[i]=='.') //remove '.' i--; - s = s.left(i+1).replace('.', KGlobal::locale()->decimalSymbol()); + s = s.left(i+1).replace('.', TDEGlobal::locale()->decimalSymbol()); return s; } if (decimalPlaces == 0) return TQString::number((int)value); - return KGlobal::locale()->formatNumber(value, decimalPlaces); + return TDEGlobal::locale()->formatNumber(value, decimalPlaces); } KexiDB::Field::Type KexiDB::intToFieldType( int type ) |