TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Use tdecrash.h

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/571/head
Michele Calgaro 9 months ago
parent 3df12e580b
commit 2e45e9cc1d
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
10 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File

28
drkonqi/backtrace.cpp
Unescape Escape View File

@ -238,12 +238,12 @@ bool BackTrace::usefulBacktrace()
// remove stack frames added because of TDECrash // remove stack frames added because of TDECrash
void BackTrace::processBacktrace() void BackTrace::processBacktrace()
{ {
if( !m_krashconf->kcrashRegExp().isEmpty()) { if( !m_krashconf->tdecrashRegExp().isEmpty()) {
TQRegExp kcrashregexp( m_krashconf->kcrashRegExp()); TQRegExp tdecrashregexp( m_krashconf->tdecrashRegExp());
kcrashregexp.setMinimal(true); tdecrashregexp.setMinimal(true);
int pos = 0; int pos = 0;
int prevpos = 0; int prevpos = 0;
while ((pos = kcrashregexp.search( m_strBt, pos )) >= 0) { while ((pos = tdecrashregexp.search( m_strBt, pos )) >= 0) {
if (prevpos == pos) { if (prevpos == pos) {
// Avoid infinite loop // Avoid infinite loop
// Shouldn't ever get here, but given that this is a crash handler, better safe than sorry! // 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; prevpos = pos;
if( pos >= 0 ) { if( pos >= 0 ) {
int len = kcrashregexp.matchedLength(); int len = tdecrashregexp.matchedLength();
int nextinfochunkpos = m_strBt.find("====", pos); int nextinfochunkpos = m_strBt.find("====", pos);
if (nextinfochunkpos >= 0) { if (nextinfochunkpos >= 0) {
// Trying to delete too much! // Trying to delete too much!
int limitedlen = nextinfochunkpos - pos; int limitedlen = nextinfochunkpos - pos;
TQString limitedstrBt = m_strBt.mid(pos, limitedlen); TQString limitedstrBt = m_strBt.mid(pos, limitedlen);
int limitedpos = kcrashregexp.search( limitedstrBt ); int limitedpos = tdecrashregexp.search( limitedstrBt );
if (limitedpos >= 0) { if (limitedpos >= 0) {
len = kcrashregexp.matchedLength(); len = tdecrashregexp.matchedLength();
} }
else { else {
len = 0; len = 0;
@ -287,11 +287,11 @@ void BackTrace::processBacktrace()
} }
} }
} }
if( !m_krashconf->kcrashRegExpSingle().isEmpty()) { if( !m_krashconf->tdecrashRegExpSingle().isEmpty()) {
TQRegExp kcrashregexp( m_krashconf->kcrashRegExpSingle()); TQRegExp tdecrashregexp( m_krashconf->tdecrashRegExpSingle());
int pos = kcrashregexp.search( m_strBt ); int pos = tdecrashregexp.search( m_strBt );
if( pos >= 0 ) { if( pos >= 0 ) {
int len = kcrashregexp.matchedLength(); int len = tdecrashregexp.matchedLength();
if( m_strBt[ pos ] == '\n' ) { if( m_strBt[ pos ] == '\n' ) {
++pos; ++pos;
--len; --len;
@ -381,10 +381,10 @@ void BackTrace::processBacktrace()
{ {
// Clean up hard to read debug blocks // Clean up hard to read debug blocks
TQRegExp kcrashregexp( "[^\n]\n==== "); TQRegExp tdecrashregexp( "[^\n]\n==== ");
kcrashregexp.setMinimal(true); tdecrashregexp.setMinimal(true);
int pos = 0; 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"); m_strBt.insert(pos+1, "\n");
} }
} }

4
drkonqi/debugger.cpp
Unescape Escape View File

@ -95,7 +95,7 @@ void KrashDebugger :: slotSave()
{ {
if (m_krashconf->safeMode()) 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()) if (!tf.status())
{ {
*tf.textStream() << m_backtrace->text(); *tf.textStream() << m_backtrace->text();
@ -109,7 +109,7 @@ void KrashDebugger :: slotSave()
} }
else else
{ {
TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" ); TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".tdecrash" );
if( defname.contains( '/' )) if( defname.contains( '/' ))
defname = defname.mid( defname.findRev( '/' ) + 1 ); defname = defname.mid( defname.findRev( '/' ) + 1 );
TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename")); TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename"));

4
drkonqi/krashconf.cpp
Unescape Escape View File

@ -110,8 +110,8 @@ void KrashConfig :: readConfig()
m_invalidStackFrameRegExp = debuggers.readEntry("InvalidStackFrameRegExp"); m_invalidStackFrameRegExp = debuggers.readEntry("InvalidStackFrameRegExp");
m_frameRegExp = debuggers.readEntry("FrameRegExp"); m_frameRegExp = debuggers.readEntry("FrameRegExp");
m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp"); m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp");
m_kcrashRegExp = debuggers.readEntry("TDECrashRegExp"); m_tdecrashRegExp = debuggers.readEntry("TDECrashRegExp");
m_kcrashRegExpSingle = debuggers.readEntry("TDECrashRegExpSingle"); m_tdecrashRegExpSingle = debuggers.readEntry("TDECrashRegExpSingle");
m_threadRegExp = debuggers.readEntry("ThreadRegExp"); m_threadRegExp = debuggers.readEntry("ThreadRegExp");
m_infoSharedLibraryHeader = debuggers.readEntry("InfoSharedLibraryHeader"); m_infoSharedLibraryHeader = debuggers.readEntry("InfoSharedLibraryHeader");

10
drkonqi/krashconf.h
Unescape Escape View File

@ -1,5 +1,5 @@
/***************************************************************** /*****************************************************************
* drkonqi - The KDE Crash Handler * drkonqi - The TDE Crash Handler
* *
* Copyright (C) 2000-2003 Hans Petter Bieker <bieker@kde.org> * Copyright (C) 2000-2003 Hans Petter Bieker <bieker@kde.org>
* *
@ -65,8 +65,8 @@ public:
TQString invalidStackFrameRegExp() const { return m_invalidStackFrameRegExp; } TQString invalidStackFrameRegExp() const { return m_invalidStackFrameRegExp; }
TQString frameRegExp() const { return m_frameRegExp; } TQString frameRegExp() const { return m_frameRegExp; }
TQString neededInValidBacktraceRegExp() const { return m_neededInValidBacktraceRegExp; } TQString neededInValidBacktraceRegExp() const { return m_neededInValidBacktraceRegExp; }
TQString kcrashRegExp() const { return m_kcrashRegExp; } TQString tdecrashRegExp() const { return m_tdecrashRegExp; }
TQString kcrashRegExpSingle() const { return m_kcrashRegExpSingle; } TQString tdecrashRegExpSingle() const { return m_tdecrashRegExpSingle; }
TQString threadRegExp() const { return m_threadRegExp; } TQString threadRegExp() const { return m_threadRegExp; }
TQString infoSharedLibraryHeader() const { return m_infoSharedLibraryHeader; } TQString infoSharedLibraryHeader() const { return m_infoSharedLibraryHeader; }
bool showBacktrace() const { return m_showbacktrace; }; bool showBacktrace() const { return m_showbacktrace; };
@ -110,8 +110,8 @@ private:
TQString m_invalidStackFrameRegExp; TQString m_invalidStackFrameRegExp;
TQString m_frameRegExp; TQString m_frameRegExp;
TQString m_neededInValidBacktraceRegExp; TQString m_neededInValidBacktraceRegExp;
TQString m_kcrashRegExp; TQString m_tdecrashRegExp;
TQString m_kcrashRegExpSingle; TQString m_tdecrashRegExpSingle;
TQString m_threadRegExp; TQString m_threadRegExp;
TQString m_infoSharedLibraryHeader; TQString m_infoSharedLibraryHeader;
}; };

2
kdesktop/lock/lockprocess.cpp
Unescape Escape View File

@ -85,7 +85,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#include <kcrash.h> #include <tdecrash.h>
#include <pthread.h> #include <pthread.h>

2
kdesktop/main.cpp
Unescape Escape View File

@ -24,7 +24,7 @@
#include <tdeaboutdata.h> #include <tdeaboutdata.h>
#include <tdecmdlineargs.h> #include <tdecmdlineargs.h>
#include <kopenwith.h> #include <kopenwith.h>
#include <kcrash.h> #include <tdecrash.h>
#include <kdebug.h> #include <kdebug.h>
#include <tdeglobalsettings.h> #include <tdeglobalsettings.h>
#include <tdeglobal.h> #include <tdeglobal.h>

2
kicker/kicker/core/kicker.cpp
Unescape Escape View File

@ -32,7 +32,7 @@
#include <tdeconfig.h> #include <tdeconfig.h>
#include <tdecmdlineargs.h> #include <tdecmdlineargs.h>
#include <kcmultidialog.h> #include <kcmultidialog.h>
#include <kcrash.h> #include <tdecrash.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdirwatch.h> #include <kdirwatch.h>
#include <tdeglobal.h> #include <tdeglobal.h>

2
konsole/konsole/kwrited.cpp
Unescape Escape View File

@ -39,7 +39,7 @@
#include <tdelocale.h> #include <tdelocale.h>
#include <tdeglobalsettings.h> #include <tdeglobalsettings.h>
#include <kdebug.h> #include <kdebug.h>
#include <kcrash.h> #include <tdecrash.h>
#include <kpty.h> #include <kpty.h>
#include <kuser.h> #include <kuser.h>
#include <tdeglobal.h> #include <tdeglobal.h>

2
nsplugins/pluginscan.cpp
Unescape Escape View File

@ -46,7 +46,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <klibloader.h> #include <klibloader.h>
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kcrash.h> #include <tdecrash.h>
#include <kdesktopfile.h> #include <kdesktopfile.h>
#include <kservicetype.h> #include <kservicetype.h>
#include <kmimetype.h> #include <kmimetype.h>

2
tdm/kfrontend/kgapp.cpp
Unescape Escape View File

@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kuser.h> #include <kuser.h>
#include <tdeprocess.h> #include <tdeprocess.h>
#include <tdecmdlineargs.h> #include <tdecmdlineargs.h>
#include <kcrash.h> #include <tdecrash.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <tdelocale.h> #include <tdelocale.h>

Write Preview
Loading…
Cancel
Save