Rename KCrash to avoid conflicts with KDE4

pull/2/head
Timothy Pearson 11 years ago
parent de9b6c9ad1
commit 98eb308fc1

@ -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" ));
}
}
}

@ -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

@ -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");

@ -289,7 +289,7 @@ LockProcess::LockProcess()
greetPlugin.library = 0;
KCrash::setCrashHandler(segv_handler);
TDECrash::setCrashHandler(segv_handler);
}
//---------------------------------------------------------------------------

@ -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 )

@ -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 */)

@ -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);

@ -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]);

@ -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;

Loading…
Cancel
Save