From 98eb308fc180d9bea71f448b262ab796353ac904 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 5 Feb 2013 18:36:52 -0600
Subject: Rename KCrash to avoid conflicts with KDE4

---
 drkonqi/backtrace.cpp   | 4 ++--
 drkonqi/debuggers/gdbrc | 2 +-
 drkonqi/krashconf.cpp   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'drkonqi')

diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp
index f6c3804b7..b0d3cb4fe 100644
--- a/drkonqi/backtrace.cpp
+++ b/drkonqi/backtrace.cpp
@@ -198,7 +198,7 @@ bool BackTrace::usefulBacktrace()
   return !m_strBt.isNull() && !tooShort && (unknown < frames);
 }
 
-// remove stack frames added because of KCrash
+// remove stack frames added because of TDECrash
 void BackTrace::processBacktrace()
 {
   if( !m_krashconf->kcrashRegExp().isEmpty())
@@ -214,7 +214,7 @@ void BackTrace::processBacktrace()
         --len;
         }
       m_strBt.remove( pos, len );
-      m_strBt.insert( pos, TQString::fromLatin1( "[KCrash handler]\n" ));
+      m_strBt.insert( pos, TQString::fromLatin1( "[TDECrash handler]\n" ));
       }
     }
 }
diff --git a/drkonqi/debuggers/gdbrc b/drkonqi/debuggers/gdbrc
index 5254aafe6..c0215c4e0 100644
--- a/drkonqi/debuggers/gdbrc
+++ b/drkonqi/debuggers/gdbrc
@@ -163,4 +163,4 @@ RemoveFromBacktraceRegExp=\(no debugging symbols found\)\.\.\.\\n?
 InvalidStackFrameRegExp=\\n#[0-9]+\\s+0x[0-9A-Fa-f]+ \w* \?\?
 FrameRegExp=\\n#[0-9]+\\s+0x[0-9A-Fa-f]+
 NeededInValidBacktraceRegExp=\\n#5
-KCrashRegExp=\\n0x[0123456789abcdefABCDEF]+.*<signal handler called>[ ]*\\n
+TDECrashRegExp=\\n0x[0123456789abcdefABCDEF]+.*<signal handler called>[ ]*\\n
diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp
index 9730d7183..0bb6d7fa1 100644
--- a/drkonqi/krashconf.cpp
+++ b/drkonqi/krashconf.cpp
@@ -110,7 +110,7 @@ void KrashConfig :: readConfig()
   m_invalidStackFrameRegExp = debuggers.readEntry("InvalidStackFrameRegExp");
   m_frameRegExp = debuggers.readEntry("FrameRegExp");
   m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp");
-  m_kcrashRegExp = debuggers.readEntry("KCrashRegExp");
+  m_kcrashRegExp = debuggers.readEntry("TDECrashRegExp");
 
   TDEConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname),
                  true, false, "appdata");
-- 
cgit v1.2.1