diff options
Diffstat (limited to 'kfilereplace/kfilereplacepart.cpp')
-rw-r--r-- | kfilereplace/kfilereplacepart.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/kfilereplace/kfilereplacepart.cpp b/kfilereplace/kfilereplacepart.cpp index c68821d7..d6a5aa6d 100644 --- a/kfilereplace/kfilereplacepart.cpp +++ b/kfilereplace/kfilereplacepart.cpp @@ -464,7 +464,7 @@ void KFileReplacePart::resetActions() actionCollection()->action("new_project")->setEnabled(true); actionCollection()->action("search")->setEnabled(hasItems && searchOnlyMode); actionCollection()->action("file_simulate")->setEnabled(hasItems && !searchOnlyMode); - actionCollection()->action("tqreplace")->setEnabled(hasItems && !searchOnlyMode); + actionCollection()->action("replace")->setEnabled(hasItems && !searchOnlyMode); actionCollection()->action("save_results")->setEnabled(hasItems); actionCollection()->action("stop")->setEnabled(false); @@ -570,7 +570,7 @@ void KFileReplacePart::initGUI() (void)new KAction(i18n("Customize Search/Replace Session..."), "projectopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetNewParameters()), actionCollection(), "new_project"); (void)new KAction(i18n("&Search"), "filesearch", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearchingOperation()), actionCollection(), "search"); (void)new KAction(i18n("S&imulate"), "filesimulate", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate"); - (void)new KAction(i18n("&Replace"), "filereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplacingOperation()), actionCollection(), "tqreplace"); + (void)new KAction(i18n("&Replace"), "filereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplacingOperation()), actionCollection(), "replace"); (void)new KAction(i18n("Sto&p"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "stop"); (void)new KAction(i18n("Cre&ate Report File..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateReport()), actionCollection(), "save_results"); @@ -583,8 +583,8 @@ void KFileReplacePart::initGUI() (void)new KAction(i18n("&Save Strings List to File..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsSave()), actionCollection(), "strings_save"); (void)new KAction(i18n("&Load Strings List From File..."), "unsortedList", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsLoad()), actionCollection(), "strings_load"); (void)new KRecentFilesAction(i18n("&Load Recent Strings Files"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenRecentStringFile(const KURL&)), actionCollection(),"strings_load_recent"); - (void)new KAction(i18n("&Invert Current String (search <--> tqreplace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert"); - (void)new KAction(i18n("&Invert All Strings (search <--> tqreplace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all"); + (void)new KAction(i18n("&Invert Current String (search <--> replace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert"); + (void)new KAction(i18n("&Invert All Strings (search <--> replace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all"); // Options (void)new KToggleAction(i18n("&Include Sub-Folders"), "recursive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRecursive()), actionCollection(), "options_recursive"); @@ -630,7 +630,7 @@ void KFileReplacePart::freezeActions() actionCollection()->action("stop")->setEnabled(true); actionCollection()->action("file_simulate")->setEnabled(false); - actionCollection()->action("tqreplace")->setEnabled(false); + actionCollection()->action("replace")->setEnabled(false); actionCollection()->action("search")->setEnabled(false); actionCollection()->action("strings_add")->setEnabled(false); actionCollection()->action("strings_del")->setEnabled(false); @@ -1381,15 +1381,15 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa int pos; if(m_option->m_regularExpressions) - pos = line.tqfind(rxKey); + pos = line.find(rxKey); else - pos = line.tqfind(strKey, 0 ,m_option->m_caseSensitive); + pos = line.find(strKey, 0 ,m_option->m_caseSensitive); if(pos != -1) { atLeastOneStringFound = true; - int lineNumber = line.mid(0,pos).tqcontains('\n')+1; - int columnNumber = pos - line.tqfindRev('\n',pos); + int lineNumber = line.mid(0,pos).contains('\n')+1; + int columnNumber = pos - line.findRev('\n',pos); if (!item) item = new KListViewItem(rv); @@ -1418,7 +1418,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa if(m_option->m_regularExpressions) pos = rxKey.search(line,pos); else - pos = line.tqfind(strKey, pos ,m_option->m_caseSensitive); + pos = line.find(strKey, pos ,m_option->m_caseSensitive); while(pos != -1) { @@ -1429,8 +1429,8 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa atLeastOneStringFound = true; TQString msg, capturedText; - int lineNumber = line.mid(0,pos).tqcontains('\n')+1; - int columnNumber = pos - line.tqfindRev('\n',pos); + int lineNumber = line.mid(0,pos).contains('\n')+1; + int columnNumber = pos - line.findRev('\n',pos); if(m_option->m_regularExpressions) { @@ -1440,7 +1440,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa else { capturedText = line.mid(pos,strKey.length()); - pos = line.tqfind(strKey,pos+strKey.length()); + pos = line.find(strKey,pos+strKey.length()); } msg = i18n(" Line:%2, Col:%3 - \"%1\"").tqarg(capturedText).tqarg(TQString::number(lineNumber,10)).tqarg(TQString::number(columnNumber,10)); @@ -1569,7 +1569,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName) // Adds file to "load strings form file" menu TQStringList fileList = m_option->m_recentStringFileList; - if(!fileList.tqcontains(fileName)) + if(!fileList.contains(fileName)) { fileList.append(fileName); ((KRecentFilesAction* ) actionCollection()->action("strings_load_recent"))->setItems(fileList); @@ -1623,10 +1623,10 @@ bool KFileReplacePart::checkBeforeOperation() loadViewContent(); KListView* sv = m_view->getStringsView(); - // Checks if there are strings to tqreplace (not need in search operation) + // Checks if there are strings to replace (not need in search operation) if (sv->childCount() == 0) { - KMessageBox::error(m_w, i18n("There are no strings to search and tqreplace.")); + KMessageBox::error(m_w, i18n("There are no strings to search and replace.")); return false; } |