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/system/kdedmodule/systemdirnotify.cpp | 28 +++++++++++----------- kioslave/system/kdedmodule/systemdirnotify.h | 4 ++-- .../system/kdedmodule/systemdirnotifymodule.cpp | 4 ++-- kioslave/system/kdedmodule/systemdirnotifymodule.h | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) (limited to 'kioslave/system/kdedmodule') diff --git a/kioslave/system/kdedmodule/systemdirnotify.cpp b/kioslave/system/kdedmodule/systemdirnotify.cpp index e0ec57992..162d96621 100644 --- a/kioslave/system/kdedmodule/systemdirnotify.cpp +++ b/kioslave/system/kdedmodule/systemdirnotify.cpp @@ -26,7 +26,7 @@ #include -#include +#include SystemDirNotify::SystemDirNotify() : mInited( false ) @@ -41,21 +41,21 @@ void SystemDirNotify::init() KGlobal::dirs()->addResourceType("system_entries", KStandardDirs::kde_default("data") + "systemview"); - QStringList names_found; - QStringList dirList = KGlobal::dirs()->resourceDirs("system_entries"); + TQStringList names_found; + TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries"); - QStringList::ConstIterator dirpath = dirList.begin(); - QStringList::ConstIterator end = dirList.end(); + TQStringList::ConstIterator dirpath = dirList.begin(); + TQStringList::ConstIterator end = dirList.end(); for(; dirpath!=end; ++dirpath) { - QDir dir = *dirpath; + TQDir dir = *dirpath; if (!dir.exists()) continue; - QStringList filenames - = dir.entryList( QDir::Files | QDir::Readable ); + TQStringList filenames + = dir.entryList( TQDir::Files | TQDir::Readable ); - QStringList::ConstIterator name = filenames.begin(); - QStringList::ConstIterator endf = filenames.end(); + TQStringList::ConstIterator name = filenames.begin(); + TQStringList::ConstIterator endf = filenames.end(); for(; name!=endf; ++name) { @@ -63,7 +63,7 @@ void SystemDirNotify::init() { KDesktopFile desktop(*dirpath+*name, true); - QString system_name = *name; + TQString system_name = *name; system_name.truncate(system_name.length()-8); KURL system_url("system:/"+system_name); @@ -90,8 +90,8 @@ KURL SystemDirNotify::toSystemURL(const KURL &url) kdDebug() << "SystemDirNotify::toSystemURL(" << url << ")" << endl; init(); - QMap::const_iterator it = m_urlMap.begin(); - QMap::const_iterator end = m_urlMap.end(); + TQMap::const_iterator it = m_urlMap.begin(); + TQMap::const_iterator end = m_urlMap.end(); for (; it!=end; ++it) { @@ -99,7 +99,7 @@ KURL SystemDirNotify::toSystemURL(const KURL &url) if ( base.isParentOf(url) ) { - QString path = KURL::relativePath(base.path(), + TQString path = KURL::relativePath(base.path(), url.path()); KURL result = it.data(); result.addPath(path); diff --git a/kioslave/system/kdedmodule/systemdirnotify.h b/kioslave/system/kdedmodule/systemdirnotify.h index 34da65b82..b743ddb42 100644 --- a/kioslave/system/kdedmodule/systemdirnotify.h +++ b/kioslave/system/kdedmodule/systemdirnotify.h @@ -21,7 +21,7 @@ #include #include -#include +#include class SystemDirNotify : public KDirNotify { @@ -40,7 +40,7 @@ private: KURL toSystemURL(const KURL &url); KURL::List toSystemURLList(const KURL::List &list); - QMap m_urlMap; + TQMap m_urlMap; bool mInited; }; diff --git a/kioslave/system/kdedmodule/systemdirnotifymodule.cpp b/kioslave/system/kdedmodule/systemdirnotifymodule.cpp index 36c46fcd0..b89daf129 100644 --- a/kioslave/system/kdedmodule/systemdirnotifymodule.cpp +++ b/kioslave/system/kdedmodule/systemdirnotifymodule.cpp @@ -22,13 +22,13 @@ #include #include -SystemDirNotifyModule::SystemDirNotifyModule(const QCString &obj) +SystemDirNotifyModule::SystemDirNotifyModule(const TQCString &obj) : KDEDModule(obj) { } extern "C" { - KDE_EXPORT KDEDModule *create_systemdirnotify(const QCString &obj) + KDE_EXPORT KDEDModule *create_systemdirnotify(const TQCString &obj) { KGlobal::locale()->insertCatalogue("kio_system"); return new SystemDirNotifyModule(obj); diff --git a/kioslave/system/kdedmodule/systemdirnotifymodule.h b/kioslave/system/kdedmodule/systemdirnotifymodule.h index c75cd1a9e..e979ba098 100644 --- a/kioslave/system/kdedmodule/systemdirnotifymodule.h +++ b/kioslave/system/kdedmodule/systemdirnotifymodule.h @@ -28,7 +28,7 @@ class SystemDirNotifyModule : public KDEDModule K_DCOP public: - SystemDirNotifyModule(const QCString &obj); + SystemDirNotifyModule(const TQCString &obj); private: SystemDirNotify notifier; }; -- cgit v1.2.1