diff options
Diffstat (limited to 'drkonqi')
-rw-r--r-- | drkonqi/backtrace.cpp | 44 | ||||
-rw-r--r-- | drkonqi/bugdescriptiondialog.cpp | 4 | ||||
-rw-r--r-- | drkonqi/crashtest.cpp | 2 | ||||
-rw-r--r-- | drkonqi/debugger.cpp | 18 | ||||
-rw-r--r-- | drkonqi/krashconf.cpp | 4 | ||||
-rw-r--r-- | drkonqi/krashconf.h | 10 | ||||
-rw-r--r-- | drkonqi/sha1.cpp | 3 | ||||
-rw-r--r-- | drkonqi/toplevel.cpp | 34 |
8 files changed, 58 insertions, 61 deletions
diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp index ac82e4417..1f2521781 100644 --- a/drkonqi/backtrace.cpp +++ b/drkonqi/backtrace.cpp @@ -30,9 +30,9 @@ #include <tqfile.h> #include <tqregexp.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <tdetempfile.h> @@ -100,7 +100,7 @@ void BackTrace::start() return; } m_temp = new KTempFile; - m_temp->setAutoDelete(TRUE); + m_temp->setAutoDelete(true); int handle = m_temp->handle(); TQString backtraceCommand = m_krashconf->backtraceCommand(); const char* bt = backtraceCommand.latin1(); @@ -114,7 +114,7 @@ void BackTrace::start() // write the debugger command m_temp_cmd = new KTempFile(TQString::null, TQString::null, 0700); - m_temp_cmd->setAutoDelete(TRUE); + m_temp_cmd->setAutoDelete(true); handle = m_temp_cmd->handle(); const char* dbgcommand = str.latin1(); ::write(handle, dbgcommand, strlen(dbgcommand)); // the command to execute the debugger @@ -148,10 +148,10 @@ void BackTrace::start() *m_proc << "tdesu -t --comment \"" << i18n("Administrative access is required to generate a backtrace") << "\" -c \"" << m_temp_cmd->name() << "\""; } - connect(m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - TQT_SLOT(slotReadInput(TDEProcess*, char*, int))); - connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + TQ_SLOT(slotReadInput(TDEProcess*, char*, int))); + connect(m_proc, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*))); m_proc->start ( TDEProcess::NotifyOnExit, TDEProcess::All ); } @@ -238,12 +238,12 @@ bool BackTrace::usefulBacktrace() // remove stack frames added because of TDECrash void BackTrace::processBacktrace() { - if( !m_krashconf->kcrashRegExp().isEmpty()) { - TQRegExp kcrashregexp( m_krashconf->kcrashRegExp()); - kcrashregexp.setMinimal(true); + if( !m_krashconf->tdecrashRegExp().isEmpty()) { + TQRegExp tdecrashregexp( m_krashconf->tdecrashRegExp()); + tdecrashregexp.setMinimal(true); int pos = 0; int prevpos = 0; - while ((pos = kcrashregexp.search( m_strBt, pos )) >= 0) { + while ((pos = tdecrashregexp.search( m_strBt, pos )) >= 0) { if (prevpos == pos) { // Avoid infinite loop // Shouldn't ever get here, but given that this is a crash handler, better safe than sorry! @@ -251,15 +251,15 @@ void BackTrace::processBacktrace() } prevpos = pos; if( pos >= 0 ) { - int len = kcrashregexp.matchedLength(); + int len = tdecrashregexp.matchedLength(); int nextinfochunkpos = m_strBt.find("====", pos); if (nextinfochunkpos >= 0) { // Trying to delete too much! int limitedlen = nextinfochunkpos - pos; TQString limitedstrBt = m_strBt.mid(pos, limitedlen); - int limitedpos = kcrashregexp.search( limitedstrBt ); + int limitedpos = tdecrashregexp.search( limitedstrBt ); if (limitedpos >= 0) { - len = kcrashregexp.matchedLength(); + len = tdecrashregexp.matchedLength(); } else { len = 0; @@ -287,11 +287,11 @@ void BackTrace::processBacktrace() } } } - if( !m_krashconf->kcrashRegExpSingle().isEmpty()) { - TQRegExp kcrashregexp( m_krashconf->kcrashRegExpSingle()); - int pos = kcrashregexp.search( m_strBt ); + if( !m_krashconf->tdecrashRegExpSingle().isEmpty()) { + TQRegExp tdecrashregexp( m_krashconf->tdecrashRegExpSingle()); + int pos = tdecrashregexp.search( m_strBt ); if( pos >= 0 ) { - int len = kcrashregexp.matchedLength(); + int len = tdecrashregexp.matchedLength(); if( m_strBt[ pos ] == '\n' ) { ++pos; --len; @@ -381,10 +381,10 @@ void BackTrace::processBacktrace() { // Clean up hard to read debug blocks - TQRegExp kcrashregexp( "[^\n]\n==== "); - kcrashregexp.setMinimal(true); + TQRegExp tdecrashregexp( "[^\n]\n==== "); + tdecrashregexp.setMinimal(true); int pos = 0; - while ((pos = kcrashregexp.search( m_strBt, pos )) >= 0) { + while ((pos = tdecrashregexp.search( m_strBt, pos )) >= 0) { m_strBt.insert(pos+1, "\n"); } } diff --git a/drkonqi/bugdescriptiondialog.cpp b/drkonqi/bugdescriptiondialog.cpp index 32c7b4b2d..ba9e832eb 100644 --- a/drkonqi/bugdescriptiondialog.cpp +++ b/drkonqi/bugdescriptiondialog.cpp @@ -31,8 +31,8 @@ #include <klineedit.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <kstdguiitem.h> #include <kurl.h> #include <kurllabel.h> diff --git a/drkonqi/crashtest.cpp b/drkonqi/crashtest.cpp index f1ff70df4..0141b1031 100644 --- a/drkonqi/crashtest.cpp +++ b/drkonqi/crashtest.cpp @@ -21,7 +21,7 @@ void WorkerObject::run() #define SET_UP_WORKER(x, y) \ WorkerObject x; \ x.moveToThread(&y); \ - TQTimer::singleShot(0, &x, SLOT(run())); + TQTimer::singleShot(0, &x, TQ_SLOT(run())); static TDECmdLineOptions options[] = { diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp index a9625d44a..f4f883d6a 100644 --- a/drkonqi/debugger.cpp +++ b/drkonqi/debugger.cpp @@ -51,7 +51,7 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent, m_proctrace(0) { TQVBoxLayout *vbox = new TQVBoxLayout( this, 0, KDialog::marginHint() ); - vbox->setAutoAdd(TRUE); + vbox->setAutoAdd(true); m_backtrace = new KTextBrowser(this); m_backtrace->setTextFormat(TQt::PlainText); @@ -64,10 +64,10 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent, //m_copyButton = new KPushButton( KStdGuiItem::copy(), w ); KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "edit-copy" ) ); m_copyButton = new KPushButton( item, w ); - connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) ); + connect( m_copyButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCopy() ) ); m_copyButton->setEnabled( false ); m_saveButton = new KPushButton( m_krashconf->safeMode() ? KStdGuiItem::save() : KStdGuiItem::saveAs(), w ); - connect( m_saveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSave() ) ); + connect( m_saveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSave() ) ); m_saveButton->setEnabled( false ); } @@ -95,7 +95,7 @@ void KrashDebugger :: slotSave() { if (m_krashconf->safeMode()) { - KTempFile tf(TQString::fromAscii("/tmp/"), TQString::fromAscii(".kcrash"), 0600); + KTempFile tf(TQString::fromAscii("/tmp/"), TQString::fromAscii(".tdecrash"), 0600); if (!tf.status()) { *tf.textStream() << m_backtrace->text(); @@ -109,7 +109,7 @@ void KrashDebugger :: slotSave() } else { - TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" ); + TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".tdecrash" ); if( defname.contains( '/' )) defname = defname.mid( defname.findRev( '/' ) + 1 ); TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename")); @@ -195,10 +195,10 @@ void KrashDebugger :: startDebugger() m_proctrace = new BackTrace(m_krashconf, this); - connect(m_proctrace, TQT_SIGNAL(append(const TQString &)), - TQT_SLOT(slotAppend(const TQString &))); - connect(m_proctrace, TQT_SIGNAL(done(const TQString&)), TQT_SLOT(slotDone(const TQString&))); - connect(m_proctrace, TQT_SIGNAL(someError()), TQT_SLOT(slotSomeError())); + connect(m_proctrace, TQ_SIGNAL(append(const TQString &)), + TQ_SLOT(slotAppend(const TQString &))); + connect(m_proctrace, TQ_SIGNAL(done(const TQString&)), TQ_SLOT(slotDone(const TQString&))); + connect(m_proctrace, TQ_SIGNAL(someError()), TQ_SLOT(slotSomeError())); m_proctrace->start(); } diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp index 12c8064e0..384ac76d0 100644 --- a/drkonqi/krashconf.cpp +++ b/drkonqi/krashconf.cpp @@ -110,8 +110,8 @@ void KrashConfig :: readConfig() m_invalidStackFrameRegExp = debuggers.readEntry("InvalidStackFrameRegExp"); m_frameRegExp = debuggers.readEntry("FrameRegExp"); m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp"); - m_kcrashRegExp = debuggers.readEntry("TDECrashRegExp"); - m_kcrashRegExpSingle = debuggers.readEntry("TDECrashRegExpSingle"); + m_tdecrashRegExp = debuggers.readEntry("TDECrashRegExp"); + m_tdecrashRegExpSingle = debuggers.readEntry("TDECrashRegExpSingle"); m_threadRegExp = debuggers.readEntry("ThreadRegExp"); m_infoSharedLibraryHeader = debuggers.readEntry("InfoSharedLibraryHeader"); diff --git a/drkonqi/krashconf.h b/drkonqi/krashconf.h index be823cba1..409ca51b1 100644 --- a/drkonqi/krashconf.h +++ b/drkonqi/krashconf.h @@ -1,5 +1,5 @@ /***************************************************************** - * drkonqi - The KDE Crash Handler + * drkonqi - The TDE Crash Handler * * Copyright (C) 2000-2003 Hans Petter Bieker <bieker@kde.org> * @@ -65,8 +65,8 @@ public: TQString invalidStackFrameRegExp() const { return m_invalidStackFrameRegExp; } TQString frameRegExp() const { return m_frameRegExp; } TQString neededInValidBacktraceRegExp() const { return m_neededInValidBacktraceRegExp; } - TQString kcrashRegExp() const { return m_kcrashRegExp; } - TQString kcrashRegExpSingle() const { return m_kcrashRegExpSingle; } + TQString tdecrashRegExp() const { return m_tdecrashRegExp; } + TQString tdecrashRegExpSingle() const { return m_tdecrashRegExpSingle; } TQString threadRegExp() const { return m_threadRegExp; } TQString infoSharedLibraryHeader() const { return m_infoSharedLibraryHeader; } bool showBacktrace() const { return m_showbacktrace; }; @@ -110,8 +110,8 @@ private: TQString m_invalidStackFrameRegExp; TQString m_frameRegExp; TQString m_neededInValidBacktraceRegExp; - TQString m_kcrashRegExp; - TQString m_kcrashRegExpSingle; + TQString m_tdecrashRegExp; + TQString m_tdecrashRegExpSingle; TQString m_threadRegExp; TQString m_infoSharedLibraryHeader; }; diff --git a/drkonqi/sha1.cpp b/drkonqi/sha1.cpp index 86dd30a99..c2619d3a6 100644 --- a/drkonqi/sha1.cpp +++ b/drkonqi/sha1.cpp @@ -26,9 +26,6 @@ #ifdef HAVE_STDINT_H #include <stdint.h> /* For uintXX_t on OSX */ #endif -#ifdef HAVE_SYS_BITYPES_H -#include <sys/bitypes.h> /* For uintXX_t on Tru64 */ -#endif #ifdef HAVE_STDINT_H #include <stdint.h> #endif diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp index 969a1a8cd..d0a11d80e 100644 --- a/drkonqi/toplevel.cpp +++ b/drkonqi/toplevel.cpp @@ -31,11 +31,11 @@ #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kbugreport.h> #include <tdefiledialog.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeapplication.h> #include <dcopclient.h> #include <tdetempfile.h> @@ -89,11 +89,11 @@ Toplevel :: Toplevel(KrashConfig *krashconf, TQWidget *parent, const char *name) showButton( User2, m_krashconf->showDebugger() ); showButton( User3, true ); - connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(accept())); - connect(m_krashconf, TQT_SIGNAL(newDebuggingApplication(const TQString&)), TQT_SLOT(slotNewDebuggingApp(const TQString&))); + connect(this, TQ_SIGNAL(closeClicked()), TQ_SLOT(accept())); + connect(m_krashconf, TQ_SIGNAL(newDebuggingApplication(const TQString&)), TQ_SLOT(slotNewDebuggingApp(const TQString&))); - if ( !m_krashconf->safeMode() && kapp->dcopClient()->attach() ) - kapp->dcopClient()->registerAs( kapp->name() ); + if ( !m_krashconf->safeMode() && tdeApp->dcopClient()->attach() ) + tdeApp->dcopClient()->registerAs( tdeApp->name() ); } Toplevel :: ~Toplevel() @@ -160,8 +160,8 @@ void Toplevel :: slotUser1() // generate the backtrace BackTrace *backtrace = new BackTrace(m_krashconf, this); - connect(backtrace, TQT_SIGNAL(someError()), TQT_SLOT(slotBacktraceSomeError())); - connect(backtrace, TQT_SIGNAL(done(const TQString &)), TQT_SLOT(slotBacktraceDone(const TQString &))); + connect(backtrace, TQ_SIGNAL(someError()), TQ_SLOT(slotBacktraceSomeError())); + connect(backtrace, TQ_SIGNAL(done(const TQString &)), TQ_SLOT(slotBacktraceDone(const TQString &))); backtrace->start(); @@ -199,8 +199,8 @@ void Toplevel :: slotUser3() // generate the backtrace BackTrace *backtrace = new BackTrace(m_krashconf, this); - connect(backtrace, TQT_SIGNAL(someError()), TQT_SLOT(slotSendReportBacktraceSomeError())); - connect(backtrace, TQT_SIGNAL(done(const TQString &)), TQT_SLOT(slotSendReportBacktraceDone(const TQString &))); + connect(backtrace, TQ_SIGNAL(someError()), TQ_SLOT(slotSendReportBacktraceSomeError())); + connect(backtrace, TQ_SIGNAL(done(const TQString &)), TQ_SLOT(slotSendReportBacktraceDone(const TQString &))); backtrace->start(); @@ -399,13 +399,13 @@ int Toplevel::postCrashDataToServer(TQCString data) { TDEIO::TransferJob* job = TDEIO::http_post(url, postData, true); job->addMetaData("content-type", TQString("Content-Type: multipart/form-data; boundary=%1").arg(formDataBoundary)); job->addMetaData("referrer", "http://drkonqi-client.crashreport.trinitydesktop.org"); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(postCrashDataToServerData(TDEIO::Job *, const TQByteArray &))); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(postCrashDataToServerResult(TDEIO::Job *))); -// connect(job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )), -// TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t))); -// connect(job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), -// TQT_SLOT(mimetype(TDEIO::Job *, const TQString &))); - connect(job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)), TQT_SLOT(postCrashDataToServerDataRedirection(TDEIO::Job *, const KURL&))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQ_SLOT(postCrashDataToServerData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(postCrashDataToServerResult(TDEIO::Job *))); +// connect(job, TQ_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )), +// TQ_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t))); +// connect(job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), +// TQ_SLOT(mimetype(TDEIO::Job *, const TQString &))); + connect(job, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL&)), TQ_SLOT(postCrashDataToServerDataRedirection(TDEIO::Job *, const KURL&))); return 0; } |