Rename KCrash to avoid conflicts with KDE4

3 files changed, 22 insertions, 22 deletions

diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.cc b/tdeio/bookmarks/kbookmarkimporter_crash.cc
index b2871eecd..f49879124 100644
--- a/tdeio/bookmarks/kbookmarkimporter_crash.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.cc
@@ -40,12 +40,12 @@
 typedef TQMap<TQString, TQString> ViewMap;
 
 // KDE 4.0: remove this BC keeping stub
-void KCrashBookmarkImporter::parseCrashLog( TQString /*filename*/, bool /*del*/ ) 
+void TDECrashBookmarkImporter::parseCrashLog( TQString /*filename*/, bool /*del*/ ) 
 {
     ;
 }
 
-ViewMap KCrashBookmarkImporterImpl::parseCrashLog_noemit( const TQString & filename, bool del ) 
+ViewMap TDECrashBookmarkImporterImpl::parseCrashLog_noemit( const TQString & filename, bool del ) 
 {
     static const int g_lineLimit = 16*1024;
 
@@ -88,12 +88,12 @@ ViewMap KCrashBookmarkImporterImpl::parseCrashLog_noemit( const TQString & filen
     return views;
 }
 
-TQStringList KCrashBookmarkImporter::getCrashLogs() 
+TQStringList TDECrashBookmarkImporter::getCrashLogs() 
 {
-    return KCrashBookmarkImporterImpl::getCrashLogs();
+    return TDECrashBookmarkImporterImpl::getCrashLogs();
 }
 
-TQStringList KCrashBookmarkImporterImpl::getCrashLogs() 
+TQStringList TDECrashBookmarkImporterImpl::getCrashLogs() 
 {
     TQMap<TQString, bool> activeLogs;
 
@@ -127,7 +127,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs()
         activeLogs[ret] = true;
     }
 
-    TQDir d( KCrashBookmarkImporterImpl().findDefaultLocation() );
+    TQDir d( TDECrashBookmarkImporterImpl().findDefaultLocation() );
     d.setSorting( TQDir::Time );
     d.setFilter( TQDir::Files );
     d.setNameFilter( "konqueror-crash-*.log" );
@@ -154,10 +154,10 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs()
     return crashFiles;
 }
 
-void KCrashBookmarkImporterImpl::parse() 
+void TDECrashBookmarkImporterImpl::parse() 
 {
     TQDict<bool> signatureMap;
-    TQStringList crashFiles = KCrashBookmarkImporterImpl::getCrashLogs();
+    TQStringList crashFiles = TDECrashBookmarkImporterImpl::getCrashLogs();
     int count = 1;
     for ( TQStringList::Iterator it = crashFiles.begin(); it != crashFiles.end(); ++it ) 
     {
@@ -185,29 +185,29 @@ void KCrashBookmarkImporterImpl::parse()
     }
 }
 
-TQString KCrashBookmarkImporter::crashBookmarksDir() 
+TQString TDECrashBookmarkImporter::crashBookmarksDir() 
 {
-    static KCrashBookmarkImporterImpl *p = 0;
+    static TDECrashBookmarkImporterImpl *p = 0;
     if (!p)
-        p = new KCrashBookmarkImporterImpl;
+        p = new TDECrashBookmarkImporterImpl;
     return p->findDefaultLocation();
 }
 
-void KCrashBookmarkImporterImpl::setShouldDelete( bool shouldDelete ) 
+void TDECrashBookmarkImporterImpl::setShouldDelete( bool shouldDelete ) 
 {
     m_shouldDelete = shouldDelete;
 }
 
-void KCrashBookmarkImporter::parseCrashBookmarks( bool del ) 
+void TDECrashBookmarkImporter::parseCrashBookmarks( bool del ) 
 {
-    KCrashBookmarkImporterImpl importer;
+    TDECrashBookmarkImporterImpl importer;
     importer.setFilename( m_fileName );
     importer.setShouldDelete( del );
     importer.setupSignalForwards( &importer, this );
     importer.parse();
 }
 
-TQString KCrashBookmarkImporterImpl::findDefaultLocation( bool ) const 
+TQString TDECrashBookmarkImporterImpl::findDefaultLocation( bool ) const 
 {
     return locateLocal( "tmp", "" );
 }
diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.h b/tdeio/bookmarks/kbookmarkimporter_crash.h
index f4fc9af32..ab3e43aea 100644
--- a/tdeio/bookmarks/kbookmarkimporter_crash.h
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.h
@@ -34,12 +34,12 @@
  * A class for importing all crash sessions as bookmarks
  * @deprecated
  */
-class TDEIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public TQObject
+class TDEIO_EXPORT_DEPRECATED TDECrashBookmarkImporter : public TQObject
 {
     Q_OBJECT
 public:
-    KCrashBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {}
-    ~KCrashBookmarkImporter() {}
+    TDECrashBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {}
+    ~TDECrashBookmarkImporter() {}
     void parseCrashBookmarks( bool del = true );
     static TQString crashBookmarksDir( );
     static TQStringList getCrashLogs(); // EMPTY!
@@ -57,10 +57,10 @@ protected:
  * A class for importing all crash sessions as bookmarks
  * @since 3.2
  */
-class TDEIO_EXPORT KCrashBookmarkImporterImpl : public KBookmarkImporterBase
+class TDEIO_EXPORT TDECrashBookmarkImporterImpl : public KBookmarkImporterBase
 {
 public:
-    KCrashBookmarkImporterImpl() : m_shouldDelete(false) { }
+    TDECrashBookmarkImporterImpl() : m_shouldDelete(false) { }
     void setShouldDelete(bool);
     virtual void parse();
     virtual TQString findDefaultLocation(bool forSaving = false) const;
@@ -68,7 +68,7 @@ public:
 private:
     bool m_shouldDelete;
     TQMap<TQString, TQString> parseCrashLog_noemit( const TQString & filename, bool del );
-    class KCrashBookmarkImporterImplPrivate *d;
+    class TDECrashBookmarkImporterImplPrivate *d;
 };
 
 #endif
diff --git a/tdeio/tdeio/slavebase.cpp b/tdeio/tdeio/slavebase.cpp
index e979f530b..8b6ee3903 100644
--- a/tdeio/tdeio/slavebase.cpp
+++ b/tdeio/tdeio/slavebase.cpp
@@ -170,7 +170,7 @@ SlaveBase::SlaveBase( const TQCString &protocol,
 #ifdef Q_OS_UNIX
     if (!getenv("TDE_DEBUG"))
     {
-        KCrash::setCrashHandler( sigsegv_handler );
+        TDECrash::setCrashHandler( sigsegv_handler );
         signal(SIGILL,&sigsegv_handler);
         signal(SIGTRAP,&sigsegv_handler);
         signal(SIGABRT,&sigsegv_handler);