From 78735b180c2ba56fa1cf4fd578726d457626e80a Mon Sep 17 00:00:00 2001 From: Elvio Basello Date: Mon, 10 Jan 2011 18:36:59 +0000 Subject: killed some QString helpers. Pay attention to the localizations: format strings have changed!; updated translation files; git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5328 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/addon/AddonFunctions.cpp | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) (limited to 'src/modules/addon/AddonFunctions.cpp') diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp index 4cad53710..8f1643071 100644 --- a/src/modules/addon/AddonFunctions.cpp +++ b/src/modules/addon/AddonFunctions.cpp @@ -65,7 +65,7 @@ namespace AddonFunctions if(!r.readHeader(szAddonPackageFileName)) { szErr = r.lastError(); - KviQString::sprintf(szError,__tr2qs_ctx("The selected file does not seem to be a valid KVIrc package: %Q","addon"),&szErr); + szError = QString(__tr2qs_ctx("The selected file does not seem to be a valid KVIrc package: %Q","addon")).arg(szErr); return false; } @@ -143,42 +143,31 @@ namespace AddonFunctions szWarnings += "

"; } - KviQString::sprintf(hd.szHtmlText, + hd.szHtmlText = QString( "" \ "" \ "

" \ - "

%Q %Q

" \ + "

%1 %2

" \ "

" \ - "%Q" \ + "%3" \ "

" \ "

" \ - "%Q: %Q
" \ - "%Q: %Q
" \ + "%4: %5
" \ + "%6: %7
" \ "

" \ "

" \ "" \ - "%Q: %Q
" \ + "%8: %9
" \ "" \ "

" \ - "%Q" \ + "%10" \ "
" \ "" \ - "", - &szPackageName, - &szPackageVersion, - &szPackageDescription, - &szAuthor, - &szPackageAuthor, - &szCreatedAt, - &szPackageDate, - &szCreatedWith, - &szPackageApplication, - &szWarnings - ); + "").arg(szPackageName,szPackageVersion,szPackageDescription,szAuthor,szPackageAuthor,szCreatedAt,szPackageDate,szCreatedWith,szPackageApplication).arg(szWarnings); hd.addImageResource("addon_dialog_pack_image",pix); hd.addHtmlResource("addon_dialog_main",hd.szHtmlText); @@ -224,7 +213,7 @@ namespace AddonFunctions if(!r.unpack(szAddonPackageFileName,szUnpackPath)) { szErr = r.lastError(); - KviQString::sprintf(szError,__tr2qs_ctx("Failed to unpack the selected file: %Q","addon"),&szErr); + szError = QString(__tr2qs_ctx("Failed to unpack the selected file: %1","addon")).arg(szErr); return false; } @@ -240,7 +229,7 @@ namespace AddonFunctions { // FIXME: Just warn the user and assume success? szErr = __tr2qs_ctx("One or more files can't be deleted","addon"); - KviQString::sprintf(szError,__tr2qs_ctx("Failed to unpack the selected file: %Q","addon"),&szErr); + szError = QString(__tr2qs_ctx("Failed to unpack the selected file: %1","addon")).arg(szErr); return false; } -- cgit v1.3.1-10-gc9f91