From 1fffbdafa12271a1a635caf46777fb8acfb6f31b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:36 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076. --- kfilereplace/kfilereplacepart.cpp | 46 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'kfilereplace/kfilereplacepart.cpp') diff --git a/kfilereplace/kfilereplacepart.cpp b/kfilereplace/kfilereplacepart.cpp index dae70133..2a7934e2 100644 --- a/kfilereplace/kfilereplacepart.cpp +++ b/kfilereplace/kfilereplacepart.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include // KDE #include @@ -161,7 +161,7 @@ void KFileReplacePart::slotSearchingOperation() void KFileReplacePart::slotReplacingOperation() { - if (KMessageBox::warningContinueCancel(m_w, i18n("You have selected %1 as the encoding of the files.
Selecting the correct encoding is very important as if you have files that have some other encoding than the selected one, after a replace you may damage those files.

In case you do not know the encoding of your files, select utf8 and enable the creation of backup files. This setting will autodetect utf8 and utf16 files, but the changed files will be converted to utf8.").arg(m_option->m_encoding), i18n("File Encoding Warning"), KStdGuiItem::cont(), "ShowEncodingWarning") == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(m_w, i18n("You have selected %1 as the encoding of the files.
Selecting the correct encoding is very important as if you have files that have some other encoding than the selected one, after a replace you may damage those files.

In case you do not know the encoding of your files, select utf8 and enable the creation of backup files. This setting will autodetect utf8 and utf16 files, but the changed files will be converted to utf8.").tqarg(m_option->m_encoding), i18n("File Encoding Warning"), KStdGuiItem::cont(), "ShowEncodingWarning") == KMessageBox::Cancel) return; if(!checkBeforeOperation()) return; @@ -258,7 +258,7 @@ void KFileReplacePart::slotCreateReport() TQFileInfo fileInfo(documentName); if(fileInfo.exists()) { - KMessageBox::error(m_w, i18n("A folder or a file named %1 already exists.").arg(documentName)); + KMessageBox::error(m_w, i18n("A folder or a file named %1 already exists.").tqarg(documentName)); return ; } @@ -266,7 +266,7 @@ void KFileReplacePart::slotCreateReport() if(!directoryName.mkdir(documentName, true)) { - KMessageBox::error(m_w, i18n("Cannot create the %1 folder.").arg(documentName)); + KMessageBox::error(m_w, i18n("Cannot create the %1 folder.").tqarg(documentName)); return ; } @@ -1022,7 +1022,7 @@ void KFileReplacePart::replaceAndBackup(const TQString& currentDir, const TQStri TQFile currentFile(oldPathString); if(!currentFile.open(IO_ReadOnly)) { - KMessageBox::information(m_w, i18n("Cannot open file %1 for reading.").arg(oldFileName),TQString(), rcNotifyOnErrors); + KMessageBox::information(m_w, i18n("Cannot open file %1 for reading.").tqarg(oldFileName),TQString(), rcNotifyOnErrors); return ; } TQTextStream currentStream(¤tFile); @@ -1061,7 +1061,7 @@ void KFileReplacePart::replaceAndBackup(const TQString& currentDir, const TQStri TQFile newFile(oldPathString); if(!newFile.open(IO_WriteOnly)) { - KMessageBox::information(m_w, i18n("Cannot open file %1 for writing.").arg(oldFileName),TQString(), rcNotifyOnErrors); + KMessageBox::information(m_w, i18n("Cannot open file %1 for writing.").tqarg(oldFileName),TQString(), rcNotifyOnErrors); return ; } TQTextStream newStream(&newFile); @@ -1097,8 +1097,8 @@ void KFileReplacePart::replaceAndBackup(const TQString& currentDir, const TQStri } item->setText(4,TQString::number(occurrence,10)); - item->setText(5,TQString("%1[%2]").arg(oldFileInfo.owner()).arg(oldFileInfo.ownerId())); - item->setText(6,TQString("%1[%2]").arg(oldFileInfo.group()).arg(oldFileInfo.groupId())); + item->setText(5,TQString("%1[%2]").tqarg(oldFileInfo.owner()).tqarg(oldFileInfo.ownerId())); + item->setText(6,TQString("%1[%2]").tqarg(oldFileInfo.group()).tqarg(oldFileInfo.groupId())); } } @@ -1110,7 +1110,7 @@ void KFileReplacePart::replaceAndOverwrite(const TQString& currentDir, const TQS if (!oldFile.open(IO_ReadOnly)) { - KMessageBox::information(m_w, i18n("Cannot open file %1 for reading.").arg(oldFile.name()),TQString(), rcNotifyOnErrors); + KMessageBox::information(m_w, i18n("Cannot open file %1 for reading.").tqarg(oldFile.name()),TQString(), rcNotifyOnErrors); return ; } @@ -1139,7 +1139,7 @@ void KFileReplacePart::replaceAndOverwrite(const TQString& currentDir, const TQS TQFile newFile(oldPathString); if(!newFile.open(IO_WriteOnly)) { - KMessageBox::information(m_w, i18n("Cannot open file %1 for writing.").arg(newFile.name()),TQString(), rcNotifyOnErrors); + KMessageBox::information(m_w, i18n("Cannot open file %1 for writing.").tqarg(newFile.name()),TQString(), rcNotifyOnErrors); return ; } TQTextStream newStream( &newFile ); @@ -1171,8 +1171,8 @@ void KFileReplacePart::replaceAndOverwrite(const TQString& currentDir, const TQS item->setText(3,"-"); item->setText(4,TQString::number(occurrence,10)); - item->setText(5,TQString("%1[%2]").arg(oldFileInfo.owner()).arg(oldFileInfo.ownerId())); - item->setText(6,TQString("%1[%2]").arg(oldFileInfo.group()).arg(oldFileInfo.groupId())); + item->setText(5,TQString("%1[%2]").tqarg(oldFileInfo.owner()).tqarg(oldFileInfo.ownerId())); + item->setText(6,TQString("%1[%2]").tqarg(oldFileInfo.group()).tqarg(oldFileInfo.groupId())); } } @@ -1196,7 +1196,7 @@ void KFileReplacePart::replacingLoop(TQString& line, KListViewItem** item, bool& if(askConfirmReplace) { int answer = KMessageBox::questionYesNo(0, - i18n("Do you want to replace the string %1 with the string %2?").arg(it.key()).arg(it.data()), + i18n("Do you want to replace the string %1 with the string %2?").tqarg(it.key()).tqarg(it.data()), i18n("Confirm Replace"), i18n("Replace"), i18n("Do Not Replace"), @@ -1332,7 +1332,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa if(!file.open(IO_ReadOnly)) { - KMessageBox::information(m_w, i18n("Cannot open file %1 for reading.").arg(fileName), TQString(), rcNotifyOnErrors); + KMessageBox::information(m_w, i18n("Cannot open file %1 for reading.").tqarg(fileName), TQString(), rcNotifyOnErrors); return ; } // Creates a stream with the file @@ -1403,7 +1403,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa else capturedText = line.mid(pos,strKey.length()); - msg = i18n(" Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(TQString::number(columnNumber,10)); + msg = i18n(" Line:%2, Col:%3 - \"%1\"").tqarg(capturedText).tqarg(TQString::number(lineNumber,10)).tqarg(TQString::number(columnNumber,10)); tempItem->setMultiLinesEnabled(true); tempItem->setText(0,msg); occurrence = 1; @@ -1443,7 +1443,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa pos = line.find(strKey,pos+strKey.length()); } - msg = i18n(" Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(TQString::number(columnNumber,10)); + msg = i18n(" Line:%2, Col:%3 - \"%1\"").tqarg(capturedText).tqarg(TQString::number(lineNumber,10)).tqarg(TQString::number(columnNumber,10)); if(!item) item = new KListViewItem(rv); @@ -1475,8 +1475,8 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa item->setText(1,currentDir); item->setText(2,KFileReplaceLib::formatFileSize(fileInfo.size())); item->setText(3,TQString::number(occurrence,10)); - item->setText(4,TQString("%1[%2]").arg(fileInfo.owner()).arg(fileInfo.ownerId())); - item->setText(5,TQString("%1[%2]").arg(fileInfo.group()).arg(fileInfo.groupId())); + item->setText(4,TQString("%1[%2]").tqarg(fileInfo.owner()).tqarg(fileInfo.ownerId())); + item->setText(5,TQString("%1[%2]").tqarg(fileInfo.group()).tqarg(fileInfo.groupId())); } } @@ -1509,7 +1509,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName) if(!file.open(IO_ReadOnly)) { - KMessageBox::error(m_w, i18n("Cannot open the file %1 and load the string list.").arg(fileName)); + KMessageBox::error(m_w, i18n("Cannot open the file %1 and load the string list.").tqarg(fileName)); return ; } @@ -1517,7 +1517,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName) { file.close(); - KMessageBox::information(m_w, i18n("File %1 seems not to be written in new kfr format. Remember that the old kfr format will be soon abandoned. You can convert your old rules files by simply saving them with kfilereplace.").arg(fileName),i18n("Warning")); + KMessageBox::information(m_w, i18n("File %1 seems not to be written in new kfr format. Remember that the old kfr format will be soon abandoned. You can convert your old rules files by simply saving them with kfilereplace.").tqarg(fileName),i18n("Warning")); KFileReplaceLib::convertOldToNewKFRFormat(fileName, sv); @@ -1537,7 +1537,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName) if(searchAttribute.isNull() || searchAttribute.isEmpty()) { - int answer = KMessageBox::warningYesNo(m_w, i18n("The format of kfr files has been changed; attempting to load %1. Please see the KFilereplace manual for details. Do you want to load a search-and-replace list of strings?").arg(fileName),i18n("Warning"),i18n("Load"),i18n("Do Not Load")); + int answer = KMessageBox::warningYesNo(m_w, i18n("The format of kfr files has been changed; attempting to load %1. Please see the KFilereplace manual for details. Do you want to load a search-and-replace list of strings?").tqarg(fileName),i18n("Warning"),i18n("Load"),i18n("Do Not Load")); if(answer == KMessageBox::Yes) searchAttribute = "false"; @@ -1639,7 +1639,7 @@ bool KFileReplacePart::checkBeforeOperation() if(!dir.exists()) { - KMessageBox::error(m_w, i18n("The main folder of the project %1 does not exist.").arg(directory)); + KMessageBox::error(m_w, i18n("The main folder of the project %1 does not exist.").tqarg(directory)); return false; } @@ -1647,7 +1647,7 @@ bool KFileReplacePart::checkBeforeOperation() if(!(dirInfo.isReadable() && dirInfo.isExecutable()) || (!m_option->m_searchingOnlyMode && !m_option->m_simulation && !(dirInfo.isWritable()))) { - KMessageBox::error(m_w, i18n("Access denied in the main folder of the project:
%1").arg(directory)); + KMessageBox::error(m_w, i18n("Access denied in the main folder of the project:
%1").tqarg(directory)); return false; } -- cgit v1.2.1