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/trash/kfile-plugin/kfile_trash.cpp | 22 +++++++++++----------- kioslave/trash/kfile-plugin/kfile_trash.h | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'kioslave/trash/kfile-plugin') diff --git a/kioslave/trash/kfile-plugin/kfile_trash.cpp b/kioslave/trash/kfile-plugin/kfile_trash.cpp index baa27143c..edd57014d 100644 --- a/kioslave/trash/kfile-plugin/kfile_trash.cpp +++ b/kioslave/trash/kfile-plugin/kfile_trash.cpp @@ -23,16 +23,16 @@ #include #include -#include -#include -#include +#include +#include +#include typedef KGenericFactory TrashFactory; K_EXPORT_COMPONENT_FACTORY(kfile_trash, TrashFactory("kfile_trash")) -KTrashPlugin::KTrashPlugin(QObject *parent, const char *name, - const QStringList &args) : KFilePlugin(parent, name, args) +KTrashPlugin::KTrashPlugin(TQObject *parent, const char *name, + const TQStringList &args) : KFilePlugin(parent, name, args) { KGlobal::locale()->insertCatalogue( "kio_trash" ); @@ -44,7 +44,7 @@ KTrashPlugin::KTrashPlugin(QObject *parent, const char *name, (void)impl.init(); } -void KTrashPlugin::makeMimeTypeInfo(const QString& mimeType) +void KTrashPlugin::makeMimeTypeInfo(const TQString& mimeType) { KFileMimeTypeInfo* info = addMimeTypeInfo( mimeType ); @@ -52,8 +52,8 @@ void KTrashPlugin::makeMimeTypeInfo(const QString& mimeType) addGroupInfo(info, "General", i18n("General")); KFileMimeTypeInfo::ItemInfo* item; - item = addItemInfo(group, "OriginalPath", i18n("Original Path"), QVariant::String); - item = addItemInfo(group, "DateOfDeletion", i18n("Date of Deletion"), QVariant::DateTime); + item = addItemInfo(group, "OriginalPath", i18n("Original Path"), TQVariant::String); + item = addItemInfo(group, "DateOfDeletion", i18n("Date of Deletion"), TQVariant::DateTime); } bool KTrashPlugin::readInfo(KFileMetaInfo& info, uint) @@ -63,7 +63,7 @@ bool KTrashPlugin::readInfo(KFileMetaInfo& info, uint) if ( url.protocol()=="system" && url.path().startsWith("/trash") ) { - QString path = url.path(); + TQString path = url.path(); path.remove(0, 6); url.setProtocol("trash"); url.setPath(path); @@ -74,8 +74,8 @@ bool KTrashPlugin::readInfo(KFileMetaInfo& info, uint) return false; int trashId; - QString fileId; - QString relativePath; + TQString fileId; + TQString relativePath; if ( !TrashImpl::parseURL( url, trashId, fileId, relativePath ) ) return false; diff --git a/kioslave/trash/kfile-plugin/kfile_trash.h b/kioslave/trash/kfile-plugin/kfile_trash.h index 8316f7402..a041999a4 100644 --- a/kioslave/trash/kfile-plugin/kfile_trash.h +++ b/kioslave/trash/kfile-plugin/kfile_trash.h @@ -31,11 +31,11 @@ class KTrashPlugin: public KFilePlugin Q_OBJECT public: - KTrashPlugin(QObject *parent, const char *name, const QStringList& args); + KTrashPlugin(TQObject *parent, const char *name, const TQStringList& args); virtual bool readInfo(KFileMetaInfo& info, uint what); private: - void makeMimeTypeInfo(const QString& mimeType); + void makeMimeTypeInfo(const TQString& mimeType); TrashImpl impl; }; -- cgit v1.2.1