diff options
Diffstat (limited to 'drkonqi')
-rw-r--r-- | drkonqi/CMakeLists.txt | 4 | ||||
-rw-r--r-- | drkonqi/backtrace.cpp | 14 | ||||
-rw-r--r-- | drkonqi/backtrace.h | 2 | ||||
-rw-r--r-- | drkonqi/bugdescriptiondialog.cpp | 2 | ||||
-rw-r--r-- | drkonqi/crashtest.cpp | 2 | ||||
-rw-r--r-- | drkonqi/crashtest.h | 2 | ||||
-rw-r--r-- | drkonqi/debugger.cpp | 14 | ||||
-rw-r--r-- | drkonqi/debugger.h | 2 | ||||
-rw-r--r-- | drkonqi/drbugreport.h | 2 | ||||
-rw-r--r-- | drkonqi/krashconf.h | 2 | ||||
-rw-r--r-- | drkonqi/sha1.cpp (renamed from drkonqi/sha1.cc) | 0 | ||||
-rw-r--r-- | drkonqi/toplevel.cpp | 34 | ||||
-rw-r--r-- | drkonqi/toplevel.h | 2 |
13 files changed, 41 insertions, 41 deletions
diff --git a/drkonqi/CMakeLists.txt b/drkonqi/CMakeLists.txt index a2b643909..080dda686 100644 --- a/drkonqi/CMakeLists.txt +++ b/drkonqi/CMakeLists.txt @@ -33,9 +33,9 @@ tde_add_executable( drkonqi AUTOMOC SOURCES krashdcopinterface.skel main.cpp debugger.cpp bugdescription.cpp bugdescriptiondialog.cpp - sha1.cc krashconf.cpp drbugreport.cpp + sha1.cpp krashconf.cpp drbugreport.cpp backtrace.cpp toplevel.cpp - LINK tdeio-shared ${LIBR_LIBRARIES} + LINK tdeio-shared ${TDEHW_LIBRARIES} ${LIBR_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp index 70bb35fa7..813020190 100644 --- a/drkonqi/backtrace.cpp +++ b/drkonqi/backtrace.cpp @@ -36,7 +36,7 @@ #include <tdemessagebox.h> #include <tdelocale.h> #include <tdetempfile.h> -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include <tdehardwaredevices.h> #endif @@ -89,7 +89,7 @@ void BackTrace::start() { TQObject * o = parent(); - if (o && !o->inherits(TQWIDGET_OBJECT_NAME_STRING)) + if (o && !o->inherits("TQWidget")) { o = NULL; } @@ -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 ); } @@ -358,7 +358,7 @@ void BackTrace::processBacktrace() } #endif // HAVE_ELFICON -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB // Append potentially important hardware information m_strBt.append("\n==== (tdehwlib) hardware information ====\n"); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); diff --git a/drkonqi/backtrace.h b/drkonqi/backtrace.h index 94f5bcf9f..5bcd1822e 100644 --- a/drkonqi/backtrace.h +++ b/drkonqi/backtrace.h @@ -36,7 +36,7 @@ class KTempFile; class BackTrace : public TQObject { - Q_OBJECT + TQ_OBJECT public: BackTrace(const KrashConfig *krashconf, TQObject *parent, diff --git a/drkonqi/bugdescriptiondialog.cpp b/drkonqi/bugdescriptiondialog.cpp index 6d6b2d75a..32c7b4b2d 100644 --- a/drkonqi/bugdescriptiondialog.cpp +++ b/drkonqi/bugdescriptiondialog.cpp @@ -94,7 +94,7 @@ BugDescriptionDialog::BugDescriptionDialog( TQWidget * parentw, bool modal, cons lay->addWidget( m_descriptionLabel ); // The multiline-edit - m_lineedit = new TQMultiLineEdit( parent, TQMULTILINEEDIT_OBJECT_NAME_STRING ); + m_lineedit = new TQMultiLineEdit( parent, "TQMultiLineEdit" ); m_lineedit->setMinimumHeight( 180 ); // make it big m_lineedit->setWordWrap(TQMultiLineEdit::WidgetWidth); lay->addWidget( m_lineedit, 10 /*stretch*/ ); 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/crashtest.h b/drkonqi/crashtest.h index a3fe0cb2a..d2a769a1b 100644 --- a/drkonqi/crashtest.h +++ b/drkonqi/crashtest.h @@ -31,7 +31,7 @@ class WorkerObject : public TQObject { - Q_OBJECT + TQ_OBJECT public slots: void run(); diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp index 4e3622e12..2de6fb3f8 100644 --- a/drkonqi/debugger.cpp +++ b/drkonqi/debugger.cpp @@ -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 ); } @@ -193,12 +193,12 @@ void KrashDebugger :: startDebugger() } m_status->setText(i18n("Loading symbols...")); - m_proctrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this)); + 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/debugger.h b/drkonqi/debugger.h index 0604d5fcf..64276b2c8 100644 --- a/drkonqi/debugger.h +++ b/drkonqi/debugger.h @@ -38,7 +38,7 @@ class BackTrace; class KrashDebugger : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KrashDebugger(const KrashConfig *krashconf, TQWidget *parent = 0, const char *name = 0); diff --git a/drkonqi/drbugreport.h b/drkonqi/drbugreport.h index a76740416..17585c321 100644 --- a/drkonqi/drbugreport.h +++ b/drkonqi/drbugreport.h @@ -34,7 +34,7 @@ class TDEAboutData; class DrKBugReport : public KBugReport { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/drkonqi/krashconf.h b/drkonqi/krashconf.h index d3d27e160..be823cba1 100644 --- a/drkonqi/krashconf.h +++ b/drkonqi/krashconf.h @@ -36,7 +36,7 @@ class KrashConfig : public TQObject, public KrashDCOPInterface { - Q_OBJECT + TQ_OBJECT public: KrashConfig(); diff --git a/drkonqi/sha1.cc b/drkonqi/sha1.cpp index 86dd30a99..86dd30a99 100644 --- a/drkonqi/sha1.cc +++ b/drkonqi/sha1.cpp diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp index a4ad27603..0e3a38a49 100644 --- a/drkonqi/toplevel.cpp +++ b/drkonqi/toplevel.cpp @@ -89,8 +89,8 @@ 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() ); @@ -156,12 +156,12 @@ void Toplevel :: slotUser1() m_bugreport = new DrKBugReport(0, true, m_krashconf->aboutData()); if (i == KMessageBox::Yes) { - TQApplication::setOverrideCursor ( tqwaitCursor ); + TQApplication::setOverrideCursor ( TQt::waitCursor ); // generate the backtrace - BackTrace *backtrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this)); - connect(backtrace, TQT_SIGNAL(someError()), TQT_SLOT(slotBacktraceSomeError())); - connect(backtrace, TQT_SIGNAL(done(const TQString &)), TQT_SLOT(slotBacktraceDone(const TQString &))); + BackTrace *backtrace = new BackTrace(m_krashconf, this); + connect(backtrace, TQ_SIGNAL(someError()), TQ_SLOT(slotBacktraceSomeError())); + connect(backtrace, TQ_SIGNAL(done(const TQString &)), TQ_SLOT(slotBacktraceDone(const TQString &))); backtrace->start(); @@ -195,12 +195,12 @@ void Toplevel :: slotNewDebuggingApp(const TQString& launchName) void Toplevel :: slotUser3() { enableButton(User3, false); - TQApplication::setOverrideCursor ( tqwaitCursor ); + TQApplication::setOverrideCursor ( TQt::waitCursor ); // generate the backtrace - BackTrace *backtrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this)); - connect(backtrace, TQT_SIGNAL(someError()), TQT_SLOT(slotSendReportBacktraceSomeError())); - connect(backtrace, TQT_SIGNAL(done(const TQString &)), TQT_SLOT(slotSendReportBacktraceDone(const TQString &))); + BackTrace *backtrace = new BackTrace(m_krashconf, this); + 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; } diff --git a/drkonqi/toplevel.h b/drkonqi/toplevel.h index 06b23173b..c3179e907 100644 --- a/drkonqi/toplevel.h +++ b/drkonqi/toplevel.h @@ -42,7 +42,7 @@ class BugDescription; class Toplevel : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: Toplevel(KrashConfig *krash, TQWidget *parent = 0, const char * name = 0); |