diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-12-28 22:08:16 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-12-28 22:08:16 +0900 |
commit | 2e45e9cc1dcba9a93fe4457950d71efaf3d1f721 (patch) | |
tree | 207353ee67baa71abe05dc39c7518d027c2c574c | |
parent | 3df12e580bf4a71991a80424b5375157f6bce3db (diff) | |
download | tdebase-2e45e9cc1dcba9a93fe4457950d71efaf3d1f721.tar.gz tdebase-2e45e9cc1dcba9a93fe4457950d71efaf3d1f721.zip |
Use tdecrash.h
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r-- | drkonqi/backtrace.cpp | 28 | ||||
-rw-r--r-- | drkonqi/debugger.cpp | 4 | ||||
-rw-r--r-- | drkonqi/krashconf.cpp | 4 | ||||
-rw-r--r-- | drkonqi/krashconf.h | 10 | ||||
-rw-r--r-- | kdesktop/lock/lockprocess.cpp | 2 | ||||
-rw-r--r-- | kdesktop/main.cpp | 2 | ||||
-rw-r--r-- | kicker/kicker/core/kicker.cpp | 2 | ||||
-rw-r--r-- | konsole/konsole/kwrited.cpp | 2 | ||||
-rw-r--r-- | nsplugins/pluginscan.cpp | 2 | ||||
-rw-r--r-- | tdm/kfrontend/kgapp.cpp | 2 |
10 files changed, 29 insertions, 29 deletions
diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp index b0c3abdb2..c87384d1f 100644 --- a/drkonqi/backtrace.cpp +++ b/drkonqi/backtrace.cpp @@ -238,12 +238,12 @@ bool BackTrace::usefulBacktrace() // remove stack frames added because of TDECrash void BackTrace::processBacktrace() { - if( !m_krashconf->kcrashRegExp().isEmpty()) { - TQRegExp kcrashregexp( m_krashconf->kcrashRegExp()); - kcrashregexp.setMinimal(true); + if( !m_krashconf->tdecrashRegExp().isEmpty()) { + TQRegExp tdecrashregexp( m_krashconf->tdecrashRegExp()); + tdecrashregexp.setMinimal(true); int pos = 0; int prevpos = 0; - while ((pos = kcrashregexp.search( m_strBt, pos )) >= 0) { + while ((pos = tdecrashregexp.search( m_strBt, pos )) >= 0) { if (prevpos == pos) { // Avoid infinite loop // Shouldn't ever get here, but given that this is a crash handler, better safe than sorry! @@ -251,15 +251,15 @@ void BackTrace::processBacktrace() } prevpos = pos; if( pos >= 0 ) { - int len = kcrashregexp.matchedLength(); + int len = tdecrashregexp.matchedLength(); int nextinfochunkpos = m_strBt.find("====", pos); if (nextinfochunkpos >= 0) { // Trying to delete too much! int limitedlen = nextinfochunkpos - pos; TQString limitedstrBt = m_strBt.mid(pos, limitedlen); - int limitedpos = kcrashregexp.search( limitedstrBt ); + int limitedpos = tdecrashregexp.search( limitedstrBt ); if (limitedpos >= 0) { - len = kcrashregexp.matchedLength(); + len = tdecrashregexp.matchedLength(); } else { len = 0; @@ -287,11 +287,11 @@ void BackTrace::processBacktrace() } } } - if( !m_krashconf->kcrashRegExpSingle().isEmpty()) { - TQRegExp kcrashregexp( m_krashconf->kcrashRegExpSingle()); - int pos = kcrashregexp.search( m_strBt ); + if( !m_krashconf->tdecrashRegExpSingle().isEmpty()) { + TQRegExp tdecrashregexp( m_krashconf->tdecrashRegExpSingle()); + int pos = tdecrashregexp.search( m_strBt ); if( pos >= 0 ) { - int len = kcrashregexp.matchedLength(); + int len = tdecrashregexp.matchedLength(); if( m_strBt[ pos ] == '\n' ) { ++pos; --len; @@ -381,10 +381,10 @@ void BackTrace::processBacktrace() { // Clean up hard to read debug blocks - TQRegExp kcrashregexp( "[^\n]\n==== "); - kcrashregexp.setMinimal(true); + TQRegExp tdecrashregexp( "[^\n]\n==== "); + tdecrashregexp.setMinimal(true); int pos = 0; - while ((pos = kcrashregexp.search( m_strBt, pos )) >= 0) { + while ((pos = tdecrashregexp.search( m_strBt, pos )) >= 0) { m_strBt.insert(pos+1, "\n"); } } diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp index 2de6fb3f8..fa959b4cc 100644 --- a/drkonqi/debugger.cpp +++ b/drkonqi/debugger.cpp @@ -95,7 +95,7 @@ void KrashDebugger :: slotSave() { if (m_krashconf->safeMode()) { - KTempFile tf(TQString::fromAscii("/tmp/"), TQString::fromAscii(".kcrash"), 0600); + KTempFile tf(TQString::fromAscii("/tmp/"), TQString::fromAscii(".tdecrash"), 0600); if (!tf.status()) { *tf.textStream() << m_backtrace->text(); @@ -109,7 +109,7 @@ void KrashDebugger :: slotSave() } else { - TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" ); + TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".tdecrash" ); if( defname.contains( '/' )) defname = defname.mid( defname.findRev( '/' ) + 1 ); TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename")); diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp index 12c8064e0..384ac76d0 100644 --- a/drkonqi/krashconf.cpp +++ b/drkonqi/krashconf.cpp @@ -110,8 +110,8 @@ void KrashConfig :: readConfig() m_invalidStackFrameRegExp = debuggers.readEntry("InvalidStackFrameRegExp"); m_frameRegExp = debuggers.readEntry("FrameRegExp"); m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp"); - m_kcrashRegExp = debuggers.readEntry("TDECrashRegExp"); - m_kcrashRegExpSingle = debuggers.readEntry("TDECrashRegExpSingle"); + m_tdecrashRegExp = debuggers.readEntry("TDECrashRegExp"); + m_tdecrashRegExpSingle = debuggers.readEntry("TDECrashRegExpSingle"); m_threadRegExp = debuggers.readEntry("ThreadRegExp"); m_infoSharedLibraryHeader = debuggers.readEntry("InfoSharedLibraryHeader"); diff --git a/drkonqi/krashconf.h b/drkonqi/krashconf.h index be823cba1..409ca51b1 100644 --- a/drkonqi/krashconf.h +++ b/drkonqi/krashconf.h @@ -1,5 +1,5 @@ /***************************************************************** - * drkonqi - The KDE Crash Handler + * drkonqi - The TDE Crash Handler * * Copyright (C) 2000-2003 Hans Petter Bieker <bieker@kde.org> * @@ -65,8 +65,8 @@ public: TQString invalidStackFrameRegExp() const { return m_invalidStackFrameRegExp; } TQString frameRegExp() const { return m_frameRegExp; } TQString neededInValidBacktraceRegExp() const { return m_neededInValidBacktraceRegExp; } - TQString kcrashRegExp() const { return m_kcrashRegExp; } - TQString kcrashRegExpSingle() const { return m_kcrashRegExpSingle; } + TQString tdecrashRegExp() const { return m_tdecrashRegExp; } + TQString tdecrashRegExpSingle() const { return m_tdecrashRegExpSingle; } TQString threadRegExp() const { return m_threadRegExp; } TQString infoSharedLibraryHeader() const { return m_infoSharedLibraryHeader; } bool showBacktrace() const { return m_showbacktrace; }; @@ -110,8 +110,8 @@ private: TQString m_invalidStackFrameRegExp; TQString m_frameRegExp; TQString m_neededInValidBacktraceRegExp; - TQString m_kcrashRegExp; - TQString m_kcrashRegExpSingle; + TQString m_tdecrashRegExp; + TQString m_tdecrashRegExpSingle; TQString m_threadRegExp; TQString m_infoSharedLibraryHeader; }; diff --git a/kdesktop/lock/lockprocess.cpp b/kdesktop/lock/lockprocess.cpp index 0a343d88e..163d76fe6 100644 --- a/kdesktop/lock/lockprocess.cpp +++ b/kdesktop/lock/lockprocess.cpp @@ -85,7 +85,7 @@ #include <sys/types.h> #include <fcntl.h> -#include <kcrash.h> +#include <tdecrash.h> #include <pthread.h> diff --git a/kdesktop/main.cpp b/kdesktop/main.cpp index 5df394478..1fe29230e 100644 --- a/kdesktop/main.cpp +++ b/kdesktop/main.cpp @@ -24,7 +24,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kopenwith.h> -#include <kcrash.h> +#include <tdecrash.h> #include <kdebug.h> #include <tdeglobalsettings.h> #include <tdeglobal.h> diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index b5d21c28e..e99f9fed4 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -32,7 +32,7 @@ #include <tdeconfig.h> #include <tdecmdlineargs.h> #include <kcmultidialog.h> -#include <kcrash.h> +#include <tdecrash.h> #include <kdebug.h> #include <kdirwatch.h> #include <tdeglobal.h> diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp index d889ace7b..6aea6d6a4 100644 --- a/konsole/konsole/kwrited.cpp +++ b/konsole/konsole/kwrited.cpp @@ -39,7 +39,7 @@ #include <tdelocale.h> #include <tdeglobalsettings.h> #include <kdebug.h> -#include <kcrash.h> +#include <tdecrash.h> #include <kpty.h> #include <kuser.h> #include <tdeglobal.h> diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp index 8e08178be..0ed350abb 100644 --- a/nsplugins/pluginscan.cpp +++ b/nsplugins/pluginscan.cpp @@ -46,7 +46,7 @@ #include <kstandarddirs.h> #include <klibloader.h> #include <tdeconfig.h> -#include <kcrash.h> +#include <tdecrash.h> #include <kdesktopfile.h> #include <kservicetype.h> #include <kmimetype.h> diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index c60843f63..e7c6ddff7 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <kuser.h> #include <tdeprocess.h> #include <tdecmdlineargs.h> -#include <kcrash.h> +#include <tdecrash.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> #include <tdelocale.h> |