diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-16 19:02:47 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-16 19:02:47 +0000 |
| commit | e985f7e545f4739493965aad69bbecb136dc9346 (patch) | |
| tree | 54afd409d8acd6202dd8ab611d24e78c28e4c0a0 /quanta/components/debugger | |
| parent | f7670c198945adc3b95ad69a959fe5f8ae55b493 (diff) | |
| download | tdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.tar.gz tdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.zip | |
TQt4 port kdewebdev
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'quanta/components/debugger')
42 files changed, 460 insertions, 444 deletions
diff --git a/quanta/components/debugger/backtracelistview.cpp b/quanta/components/debugger/backtracelistview.cpp index 202e86e0..6c2d8679 100644 --- a/quanta/components/debugger/backtracelistview.cpp +++ b/quanta/components/debugger/backtracelistview.cpp @@ -49,8 +49,8 @@ BacktraceListviewItem::BacktraceListviewItem(BacktraceListview* view) } -BacktraceListview::BacktraceListview(TQWidget *parent, const char *name) - : KListView(parent, name) +BacktraceListview::BacktraceListview(TQWidget *tqparent, const char *name) + : KListView(tqparent, name) { int charwidth = this->fontMetrics().width("0"); // If you change the order here, change the BacktraceListviewColumns enums above @@ -91,7 +91,7 @@ void BacktraceListview::backtraceShow(int level, BacktraceType type, const TQStr void BacktraceListview::keyPressEvent(TQKeyEvent *e) { - if(e->key() != Qt::Key_Enter) + if(e->key() != TQt::Key_Enter) { e->ignore(); return; diff --git a/quanta/components/debugger/backtracelistview.h b/quanta/components/debugger/backtracelistview.h index 21b72d3d..495130f0 100644 --- a/quanta/components/debugger/backtracelistview.h +++ b/quanta/components/debugger/backtracelistview.h @@ -71,10 +71,11 @@ class BacktraceListviewItem : public KListViewItem class BacktraceListview : public KListView { Q_OBJECT + TQ_OBJECT public: - BacktraceListview(TQWidget *parent = 0, const char *name = 0); + BacktraceListview(TQWidget *tqparent = 0, const char *name = 0); ~BacktraceListview(); void backtraceShow(int level, BacktraceType type, const TQString& filename, long line, const TQString& func); diff --git a/quanta/components/debugger/conditionalbreakpointdialog.cpp b/quanta/components/debugger/conditionalbreakpointdialog.cpp index 055512da..9dfeb5a6 100644 --- a/quanta/components/debugger/conditionalbreakpointdialog.cpp +++ b/quanta/components/debugger/conditionalbreakpointdialog.cpp @@ -56,7 +56,7 @@ ConditionalBreakpointDialog::~ConditionalBreakpointDialog() void ConditionalBreakpointDialog::slotExpressionChanged() { - if(comboExpression->currentText().find( TQRegExp("[^=!]=[^=]"), 0 ) >= 0) + if(comboExpression->currentText().tqfind( TQRegExp("[^=!]=[^=]"), 0 ) >= 0) ledWarning->on(); else ledWarning->off(); diff --git a/quanta/components/debugger/conditionalbreakpointdialog.h b/quanta/components/debugger/conditionalbreakpointdialog.h index cad4adeb..ca67814e 100644 --- a/quanta/components/debugger/conditionalbreakpointdialog.h +++ b/quanta/components/debugger/conditionalbreakpointdialog.h @@ -23,6 +23,7 @@ class ConditionalBreakpointDialog : public ConditionalBreakpointDialogS { Q_OBJECT + TQ_OBJECT public: enum Break diff --git a/quanta/components/debugger/conditionalbreakpointdialogs.ui b/quanta/components/debugger/conditionalbreakpointdialogs.ui index 8e4a1bf2..9c397431 100644 --- a/quanta/components/debugger/conditionalbreakpointdialogs.ui +++ b/quanta/components/debugger/conditionalbreakpointdialogs.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ConditionalBreakpointDialogS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ConditionalBreakpointDialogS</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblExpression</cstring> </property> @@ -38,7 +38,7 @@ <string>Expression:</string> </property> </widget> - <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -62,14 +62,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -86,7 +86,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -102,7 +102,7 @@ </widget> </hbox> </widget> - <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -113,7 +113,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioOnTrue</cstring> </property> @@ -121,7 +121,7 @@ <string>When expression is true</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioOnChange</cstring> </property> @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -163,13 +163,13 @@ <property name="name"> <cstring>ledWarning</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>22</width> <height>22</height> @@ -189,7 +189,7 @@ <string>Lit when a finding a single equal sign in expression (common error)</string> </property> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>groupBox10</cstring> </property> @@ -200,7 +200,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblValue</cstring> </property> @@ -215,11 +215,11 @@ <property name="text"> <string>File:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblValue_2</cstring> </property> @@ -234,11 +234,11 @@ <property name="text"> <string>Objects of class:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblValue_3</cstring> </property> @@ -253,21 +253,21 @@ <property name="text"> <string>Function:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lineFile</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>lineFunction</cstring> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>buttonClearFile</cstring> </property> @@ -275,7 +275,7 @@ <string>x</string> </property> </widget> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>buttonClearFunction</cstring> </property> @@ -283,7 +283,7 @@ <string>x</string> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>buttonClearClass</cstring> </property> @@ -291,7 +291,7 @@ <string>x</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lineClass</cstring> </property> @@ -320,7 +320,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp index 62b0daa0..d5ce7b86 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.cpp +++ b/quanta/components/debugger/dbgp/dbgpnetwork.cpp @@ -71,14 +71,14 @@ void DBGpNetwork::sessionStart(bool useproxy, const TQString& server, const TQSt if(m_server->listen()) { emit active(true); - emit networkError(i18n("Listening on port %1").arg(service), true); + emit networkError(i18n("Listening on port %1").tqarg(service), true); } else { delete m_server; m_server = NULL; emit active(false); - emit networkError(i18n("Unable to listen on port %1").arg(service), true); + emit networkError(i18n("Unable to listen on port %1").tqarg(service), true); } } } @@ -118,7 +118,7 @@ void DBGpNetwork::slotError(int) kdDebug(24002) << k_funcinfo << ", m_server: " << m_server << ", m_socket" << m_socket << endl; if(m_socket) { - kdDebug(24002) << k_funcinfo << ", " << m_socket->errorString() << endl; + kdDebug(24002) << k_funcinfo << ", " << m_socket->KSocketBase::errorString() << endl; if(m_socket->error() == KNetwork::KSocketBase::RemotelyDisconnected) { slotConnectionClosed(); @@ -128,7 +128,7 @@ void DBGpNetwork::slotError(int) if(m_socket->error()) { - emit networkError(m_socket->errorString(), true); + emit networkError(m_socket->KSocketBase::errorString(), true); } } @@ -262,7 +262,7 @@ void DBGpNetwork::slotReadyRead() // If datalen == -1, we didnt read the size yet, otherwise we're reading data. if(m_datalen == -1) { - bytes = m_fifo.find('\0'); + bytes = m_fifo.tqfind('\0'); if(bytes < 0) break; @@ -293,7 +293,7 @@ long DBGpNetwork::sendCommand(const TQString & command, const TQString & argumen return false; m_transaction_id++; - TQString commandline = command + TQString(" -i %1").arg(m_transaction_id) + (!arguments.isEmpty() ? " " : "") + arguments; + TQString commandline = command + TQString(" -i %1").tqarg(m_transaction_id) + (!arguments.isEmpty() ? " " : "") + arguments; kdDebug(24002) << k_funcinfo << ", sending: " << commandline << endl; @@ -304,7 +304,7 @@ long DBGpNetwork::sendCommand(const TQString & command, const TQString & argumen long DBGpNetwork::sendCommand( const TQString & command, const TQString & arguments, const TQString & data ) { - QByteArrayFifo buffer; + TQByteArrayFifo buffer; buffer.append(data.ascii(), data.length()); return sendCommand(command, arguments + " -- " + buffer.base64Encoded()); } diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.h b/quanta/components/debugger/dbgp/dbgpnetwork.h index 96faca06..a6f64a69 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.h +++ b/quanta/components/debugger/dbgp/dbgpnetwork.h @@ -28,14 +28,15 @@ //using namespace KNetwork; class KResolverEntry; -class DBGpNetwork : public QObject +class DBGpNetwork : public TQObject { Q_OBJECT + TQ_OBJECT private: KNetwork::KStreamSocket *m_socket; KNetwork::KServerSocket *m_server; - QByteArrayFifo m_fifo; + TQByteArrayFifo m_fifo; bool m_useproxy; long m_datalen; long m_transaction_id; diff --git a/quanta/components/debugger/dbgp/dbgpsettings.cpp b/quanta/components/debugger/dbgp/dbgpsettings.cpp index e9bbc249..c76e00c2 100644 --- a/quanta/components/debugger/dbgp/dbgpsettings.cpp +++ b/quanta/components/debugger/dbgp/dbgpsettings.cpp @@ -23,7 +23,7 @@ DBGpSettings::DBGpSettings(const TQString &protocolversion) : DBGpSettingsS(0, "DBGpSettings", false, 0) { - textAbout->setText(textAbout->text().replace("%PROTOCOLVERSION%", protocolversion)); + textAbout->setText(textAbout->text().tqreplace("%PROTOCOLVERSION%", protocolversion)); connect(checkLocalProject, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotLocalProjectToggle(bool))); } diff --git a/quanta/components/debugger/dbgp/dbgpsettings.h b/quanta/components/debugger/dbgp/dbgpsettings.h index bdf8c2f0..6ec8e73b 100644 --- a/quanta/components/debugger/dbgp/dbgpsettings.h +++ b/quanta/components/debugger/dbgp/dbgpsettings.h @@ -22,6 +22,7 @@ class DBGpSettings : public DBGpSettingsS { Q_OBJECT + TQ_OBJECT public: DBGpSettings(const TQString &protocolversion); diff --git a/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui index 2b846a7e..98da70f1 100644 --- a/quanta/components/debugger/dbgp/dbgpsettingss.ui +++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DBGpSettingsS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>DBGpSettingsS</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -46,14 +46,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -70,7 +70,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -83,7 +83,7 @@ </widget> </hbox> </widget> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget2</cstring> </property> @@ -98,7 +98,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -109,7 +109,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -120,7 +120,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblDebuggerServerListenPort</cstring> </property> @@ -136,7 +136,7 @@ <string>Listen port:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lineServerListenPort</cstring> </property> @@ -149,7 +149,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblRequest</cstring> </property> @@ -165,7 +165,7 @@ <string>Request URL:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lineStartSession</cstring> </property> @@ -207,14 +207,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>40</height> </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -225,7 +225,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>lineServerBasedir</cstring> </property> @@ -238,7 +238,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblDebuggerServerBasedir</cstring> </property> @@ -254,7 +254,7 @@ <string>Server basedir:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lineLocalBasedir</cstring> </property> @@ -270,7 +270,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>checkLocalProject</cstring> </property> @@ -289,7 +289,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblDebuggerLocalBasedir</cstring> </property> @@ -305,7 +305,7 @@ <string>Local basedir:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblLocalProject</cstring> </property> @@ -323,7 +323,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>groupBox3_2</cstring> </property> @@ -334,7 +334,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lineProfilerFilename</cstring> </property> @@ -355,7 +355,7 @@ %c - CRC32 of the initial filepath</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblRequest_2</cstring> </property> @@ -371,7 +371,7 @@ <string>Profiler output:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblLocalProject_2</cstring> </property> @@ -387,7 +387,7 @@ <string>Map profiler output:</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>checkProfilerMapFilename</cstring> </property> @@ -409,7 +409,7 @@ <string>If this checkbox is checked, the profiler output filename will be mapped using the basedirs just like the remote script files.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblLocalProject_2_2</cstring> </property> @@ -425,7 +425,7 @@ <string>Open automatically:</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>checkProfilerAutoOpen</cstring> </property> @@ -451,7 +451,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -462,7 +462,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -473,7 +473,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="4" column="1"> + <widget class="TQCheckBox" row="4" column="1"> <property name="name"> <cstring>checkBreakOnUserError</cstring> </property> @@ -489,18 +489,18 @@ <string>User errors</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="5" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="5" colspan="1"> <property name="name"> <cstring>lblBreakOn</cstring> </property> <property name="text"> <string>Break on:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>checkBreakOnUserWarning</cstring> </property> @@ -516,7 +516,7 @@ <string>User warnings</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>checkBreakOnUserNotice</cstring> </property> @@ -532,7 +532,7 @@ <string>User notices</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>checkBreakOnNotice</cstring> </property> @@ -548,7 +548,7 @@ <string>Notices</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>checkBreakOnWarning</cstring> </property> @@ -566,7 +566,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -577,7 +577,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="3"> + <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="3"> <item> <property name="text"> <string>Pause</string> @@ -598,14 +598,14 @@ <cstring>comboDefaultExecutionState</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblDefaultExecutionMode</cstring> </property> <property name="text"> <string>Default mode:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> @@ -621,7 +621,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>40</height> @@ -630,7 +630,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -641,7 +641,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -716,12 +716,12 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>slotLocalProjectToggled(bool)</slot> <slot>checkLocalProject_toggled(bool)</slot> <slot>slotLocalProjectToggle(bool)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextbrowser.h</includehint> </includehints> diff --git a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp index 4f8e72d8..6a52ac39 100644 --- a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp +++ b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp @@ -21,13 +21,13 @@ #include <tqcstring.h> #include <kmdcodec.h> -QByteArrayFifo::QByteArrayFifo( ) +TQByteArrayFifo::TQByteArrayFifo( ) { m_size = 0; m_array.resize(0); } -TQString QByteArrayFifo::retrieve( ) +TQString TQByteArrayFifo::retrieve( ) { // See if there's a null teminator somewhere TQString str(m_array); @@ -38,16 +38,16 @@ TQString QByteArrayFifo::retrieve( ) for(size_t cnt = 0; cnt < m_size; cnt++) m_array[cnt] = m_array[cnt + size]; - // Resize array, needed for find() to work + // Resize array, needed for tqfind() to work m_array.resize(m_size); return str; } -bool QByteArrayFifo::append(const char * chars, size_t size ) +bool TQByteArrayFifo::append(const char * chars, size_t size ) { // Resize the array, fail if not possible - if(!m_array.resize(m_size + size )) + if(!m_array.tqresize(m_size + size )) return false; // Copy the elements @@ -60,16 +60,16 @@ bool QByteArrayFifo::append(const char * chars, size_t size ) return true; } -long QByteArrayFifo::find( char character ) +long TQByteArrayFifo::tqfind( char character ) { - // If size is 0, find() outputs a warning for some reason + // If size is 0, tqfind() outputs a warning for some reason if(m_size == 0) return -1; - return m_array.find(character); + return m_array.tqfind(character); } -TQString QByteArrayFifo::base64Encoded() +TQString TQByteArrayFifo::base64Encoded() { return KCodecs::base64Encode(m_array); } diff --git a/quanta/components/debugger/dbgp/qbytearrayfifo.h b/quanta/components/debugger/dbgp/qbytearrayfifo.h index 851c7f34..2f46df76 100644 --- a/quanta/components/debugger/dbgp/qbytearrayfifo.h +++ b/quanta/components/debugger/dbgp/qbytearrayfifo.h @@ -23,15 +23,15 @@ #include <tqstring.h> #include <tqcstring.h> -class QByteArrayFifo +class TQByteArrayFifo { public: - QByteArrayFifo(); + TQByteArrayFifo(); bool append(const char * chars, size_t size); TQString retrieve(); TQString base64Encoded(); - long find(char character); + long tqfind(char character); size_t length() { return m_size; } private: diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp index 481c8d61..ba1c7c44 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp @@ -49,15 +49,15 @@ K_EXPORT_COMPONENT_FACTORY( quantadebuggerdbgp, const char QuantaDebuggerDBGp::protocolversion[] = "1.0"; -QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *parent, const char*, const TQStringList&) - : DebuggerClient (parent, "DBGp") +QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *tqparent, const char*, const TQStringList&) + : DebuggerClient (tqparent, "DBGp") { // Create a socket object and set up its signals - m_errormask = 1794; + m_errortqmask = 1794; m_supportsasync = false; m_defaultExecutionState = Starting; setExecutionState(m_defaultExecutionState); - emit updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(DebuggerUI::NoSession); connect(&m_network, TQT_SIGNAL(command(const TQString&)), this, TQT_SLOT(processCommand(const TQString&))); connect(&m_network, TQT_SIGNAL(active(bool)), this, TQT_SLOT(slotNetworkActive(bool))); @@ -88,9 +88,9 @@ void QuantaDebuggerDBGp::slotNetworkActive(bool active) setExecutionState(m_defaultExecutionState); if(active) - emit updateStatus(DebuggerUI::AwaitingConnection); + emit updatetqStatus(DebuggerUI::AwaitingConnection); else - emit updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(DebuggerUI::NoSession); } @@ -113,11 +113,11 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected) debuggerInterface()->setActiveLine("", 0); if(connected) - emit updateStatus(DebuggerUI::Connected); + emit updatetqStatus(DebuggerUI::Connected); else { setExecutionState(m_defaultExecutionState); - emit updateStatus(DebuggerUI::AwaitingConnection); + emit updatetqStatus(DebuggerUI::AwaitingConnection); profilerOpen(false); } @@ -126,7 +126,7 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected) void QuantaDebuggerDBGp::slotNetworkError(const TQString &errormsg, bool log) { - debuggerInterface()->showStatus(errormsg, log); + debuggerInterface()->showtqStatus(errormsg, log); } @@ -194,29 +194,29 @@ void QuantaDebuggerDBGp::setExecutionState(const TQString &state) if(state == "starting") { setExecutionState(Starting); - emit updateStatus(DebuggerUI::Paused); + emit updatetqStatus(DebuggerUI::Paused); } else if(state == "stopping") { setExecutionState(Stopping); - emit updateStatus(DebuggerUI::Paused); + emit updatetqStatus(DebuggerUI::Paused); m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket } else if(state == "stopped") { setExecutionState(Stopped); - emit updateStatus(DebuggerUI::Paused); + emit updatetqStatus(DebuggerUI::Paused); m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket } else if(state == "running") { setExecutionState(Running); - emit updateStatus(DebuggerUI::Running); + emit updatetqStatus(DebuggerUI::Running); } else if(state == "break") { setExecutionState(Break); - emit updateStatus(DebuggerUI::Paused); + emit updatetqStatus(DebuggerUI::Paused); } } @@ -263,7 +263,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas) TQDomNode response = data.elementsByTagName("response").item(0); TQString command = attribute(response, "command"); - // Status command + // tqStatus command if(command == "status") setExecutionState(attribute(response, "status")); @@ -327,7 +327,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas) } else { - debuggerInterface()->showStatus(i18n("Unrecognized package: '%1%2'").arg(datas.left(50)).arg(datas.length() > 50 ? "..." : ""), true); + debuggerInterface()->showtqStatus(i18n("Unrecognized package: '%1%2'").tqarg(datas.left(50)).tqarg(datas.length() > 50 ? "..." : ""), true); kdDebug(24002) << datas << endl; } @@ -338,10 +338,10 @@ void QuantaDebuggerDBGp::initiateSession(const TQDomNode& initpacket) { if(attribute(initpacket, "protocol_version") != protocolversion) { - debuggerInterface()->showStatus( + debuggerInterface()->showtqStatus( i18n("The debugger for %1 uses an unsupported protocol version (%2)") - .arg(attribute(initpacket, "language")) - .arg(attribute(initpacket, "protocol_version")) + .tqarg(attribute(initpacket, "language")) + .tqarg(attribute(initpacket, "protocol_version")) , true); endSession(); @@ -384,7 +384,7 @@ void QuantaDebuggerDBGp::stackShow(const TQDomNode&node) // Type isnt currently correct with xdebug // type = (attribute(child, "type") == "file" ? File : Eval); typestr = attribute(child, "filename"); - if(typestr.find(TQRegExp(".*%28[0-9]+%29%20%3A%20eval")) >= 0) + if(typestr.tqfind(TQRegExp(".*%28[0-9]+%29%20%3A%20eval")) >= 0) type = Eval; else type = File; @@ -540,7 +540,7 @@ void QuantaDebuggerDBGp::addBreakpoint (DebuggerBreakpoint* breakpoint) " -n " + TQString::number(breakpoint->line() + 1) , breakpoint->condition()); - breakpoint->setKey(TQString("id %1").arg(id)); + breakpoint->setKey(TQString("id %1").tqarg(id)); } void QuantaDebuggerDBGp::setBreakpointKey( const TQDomNode & response ) @@ -550,7 +550,7 @@ void QuantaDebuggerDBGp::setBreakpointKey( const TQDomNode & response ) id = attribute(response, "transaction_id").toLong(); if(id > 0) { - TQString oldkey = TQString("id %1").arg(id); + TQString oldkey = TQString("id %1").tqarg(id); DebuggerBreakpoint *bp = debuggerInterface()->findDebuggerBreakpoint(oldkey); if(bp) debuggerInterface()->updateBreakpointKey(*bp, attribute(response, "id")); @@ -573,15 +573,15 @@ void QuantaDebuggerDBGp::fileOpened(const TQString&) // Watch a variable void QuantaDebuggerDBGp::addWatch(const TQString & variable) { - if(m_watchlist.find(variable) == m_watchlist.end()) + if(m_watchlist.tqfind(variable) == m_watchlist.end()) m_watchlist.append(variable); m_network.sendCommand("property_get", "-n " + variable); } // Remove watch void QuantaDebuggerDBGp::removeWatch(DebuggerVariable *variable) { - if(m_watchlist.find(variable->name()) != m_watchlist.end()) - m_watchlist.remove(m_watchlist.find(variable->name())); + if(m_watchlist.tqfind(variable->name()) != m_watchlist.end()) + m_watchlist.remove(m_watchlist.tqfind(variable->name())); } // Show conditional breakpoint state @@ -649,9 +649,9 @@ void QuantaDebuggerDBGp::readConfig(TQDomNode node) valuenode = node.namedItem("useproxy"); m_useproxy = valuenode.firstChild().nodeValue() == "1"; - valuenode = node.namedItem("errormask"); - m_errormask = valuenode.firstChild().nodeValue().toLong(); - kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl; + valuenode = node.namedItem("errortqmask"); + m_errortqmask = valuenode.firstChild().nodeValue().toLong(); + kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl; // Profiler valuenode = node.namedItem("profilerfilename"); @@ -687,11 +687,11 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) else set.comboDefaultExecutionState->setCurrentItem(1); - set.checkBreakOnNotice->setChecked(QuantaDebuggerDBGp::Notice & m_errormask); - set.checkBreakOnWarning->setChecked(QuantaDebuggerDBGp::Warning & m_errormask); - set.checkBreakOnUserNotice->setChecked(QuantaDebuggerDBGp::User_Notice & m_errormask); - set.checkBreakOnUserWarning->setChecked(QuantaDebuggerDBGp::User_Warning & m_errormask); - set.checkBreakOnUserError->setChecked(QuantaDebuggerDBGp::User_Error & m_errormask); + set.checkBreakOnNotice->setChecked(QuantaDebuggerDBGp::Notice & m_errortqmask); + set.checkBreakOnWarning->setChecked(QuantaDebuggerDBGp::Warning & m_errortqmask); + set.checkBreakOnUserNotice->setChecked(QuantaDebuggerDBGp::User_Notice & m_errortqmask); + set.checkBreakOnUserWarning->setChecked(QuantaDebuggerDBGp::User_Warning & m_errortqmask); + set.checkBreakOnUserError->setChecked(QuantaDebuggerDBGp::User_Error & m_errortqmask); set.lineProfilerFilename->setText(m_profilerFilename); if(m_profilerAutoOpen) @@ -705,7 +705,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("localproject").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("localproject"); node.appendChild( el ); if(set.checkLocalProject->isChecked()) @@ -725,7 +725,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("localbasedir").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("localbasedir"); node.appendChild( el ); el.appendChild( node.ownerDocument().createTextNode(m_localBasedir) ); @@ -734,7 +734,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("serverbasedir").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("serverbasedir"); node.appendChild( el ); if(debuggerInterface()) @@ -743,7 +743,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("listenport").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("listenport"); node.appendChild( el ); m_listenPort = set.lineServerListenPort->text(); @@ -751,7 +751,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("startsession").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("startsession"); node.appendChild( el ); m_startsession = set.lineStartSession->text(); @@ -759,7 +759,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("defaultexecutionstate").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("defaultexecutionstate"); node.appendChild( el ); if(set.comboDefaultExecutionState->currentItem() == 0) @@ -774,23 +774,23 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) } - el = node.namedItem("errormask").toElement(); + el = node.namedItem("errortqmask").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); - el = node.ownerDocument().createElement("errormask"); + el.tqparentNode().removeChild(el); + el = node.ownerDocument().createElement("errortqmask"); node.appendChild( el ); - m_errormask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerDBGp::Notice : 0) + m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerDBGp::Notice : 0) + (set.checkBreakOnWarning->isChecked() ? QuantaDebuggerDBGp::Warning : 0) + (set.checkBreakOnUserNotice->isChecked() ? QuantaDebuggerDBGp::User_Notice : 0) + (set.checkBreakOnUserWarning->isChecked() ? QuantaDebuggerDBGp::User_Warning : 0) + (set.checkBreakOnUserError->isChecked() ? QuantaDebuggerDBGp::User_Error : 0); - kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl; - el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errormask))); + kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl; + el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errortqmask))); // Profiler el = node.namedItem("profilerfilename").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("profilerfilename"); node.appendChild( el ); m_profilerFilename = set.lineProfilerFilename->text(); @@ -798,7 +798,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("profilerfilename_map").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("profilerfilename_map"); node.appendChild( el ); m_profilerMapFilename = (set.checkProfilerMapFilename->isChecked() ? true : false); @@ -806,7 +806,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("profiler_autoopen").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("profiler_autoopen"); node.appendChild( el ); m_profilerAutoOpen = (set.checkProfilerAutoOpen->isChecked() ? true : false); @@ -850,8 +850,8 @@ void QuantaDebuggerDBGp::profilerOpen() void QuantaDebuggerDBGp::profilerOpen(bool forceopen) { TQString profileroutput = m_profilerFilename; - profileroutput.replace("%a", m_appid); - profileroutput.replace("%c", m_initialscript); + profileroutput.tqreplace("%a", m_appid); + profileroutput.tqreplace("%c", m_initialscript); if(m_profilerMapFilename) profileroutput = mapServerPathToLocal( profileroutput); @@ -867,9 +867,9 @@ void QuantaDebuggerDBGp::profilerOpen(bool forceopen) else { if(forceopen) - KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").arg(profileroutput), i18n("Profiler File Error")); + KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").tqarg(profileroutput), i18n("Profiler File Error")); else - debuggerInterface()->showStatus(i18n("Unable to open profiler output (%1)").arg(profileroutput), false); + debuggerInterface()->showtqStatus(i18n("Unable to open profiler output (%1)").tqarg(profileroutput), false); } } else @@ -923,7 +923,7 @@ void QuantaDebuggerDBGp::propertySetResponse( const TQDomNode & setnode) { if(attribute(setnode, "success") == "0") { - debuggerInterface()->showStatus(i18n("Unable to set value of variable."), true); + debuggerInterface()->showtqStatus(i18n("Unable to set value of variable."), true); } } @@ -932,11 +932,11 @@ DebuggerVariable* QuantaDebuggerDBGp::buildVariable( const TQDomNode & variablen { /* Sample: - <property name="$arrayVar" fullname="$arrayVar" address="-1073754976" type="hash" children="1" numchildren="4"> + <property name="$arrayVar" fullname="$arrayVar" address="-1073754976" type="hash" tqchildren="1" numtqchildren="4"> <property name="birthyear" fullname="$arrayVar['birthyear']" address="135522364" type="int"> <![CDATA[1949]]> </property> - <property name="songs" fullname="$arrayVar['songs']" address="135522236" type="hash" children="1" numchildren="3"> + <property name="songs" fullname="$arrayVar['songs']" address="135522236" type="hash" tqchildren="1" numtqchildren="3"> <property name="0" fullname="$arrayVar['songs'][0]" address="135522332" type="string" encoding="base64"> <![CDATA[SW5ub2NlbnQgV2hlbiBZb3UgRHJlYW0=]]> </property> @@ -1015,22 +1015,22 @@ void QuantaDebuggerDBGp::handleError(const TQDomNode & statusnode ) { // Managable error long error = attribute(errornode, "code").toLong(); - if(!(error & m_errormask)) + if(!(error & m_errortqmask)) { setExecutionState(Running); } else { - emit updateStatus(DebuggerUI::HaltedOnError); - debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true); + emit updatetqStatus(DebuggerUI::HaltedOnError); + debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true); } break; } else { // Fatal error - emit updateStatus(DebuggerUI::HaltedOnError); - debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true); + emit updatetqStatus(DebuggerUI::HaltedOnError); + debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true); } } errornode = errornode.nextSibling(); diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h index 7c9601ad..52ec17bc 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h @@ -32,9 +32,10 @@ typedef TQMap<TQString, TQString> StringMap; class QuantaDebuggerDBGp : public DebuggerClient { Q_OBJECT + TQ_OBJECT public: - QuantaDebuggerDBGp(TQObject *parent, const char* name, const TQStringList&); + QuantaDebuggerDBGp(TQObject *tqparent, const char* name, const TQStringList&); ~QuantaDebuggerDBGp(); // Execution states @@ -121,7 +122,7 @@ class QuantaDebuggerDBGp : public DebuggerClient bool m_profilerAutoOpen; bool m_profilerMapFilename; State m_executionState, m_defaultExecutionState; - long m_errormask; + long m_errortqmask; long m_displaydelay; bool m_supportsasync; @@ -160,7 +161,7 @@ class QuantaDebuggerDBGp : public DebuggerClient void processCommand(const TQString&); signals: - void updateStatus(DebuggerUI::DebuggerStatus); + void updatetqStatus(DebuggerUI::DebuggertqStatus); }; #endif diff --git a/quanta/components/debugger/debuggerbreakpointlist.cpp b/quanta/components/debugger/debuggerbreakpointlist.cpp index 6a47d296..2d18309f 100644 --- a/quanta/components/debugger/debuggerbreakpointlist.cpp +++ b/quanta/components/debugger/debuggerbreakpointlist.cpp @@ -50,7 +50,7 @@ void DebuggerBreakpointList::add(DebuggerBreakpoint* bp) void DebuggerBreakpointList::remove(DebuggerBreakpoint* bp) { - BreakpointList_t::iterator it = find(*bp); + BreakpointList_t::iterator it = tqfind(*bp); if(it == m_breakpointList->end()) return; @@ -113,7 +113,7 @@ void DebuggerBreakpointList::clear() bool DebuggerBreakpointList::exists(DebuggerBreakpoint* bp) { - BreakpointList_t::iterator it = find(*bp); + BreakpointList_t::iterator it = tqfind(*bp); if(it == m_breakpointList->end()) return false; @@ -124,7 +124,7 @@ bool DebuggerBreakpointList::exists(DebuggerBreakpoint* bp) } -BreakpointList_t::iterator DebuggerBreakpointList::find(const DebuggerBreakpoint &bp) +BreakpointList_t::iterator DebuggerBreakpointList::tqfind(const DebuggerBreakpoint &bp) { BreakpointList_t::iterator it; @@ -180,7 +180,7 @@ void DebuggerBreakpointList::updateBreakpointKey( const DebuggerBreakpoint & bp, { //DebuggerBreakpoint *bpp = new DebuggerBreakpoint(bp); BreakpointList_t::iterator it; - it = find(bp); + it = tqfind(bp); if(it != m_breakpointList->end()) { (*it)->setKey(newkey); diff --git a/quanta/components/debugger/debuggerbreakpointlist.h b/quanta/components/debugger/debuggerbreakpointlist.h index aa6cd803..ef9233bc 100644 --- a/quanta/components/debugger/debuggerbreakpointlist.h +++ b/quanta/components/debugger/debuggerbreakpointlist.h @@ -31,7 +31,7 @@ class DebuggerBreakpointList private: BreakpointList_t* m_breakpointList; BreakpointList_t::iterator m_current; - BreakpointList_t::iterator find(const DebuggerBreakpoint &bp); + BreakpointList_t::iterator tqfind(const DebuggerBreakpoint &bp); public: DebuggerBreakpointList(); diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp index 8614bc28..bf4911ad 100644 --- a/quanta/components/debugger/debuggerbreakpointview.cpp +++ b/quanta/components/debugger/debuggerbreakpointview.cpp @@ -52,8 +52,8 @@ DebuggerBreakpointViewItem::DebuggerBreakpointViewItem(DebuggerBreakpointView* v } -DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *parent, const char *name) - : KListView(parent, name) +DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *tqparent, const char *name) + : KListView(tqparent, name) { // If you change here, change the DebuggerBreakpointViewColumns enums above addColumn(i18n("Expression")); @@ -154,7 +154,7 @@ void DebuggerBreakpointView::slotRemoveSelected() void DebuggerBreakpointView::keyPressEvent(TQKeyEvent *e) { - if(e->key() != Qt::Key_Delete) + if(e->key() != TQt::Key_Delete) { e->ignore(); return; diff --git a/quanta/components/debugger/debuggerbreakpointview.h b/quanta/components/debugger/debuggerbreakpointview.h index 196cd451..e593a815 100644 --- a/quanta/components/debugger/debuggerbreakpointview.h +++ b/quanta/components/debugger/debuggerbreakpointview.h @@ -44,9 +44,10 @@ class DebuggerBreakpointViewItem : public KListViewItem class DebuggerBreakpointView : public KListView { Q_OBJECT + TQ_OBJECT public: - DebuggerBreakpointView(TQWidget *parent = 0, const char *name = 0); + DebuggerBreakpointView(TQWidget *tqparent = 0, const char *name = 0); ~DebuggerBreakpointView(); void showBreakpoint(const DebuggerBreakpoint& bp); diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp index b62b3e3b..60fd68ef 100644 --- a/quanta/components/debugger/debuggermanager.cpp +++ b/quanta/components/debugger/debuggermanager.cpp @@ -49,8 +49,8 @@ // dialogs #include "debuggervariablesets.h" -DebuggerManager::DebuggerManager(TQObject *myparent) - : TQObject(myparent) +DebuggerManager::DebuggerManager(TQObject *mytqparent) + : TQObject(mytqparent) { initActions(); @@ -67,7 +67,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU if(m_client) { - disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + disconnect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus))); delete m_client; m_client = NULL; @@ -108,7 +108,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU if(!m_client) { emit hideSplash(); - KMessageBox::error(NULL, i18n("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").arg(errCode).arg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); + KMessageBox::error(NULL, i18n("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").tqarg(errCode).tqarg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); } break; } @@ -143,7 +143,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU // recreate UI m_debuggerui = new DebuggerUI(this, "debuggerui"); - connect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + connect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus))); // Load saved breakpoints if(Project::ref()->debuggerPersistentBreakpoints()) @@ -212,7 +212,7 @@ void DebuggerManager::initActions() return; //Debugger, breakpoint - newaction = new KAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), Qt::CTRL+Qt::SHIFT+Qt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle"); + newaction = new KAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle"); newaction->setToolTip(i18n("Toggles a breakpoint at the current cursor location")); newaction = new KAction(i18n("&Clear Breakpoints"), 0, this, TQT_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear"); @@ -299,7 +299,7 @@ DebuggerManager::~DebuggerManager() if(m_client) { - disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + disconnect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus))); delete m_client; m_client = 0L; @@ -601,11 +601,11 @@ bool DebuggerManager::setActiveLine (const TQString& file, int line ) return true; // Find new position in editor - if(ViewManager::ref()->isOpened(filename) || QExtFileInfo::exists(filename, true, 0L)) + if(ViewManager::ref()->isOpened(filename) || TQExtFileInfo::exists(filename, true, 0L)) quantaApp->gotoFileAndLine(filename, line, 0); else { - showStatus(i18n("Unable to open file %1, check your basedirs and mappings.").arg(filename), true); + showtqStatus(i18n("Unable to open file %1, check your basedirs and mappings.").tqarg(filename), true); } // Add new active line mark @@ -659,7 +659,7 @@ void DebuggerManager::disconnectBreakpointSignals(Document* qdoc) } // Show a status message and optionally put it on the log -bool DebuggerManager::showStatus(const TQString& a_message, bool log) +bool DebuggerManager::showtqStatus(const TQString& a_message, bool log) { TQString message = a_message; quantaApp->slotStatusMsg(m_client->getName() + ": " + message); @@ -781,7 +781,7 @@ void DebuggerManager::saveProperties( ) // (Re)create breakpoints section TQDomNode nodeBreakpoints = nodeDbg.namedItem("breakpoints"); if(!nodeBreakpoints.isNull()) - nodeBreakpoints.parentNode().removeChild(nodeBreakpoints); + nodeBreakpoints.tqparentNode().removeChild(nodeBreakpoints); if(m_breakpointList->count() > 0) { @@ -818,7 +818,7 @@ void DebuggerManager::saveProperties( ) // (Re)create watches section TQDomNode nodeWatches = nodeDbg.namedItem("watches"); if(!nodeWatches.isNull()) - nodeWatches.parentNode().removeChild(nodeWatches); + nodeWatches.tqparentNode().removeChild(nodeWatches); if(m_debuggerui->watches()->first()) { diff --git a/quanta/components/debugger/debuggermanager.h b/quanta/components/debugger/debuggermanager.h index 5a88b156..ad3c8739 100644 --- a/quanta/components/debugger/debuggermanager.h +++ b/quanta/components/debugger/debuggermanager.h @@ -30,9 +30,10 @@ class DebuggerBreakpoint; class PathMapper; class Document; -class DebuggerManager : public QObject +class DebuggerManager : public TQObject { Q_OBJECT + TQ_OBJECT private: // client DebuggerClient *m_client; @@ -53,7 +54,7 @@ class DebuggerManager : public QObject long m_currentLine; public: - DebuggerManager(TQObject *myparent); + DebuggerManager(TQObject *mytqparent); ~DebuggerManager(); // Access to memebers @@ -70,7 +71,7 @@ class DebuggerManager : public QObject void updateBreakpointKey(const DebuggerBreakpoint &bp, const TQString& newkey); // Public help functions - bool showStatus(const TQString& message, bool log); + bool showtqStatus(const TQString& message, bool log); bool setActiveLine (const TQString& file, int line); void setMark(const TQString& filename, long line, bool set, int mark); diff --git a/quanta/components/debugger/debuggerui.cpp b/quanta/components/debugger/debuggerui.cpp index fdf32a5c..ae88b3e9 100644 --- a/quanta/components/debugger/debuggerui.cpp +++ b/quanta/components/debugger/debuggerui.cpp @@ -36,8 +36,8 @@ #include "resource.h" #include "whtmlpart.h" -DebuggerUI::DebuggerUI(TQObject *parent, const char *name) - : TQObject(parent, name), m_variablesListView(0) +DebuggerUI::DebuggerUI(TQObject *tqparent, const char *name) + : TQObject(tqparent, name), m_variablesListView(0) { // Variable watch tree @@ -69,9 +69,9 @@ DebuggerUI::DebuggerUI(TQObject *parent, const char *name) // Show debugger toolbar quantaApp->toolBar("debugger_toolbar")->show(); - connect(m_variablesListView, TQT_SIGNAL(removeVariable(DebuggerVariable* )), parent, TQT_SLOT(slotRemoveVariable(DebuggerVariable* ))); + connect(m_variablesListView, TQT_SIGNAL(removeVariable(DebuggerVariable* )), tqparent, TQT_SLOT(slotRemoveVariable(DebuggerVariable* ))); - connect(m_debuggerBreakpointView, TQT_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), parent, TQT_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* ))); + connect(m_debuggerBreakpointView, TQT_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), tqparent, TQT_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* ))); showMenu(); } @@ -109,7 +109,7 @@ void DebuggerUI::showMenu() else m_debuggerMenuID = 0; - // Status indicator + // tqStatus indicator quantaApp->statusBar()->insertFixedItem(i18n("Debugger Inactive"), IDS_STATUS_DEBUGGER); } @@ -124,7 +124,7 @@ void DebuggerUI::hideMenu() } m_debuggerMenuID = 0; - // Status indicator + // tqStatus indicator quantaApp->statusBar()->removeItem(IDS_STATUS_DEBUGGER); } @@ -148,7 +148,7 @@ void DebuggerUI::sendRequest(const KURL &url) m_preview->openURL(url); } -void DebuggerUI::slotStatus( DebuggerStatus status ) +void DebuggerUI::slottqStatus( DebuggertqStatus status ) { switch(status) { diff --git a/quanta/components/debugger/debuggerui.h b/quanta/components/debugger/debuggerui.h index 767facad..3a438f11 100644 --- a/quanta/components/debugger/debuggerui.h +++ b/quanta/components/debugger/debuggerui.h @@ -32,12 +32,13 @@ class DebuggerVariable; class WHTMLPart; class KURL; -class DebuggerUI : public QObject +class DebuggerUI : public TQObject { Q_OBJECT + TQ_OBJECT public: - enum DebuggerStatus + enum DebuggertqStatus { NoSession = 0, AwaitingConnection, @@ -49,7 +50,7 @@ class DebuggerUI : public QObject HaltedOnBreakpoint }; - DebuggerUI(TQObject *parent = 0, const char *name = 0); + DebuggerUI(TQObject *tqparent = 0, const char *name = 0); ~DebuggerUI(); // Watches @@ -82,8 +83,8 @@ class DebuggerUI : public QObject WHTMLPart *m_preview; public slots: - // Status indication - void slotStatus(DebuggerUI::DebuggerStatus status); + // tqStatus indication + void slottqStatus(DebuggerUI::DebuggertqStatus status); }; diff --git a/quanta/components/debugger/debuggervariable.cpp b/quanta/components/debugger/debuggervariable.cpp index 390290a7..46f827cb 100644 --- a/quanta/components/debugger/debuggervariable.cpp +++ b/quanta/components/debugger/debuggervariable.cpp @@ -258,17 +258,17 @@ DebuggerVariable* DebuggerVariable::findItem( TQListViewItem * item, bool traver return NULL; } -void DebuggerVariable::copy( DebuggerVariable * v, bool copychildren ) +void DebuggerVariable::copy( DebuggerVariable * v, bool copytqchildren ) { m_name = v->name(); - m_size = (v->isScalar() || copychildren ? v->size() : m_valueList.count()); + m_size = (v->isScalar() || copytqchildren ? v->size() : m_valueList.count()); m_value = v->value(); m_type = v->type(); m_isReference = v->isReference(); // We cant just assign m_valuelist to v->values(), it would make a shallow copy... // - if(copychildren) + if(copytqchildren) { m_valueList.clear(); for(DebuggerVariable * v2 = v->values().first(); v2; v2 = v->values().next()) diff --git a/quanta/components/debugger/debuggervariablesets.ui b/quanta/components/debugger/debuggervariablesets.ui index 70440ff4..76689e57 100644 --- a/quanta/components/debugger/debuggervariablesets.ui +++ b/quanta/components/debugger/debuggervariablesets.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DebuggerVariableSetS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>DebuggerVariableSetS</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -46,14 +46,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -70,7 +70,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -86,7 +86,7 @@ </widget> </hbox> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lineVariable</cstring> </property> @@ -94,7 +94,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblVariable</cstring> </property> @@ -110,7 +110,7 @@ <string>Variable:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblValue</cstring> </property> @@ -125,7 +125,7 @@ <property name="text"> <string>New value:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -139,14 +139,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> </size> </property> </spacer> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lineValue</cstring> </property> @@ -181,5 +181,5 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/components/debugger/gubed/gubedsettings.cpp b/quanta/components/debugger/gubed/gubedsettings.cpp index 9464dc81..b6df9b25 100644 --- a/quanta/components/debugger/gubed/gubedsettings.cpp +++ b/quanta/components/debugger/gubed/gubedsettings.cpp @@ -22,7 +22,7 @@ GubedSettings::GubedSettings(const TQString &protocolversion) : GubedSettingsS(0, "GubedSettings", false, 0) { - textAbout->setText(textAbout->text().replace("%PROTOCOLVERSION%", protocolversion)); + textAbout->setText(textAbout->text().tqreplace("%PROTOCOLVERSION%", protocolversion)); } GubedSettings::~GubedSettings() diff --git a/quanta/components/debugger/gubed/gubedsettings.h b/quanta/components/debugger/gubed/gubedsettings.h index 73232e06..b8fef421 100644 --- a/quanta/components/debugger/gubed/gubedsettings.h +++ b/quanta/components/debugger/gubed/gubedsettings.h @@ -22,6 +22,7 @@ class GubedSettings : public GubedSettingsS { Q_OBJECT + TQ_OBJECT public slots: virtual void slotUseProxyToggle( bool useproxy); diff --git a/quanta/components/debugger/gubed/gubedsettingss.ui b/quanta/components/debugger/gubed/gubedsettingss.ui index 12125c93..7697a337 100644 --- a/quanta/components/debugger/gubed/gubedsettingss.ui +++ b/quanta/components/debugger/gubed/gubedsettingss.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>GubedSettingsS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>GubedSettingsS</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -46,14 +46,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -70,7 +70,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -83,7 +83,7 @@ </widget> </hbox> </widget> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget2</cstring> </property> @@ -95,7 +95,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -116,14 +116,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>40</height> </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -134,7 +134,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblDebuggerServerBasedir</cstring> </property> @@ -150,7 +150,7 @@ <string>Server basedir:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblDebuggerLocalBasedir</cstring> </property> @@ -166,12 +166,12 @@ <string>Local basedir:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lineServerBasedir</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lineLocalBasedir</cstring> </property> @@ -181,7 +181,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -192,7 +192,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>lineServerListenPort</cstring> </property> @@ -205,7 +205,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>lineServerPort</cstring> </property> @@ -221,7 +221,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lineServerHost</cstring> </property> @@ -229,7 +229,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>checkUseProxy</cstring> </property> @@ -237,7 +237,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblDebuggerUseProxe</cstring> </property> @@ -253,7 +253,7 @@ <string>Use proxy</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblDebuggerServerHost</cstring> </property> @@ -269,7 +269,7 @@ <string>Proxy host:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblDebuggerServerPort</cstring> </property> @@ -285,7 +285,7 @@ <string>Proxy port:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lblDebuggerServerListenPort</cstring> </property> @@ -303,7 +303,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -314,7 +314,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lineStartSession</cstring> </property> @@ -336,7 +336,7 @@ %add - Document root of current script</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>optAddInclude</cstring> </property> @@ -347,7 +347,7 @@ <string>&Add include</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>optStartSession</cstring> </property> @@ -362,7 +362,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -373,7 +373,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -384,7 +384,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="4" column="1"> + <widget class="TQCheckBox" row="4" column="1"> <property name="name"> <cstring>checkBreakOnUserError</cstring> </property> @@ -400,18 +400,18 @@ <string>User errors</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="5" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="5" colspan="1"> <property name="name"> <cstring>lblBreakOn</cstring> </property> <property name="text"> <string>Break on:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>checkBreakOnUserWarning</cstring> </property> @@ -427,7 +427,7 @@ <string>User warnings</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>checkBreakOnUserNotice</cstring> </property> @@ -443,7 +443,7 @@ <string>User notices</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>checkBreakOnNotice</cstring> </property> @@ -459,7 +459,7 @@ <string>Notices</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>checkBreakOnWarning</cstring> </property> @@ -487,14 +487,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>50</height> </size> </property> </spacer> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -505,7 +505,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblDelayFast</cstring> </property> @@ -526,11 +526,11 @@ <string>Fast</string> </property> </widget> - <widget class="QSlider" row="1" column="2"> + <widget class="TQSlider" row="1" column="2"> <property name="name"> <cstring>sliderDisplayDelay</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>27</height> @@ -546,7 +546,7 @@ <enum>Below</enum> </property> </widget> - <widget class="QLabel" row="1" column="3"> + <widget class="TQLabel" row="1" column="3"> <property name="name"> <cstring>lblDelaySlow</cstring> </property> @@ -566,11 +566,11 @@ <property name="text"> <string>Slow</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="3"> + <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="3"> <item> <property name="text"> <string>Pause</string> @@ -599,25 +599,25 @@ <cstring>comboDefaultExecutionState</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblDefaultExecutionMode</cstring> </property> <property name="text"> <string>Default mode:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblDisplayDelay</cstring> </property> <property name="text"> <string>Run speed:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> @@ -625,7 +625,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -636,7 +636,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -652,7 +652,7 @@ <string><h4>Gubed PHP Debugger Plugin for Quanta +</h4></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1</cstring> </property> @@ -670,7 +670,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -752,10 +752,10 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot specifier="pure virtual">slotUseProxyToggle( bool )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextbrowser.h</includehint> </includehints> diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp index 8c2ab1b5..58f949a1 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp +++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp @@ -47,17 +47,17 @@ K_EXPORT_COMPONENT_FACTORY( quantadebuggergubed, const char QuantaDebuggerGubed::protocolversion[] = "0.0.12"; -QuantaDebuggerGubed::QuantaDebuggerGubed (TQObject *parent, const char* name, const TQStringList&) - : DebuggerClient (parent, name) +QuantaDebuggerGubed::QuantaDebuggerGubed (TQObject *tqparent, const char* name, const TQStringList&) + : DebuggerClient (tqparent, name) { // Create a socket object and set up its signals m_socket = NULL; m_server = NULL; - m_errormask = 1794; + m_errortqmask = 1794; m_defaultExecutionState = Pause; setExecutionState(m_defaultExecutionState); - emit updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(DebuggerUI::NoSession); m_datalen = -1; } @@ -80,7 +80,7 @@ QuantaDebuggerGubed::~QuantaDebuggerGubed () delete m_server; m_server = NULL; } - emit updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(DebuggerUI::NoSession); } // Try to make a connection to the gubed server @@ -109,7 +109,7 @@ void QuantaDebuggerGubed::startSession() debuggerInterface()->enableAction("debug_request", false); kdDebug(24002) << k_funcinfo << ", proxy:" << m_serverHost << ", " << m_serverPort.toUInt() << endl; - emit updateStatus(DebuggerUI::AwaitingConnection); + emit updatetqStatus(DebuggerUI::AwaitingConnection); } } else @@ -123,14 +123,14 @@ void QuantaDebuggerGubed::startSession() if(m_server->listen()) { - emit updateStatus(DebuggerUI::AwaitingConnection); + emit updatetqStatus(DebuggerUI::AwaitingConnection); debuggerInterface()->enableAction("debug_connect", false); debuggerInterface()->enableAction("debug_disconnect", true); debuggerInterface()->enableAction("debug_request", true); } else { - emit updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(DebuggerUI::NoSession); delete m_server; m_server = NULL; debuggerInterface()->enableAction("debug_connect", true); @@ -174,7 +174,7 @@ void QuantaDebuggerGubed::endSession() debuggerInterface()->enableAction("debug_leap", false); debuggerInterface()->enableAction("debug_pause", false); - emit updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(DebuggerUI::NoSession); } // Change executionstate of the script @@ -185,7 +185,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate) sendCommand("pause", (char*)0L); sendCommand("sendactiveline", (char*)0L); if(isActive()) - emit updateStatus(DebuggerUI::Paused); + emit updatetqStatus(DebuggerUI::Paused); } else if(newstate == Run) { @@ -194,7 +194,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate) sendCommand("run", (char*)0L); if(isActive()) - emit updateStatus(DebuggerUI::Running); + emit updatetqStatus(DebuggerUI::Running); } else if(newstate == Trace) { @@ -203,7 +203,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate) sendCommand("trace", (char*)0L); if(isActive()) - emit updateStatus(DebuggerUI::Tracing); + emit updatetqStatus(DebuggerUI::Tracing); } m_executionState = newstate; @@ -258,15 +258,15 @@ void QuantaDebuggerGubed::slotError(int) if(m_socket->error()) { - kdDebug(24002) << k_funcinfo << ", " << m_socket->errorString() << endl; - debuggerInterface()->showStatus(m_socket->errorString(), false); + kdDebug(24002) << k_funcinfo << ", " << m_socket->KSocketBase::errorString() << endl; + debuggerInterface()->showtqStatus(m_socket->KSocketBase::errorString(), false); } } if(m_server && m_server->error()) { kdDebug(24002) << k_funcinfo << ", " << m_server->errorString() << endl; - debuggerInterface()->showStatus(m_server->errorString(), false); + debuggerInterface()->showtqStatus(m_server->errorString(), false); } } @@ -294,7 +294,7 @@ void QuantaDebuggerGubed::slotReadyAccept() connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead())); connected(); - emit updateStatus(DebuggerUI::Connected); + emit updatetqStatus(DebuggerUI::Connected); } else { @@ -307,7 +307,7 @@ void QuantaDebuggerGubed::slotReadyAccept() // Connection established void QuantaDebuggerGubed::slotConnected(const KNetwork::KResolverEntry &) { - emit updateStatus(DebuggerUI::Connected); + emit updatetqStatus(DebuggerUI::Connected); connected(); } @@ -353,7 +353,7 @@ void QuantaDebuggerGubed::slotConnectionClosed() debuggerInterface()->setActiveLine("", 0); - emit updateStatus(DebuggerUI::AwaitingConnection); + emit updatetqStatus(DebuggerUI::AwaitingConnection); m_active = false; } @@ -383,13 +383,13 @@ void QuantaDebuggerGubed::slotReadyRead() // If datalen == -1, we didnt read the command yet, otherwise were reading data. if(m_datalen == -1) { - bytes = m_buffer.find(";"); + bytes = m_buffer.tqfind(";"); if(bytes < 0) break; data = m_buffer.left(bytes); m_buffer.remove(0, bytes + 1); - bytes = data.find(":"); + bytes = data.tqfind(":"); m_command = data.left(bytes); data.remove(0, bytes + 1); m_datalen = data.toLong(); @@ -437,7 +437,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) else if(m_executionState == Trace) sendCommand("trace", (char*)0L); - sendCommand("seterrormask", "errormask", TQString::number(m_errormask).ascii(), (char*)0L); + sendCommand("seterrortqmask", "errortqmask", TQString::number(m_errortqmask).ascii(), (char*)0L); } // Just some status info, display on status line else if(m_command == "status") @@ -445,9 +445,9 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) long argcnt = args["args"].toLong(); TQString msg = i18n(args["message"].ascii()); // How will we get these messages throught to the translators? for(int cnt = 1; cnt <= argcnt; cnt++) - msg.replace("%" + TQString("%1").arg(cnt) + "%", args[TQString("arg%1").arg(cnt)]); + msg.tqreplace("%" + TQString("%1").tqarg(cnt) + "%", args[TQString("arg%1").tqarg(cnt)]); - debuggerInterface()->showStatus(msg, false); + debuggerInterface()->showtqStatus(msg, false); } // New current line else if(m_command == "setactiveline") @@ -462,7 +462,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) // Parsing failed else if(m_command == "parsefailed") { - debuggerInterface()->showStatus(i18n("Syntax or parse error in %1)").arg(args["filenme"]), true); + debuggerInterface()->showtqStatus(i18n("Syntax or parse error in %1)").tqarg(args["filenme"]), true); return; } // A debugging session is running @@ -479,11 +479,11 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) else if(m_command == "error") { // Put the line number first so double clicking will jump to the corrrect line - debuggerInterface()->showStatus(i18n("Error occurred: Line %1, Code %2 (%3) in %4").arg(args["line"]).arg(args["errnum"]).arg(args["errmsg"]).arg(args["filename"]), true); + debuggerInterface()->showtqStatus(i18n("Error occurred: Line %1, Code %2 (%3) in %4").tqarg(args["line"]).tqarg(args["errnum"]).tqarg(args["errmsg"]).tqarg(args["filename"]), true); - // Filter to get error code only and match it with out mask + // Filter to get error code only and match it with out tqmask long error = args["errnum"].toLong(); - if(m_errormask & error) + if(m_errortqmask & error) setExecutionState(Pause); else if(m_executionState == Trace) setExecutionState(Trace); @@ -492,21 +492,21 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) else setExecutionState(Pause); - emit updateStatus(DebuggerUI::HaltedOnError); + emit updatetqStatus(DebuggerUI::HaltedOnError); } // We came across a hard coded breakpoint else if(m_command == "forcebreak") { setExecutionState(Pause); - emit updateStatus(DebuggerUI::HaltedOnBreakpoint); - debuggerInterface()->showStatus(i18n("Breakpoint reached"), true); + emit updatetqStatus(DebuggerUI::HaltedOnBreakpoint); + debuggerInterface()->showtqStatus(i18n("Breakpoint reached"), true); } // A conditional breakpoint was fulfilled else if(m_command == "conditionalbreak") { setExecutionState(Pause); - emit updateStatus(DebuggerUI::HaltedOnBreakpoint); - debuggerInterface()->showStatus(i18n("Conditional breakpoint fulfilled"), true); + emit updatetqStatus(DebuggerUI::HaltedOnBreakpoint); + debuggerInterface()->showtqStatus(i18n("Conditional breakpoint fulfilled"), true); } // There is a breakpoint set in this file/line else if(m_command == "removebreakpoint") @@ -516,7 +516,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) // We're about to debug a file.. else if(m_command == "initialize") { - debuggerInterface()->showStatus(i18n("Established connection to %1").arg(args["filename"]), false); + debuggerInterface()->showtqStatus(i18n("Established connection to %1").tqarg(args["filename"]), false); sendCommand("sendprotocolversion", (char*)0L); debuggerInterface()->setActiveLine(mapServerPathToLocal(args["filename"]), 0); @@ -549,7 +549,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) // Reached en of an include else if(m_command == "end") { - //debuggerInterface()->showStatus(i18n("At end of include %1").arg(data), true); + //debuggerInterface()->showtqStatus(i18n("At end of include %1").tqarg(data), true); return; } // Check protocol version @@ -557,7 +557,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) { if(args["version"] != protocolversion) { - debuggerInterface()->showStatus(i18n("The script being debugged does not communicate with the correct protocol version"), true); + debuggerInterface()->showtqStatus(i18n("The script being debugged does not communicate with the correct protocol version"), true); sendCommand("die", (char*)0L); } return; @@ -603,7 +603,7 @@ bool QuantaDebuggerGubed::sendCommand(const TQString& command, StringMap args) TQString buffer = phpSerialize(args); - buffer = TQString(command + ":%1;" + buffer).arg(buffer.length()); + buffer = TQString(command + ":%1;" + buffer).tqarg(buffer.length()); m_socket->writeBlock(buffer.ascii(), buffer.length()); return true; } @@ -768,15 +768,15 @@ void QuantaDebuggerGubed::fileOpened(const TQString&) // Watch a variable void QuantaDebuggerGubed::addWatch(const TQString &variable) { - if(m_watchlist.find(variable) == m_watchlist.end()) + if(m_watchlist.tqfind(variable) == m_watchlist.end()) m_watchlist.append(variable); sendCommand("getwatch", "variable", variable.ascii(), (char*)0L); } // Remove watch void QuantaDebuggerGubed::removeWatch(DebuggerVariable *variable) { - if(m_watchlist.find(variable->name()) != m_watchlist.end()) - m_watchlist.remove(m_watchlist.find(variable->name())); + if(m_watchlist.tqfind(variable->name()) != m_watchlist.end()) + m_watchlist.remove(m_watchlist.tqfind(variable->name())); //sendCommand("unwatchvariable", var->name()); } @@ -843,9 +843,9 @@ void QuantaDebuggerGubed::readConfig(TQDomNode node) valuenode = node.namedItem("displaydelay"); m_displaydelay = valuenode.firstChild().nodeValue().toLong(); - valuenode = node.namedItem("errormask"); - m_errormask = valuenode.firstChild().nodeValue().toLong(); - kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl; + valuenode = node.namedItem("errortqmask"); + m_errortqmask = valuenode.firstChild().nodeValue().toLong(); + kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl; } @@ -866,11 +866,11 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) set.lineStartSession->setText(m_startsession); set.comboDefaultExecutionState->setCurrentItem((int)m_defaultExecutionState); - set.checkBreakOnNotice->setChecked(QuantaDebuggerGubed::Notice & m_errormask); - set.checkBreakOnWarning->setChecked(QuantaDebuggerGubed::Warning & m_errormask); - set.checkBreakOnUserNotice->setChecked(QuantaDebuggerGubed::User_Notice & m_errormask); - set.checkBreakOnUserWarning->setChecked(QuantaDebuggerGubed::User_Warning & m_errormask); - set.checkBreakOnUserError->setChecked(QuantaDebuggerGubed::User_Error & m_errormask); + set.checkBreakOnNotice->setChecked(QuantaDebuggerGubed::Notice & m_errortqmask); + set.checkBreakOnWarning->setChecked(QuantaDebuggerGubed::Warning & m_errortqmask); + set.checkBreakOnUserNotice->setChecked(QuantaDebuggerGubed::User_Notice & m_errortqmask); + set.checkBreakOnUserWarning->setChecked(QuantaDebuggerGubed::User_Warning & m_errortqmask); + set.checkBreakOnUserError->setChecked(QuantaDebuggerGubed::User_Error & m_errortqmask); if(set.exec() == TQDialog::Accepted ) { @@ -878,7 +878,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("serverhost").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("serverhost"); node.appendChild( el ); m_serverHost = set.lineServerHost->text(); @@ -886,7 +886,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("serverport").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("serverport"); node.appendChild( el ); m_serverPort = set.lineServerPort->text(); @@ -894,7 +894,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("localbasedir").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("localbasedir"); node.appendChild( el ); m_localBasedir = set.lineLocalBasedir->text(); @@ -904,7 +904,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("serverbasedir").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("serverbasedir"); node.appendChild( el ); m_serverBasedir = set.lineServerBasedir->text(); @@ -914,7 +914,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("useproxy").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("useproxy"); node.appendChild( el ); m_useproxy = set.checkUseProxy->isChecked(); @@ -922,7 +922,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("listenport").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("listenport"); node.appendChild( el ); m_listenPort = set.lineServerListenPort->text(); @@ -930,7 +930,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("startsession").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("startsession"); node.appendChild( el ); m_startsession = set.lineStartSession->text(); @@ -938,7 +938,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("defaultexecutionstate").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("defaultexecutionstate"); node.appendChild( el ); m_defaultExecutionState = (State)set.comboDefaultExecutionState->currentItem(); @@ -947,24 +947,24 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("displaydelay").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("displaydelay"); node.appendChild( el ); m_displaydelay = set.sliderDisplayDelay->value(); el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_displaydelay))); - el = node.namedItem("errormask").toElement(); + el = node.namedItem("errortqmask").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); - el = node.ownerDocument().createElement("errormask"); + el.tqparentNode().removeChild(el); + el = node.ownerDocument().createElement("errortqmask"); node.appendChild( el ); - m_errormask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerGubed::Notice : 0) + m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerGubed::Notice : 0) + (set.checkBreakOnWarning->isChecked() ? QuantaDebuggerGubed::Warning : 0) + (set.checkBreakOnUserNotice->isChecked() ? QuantaDebuggerGubed::User_Notice : 0) + (set.checkBreakOnUserWarning->isChecked() ? QuantaDebuggerGubed::User_Warning : 0) + (set.checkBreakOnUserError->isChecked() ? QuantaDebuggerGubed::User_Error : 0); - kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl; - el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errormask))); + kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl; + el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errortqmask))); } } @@ -995,7 +995,7 @@ TQString QuantaDebuggerGubed::phpSerialize(StringMap args) { StringMap::Iterator it; // a:2:{s:4:"name";s:7:"Jessica";s:3:"age";s:2:"26";s:4:"test";i:1;} - TQString ret = TQString("a:%1:{").arg(args.size()); + TQString ret = TQString("a:%1:{").tqarg(args.size()); for( it = args.begin(); it != args.end(); ++it ) { bool isNumber; @@ -1003,15 +1003,15 @@ TQString QuantaDebuggerGubed::phpSerialize(StringMap args) it.data().toInt(&isNumber); if(isNumber && !it.data().isEmpty()) ret += TQString("s:%1:\"%2\";i:%3;") - .arg(it.key().length()) - .arg(it.key()) - .arg(it.data()); + .tqarg(it.key().length()) + .tqarg(it.key()) + .tqarg(it.data()); else ret += TQString("s:%1:\"%2\";s:%3:\"%4\";") - .arg(it.key().length()) - .arg(it.key()) - .arg(it.data().length()) - .arg(it.data()); + .tqarg(it.key().length()) + .tqarg(it.key()) + .tqarg(it.data().length()) + .tqarg(it.data()); } @@ -1038,13 +1038,13 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args) return ca; } - cnt = args.mid(2, args.find("{") - 3).toLong(); - TQString data = args.mid(args.find("{") + 1); + cnt = args.mid(2, args.tqfind("{") - 3).toLong(); + TQString data = args.mid(args.tqfind("{") + 1); TQString tmp, func; while(cnt > 0) { - tmp = data.left(data.find("\"")); + tmp = data.left(data.tqfind("\"")); length = tmp.mid(2, tmp.length() - 3).toLong(); func = data.mid(tmp.length() + 1, length); @@ -1053,8 +1053,8 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args) if(data.left(1) == "i") { // Integer data - tmp = data.mid(data.find(":") + 1); - tmp = tmp.left(tmp.find(";")); + tmp = data.mid(data.tqfind(":") + 1); + tmp = tmp.left(tmp.tqfind(";")); ca[func] = tmp; data = data.mid(tmp.length() + 3); // kdDebug(24002) << k_funcinfo << "**i " << func << ": " << ca[func] << endl; @@ -1062,7 +1062,7 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args) else { // String data - tmp = data.left(data.find("\"")); + tmp = data.left(data.tqfind("\"")); length = tmp.mid(2, tmp.length() - 3).toLong(); ca[func] = data.mid(tmp.length() + 1, length); @@ -1098,8 +1098,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) if(type == "s") { // Get length of key - tempstring = str.left(str.find(':')); - str.remove(0, str.find(':') + 1); + tempstring = str.left(str.tqfind(':')); + str.remove(0, str.tqfind(':') + 1); length = tempstring.toUInt(); key = str.left(length + 1); @@ -1108,8 +1108,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) } else if(type == "i") { - key = str.left(str.find(';')); - str.remove(0, str.find(';') + 1); + key = str.left(str.tqfind(';')); + str.remove(0, str.tqfind(';') + 1); } @@ -1122,8 +1122,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) /* Example: s:4:"$row";i:6; */ - data = str.left(str.find(';')); - str.remove(0, str.find(';') + 1); + data = str.left(str.tqfind(';')); + str.remove(0, str.tqfind(';') + 1); debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Integer); } @@ -1132,9 +1132,9 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) /* Example: s:8:"$boolvar";b:1; */ - data = str.left(str.find(';')); + data = str.left(str.tqfind(';')); data = (data == "0" ? i18n("False"): i18n("True")); - str.remove(0, str.find(';') + 1); + str.remove(0, str.tqfind(';') + 1); debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Boolean); } else if(type == "N") @@ -1151,8 +1151,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) */ // Get length of string - tempstring = str.left(str.find(':')); - str.remove(0, str.find(':') + 1); + tempstring = str.left(str.tqfind(':')); + str.remove(0, str.tqfind(':') + 1); length = tempstring.toUInt(); data = str.left(length + 1); @@ -1168,8 +1168,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) */ // Get length of array - tempstring = str.left(str.find(':')); - str.remove(0, str.find(':') + 2); + tempstring = str.left(str.tqfind(':')); + str.remove(0, str.tqfind(':') + 2); length = tempstring.toUInt(); TQPtrList<DebuggerVariable> vars ; @@ -1193,13 +1193,13 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) */ // Get length of array - tempstring = str.left(str.find(':')); - str.remove(0, str.find(':') + 2); - tempstring = str.mid(str.find(':') + 1); - tempstring = tempstring.left(tempstring.find(':')); + tempstring = str.left(str.tqfind(':')); + str.remove(0, str.tqfind(':') + 2); + tempstring = str.mid(str.tqfind(':') + 1); + tempstring = tempstring.left(tempstring.tqfind(':')); length = tempstring.toUInt(); - str.remove(0, str.find('{') + 1); + str.remove(0, str.tqfind('{') + 1); TQPtrList<DebuggerVariable> vars ; while(length > 0) @@ -1220,8 +1220,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) /* Example: s:9:"$floatvar";d:12.5600000000000004973799150320701301097869873046875;" */ - data = str.left(str.find(';')); - str.remove(0, str.find(';') + 1); + data = str.left(str.tqfind(';')); + str.remove(0, str.tqfind(';') + 1); debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Float); } diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.h b/quanta/components/debugger/gubed/quantadebuggergubed.h index 624a8ae8..b30bbe5c 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.h +++ b/quanta/components/debugger/gubed/quantadebuggergubed.h @@ -31,9 +31,10 @@ typedef TQMap<TQString, TQString> StringMap; class QuantaDebuggerGubed : public DebuggerClient { Q_OBJECT + TQ_OBJECT public: - QuantaDebuggerGubed(TQObject *parent, const char* name, const TQStringList&); + QuantaDebuggerGubed(TQObject *tqparent, const char* name, const TQStringList&); ~QuantaDebuggerGubed(); // Execution states @@ -109,7 +110,7 @@ class QuantaDebuggerGubed : public DebuggerClient TQString m_listenPort; bool m_useproxy; State m_executionState, m_defaultExecutionState; - long m_errormask; + long m_errortqmask; long m_displaydelay; WatchList m_watchlist; @@ -147,7 +148,7 @@ class QuantaDebuggerGubed : public DebuggerClient void slotReadyAccept(); signals: - void updateStatus(DebuggerUI::DebuggerStatus); + void updatetqStatus(DebuggerUI::DebuggertqStatus); }; #endif diff --git a/quanta/components/debugger/interfaces/debuggerclient.cpp b/quanta/components/debugger/interfaces/debuggerclient.cpp index 97140dbb..03b024f0 100644 --- a/quanta/components/debugger/interfaces/debuggerclient.cpp +++ b/quanta/components/debugger/interfaces/debuggerclient.cpp @@ -23,8 +23,8 @@ // CTor -DebuggerClient::DebuggerClient(TQObject *parent, const char* name) - : TQObject(parent, name) +DebuggerClient::DebuggerClient(TQObject *tqparent, const char* name) + : TQObject(tqparent, name) { m_active = false; } @@ -32,7 +32,7 @@ DebuggerClient::DebuggerClient(TQObject *parent, const char* name) DebuggerInterface* DebuggerClient::debuggerInterface() { - return static_cast<DebuggerInterface*>( parent()->child( 0, "DebuggerInterface" ) ); + return static_cast<DebuggerInterface*>( tqparent()->child( 0, "DebuggerInterface" ) ); } // Active state of session @@ -43,7 +43,7 @@ bool DebuggerClient::isActive() void DebuggerClient::unSupportedAction(const TQString &action) { - KMessageBox::error(NULL, i18n("The current debugger, %1, does not support the \"%2\" instruction.").arg(this->getName()).arg(action), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("The current debugger, %1, does not support the \"%2\" instruction.").tqarg(this->getName()).tqarg(action), i18n("Unsupported Debugger Function")); } @@ -129,7 +129,7 @@ void DebuggerClient::removeBreakpoint(DebuggerBreakpoint*) // Unimplemented defaults void DebuggerClient::showConfig(TQDomNode) { - KMessageBox::error(NULL, i18n("%1 does not have any specific settings.").arg(this->getName()), i18n("Settings")); + KMessageBox::error(NULL, i18n("%1 does not have any specific settings.").tqarg(this->getName()), i18n("Settings")); } // Unimplemented defaults @@ -141,20 +141,20 @@ void DebuggerClient::readConfig(TQDomNode) // Unimplemented defaults: add watch void DebuggerClient::addWatch(const TQString &) { - KMessageBox::error(NULL, i18n("%1 does not support watches.").arg(this->getName()), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("%1 does not support watches.").tqarg(this->getName()), i18n("Unsupported Debugger Function")); } // Unimplemented defaults: Remove watch void DebuggerClient::removeWatch(DebuggerVariable *) { // Giving an error seems pointless, since you shouldnt be able to add a watch in the first place... - KMessageBox::error(NULL, i18n("%1 does not support watches.").arg(this->getName()), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("%1 does not support watches.").tqarg(this->getName()), i18n("Unsupported Debugger Function")); } // Unimplemented defaults: set value of varialbe void DebuggerClient::variableSetValue(const DebuggerVariable &) { - KMessageBox::error(NULL, i18n("%1 does not support setting the value of variables.").arg(this->getName()), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("%1 does not support setting the value of variables.").tqarg(this->getName()), i18n("Unsupported Debugger Function")); } #include "debuggerclient.moc" diff --git a/quanta/components/debugger/interfaces/debuggerclient.h b/quanta/components/debugger/interfaces/debuggerclient.h index 1966039f..20d5b604 100644 --- a/quanta/components/debugger/interfaces/debuggerclient.h +++ b/quanta/components/debugger/interfaces/debuggerclient.h @@ -60,13 +60,14 @@ namespace DebuggerClientCapabilities }; } -class DebuggerClient : public QObject +class DebuggerClient : public TQObject { Q_OBJECT + TQ_OBJECT private: protected: - DebuggerClient(TQObject *parent, const char* name); + DebuggerClient(TQObject *tqparent, const char* name); bool m_active; @@ -108,7 +109,7 @@ class DebuggerClient : public QObject DebuggerInterface *debuggerInterface(); signals: - void updateStatus(DebuggerUI::DebuggerStatus); + void updatetqStatus(DebuggerUI::DebuggertqStatus); }; diff --git a/quanta/components/debugger/interfaces/debuggerinterface.cpp b/quanta/components/debugger/interfaces/debuggerinterface.cpp index 4d7beda6..013aeb15 100644 --- a/quanta/components/debugger/interfaces/debuggerinterface.cpp +++ b/quanta/components/debugger/interfaces/debuggerinterface.cpp @@ -17,8 +17,8 @@ #include "debuggerinterface.h" -DebuggerInterface::DebuggerInterface (TQObject *parent, const char* name) - : TQObject(parent, name) +DebuggerInterface::DebuggerInterface (TQObject *tqparent, const char* name) + : TQObject(tqparent, name) { } diff --git a/quanta/components/debugger/interfaces/debuggerinterface.h b/quanta/components/debugger/interfaces/debuggerinterface.h index 1540a616..a93fee50 100644 --- a/quanta/components/debugger/interfaces/debuggerinterface.h +++ b/quanta/components/debugger/interfaces/debuggerinterface.h @@ -28,22 +28,23 @@ class PathMapper; -class DebuggerInterface : public QObject +class DebuggerInterface : public TQObject { Q_OBJECT + TQ_OBJECT private: public: - DebuggerInterface(TQObject *parent, const char* name); + DebuggerInterface(TQObject *tqparent, const char* name); // Breakpoints virtual void haveBreakpoint (const TQString& file, int line) = 0; virtual void havenoBreakpoint (const TQString& file, int line) = 0; // Public help functions - virtual bool showStatus(const TQString& message, bool log) = 0; + virtual bool showtqStatus(const TQString& message, bool log) = 0; virtual bool setActiveLine (const TQString& file, int line) = 0; virtual void enableAction(const TQString& action, bool enable) = 0; diff --git a/quanta/components/debugger/pathmapper.cpp b/quanta/components/debugger/pathmapper.cpp index c38e2fec..e1d74875 100644 --- a/quanta/components/debugger/pathmapper.cpp +++ b/quanta/components/debugger/pathmapper.cpp @@ -27,8 +27,8 @@ #include <qextfileinfo.h> #include <tqdom.h> -PathMapper::PathMapper(TQObject *parent, const char *name) - : TQObject(parent, name) +PathMapper::PathMapper(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { } @@ -43,7 +43,7 @@ TQString PathMapper::translate(const TQString & path, const TQString & from, con TQString translated = path; // Check if this dir is matched by the maps - if(path.startsWith(from, false)) + if(path.tqstartsWith(from, false)) { translated.remove(0, from.length()); translated = to + translated; @@ -110,21 +110,21 @@ TQString PathMapper::mapServerPathToLocal(const TQString &serverpath) newpath = translate(serverpath, m_serverBasedir, m_localBasedir); // Check if this dir is matched by the basedirs - if(QExtFileInfo::exists(newpath, true, 0L)) + if(TQExtFileInfo::exists(newpath, true, 0L)) return newpath; // Check if any previous mappings fit... for (unsigned int cnt = 0; cnt < m_serverlist.count(); cnt++ ) { newpath = translate(serverpath, m_serverlist[cnt], m_locallist[cnt]); - if(QExtFileInfo::exists(newpath, true, 0L)) + if(TQExtFileInfo::exists(newpath, true, 0L)) return newpath; } // If the basedirs didnt match, check if the file exists, // otherwise scan through the mapping history or show the // mapping dialog - if(!QExtFileInfo::exists(serverpath, true, 0L)) + if(!TQExtFileInfo::exists(serverpath, true, 0L)) { PathMapperDialog pmdlg(serverpath, PathMapperDialog::ServerToLocal); for (unsigned int cnt = 0; cnt < m_serverlist.count(); cnt++ ) diff --git a/quanta/components/debugger/pathmapper.h b/quanta/components/debugger/pathmapper.h index fd48e3ab..92a761ac 100644 --- a/quanta/components/debugger/pathmapper.h +++ b/quanta/components/debugger/pathmapper.h @@ -25,12 +25,13 @@ class KURL; -class PathMapper : public QObject +class PathMapper : public TQObject { Q_OBJECT + TQ_OBJECT public: - PathMapper(TQObject *parent = 0, const char *name = 0); + PathMapper(TQObject *tqparent = 0, const char *name = 0); PathMapper(); virtual TQString mapLocalPathToServer(const TQString &localpath); virtual TQString mapServerPathToLocal(const TQString &serverpath); diff --git a/quanta/components/debugger/pathmapperdialog.cpp b/quanta/components/debugger/pathmapperdialog.cpp index 74e01956..8cc385d5 100644 --- a/quanta/components/debugger/pathmapperdialog.cpp +++ b/quanta/components/debugger/pathmapperdialog.cpp @@ -69,7 +69,7 @@ void PathMapperDialog::slotPathsChanged() translated = m_path; // Check if this dir is matched by the maps - if(m_path.startsWith(from, false)) + if(m_path.tqstartsWith(from, false)) { translated.remove(0, from.length()); translated = to + translated; @@ -78,10 +78,10 @@ void PathMapperDialog::slotPathsChanged() // Indicate wether local file exists if(m_direction == ServerToLocal) { - if(QExtFileInfo::exists(translated, true, this)) - ledTranslationExists->setColor(Qt::green); + if(TQExtFileInfo::exists(translated, true, this)) + ledTranslationExists->setColor(TQt::green); else - ledTranslationExists->setColor(Qt::red); + ledTranslationExists->setColor(TQt::red); ledTranslationExists->on(); } diff --git a/quanta/components/debugger/pathmapperdialog.h b/quanta/components/debugger/pathmapperdialog.h index 39eb4600..e8d6b8c4 100644 --- a/quanta/components/debugger/pathmapperdialog.h +++ b/quanta/components/debugger/pathmapperdialog.h @@ -22,6 +22,7 @@ class PathMapperDialog : public PathMapperDialogS { Q_OBJECT + TQ_OBJECT public: enum Direction diff --git a/quanta/components/debugger/pathmapperdialogs.ui b/quanta/components/debugger/pathmapperdialogs.ui index fc7486d4..933d003a 100644 --- a/quanta/components/debugger/pathmapperdialogs.ui +++ b/quanta/components/debugger/pathmapperdialogs.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>PathMapperDialogS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>PathMapperDialogS</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblDebuggerLocalBasedir</cstring> </property> @@ -49,7 +49,7 @@ <string>Local basedir:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblDebuggerServerBasedir</cstring> </property> @@ -65,7 +65,7 @@ <string>Server basedir:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lineLocalPath</cstring> </property> @@ -74,7 +74,7 @@ The quanta will know that files starting with "/home/user/project/" on the local computer, will start with "/var/www/" on the remote computer.</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lineServerPath</cstring> </property> @@ -85,7 +85,7 @@ The quanta will know that files starting with "/home/user/project/" on the local </widget> </grid> </widget> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -109,14 +109,14 @@ The quanta will know that files starting with "/home/user/project/" on the local <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -133,7 +133,7 @@ The quanta will know that files starting with "/home/user/project/" on the local <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -149,7 +149,7 @@ The quanta will know that files starting with "/home/user/project/" on the local </widget> </hbox> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>groupBox7</cstring> </property> @@ -160,7 +160,7 @@ The quanta will know that files starting with "/home/user/project/" on the local <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Local Directory</string> @@ -204,7 +204,7 @@ The quanta will know that files starting with "/home/user/project/" on the local </widget> </hbox> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox8</cstring> </property> @@ -215,7 +215,7 @@ The quanta will know that files starting with "/home/user/project/" on the local <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblTranslates</cstring> </property> @@ -231,7 +231,7 @@ The quanta will know that files starting with "/home/user/project/" on the local <string>Translates to:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblOriginal</cstring> </property> @@ -251,13 +251,13 @@ The quanta will know that files starting with "/home/user/project/" on the local <property name="name"> <cstring>ledTranslationExists</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>22</width> <height>22</height> @@ -279,7 +279,7 @@ The quanta will know that files starting with "/home/user/project/" on the local <string>This indicator tells you whether the translated path exists on local disk or not.</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lineTranslated</cstring> </property> @@ -297,7 +297,7 @@ The quanta will know that files starting with "/home/user/project/" on the local <string>This field shows what the "original path" above will look like after translation.</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>linePath</cstring> </property> @@ -335,10 +335,10 @@ The quanta will know that files starting with "/home/user/project/" on the local <slot>reject()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>slotHistoryclicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kled.h</includehint> </includehints> diff --git a/quanta/components/debugger/quantadebuggerinterface.cpp b/quanta/components/debugger/quantadebuggerinterface.cpp index af70da0a..be930d17 100644 --- a/quanta/components/debugger/quantadebuggerinterface.cpp +++ b/quanta/components/debugger/quantadebuggerinterface.cpp @@ -32,10 +32,10 @@ class DebuggerBreakpoint; -QuantaDebuggerInterface::QuantaDebuggerInterface (TQObject *myparent, const char* name) - : DebuggerInterface(myparent, name) +QuantaDebuggerInterface::QuantaDebuggerInterface (TQObject *mytqparent, const char* name) + : DebuggerInterface(mytqparent, name) { - m_manager = static_cast<DebuggerManager*>(parent()); + m_manager = static_cast<DebuggerManager*>(tqparent()); } QuantaDebuggerInterface::~QuantaDebuggerInterface () @@ -52,9 +52,9 @@ void QuantaDebuggerInterface::havenoBreakpoint (const TQString& file, int line) } // Public help functions -bool QuantaDebuggerInterface::showStatus(const TQString& message, bool log) +bool QuantaDebuggerInterface::showtqStatus(const TQString& message, bool log) { - return m_manager->showStatus(message, log); + return m_manager->showtqStatus(message, log); } bool QuantaDebuggerInterface::setActiveLine(const TQString& file, int line) @@ -86,20 +86,20 @@ const TQString QuantaDebuggerInterface::activeFileParts(const TQString & str) // n/d/p = name/dir/path // Filename, filedir and filepath - newstr.replace("%afn", ViewManager::ref()->activeDocument()->url().fileName()); - newstr.replace("%afd", ViewManager::ref()->activeDocument()->url().directory()); - newstr.replace("%afp", ViewManager::ref()->activeDocument()->url().path()); + newstr.tqreplace("%afn", ViewManager::ref()->activeDocument()->url().fileName()); + newstr.tqreplace("%afd", ViewManager::ref()->activeDocument()->url().directory()); + newstr.tqreplace("%afp", ViewManager::ref()->activeDocument()->url().path()); // filedir and filepath relative to project root - newstr.replace("%rfpp", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().path())); - newstr.replace("%rfpd", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().directory())); + newstr.tqreplace("%rfpp", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().path())); + newstr.tqreplace("%rfpd", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().directory())); // filedir and filepath relative to document root - newstr.replace("%rfdp", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().path())); - newstr.replace("%rfdd", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().directory())); + newstr.tqreplace("%rfdp", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().path())); + newstr.tqreplace("%rfdd", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().directory())); - newstr.replace("%apd", Project::ref()->projectBaseURL().path()); - newstr.replace("%add", Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory()); + newstr.tqreplace("%apd", Project::ref()->projectBaseURL().path()); + newstr.tqreplace("%add", Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory()); kdDebug(24002) << k_funcinfo << ", BaseURL " << Project::ref()->projectBaseURL().path() << ", active doc : " << ViewManager::ref()->activeDocument()->url().path() << ", documentFolderForURL" << Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()) << ", newstr" << newstr << endl; diff --git a/quanta/components/debugger/quantadebuggerinterface.h b/quanta/components/debugger/quantadebuggerinterface.h index d18fd1cd..ba637307 100644 --- a/quanta/components/debugger/quantadebuggerinterface.h +++ b/quanta/components/debugger/quantadebuggerinterface.h @@ -28,12 +28,13 @@ class DebuggerManager; class QuantaDebuggerInterface : public DebuggerInterface { Q_OBJECT + TQ_OBJECT private: DebuggerManager *m_manager; public: - QuantaDebuggerInterface(TQObject *myparent, const char* name); + QuantaDebuggerInterface(TQObject *mytqparent, const char* name); ~QuantaDebuggerInterface(); // Breakpoints @@ -42,7 +43,7 @@ class QuantaDebuggerInterface : public DebuggerInterface void refreshBreakpoints(); // Public help functions - bool showStatus(const TQString& message, bool log); + bool showtqStatus(const TQString& message, bool log); bool setActiveLine (const TQString& file, int line) ; void enableAction(const TQString& action, bool enable); diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp index 03ddd7d3..9c7263bb 100644 --- a/quanta/components/debugger/variableslistview.cpp +++ b/quanta/components/debugger/variableslistview.cpp @@ -39,7 +39,7 @@ namespace VariablesListViewColumns enum Columns { Name = 0, - Status, + tqStatus, Value, Type, Size @@ -47,12 +47,12 @@ namespace VariablesListViewColumns }; } -VariablesListView::VariablesListView(TQWidget *parent, const char *name) - : KListView(parent, name) +VariablesListView::VariablesListView(TQWidget *tqparent, const char *name) + : KListView(tqparent, name) { // If you change here, change the VariablesListViewColumns enums above addColumn(i18n("Name")); - addColumn(TQString::null); + addColumn(TQString()); addColumn(i18n("Value")); addColumn(i18n("Type")); addColumn(i18n("Size")); @@ -106,7 +106,7 @@ void VariablesListView::slotRemoveSelected() void VariablesListView::keyPressEvent(TQKeyEvent *e) { - if(e->key() != Qt::Key_Delete) + if(e->key() != TQt::Key_Delete) { e->ignore(); return; @@ -160,7 +160,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab { KListViewItem * item; - // Remove children that doesen't exist anymore + // Remove tqchildren that doesen't exist anymore TQPtrList<DebuggerVariable> oldlist = oldvar->values(); for(DebuggerVariable* oldchild = oldlist.last(); oldchild; oldchild = oldlist.prev()) { @@ -178,7 +178,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab oldvar->deleteChild(oldchild); } - // Update and add children + // Update and add tqchildren TQPtrList<DebuggerVariable> newlist = newvar->values(); for(DebuggerVariable* newchild = newlist.last(); newchild; newchild = newlist.prev()) { @@ -206,9 +206,9 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab item = oldvar->item(); if(oldvar->value() != newvar->value()) - item->setPixmap(VariablesListViewColumns::Status, SmallIcon("ok")); + item->setPixmap(VariablesListViewColumns::tqStatus, SmallIcon("ok")); else - item->setPixmap(VariablesListViewColumns::Status, KPixmap()); + item->setPixmap(VariablesListViewColumns::tqStatus, KPixmap()); oldvar->copy(newvar, false); @@ -274,7 +274,7 @@ void VariablesListView::slotVariableDump( ) if(!v) return; - quantaApp->messageOutput()->showMessage(i18n("Contents of variable %1:\n>>>\n").arg(v->name())); + quantaApp->messageOutput()->showMessage(i18n("Contents of variable %1:\n>>>\n").tqarg(v->name())); quantaApp->messageOutput()->showMessage(v->value()); quantaApp->messageOutput()->showMessage("<<<\n"); } @@ -284,7 +284,7 @@ void VariablesListView::slotVariableCopyToClipboard( ) DebuggerVariable *v = selected(true); if(!v) return; - TQApplication::clipboard()->setText(v->value()); + TQApplication::tqclipboard()->setText(v->value()); } #include "variableslistview.moc" diff --git a/quanta/components/debugger/variableslistview.h b/quanta/components/debugger/variableslistview.h index 729aa8d8..b4f3d9bc 100644 --- a/quanta/components/debugger/variableslistview.h +++ b/quanta/components/debugger/variableslistview.h @@ -28,6 +28,7 @@ class DebuggerVariable; class VariablesListView : public KListView { Q_OBJECT + TQ_OBJECT enum menuitems { @@ -38,7 +39,7 @@ class VariablesListView : public KListView }; public: - VariablesListView(TQWidget *parent = 0, const char *name = 0); + VariablesListView(TQWidget *tqparent = 0, const char *name = 0); ~VariablesListView(); void addVariable(DebuggerVariable* variable); |