summaryrefslogtreecommitdiffstats
path: root/kdesktop
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-05 18:36:52 -0600
committerTimothy Pearson <[email protected]>2013-02-05 18:36:52 -0600
commit98eb308fc180d9bea71f448b262ab796353ac904 (patch)
tree4df48980d609a6353b9dd8cf0ee16061efb6473f /kdesktop
parentde9b6c9ad15f9f51812daae17cce635d1050a9ba (diff)
downloadtdebase-98eb308fc180d9bea71f448b262ab796353ac904.tar.gz
tdebase-98eb308fc180d9bea71f448b262ab796353ac904.zip
Rename KCrash to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop')
-rw-r--r--kdesktop/lock/lockprocess.cc2
-rw-r--r--kdesktop/main.cc4
2 files changed, 3 insertions, 3 deletions
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 )