diff options
Diffstat (limited to 'tdefilereplace')
| -rw-r--r-- | tdefilereplace/report.h | 6 | ||||
| -rw-r--r-- | tdefilereplace/tdefilereplace.cpp | 8 | ||||
| -rw-r--r-- | tdefilereplace/tdefilereplacelib.cpp | 2 | ||||
| -rw-r--r-- | tdefilereplace/tdefilereplacelib.h | 2 | ||||
| -rw-r--r-- | tdefilereplace/tdefilereplacepart.cpp | 124 | ||||
| -rw-r--r-- | tdefilereplace/tdefilereplacepart.h | 2 | ||||
| -rw-r--r-- | tdefilereplace/tdefilereplaceview.cpp | 12 | ||||
| -rw-r--r-- | tdefilereplace/tdefilereplaceview.h | 14 | ||||
| -rw-r--r-- | tdefilereplace/tdefilereplaceviewwdg.ui | 8 |
9 files changed, 89 insertions, 89 deletions
diff --git a/tdefilereplace/report.h b/tdefilereplace/report.h index 13856334..2255f240 100644 --- a/tdefilereplace/report.h +++ b/tdefilereplace/report.h @@ -25,7 +25,7 @@ class TQString; // KDE #include <klocale.h> #include "configurationclasses.h" -class KListView; +class TDEListView; /** Report class is used to create a pair of files (a xml and a css file) which are * a short statistical report of the operations. @@ -34,14 +34,14 @@ class KListView; class Report { private: - KListView* m_stringsView, + TDEListView* m_stringsView, * m_resultsView; TQString m_docPath; bool m_isSearchFlag; RCOptions* m_option; public: - Report(RCOptions* info, KListView* rv, KListView* sv) { m_option = info; + Report(RCOptions* info, TDEListView* rv, TDEListView* sv) { m_option = info; m_resultsView = rv; m_stringsView = sv; m_isSearchFlag = m_option->m_searchingOnlyMode; diff --git a/tdefilereplace/tdefilereplace.cpp b/tdefilereplace/tdefilereplace.cpp index bd5725e4..b96883d9 100644 --- a/tdefilereplace/tdefilereplace.cpp +++ b/tdefilereplace/tdefilereplace.cpp @@ -91,10 +91,10 @@ void KFileReplace::applyNewToolbarConfig() void KFileReplace::removeDuplicatedActions() { - KActionCollection* part_action_collection = m_part->actionCollection(); - KAction* part_about_action = part_action_collection->action("help_about_tdefilereplace"); - KAction* part_report_action = part_action_collection->action("report_bug"); - KAction* part_help_action= part_action_collection->action("help_tdefilereplace"); + TDEActionCollection* part_action_collection = m_part->actionCollection(); + TDEAction* part_about_action = part_action_collection->action("help_about_tdefilereplace"); + TDEAction* part_report_action = part_action_collection->action("report_bug"); + TDEAction* part_help_action= part_action_collection->action("help_tdefilereplace"); if (!part_about_action || !part_report_action || !part_help_action || !part_action_collection) return; diff --git a/tdefilereplace/tdefilereplacelib.cpp b/tdefilereplace/tdefilereplacelib.cpp index 0f396f85..0d2246a1 100644 --- a/tdefilereplace/tdefilereplacelib.cpp +++ b/tdefilereplace/tdefilereplacelib.cpp @@ -119,7 +119,7 @@ TQString KFileReplaceLib::formatFileSize(double size) return stringSize; } -void KFileReplaceLib::convertOldToNewKFRFormat(const TQString& fileName, KListView* stringView) +void KFileReplaceLib::convertOldToNewKFRFormat(const TQString& fileName, TDEListView* stringView) { //this method convert old format in new XML-based format typedef struct diff --git a/tdefilereplace/tdefilereplacelib.h b/tdefilereplace/tdefilereplacelib.h index 9669b31c..eb83f9a2 100644 --- a/tdefilereplace/tdefilereplacelib.h +++ b/tdefilereplace/tdefilereplacelib.h @@ -53,7 +53,7 @@ class KFileReplaceLib /** converts the old kfr format file in the new xml-based format. */ - static void convertOldToNewKFRFormat(const TQString& fileName, KListView* stringView); + static void convertOldToNewKFRFormat(const TQString& fileName, TDEListView* stringView); /** Verifies that files, which we are scanning, respect some conditions diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp index ab91ae47..39126044 100644 --- a/tdefilereplace/tdefilereplacepart.cpp +++ b/tdefilereplace/tdefilereplacepart.cpp @@ -107,7 +107,7 @@ void KFileReplacePart::slotSearchingOperation() if(!checkBeforeOperation()) return; - KListView* rv = m_view->getResultsView(); + TDEListView* rv = m_view->getResultsView(); rv->clear(); @@ -166,7 +166,7 @@ void KFileReplacePart::slotReplacingOperation() if(!checkBeforeOperation()) return; - KListView* rv = m_view->getResultsView(); + TDEListView* rv = m_view->getResultsView(); if(m_option->m_simulation) { @@ -239,7 +239,7 @@ void KFileReplacePart::slotStop() void KFileReplacePart::slotCreateReport() { // Check there are results - KListView* rv = m_view->getResultsView(), + TDEListView* rv = m_view->getResultsView(), * sv = m_view->getStringsView(); if(rv->firstChild() == 0) @@ -454,7 +454,7 @@ void KFileReplacePart::reportBug() void KFileReplacePart::resetActions() { - KListView* rv = m_view->getResultsView(), + TDEListView* rv = m_view->getResultsView(), * sv = m_view->getStringsView(); bool hasItems = (sv->firstChild() != 0), @@ -499,11 +499,11 @@ void KFileReplacePart::resetActions() actionCollection()->action("results_treereduce")->setEnabled(hasItems); // Updates menus and toolbar - ((KToggleAction* ) actionCollection()->action("options_recursive"))->setChecked(m_option->m_recursive); - ((KToggleAction* ) actionCollection()->action("options_backup"))->setChecked(m_option->m_backup && !searchOnlyMode); - ((KToggleAction* ) actionCollection()->action("options_case"))->setChecked(m_option->m_caseSensitive); - ((KToggleAction* ) actionCollection()->action("options_var"))->setChecked(m_option->m_variables && !searchOnlyMode); - ((KToggleAction* ) actionCollection()->action("options_regularexpressions"))->setChecked(m_option->m_regularExpressions); + ((TDEToggleAction* ) actionCollection()->action("options_recursive"))->setChecked(m_option->m_recursive); + ((TDEToggleAction* ) actionCollection()->action("options_backup"))->setChecked(m_option->m_backup && !searchOnlyMode); + ((TDEToggleAction* ) actionCollection()->action("options_case"))->setChecked(m_option->m_caseSensitive); + ((TDEToggleAction* ) actionCollection()->action("options_var"))->setChecked(m_option->m_variables && !searchOnlyMode); + ((TDEToggleAction* ) actionCollection()->action("options_regularexpressions"))->setChecked(m_option->m_regularExpressions); } //PUBLIC METHODS @@ -567,48 +567,48 @@ void KFileReplacePart::initGUI() } } // File - (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(), "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"); + (void)new TDEAction(i18n("Customize Search/Replace Session..."), "projectopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetNewParameters()), actionCollection(), "new_project"); + (void)new TDEAction(i18n("&Search"), "filesearch", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearchingOperation()), actionCollection(), "search"); + (void)new TDEAction(i18n("S&imulate"), "filesimulate", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate"); + (void)new TDEAction(i18n("&Replace"), "filereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplacingOperation()), actionCollection(), "replace"); + (void)new TDEAction(i18n("Sto&p"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "stop"); + (void)new TDEAction(i18n("Cre&ate Report File..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateReport()), actionCollection(), "save_results"); // Strings - (void)new KAction(i18n("&Add String..."), "editadd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsAdd()), actionCollection(), "strings_add"); + (void)new TDEAction(i18n("&Add String..."), "editadd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsAdd()), actionCollection(), "strings_add"); - (void)new KAction(i18n("&Delete String"), "editremove", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsDeleteItem()), actionCollection(), "strings_del"); - (void)new KAction(i18n("&Empty Strings List"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty"); - (void)new KAction(i18n("Edit Selected String..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsEdit()), actionCollection(), "strings_edit"); - (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 <--> 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"); + (void)new TDEAction(i18n("&Delete String"), "editremove", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsDeleteItem()), actionCollection(), "strings_del"); + (void)new TDEAction(i18n("&Empty Strings List"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty"); + (void)new TDEAction(i18n("Edit Selected String..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsEdit()), actionCollection(), "strings_edit"); + (void)new TDEAction(i18n("&Save Strings List to File..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsSave()), actionCollection(), "strings_save"); + (void)new TDEAction(i18n("&Load Strings List From File..."), "unsortedList", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsLoad()), actionCollection(), "strings_load"); + (void)new TDERecentFilesAction(i18n("&Load Recent Strings Files"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenRecentStringFile(const KURL&)), actionCollection(),"strings_load_recent"); + (void)new TDEAction(i18n("&Invert Current String (search <--> replace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert"); + (void)new TDEAction(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"); - (void)new KToggleAction(i18n("Create &Backup Files"), "backup_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionBackup()), actionCollection(), "options_backup"); - (void)new KToggleAction(i18n("Case &Sensitive"), "casesensitive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionCaseSensitive()), actionCollection(), "options_case"); - (void)new KToggleAction(i18n("Enable Commands &in Replace String: [$command:option$]"), "command_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionVariables()), actionCollection(), "options_var"); - (void)new KToggleAction(i18n("Enable &Regular Expressions"), "regularexpression_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRegularExpressions()), actionCollection(), "options_regularexpressions"); - (void)new KAction(i18n("Configure &KFileReplace..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionPreferences()), actionCollection(), "configure_tdefilereplace"); + (void)new TDEToggleAction(i18n("&Include Sub-Folders"), "recursive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRecursive()), actionCollection(), "options_recursive"); + (void)new TDEToggleAction(i18n("Create &Backup Files"), "backup_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionBackup()), actionCollection(), "options_backup"); + (void)new TDEToggleAction(i18n("Case &Sensitive"), "casesensitive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionCaseSensitive()), actionCollection(), "options_case"); + (void)new TDEToggleAction(i18n("Enable Commands &in Replace String: [$command:option$]"), "command_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionVariables()), actionCollection(), "options_var"); + (void)new TDEToggleAction(i18n("Enable &Regular Expressions"), "regularexpression_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRegularExpressions()), actionCollection(), "options_regularexpressions"); + (void)new TDEAction(i18n("Configure &KFileReplace..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionPreferences()), actionCollection(), "configure_tdefilereplace"); // Results - (void)new KAction(i18n("&Properties"), "informations", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultProperties()), actionCollection(), "results_infos"); - (void)new KAction(i18n("&Open"), "filenew", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultOpen()), actionCollection(), "results_openfile"); + (void)new TDEAction(i18n("&Properties"), "informations", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultProperties()), actionCollection(), "results_infos"); + (void)new TDEAction(i18n("&Open"), "filenew", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultOpen()), actionCollection(), "results_openfile"); if(quantaFound) { - (void)new KAction(i18n("&Edit in Quanta"), "quanta", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultEdit()), actionCollection(), "results_editfile"); + (void)new TDEAction(i18n("&Edit in Quanta"), "quanta", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultEdit()), actionCollection(), "results_editfile"); } - (void)new KAction(i18n("Open Parent &Folder"), "fileopen", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir"); - (void)new KAction(i18n("&Delete"), "editdelete", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDelete()), actionCollection(), "results_delete"); - (void)new KAction(i18n("E&xpand Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand"); - (void)new KAction(i18n("&Reduce Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce"); - (void)new KAction(i18n("&About KFileReplace"), "tdefilereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdefilereplace"); - (void)new KAction(i18n("KFileReplace &Handbook"), "help", 0, TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdefilereplace"); - (void)new KAction(i18n("&Report Bug"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(reportBug()), actionCollection(), "report_bug"); + (void)new TDEAction(i18n("Open Parent &Folder"), "fileopen", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir"); + (void)new TDEAction(i18n("&Delete"), "editdelete", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDelete()), actionCollection(), "results_delete"); + (void)new TDEAction(i18n("E&xpand Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand"); + (void)new TDEAction(i18n("&Reduce Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce"); + (void)new TDEAction(i18n("&About KFileReplace"), "tdefilereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdefilereplace"); + (void)new TDEAction(i18n("KFileReplace &Handbook"), "help", 0, TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdefilereplace"); + (void)new TDEAction(i18n("&Report Bug"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(reportBug()), actionCollection(), "report_bug"); } @@ -654,11 +654,11 @@ void KFileReplacePart::freezeActions() actionCollection()->action("results_delete")->setEnabled(false); actionCollection()->action("results_treeexpand")->setEnabled(false); actionCollection()->action("results_treereduce")->setEnabled(false); - ((KToggleAction* ) actionCollection()->action("options_recursive"))->setChecked(false); - ((KToggleAction* ) actionCollection()->action("options_backup"))->setChecked(false); - ((KToggleAction* ) actionCollection()->action("options_case"))->setChecked(false); - ((KToggleAction* ) actionCollection()->action("options_var"))->setChecked(false); - ((KToggleAction* ) actionCollection()->action("options_regularexpressions"))->setChecked(false); + ((TDEToggleAction* ) actionCollection()->action("options_recursive"))->setChecked(false); + ((TDEToggleAction* ) actionCollection()->action("options_backup"))->setChecked(false); + ((TDEToggleAction* ) actionCollection()->action("options_case"))->setChecked(false); + ((TDEToggleAction* ) actionCollection()->action("options_var"))->setChecked(false); + ((TDEToggleAction* ) actionCollection()->action("options_regularexpressions"))->setChecked(false); } void KFileReplacePart::loadOptionsFromRC() @@ -1040,7 +1040,7 @@ void KFileReplacePart::replaceAndBackup(const TQString& currentDir, const TQStri TQString backupExtension = m_option->m_backupExtension; bool atLeastOneStringFound = false; - KListViewItem *item = 0; + TDEListViewItem *item = 0; int occurrence = 0; replacingLoop(line, &item, atLeastOneStringFound, occurrence, m_option->m_regularExpressions, m_option->m_askConfirmReplace); @@ -1115,7 +1115,7 @@ void KFileReplacePart::replaceAndOverwrite(const TQString& currentDir, const TQS } TQString fileSizeBeforeReplacing = KFileReplaceLib::formatFileSize(oldFileInfo.size()); - KListViewItem *item = 0; + TDEListViewItem *item = 0; TQTextStream oldStream( &oldFile ); if (m_option->m_encoding == "utf8") @@ -1176,11 +1176,11 @@ void KFileReplacePart::replaceAndOverwrite(const TQString& currentDir, const TQS } } -void KFileReplacePart::replacingLoop(TQString& line, KListViewItem** item, bool& atLeastOneStringFound, int& occur, bool regularExpression, bool& askConfirmReplace) +void KFileReplacePart::replacingLoop(TQString& line, TDEListViewItem** item, bool& atLeastOneStringFound, int& occur, bool regularExpression, bool& askConfirmReplace) { KeyValueMap tempMap = m_replacementMap; KeyValueMap::Iterator it; - KListView* rv = m_view->getResultsView(); + TDEListView* rv = m_view->getResultsView(); for(it = tempMap.begin(); it != tempMap.end(); ++it) { @@ -1209,8 +1209,8 @@ void KFileReplacePart::replacingLoop(TQString& line, KListViewItem** item, bool& entry.columnNumber(line)); if(!*item) - *item = new KListViewItem(rv); - KListViewItem* tempItem = new KListViewItem(*item); + *item = new TDEListViewItem(rv); + TDEListViewItem* tempItem = new TDEListViewItem(*item); tempItem->setMultiLinesEnabled(true); tempItem->setText(0,msg); occur ++; @@ -1231,8 +1231,8 @@ void KFileReplacePart::replacingLoop(TQString& line, KListViewItem** item, bool& entry.columnNumber(line)); if(!*item) - *item = new KListViewItem(rv); - KListViewItem* tempItem = new KListViewItem(*item); + *item = new TDEListViewItem(rv); + TDEListViewItem* tempItem = new TDEListViewItem(*item); tempItem->setMultiLinesEnabled(true); tempItem->setText(0,msg); occur ++; @@ -1346,7 +1346,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa TQFileInfo fileInfo(currentDir+"/"+fileName); - KListViewItem *item = 0; + TDEListViewItem *item = 0; //Counts occurrences int occurrence = 0; @@ -1358,7 +1358,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa KeyValueMap::Iterator it = tempMap.begin(); - KListView* rv = m_view->getResultsView(); + TDEListView* rv = m_view->getResultsView(); while(it != tempMap.end()) { @@ -1392,9 +1392,9 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa int columnNumber = pos - line.findRev('\n',pos); if (!item) - item = new KListViewItem(rv); + item = new TDEListViewItem(rv); - KListViewItem* tempItem= new KListViewItem(item); + TDEListViewItem* tempItem= new TDEListViewItem(item); TQString msg, capturedText; @@ -1446,8 +1446,8 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa msg = i18n(" Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(TQString::number(columnNumber,10)); if(!item) - item = new KListViewItem(rv); - KListViewItem* tempItem = new KListViewItem(item); + item = new TDEListViewItem(rv); + TDEListViewItem* tempItem = new TDEListViewItem(item); tempItem->setMultiLinesEnabled(true); tempItem->setText(0,msg); occurrence++; @@ -1505,7 +1505,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName) * creates a xml document and browses it*/ TQDomDocument doc("mydocument"); TQFile file(fileName); - KListView* sv = m_view->getStringsView(); + TDEListView* sv = m_view->getStringsView(); if(!file.open(IO_ReadOnly)) { @@ -1572,7 +1572,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName) if(!fileList.contains(fileName)) { fileList.append(fileName); - ((KRecentFilesAction* ) actionCollection()->action("strings_load_recent"))->setItems(fileList); + ((TDERecentFilesAction* ) actionCollection()->action("strings_load_recent"))->setItems(fileList); m_option->m_recentStringFileList = fileList; } @@ -1621,7 +1621,7 @@ void KFileReplacePart::setOptionMask() bool KFileReplacePart::checkBeforeOperation() { loadViewContent(); - KListView* sv = m_view->getStringsView(); + TDEListView* sv = m_view->getStringsView(); // Checks if there are strings to replace (not need in search operation) if (sv->childCount() == 0) diff --git a/tdefilereplace/tdefilereplacepart.h b/tdefilereplace/tdefilereplacepart.h index d625d7bb..bc507088 100644 --- a/tdefilereplace/tdefilereplacepart.h +++ b/tdefilereplace/tdefilereplacepart.h @@ -136,7 +136,7 @@ class KFileReplacePart: public KParts::ReadOnlyPart void recursiveFileReplace(const TQString& dirName, int& filesNumber); void replaceAndBackup(const TQString& currentDir, const TQString& oldFileName); void replaceAndOverwrite(const TQString& currentDir, const TQString& oldFileName); - void replacingLoop(TQString& line, KListViewItem** item, bool& atLeastOneStringFound, int& occur, bool regularExpression, bool& askConfirmReplace); + void replacingLoop(TQString& line, TDEListViewItem** item, bool& atLeastOneStringFound, int& occur, bool regularExpression, bool& askConfirmReplace); /** * Searching methods diff --git a/tdefilereplace/tdefilereplaceview.cpp b/tdefilereplace/tdefilereplaceview.cpp index b7a8c6be..ffefd154 100644 --- a/tdefilereplace/tdefilereplaceview.cpp +++ b/tdefilereplace/tdefilereplaceview.cpp @@ -99,7 +99,7 @@ void KFileReplaceView::stringsInvert(bool invertAll) { TQListViewItem* lviCurItem, * lviFirst; - KListView* sv = getStringsView(); + TDEListView* sv = getStringsView(); if(invertAll) lviCurItem = lviFirst = sv->firstChild(); @@ -149,7 +149,7 @@ void KFileReplaceView::changeView(bool searchingOnlyMode) } } -KListView* KFileReplaceView::getResultsView() +TDEListView* KFileReplaceView::getResultsView() { if(m_option->m_searchingOnlyMode) m_rv = m_lvResults_2; @@ -159,7 +159,7 @@ KListView* KFileReplaceView::getResultsView() return m_rv; } -KListView* KFileReplaceView::getStringsView() +TDEListView* KFileReplaceView::getStringsView() { if(m_option->m_searchingOnlyMode) m_sv = m_lvStrings_2; @@ -177,7 +177,7 @@ void KFileReplaceView::slotMouseButtonClicked (int button, TQListViewItem *lvi, // RIGHT BUTTON if (button == Qt::RightButton) { - m_lviCurrent = static_cast<KListViewItem*>(lvi); + m_lviCurrent = static_cast<TDEListViewItem*>(lvi); m_menuResult->popup(pos); } } @@ -394,7 +394,7 @@ void KFileReplaceView::slotStringsEdit() void KFileReplaceView::slotStringsSave() { // Check there are strings in the list - KListView* sv = getStringsView(); + TDEListView* sv = getStringsView(); if (sv->firstChild() == 0) { @@ -494,7 +494,7 @@ void KFileReplaceView::initGUI() } } - m_menuResult = new KPopupMenu(this, "ResultPopup"); + m_menuResult = new TDEPopupMenu(this, "ResultPopup"); diff --git a/tdefilereplace/tdefilereplaceview.h b/tdefilereplace/tdefilereplaceview.h index 5ef3cfe4..bac91dcb 100644 --- a/tdefilereplace/tdefilereplaceview.h +++ b/tdefilereplace/tdefilereplaceview.h @@ -28,8 +28,8 @@ class TQPixMap; //KDE -class KPopupMenu; -class KListView; +class TDEPopupMenu; +class TDEListView; //local #include "tdefilereplaceviewwdg.h" @@ -59,10 +59,10 @@ class KFileReplaceView : public KFileReplaceViewWdg Q_OBJECT private: - KPopupMenu* m_menuResult; + TDEPopupMenu* m_menuResult; RCOptions* m_option; - KListViewItem* m_lviCurrent; - KListView* m_rv, + TDEListViewItem* m_lviCurrent; + TDEListView* m_rv, * m_sv; public://Constructors @@ -74,8 +74,8 @@ class KFileReplaceView : public KFileReplaceViewWdg void displayScannedFiles(int filesNumber) { m_lcdFilesNumber->display(TQString::number(filesNumber,10)); } void stringsInvert(bool invertAll); void changeView(bool searchingOnlyMode); - KListView* getResultsView(); - KListView* getStringsView(); + TDEListView* getResultsView(); + TDEListView* getStringsView(); void updateOptions(RCOptions* info) { m_option = info; } void loadMap(KeyValueMap extMap){ loadMapIntoView(extMap); } KeyValueMap getStringsViewMap()const { return m_option->m_mapStringsView;} diff --git a/tdefilereplace/tdefilereplaceviewwdg.ui b/tdefilereplace/tdefilereplaceviewwdg.ui index c8fca48d..4bd2ee37 100644 --- a/tdefilereplace/tdefilereplaceviewwdg.ui +++ b/tdefilereplace/tdefilereplaceviewwdg.ui @@ -52,7 +52,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KListView" row="0" column="0"> + <widget class="TDEListView" row="0" column="0"> <column> <property name="text"> <string>Name</string> @@ -175,7 +175,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KListView" row="0" column="0"> + <widget class="TDEListView" row="0" column="0"> <column> <property name="text"> <string>Name</string> @@ -300,7 +300,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KListView" row="0" column="0"> + <widget class="TDEListView" row="0" column="0"> <column> <property name="text"> <string>Search For</string> @@ -355,7 +355,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KListView" row="0" column="0"> + <widget class="TDEListView" row="0" column="0"> <column> <property name="text"> <string>Search For</string> |