Rename KCrash to avoid conflicts with KDE4

9 files changed, 13 insertions, 13 deletions

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");
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index c8fc7c3a4..28e15873f 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -289,7 +289,7 @@ LockProcess::LockProcess()
 
     greetPlugin.library = 0;
 
-    KCrash::setCrashHandler(segv_handler);
+    TDECrash::setCrashHandler(segv_handler);
 }
 
 //---------------------------------------------------------------------------
diff --git a/kdesktop/main.cc b/kdesktop/main.cc
index 5730305c3..e0f7d98d9 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cc
@@ -90,7 +90,7 @@ static void crashHandler(int sigId)
 static void signalHandler(int sigId)
 {
     fprintf(stderr, "*** kdesktop got signal %d (Exiting)\n", sigId);
-    KCrash::setEmergencySaveFunction(0); // No restarts any more
+    TDECrash::setEmergencySaveFunction(0); // No restarts any more
     // try to cleanup all windows
     signal(SIGTERM, SIG_DFL); // next one kills
     signal(SIGHUP,  SIG_DFL); // next one kills
@@ -102,7 +102,7 @@ void KDesktop::slotUpAndRunning()
 {
     // Activate crash recovery
     if (getenv("TDE_DEBUG") == NULL)
-        KCrash::setEmergencySaveFunction(crashHandler); // Try to restart on crash
+        TDECrash::setEmergencySaveFunction(crashHandler); // Try to restart on crash
 }
 
 extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index 316f1a625..713568e68 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -71,7 +71,7 @@ Kicker::Kicker()
     // initialize the configuration object
     KickerSettings::instance(instanceName() + "rc");
 
-    if (KCrash::crashHandler() == 0 )
+    if (TDECrash::crashHandler() == 0 )
     {
         // this means we've most likely crashed once. so let's see if we
         // stay up for more than 2 minutes time, and if so reset the
@@ -148,7 +148,7 @@ Kicker::~Kicker()
 
 void Kicker::setCrashHandler()
 {
-    KCrash::setEmergencySaveFunction(Kicker::crashHandler);
+    TDECrash::setEmergencySaveFunction(Kicker::crashHandler);
 }
 
 void Kicker::crashHandler(int /* signal */)
diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp
index 4c96765e2..bbaf6b956 100644
--- a/konqueror/keditbookmarks/importers.cpp
+++ b/konqueror/keditbookmarks/importers.cpp
@@ -163,7 +163,7 @@ TQString OperaImportCommand::requestFilename() const {
 }
 
 TQString CrashesImportCommand::requestFilename() const {
-    static KCrashBookmarkImporterImpl importer;
+    static TDECrashBookmarkImporterImpl importer;
     return importer.findDefaultLocation();
 }
 
@@ -203,7 +203,7 @@ void OperaImportCommand::doExecute(const KBookmarkGroup &bkGroup) {
 }
 
 void CrashesImportCommand::doExecute(const KBookmarkGroup &bkGroup) {
-    KCrashBookmarkImporterImpl importer;
+    TDECrashBookmarkImporterImpl importer;
     importer.setShouldDelete(true);
     importer.setFilename(m_fileName);
     parseInto(bkGroup, &importer);
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index 15386b1f0..f5da34fd1 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -358,7 +358,7 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList,
         } else if (loader_pid == 0) {
            // inside the child
            close(pipes[0]);
-           KCrash::setCrashHandler(segv_handler);
+           TDECrash::setCrashHandler(segv_handler);
            _exit(tryCheck(pipes[1], absFile));
         } else {
            close(pipes[1]);
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp
index ad99acc11..b3d45d446 100644
--- a/tdm/kfrontend/kgapp.cpp
+++ b/tdm/kfrontend/kgapp.cpp
@@ -200,7 +200,7 @@ kg_main( const char *argv0 )
 	kdDebug() << timestamp() << "start" << endl;
 	kde_have_kipc = false;
 	TDEApplication::disableAutoDcopRegistration();
-	KCrash::setSafer( true );
+	TDECrash::setSafer( true );
 
 	TDEProcess *tsak = 0;
 	TDEProcess *proc = 0;