TDE
/
krusader
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/krusader
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KStandard for enhanced compatibility with KDE4

Browse Source
feat/lzip-support
Timothy Pearson 12 years ago
parent fb3914c062
commit 008082895c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

12
krArc/krarc.cpp
Unescape View File

@ -1241,7 +1241,7 @@ bool tdeio_krarcProtocol::initArcParameters() {
getCmd = fullPathName( "unzip" ) + " -p "; getCmd = fullPathName( "unzip" ) + " -p ";
copyCmd = fullPathName( "unzip" ) + " -jo "; copyCmd = fullPathName( "unzip" ) + " -jo ";
if( KStandardDirs::findExe( "zip" ).isEmpty() ) { if( TDEStandardDirs::findExe( "zip" ).isEmpty() ) {
delCmd = TQString(); delCmd = TQString();
putCmd = TQString(); putCmd = TQString();
} else { } else {
@ -1255,7 +1255,7 @@ bool tdeio_krarcProtocol::initArcParameters() {
putCmd += "-P '"+password+"' "; putCmd += "-P '"+password+"' ";
} }
} else if (arcType == "rar") { } else if (arcType == "rar") {
if( KStandardDirs::findExe( "rar" ).isEmpty() ) { if( TDEStandardDirs::findExe( "rar" ).isEmpty() ) {
cmd = fullPathName( "unrar" ); cmd = fullPathName( "unrar" );
listCmd = fullPathName( "unrar" ) + " -c- -v v "; listCmd = fullPathName( "unrar" ) + " -c- -v v ";
getCmd = fullPathName( "unrar" ) + " p -ierr -idp -c- -y "; getCmd = fullPathName( "unrar" ) + " p -ierr -idp -c- -y ";
@ -1339,7 +1339,7 @@ bool tdeio_krarcProtocol::initArcParameters() {
putCmd = TQString(); putCmd = TQString();
} else if (arcType == "7z") { } else if (arcType == "7z") {
cmd = fullPathName( "7z" ); cmd = fullPathName( "7z" );
if( KStandardDirs::findExe(cmd).isEmpty() ) if( TDEStandardDirs::findExe(cmd).isEmpty() )
cmd = fullPathName( "7za" ); cmd = fullPathName( "7za" );
listCmd = cmd + " l -y "; listCmd = cmd + " l -y ";
@ -1366,7 +1366,7 @@ bool tdeio_krarcProtocol::initArcParameters() {
putCmd = TQString(); putCmd = TQString();
} }
if( KStandardDirs::findExe(cmd).isEmpty() ){ if( TDEStandardDirs::findExe(cmd).isEmpty() ){
error( TDEIO::ERR_CANNOT_LAUNCH_PROCESS, error( TDEIO::ERR_CANNOT_LAUNCH_PROCESS,
cmd+ cmd+
i18n("\nMake sure that the %1 binary are installed properly on your system.").arg(cmd)); i18n("\nMake sure that the %1 binary are installed properly on your system.").arg(cmd));
@ -1501,9 +1501,9 @@ TQString tdeio_krarcProtocol::detectArchive( bool &encrypted, TQString fileName
else { // we try to find whether the 7z archive is encrypted else { // we try to find whether the 7z archive is encrypted
// this is hard as the headers are also compresseds // this is hard as the headers are also compresseds
TQString tester = fullPathName( "7z" ); TQString tester = fullPathName( "7z" );
if( KStandardDirs::findExe( tester ).isEmpty() ) { if( TDEStandardDirs::findExe( tester ).isEmpty() ) {
tester = fullPathName( "7za" ); tester = fullPathName( "7za" );
if( KStandardDirs::findExe( tester ).isEmpty() ) { if( TDEStandardDirs::findExe( tester ).isEmpty() ) {
return type; return type;
} }
} }

Write Preview
Loading…
Cancel
Save