diff options
Diffstat (limited to 'kexi/kexidb/connectiondata.cpp')
| -rw-r--r-- | kexi/kexidb/connectiondata.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/kexi/kexidb/connectiondata.cpp b/kexi/kexidb/connectiondata.cpp index a74237cce..4f45b0f48 100644 --- a/kexi/kexidb/connectiondata.cpp +++ b/kexi/kexidb/connectiondata.cpp @@ -21,8 +21,8 @@ #include <kexidb/drivermanager.h> -#include <qfileinfo.h> -#include <qdir.h> +#include <tqfileinfo.h> +#include <tqdir.h> #include <klocale.h> @@ -50,7 +50,7 @@ ConnectionDataBase::ConnectionDataBase() /*================================================================*/ ConnectionData::ConnectionData() -: QObject() +: TQObject() , ConnectionDataBase() , formatVersion(0) , priv(new ConnectionData::Private()) @@ -58,7 +58,7 @@ ConnectionData::ConnectionData() } ConnectionData::ConnectionData(const ConnectionData& cd) -: QObject() +: TQObject() , ConnectionDataBase() , priv(0) { @@ -82,33 +82,33 @@ ConnectionData& ConnectionData::operator=(const ConnectionData& cd) return *this; } -void ConnectionData::setFileName( const QString& fn ) +void ConnectionData::setFileName( const TQString& fn ) { - QFileInfo file(fn); + TQFileInfo file(fn); if (!fn.isEmpty() && m_fileName != file.absFilePath()) { - m_fileName = QDir::convertSeparators(file.absFilePath()); - m_dbPath = QDir::convertSeparators(file.dirPath(true)); + m_fileName = TQDir::convertSeparators(file.absFilePath()); + m_dbPath = TQDir::convertSeparators(file.dirPath(true)); m_dbFileName = file.fileName(); } } -QString ConnectionData::serverInfoString(bool addUser) const +TQString ConnectionData::serverInfoString(bool addUser) const { - const QString& i18nFile = i18n("file"); + const TQString& i18nFile = i18n("file"); if (!m_dbFileName.isEmpty()) return i18nFile+": "+(m_dbPath.isEmpty() ? "" : m_dbPath - + QDir::separator()) + m_dbFileName; + + TQDir::separator()) + m_dbFileName; DriverManager man; if (!driverName.isEmpty()) { Driver::Info info = man.driverInfo(driverName); if (!info.name.isEmpty() && info.fileBased) - return QString("<")+i18nFile+">"; + return TQString("<")+i18nFile+">"; } - return ( (userName.isEmpty() || !addUser) ? QString("") : (userName+"@")) - + (hostName.isEmpty() ? QString("localhost") : hostName) - + (port!=0 ? (QString(":")+QString::number(port)) : QString::null); + return ( (userName.isEmpty() || !addUser) ? TQString("") : (userName+"@")) + + (hostName.isEmpty() ? TQString("localhost") : hostName) + + (port!=0 ? (TQString(":")+TQString::number(port)) : TQString()); } |