From ac04782336b6a026b44df9d51ba9ca008a712da2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 31 Jan 2013 13:19:08 -0600 Subject: Rename KStandard for enhanced compatibility with KDE4 --- kexi/3rdparty/kolibs/koGlobal.cc | 2 +- kexi/core/kexidbconnectionset.cpp | 6 +++--- kexi/core/kexidbconnectionset.h | 2 +- kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp | 2 +- kexi/main/startup/KexiStartup_p.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kexi') diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc index 739c6126..fc21f3a5 100644 --- a/kexi/3rdparty/kolibs/koGlobal.cc +++ b/kexi/3rdparty/kolibs/koGlobal.cc @@ -52,7 +52,7 @@ KoGlobal::KoGlobal() KImageIO::registerFormats(); - // Tell KStandardDirs about the koffice prefix + // Tell TDEStandardDirs about the koffice prefix TDEGlobal::dirs()->addPrefix(PREFIX); // Tell the iconloader about share/apps/koffice/icons diff --git a/kexi/core/kexidbconnectionset.cpp b/kexi/core/kexidbconnectionset.cpp index 69828d07..b608c46d 100644 --- a/kexi/core/kexidbconnectionset.cpp +++ b/kexi/core/kexidbconnectionset.cpp @@ -73,11 +73,11 @@ bool KexiDBConnectionSet::addConnectionData(KexiDB::ConnectionData *data, const return false; TQString baseFilename( dir + (data->hostName.isEmpty() ? "localhost" : data->hostName) ); int i = 0; - while (KStandardDirs::exists(baseFilename+(i>0 ? TQString::number(i) : TQString())+".kexic")) + while (TDEStandardDirs::exists(baseFilename+(i>0 ? TQString::number(i) : TQString())+".kexic")) i++; - if (!KStandardDirs::exists(dir)) { + if (!TDEStandardDirs::exists(dir)) { //make 'connections' dir and protect it - if (!KStandardDirs::makeDir(dir, 0700)) + if (!TDEStandardDirs::makeDir(dir, 0700)) return false; } filename = baseFilename+(i>0 ? TQString::number(i) : TQString())+".kexic"; diff --git a/kexi/core/kexidbconnectionset.h b/kexi/core/kexidbconnectionset.h index fc831cdc..4e75b4d9 100644 --- a/kexi/core/kexidbconnectionset.h +++ b/kexi/core/kexidbconnectionset.h @@ -34,7 +34,7 @@ public: /*! Loads connection data set from storage, currently from .kexic files saved in dirs returned by - KStandardDirs::findDirs("data", "connections") */ + TDEStandardDirs::findDirs("data", "connections") */ void load(); /*! Adds \a data as connection data. diff --git a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp index af82b583..71ba2321 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp @@ -55,7 +55,7 @@ SQLiteVacuum::~SQLiteVacuum() tristate SQLiteVacuum::run() { - const TQString ksqlite_app = KStandardDirs::findExe( "ksqlite" ); + const TQString ksqlite_app = TDEStandardDirs::findExe( "ksqlite" ); if (ksqlite_app.isEmpty()) { m_result = false; return m_result; diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp index 287bd846..136ea3c6 100644 --- a/kexi/main/startup/KexiStartup_p.cpp +++ b/kexi/main/startup/KexiStartup_p.cpp @@ -50,7 +50,7 @@ tristate SQLite2ToSQLite3Migration::run() if (m_run) return false; m_run = true; - const TQString ksqlite2to3_app = KStandardDirs::findExe( "ksqlite2to3" ); + const TQString ksqlite2to3_app = TDEStandardDirs::findExe( "ksqlite2to3" ); if (ksqlite2to3_app.isEmpty()) return false; -- cgit v1.2.1