From a9bde819f2b421dcc44741156e75eca4bb5fb4f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kmail/kmfoldermbox.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'kmail/kmfoldermbox.cpp') diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp index b82c3a29d..7e033523d 100644 --- a/kmail/kmfoldermbox.cpp +++ b/kmail/kmfoldermbox.cpp @@ -349,9 +349,9 @@ int KMFolderMbox::lock() case procmail_lockfile: cmd_str = "lockfile -l20 -r5 "; if (!mProcmailLockFileName.isEmpty()) - cmd_str += TQFile::encodeName(KProcess::quote(mProcmailLockFileName)); + cmd_str += TQFile::encodeName(TDEProcess::quote(mProcmailLockFileName)); else - cmd_str += TQFile::encodeName(KProcess::quote(location() + ".lock")); + cmd_str += TQFile::encodeName(TDEProcess::quote(location() + ".lock")); rc = system( cmd_str.data() ); if( rc != 0 ) @@ -363,7 +363,7 @@ int KMFolderMbox::lock() } if( mIndexStream ) { - cmd_str = "lockfile -l20 -r5 " + TQFile::encodeName(KProcess::quote(indexLocation() + ".lock")); + cmd_str = "lockfile -l20 -r5 " + TQFile::encodeName(TDEProcess::quote(indexLocation() + ".lock")); rc = system( cmd_str.data() ); if( rc != 0 ) { @@ -376,7 +376,7 @@ int KMFolderMbox::lock() break; case mutt_dotlock: - cmd_str = "mutt_dotlock " + TQFile::encodeName(KProcess::quote(location())); + cmd_str = "mutt_dotlock " + TQFile::encodeName(TDEProcess::quote(location())); rc = system( cmd_str.data() ); if( rc != 0 ) { @@ -387,7 +387,7 @@ int KMFolderMbox::lock() } if( mIndexStream ) { - cmd_str = "mutt_dotlock " + TQFile::encodeName(KProcess::quote(indexLocation())); + cmd_str = "mutt_dotlock " + TQFile::encodeName(TDEProcess::quote(indexLocation())); rc = system( cmd_str.data() ); if( rc != 0 ) { @@ -400,7 +400,7 @@ int KMFolderMbox::lock() break; case mutt_dotlock_privileged: - cmd_str = "mutt_dotlock -p " + TQFile::encodeName(KProcess::quote(location())); + cmd_str = "mutt_dotlock -p " + TQFile::encodeName(TDEProcess::quote(location())); rc = system( cmd_str.data() ); if( rc != 0 ) { @@ -411,7 +411,7 @@ int KMFolderMbox::lock() } if( mIndexStream ) { - cmd_str = "mutt_dotlock -p " + TQFile::encodeName(KProcess::quote(indexLocation())); + cmd_str = "mutt_dotlock -p " + TQFile::encodeName(TDEProcess::quote(indexLocation())); rc = system( cmd_str.data() ); if( rc != 0 ) { @@ -478,34 +478,34 @@ int KMFolderMbox::unlock() case procmail_lockfile: cmd_str = "rm -f "; if (!mProcmailLockFileName.isEmpty()) - cmd_str += TQFile::encodeName(KProcess::quote(mProcmailLockFileName)); + cmd_str += TQFile::encodeName(TDEProcess::quote(mProcmailLockFileName)); else - cmd_str += TQFile::encodeName(KProcess::quote(location() + ".lock")); + cmd_str += TQFile::encodeName(TDEProcess::quote(location() + ".lock")); rc = system( cmd_str.data() ); if( mIndexStream ) { - cmd_str = "rm -f " + TQFile::encodeName(KProcess::quote(indexLocation() + ".lock")); + cmd_str = "rm -f " + TQFile::encodeName(TDEProcess::quote(indexLocation() + ".lock")); rc = system( cmd_str.data() ); } break; case mutt_dotlock: - cmd_str = "mutt_dotlock -u " + TQFile::encodeName(KProcess::quote(location())); + cmd_str = "mutt_dotlock -u " + TQFile::encodeName(TDEProcess::quote(location())); rc = system( cmd_str.data() ); if( mIndexStream ) { - cmd_str = "mutt_dotlock -u " + TQFile::encodeName(KProcess::quote(indexLocation())); + cmd_str = "mutt_dotlock -u " + TQFile::encodeName(TDEProcess::quote(indexLocation())); rc = system( cmd_str.data() ); } break; case mutt_dotlock_privileged: - cmd_str = "mutt_dotlock -p -u " + TQFile::encodeName(KProcess::quote(location())); + cmd_str = "mutt_dotlock -p -u " + TQFile::encodeName(TDEProcess::quote(location())); rc = system( cmd_str.data() ); if( mIndexStream ) { - cmd_str = "mutt_dotlock -p -u " + TQFile::encodeName(KProcess::quote(indexLocation())); + cmd_str = "mutt_dotlock -p -u " + TQFile::encodeName(TDEProcess::quote(indexLocation())); rc = system( cmd_str.data() ); } break; -- cgit v1.2.1