From 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 20:16:47 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kioslave/trash/kio_trash.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'kioslave/trash/kio_trash.cpp') diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp index 1210bb59a..3cd52e02c 100644 --- a/kioslave/trash/kio_trash.cpp +++ b/kioslave/trash/kio_trash.cpp @@ -78,10 +78,10 @@ TrashProtocol::TrashProtocol( const TQCString& protocol, const TQCString &pool, { struct passwd *user = getpwuid( getuid() ); if ( user ) - m_userName = TQString::fromLatin1(user->pw_name); + m_userName = TQString::tqfromLatin1(user->pw_name); struct group *grp = getgrgid( getgid() ); if ( grp ) - m_groupName = TQString::fromLatin1(grp->gr_name); + m_groupName = TQString::tqfromLatin1(grp->gr_name); } TrashProtocol::~TrashProtocol() @@ -427,7 +427,7 @@ bool TrashProtocol::createUDSEntry( const TQString& physicalPath, const TQString if ( !url.isEmpty() ) addAtom( entry, KIO::UDS_URL, 0, url ); - KMimeType::Ptr mt = KMimeType::findByPath( physicalPath, buff.st_mode ); + KMimeType::Ptr mt = KMimeType::tqfindByPath( physicalPath, buff.st_mode ); addAtom( entry, KIO::UDS_MIME_TYPE, 0, mt->name() ); addAtom( entry, KIO::UDS_ACCESS, access ); addAtom( entry, KIO::UDS_SIZE, buff.st_size ); @@ -540,7 +540,7 @@ void TrashProtocol::get( const KURL& url ) this, TQT_SLOT( slotMimetype( KIO::Job*, const TQString& ) ) ); connect( job, TQT_SIGNAL( result(KIO::Job *) ), this, TQT_SLOT( jobFinished(KIO::Job *) ) ); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } void TrashProtocol::slotData( KIO::Job*, const TQByteArray&arr ) @@ -559,7 +559,7 @@ void TrashProtocol::jobFinished( KIO::Job* job ) error( job->error(), job->errorText() ); else finished(); - qApp->eventLoop()->exitLoop(); + tqApp->eventLoop()->exitLoop(); } #if 0 -- cgit v1.2.1