diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
commit | 48d4a26399959121f33d2bc3bfe51c7827b654fc (patch) | |
tree | 5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /buildtools/lib/widgets | |
parent | 7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff) | |
download | tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip |
TQt4 port kdevelop
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'buildtools/lib/widgets')
23 files changed, 129 insertions, 121 deletions
diff --git a/buildtools/lib/widgets/addenvvardlg.cpp b/buildtools/lib/widgets/addenvvardlg.cpp index 89d7f655..333cf78d 100644 --- a/buildtools/lib/widgets/addenvvardlg.cpp +++ b/buildtools/lib/widgets/addenvvardlg.cpp @@ -28,8 +28,8 @@ #include "addenvvardlg.h" -AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) - : TQDialog(parent, name, true) +AddEnvvarDialog::AddEnvvarDialog(TQWidget *tqparent, const char *name) + : TQDialog(tqparent, name, true) { setCaption(i18n("Add Environment Variable")); @@ -47,10 +47,10 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) connect( value_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); - TQVBoxLayout *layout = new TQVBoxLayout(this, 10); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10); TQGridLayout *grid = new TQGridLayout(2, 2); - layout->addLayout(grid); + tqlayout->addLayout(grid); grid->addWidget(varname_label, 0, 0); grid->addWidget(varname_edit, 0, 1); grid->addWidget(value_label, 1, 0); @@ -58,7 +58,7 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) TQFrame *frame = new TQFrame(this); frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); - layout->addWidget(frame, 0); + tqlayout->addWidget(frame, 0); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); @@ -67,8 +67,8 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) m_pOk->setDefault(true); connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); - buttonbox->layout(); - layout->addWidget(buttonbox, 0); + buttonbox->tqlayout(); + tqlayout->addWidget(buttonbox, 0); slotTextChanged(); } diff --git a/buildtools/lib/widgets/addenvvardlg.h b/buildtools/lib/widgets/addenvvardlg.h index 9f072cfb..af2abf54 100644 --- a/buildtools/lib/widgets/addenvvardlg.h +++ b/buildtools/lib/widgets/addenvvardlg.h @@ -27,12 +27,13 @@ class TQPushButton; /** Dialog to add environment variables. */ -class AddEnvvarDialog : public QDialog +class AddEnvvarDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - AddEnvvarDialog( TQWidget *parent=0, const char *name=0 ); + AddEnvvarDialog( TQWidget *tqparent=0, const char *name=0 ); ~AddEnvvarDialog(); TQString varname() const diff --git a/buildtools/lib/widgets/addfilesdialog.cpp b/buildtools/lib/widgets/addfilesdialog.cpp index f5a1fa92..d7489a56 100644 --- a/buildtools/lib/widgets/addfilesdialog.cpp +++ b/buildtools/lib/widgets/addfilesdialog.cpp @@ -25,8 +25,8 @@ #include "addfilesdialog.moc" AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, - TQWidget *parent, const char *name, bool modal): - KFileDialog(startDir, filter, parent, name, modal) + TQWidget *tqparent, const char *name, bool modal): + KFileDialog(startDir, filter, tqparent, name, modal) { KConfig *config = kapp->config(); config->setGroup("Add Files Dialog"); @@ -45,8 +45,8 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, - TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget): - KFileDialog(startDir, filter, parent, name, modal, extraWidget), m_extraWidget(extraWidget) + TQWidget *tqparent, const char *name, bool modal, TQComboBox *extraWidget): + KFileDialog(startDir, filter, tqparent, name, modal, extraWidget), m_extraWidget(extraWidget) { KConfig *config = kapp->config(); config->setGroup("Add Files Dialog"); diff --git a/buildtools/lib/widgets/addfilesdialog.h b/buildtools/lib/widgets/addfilesdialog.h index c66532e5..c81abd23 100644 --- a/buildtools/lib/widgets/addfilesdialog.h +++ b/buildtools/lib/widgets/addfilesdialog.h @@ -34,14 +34,15 @@ with the relative path (e.g. ../../dir/filename) class AddFilesDialog : public KFileDialog { Q_OBJECT + TQ_OBJECT public: enum Mode { Copy, Link, Relative }; AddFilesDialog(const TQString& startDir, const TQString& filter, - TQWidget *parent, const char *name, bool modal); + TQWidget *tqparent, const char *name, bool modal); AddFilesDialog(const TQString& startDir, const TQString& filter, - TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget); + TQWidget *tqparent, const char *name, bool modal, TQComboBox *extraWidget); virtual ~AddFilesDialog(); diff --git a/buildtools/lib/widgets/environmentdisplaydialog.cpp b/buildtools/lib/widgets/environmentdisplaydialog.cpp index 1a809459..f23d7602 100644 --- a/buildtools/lib/widgets/environmentdisplaydialog.cpp +++ b/buildtools/lib/widgets/environmentdisplaydialog.cpp @@ -25,8 +25,8 @@ extern char **environ; -EnvironmentDisplayDialog::EnvironmentDisplayDialog(TQWidget* parent, const char* name, bool modal, WFlags fl) -: EnvironmentDisplayDialogBase(parent,name, modal,fl) +EnvironmentDisplayDialog::EnvironmentDisplayDialog(TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: EnvironmentDisplayDialogBase(tqparent,name, modal,fl) { TQStringList environment; char ** e = ::environ; diff --git a/buildtools/lib/widgets/environmentdisplaydialog.h b/buildtools/lib/widgets/environmentdisplaydialog.h index 3458ba78..0e0ce5a3 100644 --- a/buildtools/lib/widgets/environmentdisplaydialog.h +++ b/buildtools/lib/widgets/environmentdisplaydialog.h @@ -26,9 +26,10 @@ class EnvironmentDisplayDialog : public EnvironmentDisplayDialogBase { Q_OBJECT + TQ_OBJECT public: - EnvironmentDisplayDialog(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + EnvironmentDisplayDialog(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); }; #endif diff --git a/buildtools/lib/widgets/environmentdisplaydialogbase.ui b/buildtools/lib/widgets/environmentdisplaydialogbase.ui index 8b41862f..41d8d4e6 100644 --- a/buildtools/lib/widgets/environmentdisplaydialogbase.ui +++ b/buildtools/lib/widgets/environmentdisplaydialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>EnvironmentDisplayDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>EnvironmentDisplayDialogBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -59,9 +59,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -77,14 +77,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>321</width> <height>21</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>closeButton</cstring> </property> @@ -104,7 +104,7 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/buildtools/lib/widgets/environmentvariableswidget.cpp b/buildtools/lib/widgets/environmentvariableswidget.cpp index 3c3e448f..2e2be1f3 100644 --- a/buildtools/lib/widgets/environmentvariableswidget.cpp +++ b/buildtools/lib/widgets/environmentvariableswidget.cpp @@ -67,8 +67,8 @@ void EnvironmentVariablesWidget::removeVarClicked() EnvironmentVariablesWidget::EnvironmentVariablesWidget(TQDomDocument &dom, const TQString &configGroup, - TQWidget *parent, const char *name) - : EnvironmentVariablesWidgetBase(parent, name), + TQWidget *tqparent, const char *name) + : EnvironmentVariablesWidgetBase(tqparent, name), m_dom(dom), m_configGroup(configGroup) { readEnvironment(dom, configGroup); diff --git a/buildtools/lib/widgets/environmentvariableswidget.h b/buildtools/lib/widgets/environmentvariableswidget.h index f2c00b52..c70aa81f 100644 --- a/buildtools/lib/widgets/environmentvariableswidget.h +++ b/buildtools/lib/widgets/environmentvariableswidget.h @@ -31,10 +31,11 @@ Environment variables widget. class EnvironmentVariablesWidget : public EnvironmentVariablesWidgetBase { Q_OBJECT + TQ_OBJECT public: EnvironmentVariablesWidget( TQDomDocument &dom, const TQString &configGroup, - TQWidget *parent=0, const char *name=0 ); + TQWidget *tqparent=0, const char *name=0 ); ~EnvironmentVariablesWidget(); /// read in a set of environment variables from the DOM document diff --git a/buildtools/lib/widgets/environmentvariableswidgetbase.ui b/buildtools/lib/widgets/environmentvariableswidgetbase.ui index d16cc613..9c8f9077 100644 --- a/buildtools/lib/widgets/environmentvariableswidgetbase.ui +++ b/buildtools/lib/widgets/environmentvariableswidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>EnvironmentVariablesWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EnvironmentVariablesWidgetBase</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QListView" row="0" column="0" rowspan="6" colspan="1"> + <widget class="TQListView" row="0" column="0" rowspan="6" colspan="1"> <column> <property name="text"> <string>Name</string> @@ -63,7 +63,7 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>removevar_button</cstring> </property> @@ -79,7 +79,7 @@ <string>&Remove</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>editvar_button</cstring> </property> @@ -95,7 +95,7 @@ <string>&Edit</string> </property> </widget> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>addvar_button</cstring> </property> @@ -121,14 +121,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> </size> </property> </spacer> - <widget class="QPushButton" row="4" column="1"> + <widget class="TQPushButton" row="4" column="1"> <property name="name"> <cstring>environmentButton</cstring> </property> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>171</height> @@ -189,12 +189,12 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot>addVarClicked()</slot> <slot>removeVarClicked()</slot> <slot>editVarClicked()</slot> <slot>environmentClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/lib/widgets/envvartools.cpp b/buildtools/lib/widgets/envvartools.cpp index 71c44377..7c3a115f 100644 --- a/buildtools/lib/widgets/envvartools.cpp +++ b/buildtools/lib/widgets/envvartools.cpp @@ -23,7 +23,7 @@ TQString EnvVarTools::quote( const TQString & arg ) { TQString res = arg; - res.replace(TQRegExp(TQString::fromLatin1("'")), TQString::fromLatin1("'\\''")); + res.tqreplace(TQRegExp(TQString::tqfromLatin1("'")), TQString::tqfromLatin1("'\\''")); res.prepend("\""); res.append("\""); return res; diff --git a/buildtools/lib/widgets/makeoptionswidget.cpp b/buildtools/lib/widgets/makeoptionswidget.cpp index ef901cc8..2058152e 100644 --- a/buildtools/lib/widgets/makeoptionswidget.cpp +++ b/buildtools/lib/widgets/makeoptionswidget.cpp @@ -29,8 +29,8 @@ #include "environmentvariableswidget.h" MakeOptionsWidget::MakeOptionsWidget(TQDomDocument &dom, const TQString &configGroup, - TQWidget *parent, const char *name) - : MakeOptionsWidgetBase(parent, name), + TQWidget *tqparent, const char *name) + : MakeOptionsWidgetBase(tqparent, name), m_dom(dom), m_configGroup(configGroup) { env_var_group->setColumnLayout( 1, Qt::Vertical ); diff --git a/buildtools/lib/widgets/makeoptionswidget.h b/buildtools/lib/widgets/makeoptionswidget.h index 0cd962c3..14635b49 100644 --- a/buildtools/lib/widgets/makeoptionswidget.h +++ b/buildtools/lib/widgets/makeoptionswidget.h @@ -32,10 +32,11 @@ Make options widget. class MakeOptionsWidget : public MakeOptionsWidgetBase { Q_OBJECT + TQ_OBJECT public: MakeOptionsWidget( TQDomDocument &dom, const TQString &configGroup, - TQWidget *parent=0, const char *name=0 ); + TQWidget *tqparent=0, const char *name=0 ); ~MakeOptionsWidget(); public slots: diff --git a/buildtools/lib/widgets/makeoptionswidgetbase.ui b/buildtools/lib/widgets/makeoptionswidgetbase.ui index 4bddebd1..91e77362 100644 --- a/buildtools/lib/widgets/makeoptionswidgetbase.ui +++ b/buildtools/lib/widgets/makeoptionswidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MakeOptionsWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>make_options_widget</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="6"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>abort_box</cstring> </property> @@ -27,7 +27,7 @@ <string>&Abort on first error</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="6"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>dontact_box</cstring> </property> @@ -35,7 +35,7 @@ <string>Onl&y display commands without actually executing them</string> </property> </widget> - <widget class="QGroupBox" row="6" column="0" rowspan="1" colspan="6"> + <widget class="TQGroupBox" row="6" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>env_var_group</cstring> </property> @@ -43,7 +43,7 @@ <string>Environment &Variables</string> </property> </widget> - <widget class="QLabel" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>makebin_label</cstring> </property> @@ -59,7 +59,7 @@ <cstring>makebin_edit</cstring> </property> </widget> - <widget class="QSpinBox" row="4" column="4"> + <widget class="TQSpinBox" row="4" column="4"> <property name="name"> <cstring>jobs_box</cstring> </property> @@ -81,7 +81,7 @@ <number>1</number> </property> </widget> - <widget class="QLabel" row="4" column="1" rowspan="1" colspan="3"> + <widget class="TQLabel" row="4" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>20</height> @@ -122,14 +122,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="6"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>runMultiJobs</cstring> </property> @@ -137,7 +137,7 @@ <string>Run more than one &job at a time</string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>prio_label</cstring> </property> @@ -145,7 +145,7 @@ <string>Make priority:</string> </property> </widget> - <widget class="QSpinBox" row="2" column="2"> + <widget class="TQSpinBox" row="2" column="2"> <property name="name"> <cstring>prio_box</cstring> </property> @@ -189,6 +189,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/lib/widgets/removesubprojectdialog.cpp b/buildtools/lib/widgets/removesubprojectdialog.cpp index 4a41ff88..8de6d45c 100644 --- a/buildtools/lib/widgets/removesubprojectdialog.cpp +++ b/buildtools/lib/widgets/removesubprojectdialog.cpp @@ -20,8 +20,8 @@ #include <tqlabel.h> #include "removesubprojectdialog.h" -RemoveSubprojectDialog::RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* parent, const char* name, bool modal, WFlags fl) - : RemoveSubprojectDlgBase(parent,name, modal,fl) +RemoveSubprojectDialog::RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* tqparent, const char* name, bool modal, WFlags fl) + : RemoveSubprojectDlgBase(tqparent,name, modal,fl) { setCaption(caption); removeLabel->setText(question); diff --git a/buildtools/lib/widgets/removesubprojectdialog.h b/buildtools/lib/widgets/removesubprojectdialog.h index 593309fe..49be23b8 100644 --- a/buildtools/lib/widgets/removesubprojectdialog.h +++ b/buildtools/lib/widgets/removesubprojectdialog.h @@ -28,9 +28,10 @@ Subproject removal dialog. class RemoveSubprojectDialog : public RemoveSubprojectDlgBase { Q_OBJECT + TQ_OBJECT public: - RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~RemoveSubprojectDialog(); /*$PUBLIC_FUNCTIONS$*/ bool removeFromDisk(); diff --git a/buildtools/lib/widgets/removesubprojectdlgbase.ui b/buildtools/lib/widgets/removesubprojectdlgbase.ui index cd36b6ff..a89b9107 100644 --- a/buildtools/lib/widgets/removesubprojectdlgbase.ui +++ b/buildtools/lib/widgets/removesubprojectdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>RemoveSubprojectDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>RemoveSubprojectDlgBase</cstring> </property> @@ -19,17 +19,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>fileGroupBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>140</height> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>removeLabel</cstring> </property> @@ -53,7 +53,7 @@ <string>[REMOVE QUESTION]</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>removeCheckBox</cstring> </property> @@ -61,11 +61,11 @@ <string>Also &remove it from disk</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>noticeLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> @@ -77,7 +77,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>buttonLayout</cstring> </property> @@ -98,14 +98,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="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeButton</cstring> </property> @@ -116,7 +116,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelButton</cstring> </property> @@ -145,10 +145,10 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot>accept()</slot> <slot>reject()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/lib/widgets/runoptionswidget.cpp b/buildtools/lib/widgets/runoptionswidget.cpp index 9aecbe17..03c75586 100644 --- a/buildtools/lib/widgets/runoptionswidget.cpp +++ b/buildtools/lib/widgets/runoptionswidget.cpp @@ -39,8 +39,8 @@ RunOptionsWidget::RunOptionsWidget(TQDomDocument &dom, const TQString &configGroup, - const TQString &buildDirectory, TQWidget *parent, const char *name) - : RunOptionsWidgetBase(parent, name), + const TQString &buildDirectory, TQWidget *tqparent, const char *name) + : RunOptionsWidgetBase(tqparent, name), m_dom(dom), m_configGroup(configGroup) { // Create the "Environment Variables" GUI diff --git a/buildtools/lib/widgets/runoptionswidget.h b/buildtools/lib/widgets/runoptionswidget.h index 02c38f35..304ce870 100644 --- a/buildtools/lib/widgets/runoptionswidget.h +++ b/buildtools/lib/widgets/runoptionswidget.h @@ -33,12 +33,13 @@ Run options widget. class RunOptionsWidget : public RunOptionsWidgetBase { Q_OBJECT + TQ_OBJECT public: RunOptionsWidget( TQDomDocument &dom, //!< document DOM const TQString &configGroup, //!< configuration group const TQString &buildDirectory, //!< project build directory - TQWidget *parent=0, //!< parent widget + TQWidget *tqparent=0, //!< tqparent widget const char *name=0 //!< widget's name ); ~RunOptionsWidget(); diff --git a/buildtools/lib/widgets/runoptionswidgetbase.ui b/buildtools/lib/widgets/runoptionswidgetbase.ui index 1163484c..3dbb74ca 100644 --- a/buildtools/lib/widgets/runoptionswidgetbase.ui +++ b/buildtools/lib/widgets/runoptionswidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>RunOptionsWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>run_options_widget</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>mainProgramGroupBox</cstring> </property> @@ -44,14 +44,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>notelabel</cstring> </property> <property name="text"> <string>Note: These options override target specific settings.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> <property name="whatsThis" stdset="0"> @@ -66,7 +66,7 @@ <string>The command line arguments passed to the main program when run</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>mainprogram_label_2</cstring> </property> @@ -77,7 +77,7 @@ <cstring>mainprogram_edit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>mainprogram_label</cstring> </property> @@ -96,7 +96,7 @@ <string>Full path to the executable</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>mainprogram_label_3</cstring> </property> @@ -115,7 +115,7 @@ <string>The command line arguments passed to the main program when debugged</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>mainprogram_label_3_2</cstring> </property> @@ -136,7 +136,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -155,7 +155,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>autocompile_box</cstring> </property> @@ -166,7 +166,7 @@ <string>If the program is not up-to-date with the source code, compile it before starting its execution</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>autoinstall_box</cstring> </property> @@ -177,7 +177,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>autokdesu_box</cstring> </property> @@ -188,7 +188,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>startinterminal_box</cstring> </property> @@ -201,7 +201,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>env_var_group</cstring> </property> @@ -239,11 +239,11 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include> </includes> -<slots> +<Q_SLOTS> <slot>mainProgramChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/buildtools/lib/widgets/subclassesdlg.cpp b/buildtools/lib/widgets/subclassesdlg.cpp index 4dde898b..a17f5b20 100644 --- a/buildtools/lib/widgets/subclassesdlg.cpp +++ b/buildtools/lib/widgets/subclassesdlg.cpp @@ -21,8 +21,8 @@ #include "subclassesdlg.h" #include "subclassesdlg.moc" -SubclassesDlg::SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* parent, const char* name, bool modal, WFlags fl) -: SubclassesDlgBase(parent,name, modal,fl), m_form(form), m_config(config), m_projectDir(projectDir) +SubclassesDlg::SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: SubclassesDlgBase(tqparent,name, modal,fl), m_form(form), m_config(config), m_projectDir(projectDir) { subclass_url->setEnabled(false); diff --git a/buildtools/lib/widgets/subclassesdlg.h b/buildtools/lib/widgets/subclassesdlg.h index adfdc7d4..0b73e269 100644 --- a/buildtools/lib/widgets/subclassesdlg.h +++ b/buildtools/lib/widgets/subclassesdlg.h @@ -28,9 +28,10 @@ Subclass creation dialog. class SubclassesDlg : public SubclassesDlgBase { Q_OBJECT + TQ_OBJECT public: - SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SubclassesDlg(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/buildtools/lib/widgets/subclassesdlgbase.ui b/buildtools/lib/widgets/subclassesdlgbase.ui index 026ab2ca..ebe62880 100644 --- a/buildtools/lib/widgets/subclassesdlgbase.ui +++ b/buildtools/lib/widgets/subclassesdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>SubclassesDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SubclassesDlgBase</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>add_button</cstring> </property> @@ -33,7 +33,7 @@ <bool>false</bool> </property> </widget> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>remove_button</cstring> </property> @@ -44,7 +44,7 @@ <bool>false</bool> </property> </widget> - <widget class="QListBox" row="1" column="1" rowspan="3" colspan="1"> + <widget class="TQListBox" row="1" column="1" rowspan="3" colspan="1"> <property name="name"> <cstring>subclasses_box</cstring> </property> @@ -53,7 +53,7 @@ <property name="name"> <cstring>subclass_url</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>24</height> @@ -73,14 +73,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>90</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -95,16 +95,16 @@ <property name="text"> <string>Related subclass &location:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> <property name="buddy" stdset="0"> <cstring>subclass_url</cstring> </property> </widget> - <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -120,14 +120,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>310</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -141,7 +141,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -192,9 +192,9 @@ </connection> <connection> <sender>subclasses_box</sender> - <signal>clicked(QListBoxItem*)</signal> + <signal>clicked(TQListBoxItem*)</signal> <receiver>SubclassesDlgBase</receiver> - <slot>currentRelationChanged(QListBoxItem*)</slot> + <slot>currentRelationChanged(TQListBoxItem*)</slot> </connection> </connections> <tabstops> @@ -208,14 +208,14 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">changeCurrentURL(const QString &str)</slot> <slot access="protected">removeRelation()</slot> <slot access="protected">newRelation()</slot> - <slot access="protected">currentRelationChanged(QListBoxItem *item)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> + <slot access="protected">currentRelationChanged(TQListBoxItem *item)</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> |