diff options
Diffstat (limited to 'drkonqi/backtrace.cpp')
| -rw-r--r-- | drkonqi/backtrace.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp index 8078f94be..1f2521781 100644 --- a/drkonqi/backtrace.cpp +++ b/drkonqi/backtrace.cpp @@ -30,9 +30,9 @@ #include <tqfile.h> #include <tqregexp.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <tdetempfile.h> @@ -89,7 +89,7 @@ void BackTrace::start() { TQObject * o = parent(); - if (o && !o->inherits(TQWIDGET_OBJECT_NAME_STRING)) + if (o && !o->inherits("TQWidget")) { o = NULL; } @@ -100,7 +100,7 @@ void BackTrace::start() return; } m_temp = new KTempFile; - m_temp->setAutoDelete(TRUE); + m_temp->setAutoDelete(true); int handle = m_temp->handle(); TQString backtraceCommand = m_krashconf->backtraceCommand(); const char* bt = backtraceCommand.latin1(); @@ -114,7 +114,7 @@ void BackTrace::start() // write the debugger command m_temp_cmd = new KTempFile(TQString::null, TQString::null, 0700); - m_temp_cmd->setAutoDelete(TRUE); + m_temp_cmd->setAutoDelete(true); handle = m_temp_cmd->handle(); const char* dbgcommand = str.latin1(); ::write(handle, dbgcommand, strlen(dbgcommand)); // the command to execute the debugger @@ -148,10 +148,10 @@ void BackTrace::start() *m_proc << "tdesu -t --comment \"" << i18n("Administrative access is required to generate a backtrace") << "\" -c \"" << m_temp_cmd->name() << "\""; } - connect(m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - TQT_SLOT(slotReadInput(TDEProcess*, char*, int))); - connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + TQ_SLOT(slotReadInput(TDEProcess*, char*, int))); + connect(m_proc, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*))); m_proc->start ( TDEProcess::NotifyOnExit, TDEProcess::All ); } @@ -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"); } } |