From c663b6440964f6ac48027143ac9e63298991f9d0 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:33:34 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kioslave/settings/kio_settings.cc | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'kioslave/settings/kio_settings.cc') diff --git a/kioslave/settings/kio_settings.cc b/kioslave/settings/kio_settings.cc index 4d5bbe873..28aaba846 100644 --- a/kioslave/settings/kio_settings.cc +++ b/kioslave/settings/kio_settings.cc @@ -20,11 +20,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include @@ -35,13 +35,13 @@ class SettingsProtocol : public KIO::SlaveBase { public: enum RunMode { SettingsMode, ProgramsMode, ApplicationsMode }; - SettingsProtocol(const QCString &protocol, const QCString &pool, const QCString &app); + SettingsProtocol(const TQCString &protocol, const TQCString &pool, const TQCString &app); virtual ~SettingsProtocol(); virtual void get( const KURL& url ); virtual void stat(const KURL& url); virtual void listDir(const KURL& url); void listRoot(); - KServiceGroup::Ptr findGroup(const QString &relPath); + KServiceGroup::Ptr findGroup(const TQString &relPath); private: DCOPClient *m_dcopClient; @@ -60,7 +60,7 @@ extern "C" { } -static void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const QString& s = QString::null) +static void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString::null) { KIO::UDSAtom atom; atom.m_uds = ID; @@ -69,7 +69,7 @@ static void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const QString entry.append(atom); } -static void createFileEntry(KIO::UDSEntry& entry, const QString& name, const QString& url, const QString& mime, const QString& iconName, const QString& localPath) +static void createFileEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime, const TQString& iconName, const TQString& localPath) { entry.clear(); addAtom(entry, KIO::UDS_NAME, 0, KIO::encodeFileName(name)); @@ -84,7 +84,7 @@ static void createFileEntry(KIO::UDSEntry& entry, const QString& name, const QSt addAtom(entry, KIO::UDS_ICON_NAME, 0, iconName); } -static void createDirEntry(KIO::UDSEntry& entry, const QString& name, const QString& url, const QString& mime,const QString& iconName) +static void createDirEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime,const TQString& iconName) { entry.clear(); addAtom(entry, KIO::UDS_NAME, 0, name); @@ -96,7 +96,7 @@ static void createDirEntry(KIO::UDSEntry& entry, const QString& name, const QStr addAtom(entry, KIO::UDS_ICON_NAME, 0, iconName); } -SettingsProtocol::SettingsProtocol( const QCString &protocol, const QCString &pool, const QCString &app): SlaveBase( protocol, pool, app ) +SettingsProtocol::SettingsProtocol( const TQCString &protocol, const TQCString &pool, const TQCString &app): SlaveBase( protocol, pool, app ) { // Adjusts which part of the K Menu to virtualize. if ( protocol == "programs" ) @@ -119,11 +119,11 @@ SettingsProtocol::~SettingsProtocol() delete m_dcopClient; } -KServiceGroup::Ptr SettingsProtocol::findGroup(const QString &relPath) +KServiceGroup::Ptr SettingsProtocol::findGroup(const TQString &relPath) { - QString nextPart; - QString alreadyFound("Settings/"); - QStringList rest = QStringList::split('/', relPath); + TQString nextPart; + TQString alreadyFound("Settings/"); + TQStringList rest = TQStringList::split('/', relPath); kdDebug() << "Trying harder to find group " << relPath << endl; for (unsigned int i=0; iisType(KST_KServiceGroup)) { KServiceGroup::Ptr g(static_cast(e)); - QString groupCaption = g->caption(); + TQString groupCaption = g->caption(); // Avoid adding empty groups. KServiceGroup::Ptr subMenuRoot = KServiceGroup::group(g->relPath()); @@ -254,7 +254,7 @@ void SettingsProtocol::listDir(const KURL& url) if ((g->name().at(0) == '.')) continue; - QString relPath = g->relPath(); + TQString relPath = g->relPath(); // Do not display the "Settings" menu group in Programs Mode. if( (m_runMode == ProgramsMode) && relPath.startsWith( "Settings" ) ) -- cgit v1.2.1