diff options
Diffstat (limited to 'kexi/core')
| -rw-r--r-- | kexi/core/kexi.cpp | 2 | ||||
| -rw-r--r-- | kexi/core/kexidbconnectionset.cpp | 8 | ||||
| -rw-r--r-- | kexi/core/kexidbshortcutfile.cpp | 6 | ||||
| -rw-r--r-- | kexi/core/kexidbshortcutfile.h | 2 | ||||
| -rw-r--r-- | kexi/core/kexitemplateloader.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp index dbaddb11..f352b51b 100644 --- a/kexi/core/kexi.cpp +++ b/kexi/core/kexi.cpp @@ -145,7 +145,7 @@ TQFont Kexi::smallFont(TQWidget *init) _INIT_SHARED; if (!_int->smallFont) { _int->smallFont = new TQFont( init->font() ); - const int wdth = KGlobalSettings::desktopGeometry(init).width(); + const int wdth = TDEGlobalSettings::desktopGeometry(init).width(); int size = 10 + TQMAX(0, wdth - 1100) / 100; size = TQMIN( init->fontInfo().pixelSize(), size ); _int->smallFont->setPixelSize( size ); diff --git a/kexi/core/kexidbconnectionset.cpp b/kexi/core/kexidbconnectionset.cpp index 492e779d..69828d07 100644 --- a/kexi/core/kexidbconnectionset.cpp +++ b/kexi/core/kexidbconnectionset.cpp @@ -68,7 +68,7 @@ bool KexiDBConnectionSet::addConnectionData(KexiDB::ConnectionData *data, const || !filename.isEmpty() && data==d->dataForFilenames[filename]; if (generateUniqueFilename) { - TQString dir = KGlobal::dirs()->saveLocation("data", "kexi/connections/", false /*!create*/); + TQString dir = TDEGlobal::dirs()->saveLocation("data", "kexi/connections/", false /*!create*/); if (dir.isEmpty()) return false; TQString baseFilename( dir + (data->hostName.isEmpty() ? "localhost" : data->hostName) ); @@ -151,11 +151,11 @@ void KexiDBConnectionSet::clear() void KexiDBConnectionSet::load() { clear(); -// TQStringList dirs( KGlobal::dirs()->findDirs("data", "kexi/connections") ); +// TQStringList dirs( TDEGlobal::dirs()->findDirs("data", "kexi/connections") ); // kexidbg << dirs << endl; - TQStringList files( KGlobal::dirs()->findAllResources("data", "kexi/connections/*.kexic") ); + TQStringList files( TDEGlobal::dirs()->findAllResources("data", "kexi/connections/*.kexic") ); // //also try for capital file extension -// files += KGlobal::dirs()->findAllResources("data", "kexi/connections/*.KEXIC"); +// files += TDEGlobal::dirs()->findAllResources("data", "kexi/connections/*.KEXIC"); // kexidbg << files << endl; foreach(TQStringList::ConstIterator, it, files) { diff --git a/kexi/core/kexidbshortcutfile.cpp b/kexi/core/kexidbshortcutfile.cpp index 01f0adb3..1969caf5 100644 --- a/kexi/core/kexidbshortcutfile.cpp +++ b/kexi/core/kexidbshortcutfile.cpp @@ -286,11 +286,11 @@ bool KexiDBConnShortcutFile::saveConnectionData(const KexiDB::ConnectionData& da bool KexiDBConnSetShortcutFiles::loadConnectionDataSet(KexiDBConnectionSet& set) { set.clear(); -// TQStringList dirs( KGlobal::dirs()->findDirs("data", "kexi/connections") ); +// TQStringList dirs( TDEGlobal::dirs()->findDirs("data", "kexi/connections") ); // kexidbg << dirs << endl; - TQStringList files( KGlobal::dirs()->findAllResources("data", "kexi/connections/*.kexic") ); + TQStringList files( TDEGlobal::dirs()->findAllResources("data", "kexi/connections/*.kexic") ); // //also try for capital file extension -// files += KGlobal::dirs()->findAllResources("data", "kexi/connections/*.KEXIC"); +// files += TDEGlobal::dirs()->findAllResources("data", "kexi/connections/*.KEXIC"); kexidbg << files << endl; foreach(TQStringList::ConstIterator, it, files) { diff --git a/kexi/core/kexidbshortcutfile.h b/kexi/core/kexidbshortcutfile.h index 382f470f..5b06cc27 100644 --- a/kexi/core/kexidbshortcutfile.h +++ b/kexi/core/kexidbshortcutfile.h @@ -105,7 +105,7 @@ class KEXICORE_EXPORT KexiDBConnShortcutFile : protected KexiDBShortcutFile //! connection information (i.e. KexiDBConnectionSet). //! This is implementation for handling .KEXIC files. //! The set is loaded from files found using -//! KGlobal::dirs()->findAllResources("data", "kexi/connections/*.kexic"). +//! TDEGlobal::dirs()->findAllResources("data", "kexi/connections/*.kexic"). class KexiDBConnSetShortcutFiles { public: diff --git a/kexi/core/kexitemplateloader.cpp b/kexi/core/kexitemplateloader.cpp index f6564d65..0defda8c 100644 --- a/kexi/core/kexitemplateloader.cpp +++ b/kexi/core/kexitemplateloader.cpp @@ -34,7 +34,7 @@ KexiTemplateInfo::List KexiTemplateLoader::loadListInfo() { KexiTemplateInfo::List list; const TQString subdir = TQString(kapp->instanceName()) + "/templates"; - TQString lang( KGlobal::locale()->language() ); + TQString lang( TDEGlobal::locale()->language() ); TQStringList dirs( kapp->dirs()->findDirs("data", subdir) ); while (true) { foreach( TQStringList::ConstIterator, it, dirs) { |