diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2015-02-02 16:21:26 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2015-02-02 16:21:26 +0900 |
| commit | b9346aa9e09dd397dac8367bcf04bf7ef8403b94 (patch) | |
| tree | d606a3e9e6081ec9cd91d73b7145b7dcf62eff91 /tdefilereplace/tdefilereplacepart.h | |
| parent | 1b697b6bf7c1e3bd0f9b6d0bb9cdf5b47b7ebc13 (diff) | |
| download | tdewebdev-b9346aa9e09dd397dac8367bcf04bf7ef8403b94.tar.gz tdewebdev-b9346aa9e09dd397dac8367bcf04bf7ef8403b94.zip | |
TDEFileReplace: fixed unresponsive GUI and application crash when circular references are found on the file system.
Added a message to advice the user of the possible circular reference. This relates to bug 2264.
Manually cherry-picked from commit d7398464 (tdeutils).
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'tdefilereplace/tdefilereplacepart.h')
| -rw-r--r-- | tdefilereplace/tdefilereplacepart.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tdefilereplace/tdefilereplacepart.h b/tdefilereplace/tdefilereplacepart.h index 0ca917e0..34a91dae 100644 --- a/tdefilereplace/tdefilereplacepart.h +++ b/tdefilereplace/tdefilereplacepart.h @@ -42,8 +42,9 @@ class TDEFileReplacePart: public KParts::ReadOnlyPart TDEAboutApplication* m_aboutDlg; KeyValueMap m_replacementMap; RCOptions* m_option; - bool m_stop, - m_searchingOperation; + bool m_stop; + bool m_searchingOperation; + bool m_circ_ref_warning_shown; int m_optionMask; public://Constructors @@ -133,7 +134,7 @@ class TDEFileReplacePart: public KParts::ReadOnlyPart * Replacing methods */ void fileReplace(); - void recursiveFileReplace(const TQString& dirName, int& filesNumber); + void recursiveFileReplace(const TQString& dirName, int& filesNumber, int depth); void replaceAndBackup(const TQString& currentDir, const TQString& oldFileName); void replaceAndOverwrite(const TQString& currentDir, const TQString& oldFileName); void replacingLoop(TQString& line, TDEListViewItem** item, bool& atLeastOneStringFound, int& occur, bool regularExpression, bool& askConfirmReplace); @@ -142,7 +143,7 @@ class TDEFileReplacePart: public KParts::ReadOnlyPart * Searching methods */ void fileSearch(const TQString& dirName, const TQString& filters); - void recursiveFileSearch(const TQString& dirName, const TQString& filters, uint& filesNumber); + void recursiveFileSearch(const TQString& dirName, const TQString& filters, uint& filesNumber, int depth); void search(const TQString& currentDir, const TQString& fileName); /** |