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/migration | |
| 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/migration')
| -rw-r--r-- | kexi/migration/importwizard.cpp | 2 | ||||
| -rw-r--r-- | kexi/migration/migratemanager.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp index 6fdc5966..a62f90aa 100644 --- a/kexi/migration/importwizard.cpp +++ b/kexi/migration/importwizard.cpp @@ -110,7 +110,7 @@ ImportWizard::ImportWizard(TQWidget *parent, TQMap<TQString,TQString>* args) } } - m_sourceDBEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); //default + m_sourceDBEncoding = TQString::fromLatin1(TDEGlobal::locale()->encoding()); //default } //=========================================================== diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp index 6d0bbc78..0cd52b4b 100644 --- a/kexi/migration/migratemanager.cpp +++ b/kexi/migration/migratemanager.cpp @@ -95,8 +95,8 @@ bool MigrateManagerInternal::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(); |