summaryrefslogtreecommitdiffstats
path: root/buildtools/custommakefiles
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-14 16:45:05 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-14 16:45:05 +0000
commit48d4a26399959121f33d2bc3bfe51c7827b654fc (patch)
tree5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /buildtools/custommakefiles
parent7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff)
downloadtdevelop-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/custommakefiles')
-rw-r--r--buildtools/custommakefiles/custombuildoptionswidget.cpp6
-rw-r--r--buildtools/custommakefiles/custombuildoptionswidget.h5
-rw-r--r--buildtools/custommakefiles/custombuildoptionswidgetbase.ui30
-rw-r--r--buildtools/custommakefiles/custommakeconfigwidget.cpp14
-rw-r--r--buildtools/custommakefiles/custommakeconfigwidget.h3
-rw-r--r--buildtools/custommakefiles/custommakeconfigwidgetbase.ui62
-rw-r--r--buildtools/custommakefiles/custommanagerwidget.cpp10
-rw-r--r--buildtools/custommakefiles/custommanagerwidget.h5
-rw-r--r--buildtools/custommakefiles/custommanagerwidgetbase.ui8
-rw-r--r--buildtools/custommakefiles/customotherconfigwidget.cpp16
-rw-r--r--buildtools/custommakefiles/customotherconfigwidget.h5
-rw-r--r--buildtools/custommakefiles/customotherconfigwidgetbase.ui52
-rw-r--r--buildtools/custommakefiles/customprojectpart.cpp82
-rw-r--r--buildtools/custommakefiles/customprojectpart.h5
-rw-r--r--buildtools/custommakefiles/selectnewfilesdialog.cpp14
-rw-r--r--buildtools/custommakefiles/selectnewfilesdialog.h5
-rw-r--r--buildtools/custommakefiles/selectnewfilesdialogbase.ui6
17 files changed, 167 insertions, 161 deletions
diff --git a/buildtools/custommakefiles/custombuildoptionswidget.cpp b/buildtools/custommakefiles/custombuildoptionswidget.cpp
index e979df61..b06ced18 100644
--- a/buildtools/custommakefiles/custombuildoptionswidget.cpp
+++ b/buildtools/custommakefiles/custombuildoptionswidget.cpp
@@ -22,8 +22,8 @@
CustomBuildOptionsWidget::CustomBuildOptionsWidget(TQDomDocument &dom,
- TQWidget *parent, const char *name)
- : CustomBuildOptionsWidgetBase(parent, name),
+ TQWidget *tqparent, const char *name)
+ : CustomBuildOptionsWidgetBase(tqparent, name),
m_dom(dom)
{
ant_button->setChecked(DomUtil::readEntry(dom, "/kdevcustomproject/build/buildtool") == "ant");
@@ -96,4 +96,4 @@ void CustomBuildOptionsWidget::makeToggled(bool b)
#include "custombuildoptionswidget.moc"
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/custommakefiles/custombuildoptionswidget.h b/buildtools/custommakefiles/custombuildoptionswidget.h
index bf67477a..492cc8ea 100644
--- a/buildtools/custommakefiles/custombuildoptionswidget.h
+++ b/buildtools/custommakefiles/custombuildoptionswidget.h
@@ -21,9 +21,10 @@ class TQTabWidget;
class CustomBuildOptionsWidget : public CustomBuildOptionsWidgetBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- CustomBuildOptionsWidget( TQDomDocument &dom, TQWidget *parent=0, const char *name=0 );
+ CustomBuildOptionsWidget( TQDomDocument &dom, TQWidget *tqparent=0, const char *name=0 );
~CustomBuildOptionsWidget();
void setMakeOptionsWidget(TQTabWidget *tw, TQWidget *mow, TQWidget *oow);
@@ -43,4 +44,4 @@ private:
#endif
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
index 59ca9ba2..619a653b 100644
--- a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
+++ b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>CustomBuildOptionsWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>configure_options_widget</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>buildtool_group</cstring>
</property>
@@ -30,7 +30,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>make_button</cstring>
</property>
@@ -41,7 +41,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>ant_button</cstring>
</property>
@@ -49,7 +49,7 @@
<string>A&amp;nt</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>other_button</cstring>
</property>
@@ -78,14 +78,14 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>builddir_label</cstring>
</property>
@@ -96,9 +96,9 @@
<cstring>builddir_edit</cstring>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -114,7 +114,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -138,7 +138,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -150,12 +150,12 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<slots>
+<Q_SLOTS>
<slot access="protected">makeToggled(bool)</slot>
<slot access="protected">otherToggled(bool)</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>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/buildtools/custommakefiles/custommakeconfigwidget.cpp b/buildtools/custommakefiles/custommakeconfigwidget.cpp
index b47ef3ff..6b27994e 100644
--- a/buildtools/custommakefiles/custommakeconfigwidget.cpp
+++ b/buildtools/custommakefiles/custommakeconfigwidget.cpp
@@ -28,8 +28,8 @@
#include <environmentvariableswidget.h>
-CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent)
- : CustomMakeConfigWidgetBase(parent),
+CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* tqparent)
+ : CustomMakeConfigWidgetBase(tqparent),
m_part(part), m_configGroup(configGroup), m_dom( *part->projectDom() )
{
abort_box->setChecked(DomUtil::readBoolEntry(m_dom, m_configGroup + "/make/abortonerror"));
@@ -43,7 +43,7 @@ CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const TQ
defaultTarget_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/make/defaulttarget"));
makeoptions_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/make/makeoptions"));
- envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D[^\\s]*"), this));
+ envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D[^\\s]*"), TQT_TQOBJECT(this)));
m_allEnvironments = m_part->allMakeEnvironments();
m_currentEnvironment = m_part->currentMakeEnvironment();
env_var_group->setColumnLayout( 1, Qt::Vertical );
@@ -61,8 +61,8 @@ CustomMakeConfigWidget::~CustomMakeConfigWidget()
void CustomMakeConfigWidget::envNameChanged(const TQString& envName)
{
TQStringList allEnvNames = m_part->allMakeEnvironments();
- bool canAdd = !allEnvNames.contains(envName) && !envName.contains("/") && !envName.isEmpty();
- bool canRemove = allEnvNames.contains(envName) && allEnvNames.count() > 1;
+ bool canAdd = !allEnvNames.tqcontains(envName) && !envName.tqcontains("/") && !envName.isEmpty();
+ bool canRemove = allEnvNames.tqcontains(envName) && allEnvNames.count() > 1;
addenvs_button->setEnabled(canAdd);
copyenvs_button->setEnabled(canAdd);
removeenvs_button->setEnabled(canRemove);
@@ -70,7 +70,7 @@ void CustomMakeConfigWidget::envNameChanged(const TQString& envName)
void CustomMakeConfigWidget::envChanged(const TQString& envName)
{
- if (envName == m_currentEnvironment || !m_allEnvironments.contains(envName))
+ if (envName == m_currentEnvironment || !m_allEnvironments.tqcontains(envName))
return;
// save settings of previously active environment
@@ -100,7 +100,7 @@ void CustomMakeConfigWidget::envRemoved()
m_allEnvironments.remove(env);
envs_combo->clear();
envs_combo->insertStringList(m_allEnvironments);
- m_currentEnvironment = TQString::null;
+ m_currentEnvironment = TQString();
envChanged( m_allEnvironments[0] );
}
diff --git a/buildtools/custommakefiles/custommakeconfigwidget.h b/buildtools/custommakefiles/custommakeconfigwidget.h
index 5a94e669..42cd310e 100644
--- a/buildtools/custommakefiles/custommakeconfigwidget.h
+++ b/buildtools/custommakefiles/custommakeconfigwidget.h
@@ -24,9 +24,10 @@ class EnvironmentVariablesWidget;
class CustomMakeConfigWidget : public CustomMakeConfigWidgetBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent);
+ CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* tqparent);
~CustomMakeConfigWidget();
diff --git a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
index b864a18f..085724c1 100644
--- a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
+++ b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>CustomMakeConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>CustomMakeConfigWidgetBase</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>abort_box</cstring>
</property>
@@ -27,7 +27,7 @@
<string>A&amp;bort on first error</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>dontact_box</cstring>
</property>
@@ -35,9 +35,9 @@
<string>Only di&amp;splay commands without actually executing them</string>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<grid>
<property name="name">
@@ -53,7 +53,7 @@
<cstring>makebin_edit</cstring>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>makeoptions_label</cstring>
</property>
@@ -69,7 +69,7 @@
<cstring>makeoptions_edit</cstring>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>makebin_label</cstring>
</property>
@@ -80,7 +80,7 @@
<cstring>makebin_edit</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>defTarget_label</cstring>
</property>
@@ -93,15 +93,15 @@
</widget>
</grid>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>tqlayout6</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>runMultiJobs</cstring>
</property>
@@ -109,7 +109,7 @@
<string>Run multiple jobs</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>jobs_label</cstring>
</property>
@@ -123,7 +123,7 @@
<cstring>jobs_box</cstring>
</property>
</widget>
- <widget class="QSpinBox">
+ <widget class="TQSpinBox">
<property name="name">
<cstring>jobs_box</cstring>
</property>
@@ -155,7 +155,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>200</width>
<height>20</height>
@@ -164,15 +164,15 @@
</spacer>
</hbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>prio_label</cstring>
</property>
@@ -183,7 +183,7 @@
<cstring>jobs_box</cstring>
</property>
</widget>
- <widget class="QSpinBox">
+ <widget class="TQSpinBox">
<property name="name">
<cstring>prio_box</cstring>
</property>
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>192</width>
<height>20</height>
@@ -224,15 +224,15 @@
</spacer>
</hbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>envs_label</cstring>
</property>
@@ -251,7 +251,7 @@
<cstring>envs_combo</cstring>
</property>
</widget>
- <widget class="QComboBox">
+ <widget class="TQComboBox">
<property name="name">
<cstring>envs_combo</cstring>
</property>
@@ -267,7 +267,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>addenvs_button</cstring>
</property>
@@ -278,7 +278,7 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>copyenvs_button</cstring>
</property>
@@ -289,7 +289,7 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>removeenvs_button</cstring>
</property>
@@ -302,7 +302,7 @@
</widget>
</hbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>env_var_group</cstring>
</property>
@@ -378,15 +378,15 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<slots>
+<Q_SLOTS>
<slot access="protected">envNameChanged(const QString &amp;)</slot>
<slot access="protected">envChanged(const QString&amp;)</slot>
<slot access="protected">envAdded()</slot>
<slot access="protected">envRemoved()</slot>
<slot access="protected">envCopied()</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>klineedit.h</includehint>
diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp
index 84278a69..bb31b025 100644
--- a/buildtools/custommakefiles/custommanagerwidget.cpp
+++ b/buildtools/custommakefiles/custommanagerwidget.cpp
@@ -28,13 +28,13 @@
#include "customprojectpart.h"
#include "domutil.h"
-CustomManagerWidget::CustomManagerWidget( CustomProjectPart* part, TQWidget* parent )
- : CustomManagerWidgetBase( parent ), m_part( part), m_dom( *part->projectDom() )
+CustomManagerWidget::CustomManagerWidget( CustomProjectPart* part, TQWidget* tqparent )
+ : CustomManagerWidgetBase( tqparent ), m_part( part), m_dom( *part->projectDom() )
{
m_filetypes->insertStringList( DomUtil::readListEntry( m_dom, "kdevcustomproject/filetypes", "filetype" ) );
KURLRequester* urlselector = new KURLRequester( );
urlselector->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly );
- urlselector->setURL( TQString::null );
+ urlselector->setURL( TQString() );
urlselector->completionObject() ->setDir( part->projectDirectory() );
urlselector->fileDialog() ->setURL( KURL( part->projectDirectory() ) );
m_blacklistBox = new KEditListBox( i18n("blacklisted files and directories are not"
@@ -54,7 +54,7 @@ void CustomManagerWidget::checkUrl(const TQString& url)
{
kdDebug(9025) << "seems to be non-relative" << endl;
TQString relpath = m_part->relativeToProject( url );
- TQListBoxItem* item = m_blacklistBox->listBox()->findItem( url );
+ TQListBoxItem* item = m_blacklistBox->listBox()->tqfindItem( url );
m_blacklistBox->listBox()->takeItem( item );
kdDebug(9025) << "relative path:" << relpath << endl;
if( !relpath.isEmpty() )
@@ -77,4 +77,4 @@ void CustomManagerWidget::accept()
#include "custommanagerwidget.moc"
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/custommakefiles/custommanagerwidget.h b/buildtools/custommakefiles/custommanagerwidget.h
index ce12805b..5f63d006 100644
--- a/buildtools/custommakefiles/custommanagerwidget.h
+++ b/buildtools/custommakefiles/custommanagerwidget.h
@@ -23,9 +23,10 @@ class KEditListBox;
class CustomManagerWidget : public CustomManagerWidgetBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- CustomManagerWidget( CustomProjectPart* part, TQWidget* parent );
+ CustomManagerWidget( CustomProjectPart* part, TQWidget* tqparent );
~CustomManagerWidget();
public slots:
void checkUrl(const TQString& url);
@@ -38,4 +39,4 @@ private:
#endif
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/custommakefiles/custommanagerwidgetbase.ui b/buildtools/custommakefiles/custommanagerwidgetbase.ui
index a388b288..4b6c0c92 100644
--- a/buildtools/custommakefiles/custommanagerwidgetbase.ui
+++ b/buildtools/custommakefiles/custommanagerwidgetbase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>CustomManagerWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>CustomManagerWidgetBase</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>grid</cstring>
</property>
@@ -55,7 +55,7 @@ This will be used when adding/removing files in directories and re-populating th
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>108</height>
@@ -66,7 +66,7 @@ This will be used when adding/removing files in directories and re-populating th
</widget>
</vbox>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>keditlistbox.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/buildtools/custommakefiles/customotherconfigwidget.cpp b/buildtools/custommakefiles/customotherconfigwidget.cpp
index d40c55d2..b3430e62 100644
--- a/buildtools/custommakefiles/customotherconfigwidget.cpp
+++ b/buildtools/custommakefiles/customotherconfigwidget.cpp
@@ -29,8 +29,8 @@
#include <environmentvariableswidget.h>
-CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent)
- : CustomOtherConfigWidgetBase(parent),
+CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* tqparent)
+ : CustomOtherConfigWidgetBase(tqparent),
m_part(part), m_configGroup(configGroup), m_dom( *part->projectDom() )
{
prio_box->setValue(DomUtil::readIntEntry(m_dom, m_configGroup + "/other/prio"));
@@ -38,7 +38,7 @@ CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const
defaultTarget_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/other/defaulttarget"));
makeoptions_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/other/otheroptions"));
- envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this));
+ envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this)));
m_allEnvironments = m_part->allMakeEnvironments();
m_currentEnvironment = m_part->currentMakeEnvironment();
env_var_group->setColumnLayout( 1, Qt::Vertical );
@@ -56,8 +56,8 @@ CustomOtherConfigWidget::~CustomOtherConfigWidget()
void CustomOtherConfigWidget::envNameChanged(const TQString& envName)
{
TQStringList allEnvNames = m_part->allMakeEnvironments();
- bool canAdd = !allEnvNames.contains(envName) && !envName.contains("/") && !envName.isEmpty();
- bool canRemove = allEnvNames.contains(envName) && allEnvNames.count() > 1;
+ bool canAdd = !allEnvNames.tqcontains(envName) && !envName.tqcontains("/") && !envName.isEmpty();
+ bool canRemove = allEnvNames.tqcontains(envName) && allEnvNames.count() > 1;
addenvs_button->setEnabled(canAdd);
copyenvs_button->setEnabled(canAdd);
removeenvs_button->setEnabled(canRemove);
@@ -65,7 +65,7 @@ void CustomOtherConfigWidget::envNameChanged(const TQString& envName)
void CustomOtherConfigWidget::envChanged(const TQString& envName)
{
- if (envName == m_currentEnvironment || !m_allEnvironments.contains(envName))
+ if (envName == m_currentEnvironment || !m_allEnvironments.tqcontains(envName))
return;
// save settings of previously active environment
@@ -95,7 +95,7 @@ void CustomOtherConfigWidget::envRemoved()
m_allEnvironments.remove(env);
envs_combo->clear();
envs_combo->insertStringList(m_allEnvironments);
- m_currentEnvironment = TQString::null;
+ m_currentEnvironment = TQString();
envChanged( m_allEnvironments[0] );
}
@@ -121,5 +121,5 @@ void CustomOtherConfigWidget::accept()
}
#include "customotherconfigwidget.moc"
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/custommakefiles/customotherconfigwidget.h b/buildtools/custommakefiles/customotherconfigwidget.h
index c786635c..a432d3e6 100644
--- a/buildtools/custommakefiles/customotherconfigwidget.h
+++ b/buildtools/custommakefiles/customotherconfigwidget.h
@@ -24,9 +24,10 @@ class EnvironmentVariablesWidget;
class CustomOtherConfigWidget : public CustomOtherConfigWidgetBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent);
+ CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* tqparent);
~CustomOtherConfigWidget();
@@ -53,5 +54,5 @@ protected:
#endif
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/custommakefiles/customotherconfigwidgetbase.ui b/buildtools/custommakefiles/customotherconfigwidgetbase.ui
index 174391ae..37c1b1ea 100644
--- a/buildtools/custommakefiles/customotherconfigwidgetbase.ui
+++ b/buildtools/custommakefiles/customotherconfigwidgetbase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>CustomOtherConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>CustomOtherConfigWidgetBase</cstring>
</property>
@@ -19,25 +19,25 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<grid>
<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>defaultTarget_edit</cstring>
</property>
</widget>
- <widget class="QLineEdit" row="1" column="1">
+ <widget class="TQLineEdit" row="1" column="1">
<property name="name">
<cstring>makebin_edit</cstring>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>makeoptions_label</cstring>
</property>
@@ -48,12 +48,12 @@
<cstring>makeoptions_edit</cstring>
</property>
</widget>
- <widget class="QLineEdit" row="2" column="1">
+ <widget class="TQLineEdit" row="2" column="1">
<property name="name">
<cstring>makeoptions_edit</cstring>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>makebin_label</cstring>
</property>
@@ -64,7 +64,7 @@
<cstring>makebin_edit</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>defTarget_label</cstring>
</property>
@@ -77,15 +77,15 @@
</widget>
</grid>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>prio_label</cstring>
</property>
@@ -96,7 +96,7 @@
<cstring>jobs_box</cstring>
</property>
</widget>
- <widget class="QSpinBox">
+ <widget class="TQSpinBox">
<property name="name">
<cstring>prio_box</cstring>
</property>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -137,15 +137,15 @@
</spacer>
</hbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>envs_label</cstring>
</property>
@@ -164,7 +164,7 @@
<cstring>envs_combo</cstring>
</property>
</widget>
- <widget class="QComboBox">
+ <widget class="TQComboBox">
<property name="name">
<cstring>envs_combo</cstring>
</property>
@@ -180,7 +180,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>addenvs_button</cstring>
</property>
@@ -191,7 +191,7 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>copyenvs_button</cstring>
</property>
@@ -202,7 +202,7 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>removeenvs_button</cstring>
</property>
@@ -215,7 +215,7 @@
</widget>
</hbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>env_var_group</cstring>
</property>
@@ -276,13 +276,13 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<slots>
+<Q_SLOTS>
<slot access="protected">envNameChanged(const QString &amp;)</slot>
<slot access="protected">envChanged(const QString&amp;)</slot>
<slot access="protected">envAdded()</slot>
<slot access="protected">envRemoved()</slot>
<slot access="protected">envCopied()</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/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index b25a69d7..da6ce3cd 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -65,8 +65,8 @@ typedef KDevGenericFactory<CustomProjectPart> CustomProjectFactory;
static const KDevPluginInfo data( "kdevcustomproject" );
K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) )
-CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & )
- : KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" )
+CustomProjectPart::CustomProjectPart( TQObject *tqparent, const char *name, const TQStringList & )
+ : KDevBuildTool( &data, tqparent, name ? name : "CustomProjectPart" )
, m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false )
{
setInstance( CustomProjectFactory::instance() );
@@ -231,7 +231,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
TQString popupstr = fcontext->urls().first().fileName();
- if ( popupstr == TQString::null )
+ if ( popupstr == TQString() )
popupstr = ".";
if ( fcontext->urls().size() == 1 && URLUtil::isDirectory( fcontext->urls().first() ) && !isInBlacklist( fcontext->urls().first().path() ) )
@@ -242,7 +242,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
m_contextDirName = m_contextDirName.mid( project()->projectDirectory().length() + 1 );
int id = popup->insertItem( i18n( "Make Active Directory" ),
this, TQT_SLOT( slotChooseActiveDirectory() ) );
- popup->setWhatsThis( id, i18n( "<b>Make active directory</b><p>"
+ popup->tqsetWhatsThis( id, i18n( "<b>Make active directory</b><p>"
"Chooses this directory as the destination for new files created using wizards "
"like the <i>New Class</i> wizard." ) );
}
@@ -258,7 +258,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
{
id = popup->insertItem( i18n( "Remove from blacklist" ),
this, TQT_SLOT( slotChangeBlacklist() ) );
- popup->setWhatsThis( id, i18n( "<b>Remove from blacklist</b><p>"
+ popup->tqsetWhatsThis( id, i18n( "<b>Remove from blacklist</b><p>"
"Removes the given file or directory from the "
"blacklist if it is already in it.<br>The blacklist contains files and"
" directories that should be ignored even if they match a project filetype "
@@ -268,7 +268,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
{
id = popup->insertItem( i18n( "Add to blacklist" ),
this, TQT_SLOT( slotChangeBlacklist() ) );
- popup->setWhatsThis( id, i18n( "<b>Add to blacklist</b><p>"
+ popup->tqsetWhatsThis( id, i18n( "<b>Add to blacklist</b><p>"
"Adds the given file or directory to the blacklist.<br>The blacklist contains files and"
" directories that should be ignored even if they match a project filetype "
"pattern" ) );
@@ -318,13 +318,13 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
{
int id = popup->insertItem( i18n( "Add Selected File/Dir(s) to Project" ),
this, TQT_SLOT( slotAddToProject() ) );
- popup->setWhatsThis( id, i18n( "<b>Add to project</b><p>Adds selected file/dir(s) to the list of files in the project. "
+ popup->tqsetWhatsThis( id, i18n( "<b>Add to project</b><p>Adds selected file/dir(s) to the list of files in the project. "
"Note that the files should be manually added to the corresponding makefile or build.xml." ) );
if ( dirAddRecursive )
{
int id = popup->insertItem( i18n( "Add Selected Dir(s) to Project (recursive)" ),
this, TQT_SLOT( slotAddToProjectRecursive() ) );
- popup->setWhatsThis( id, i18n( "<b>Add to project</b><p>Recursively adds selected dir(s) to the list of files in the project. "
+ popup->tqsetWhatsThis( id, i18n( "<b>Add to project</b><p>Recursively adds selected dir(s) to the list of files in the project. "
"Note that the files should be manually added to the corresponding makefile or build.xml." ) );
}
}
@@ -333,14 +333,14 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context
{
int id = popup->insertItem( i18n( "Remove Selected File/Dir(s) From Project" ),
this, TQT_SLOT( slotRemoveFromProject() ) );
- popup->setWhatsThis( id, i18n( "<b>Remove from project</b><p>Removes selected file/dir(s) from the list of files in the project. "
+ popup->tqsetWhatsThis( id, i18n( "<b>Remove from project</b><p>Removes selected file/dir(s) from the list of files in the project. "
"Note that the files should be manually excluded from the corresponding makefile or build.xml." ) );
if ( dirDelRecursive )
{
int id = popup->insertItem( i18n( "Remove Selected Dir(s) From Project (recursive)" ),
this, TQT_SLOT( slotRemoveFromProjectRecursive() ) );
- popup->setWhatsThis( id, i18n( "<b>Remove from project</b><p>Recursively removes selected dir(s) from the list of files in the project. "
+ popup->tqsetWhatsThis( id, i18n( "<b>Remove from project</b><p>Recursively removes selected dir(s) from the list of files in the project. "
"Note that the files should be manually excluded from the corresponding makefile or build.xml." ) );
}
}
@@ -460,7 +460,7 @@ void CustomProjectPart::openProject( const TQString &dirName, const TQString &pr
int r = KMessageBox::questionYesNo( mainWindow()->main(),
i18n( "This project does not contain any files yet.\n"
"Populate it with all C/C++/Java files below "
- "the project directory?" ), TQString::null, i18n( "Populate" ), i18n( "Do Not Populate" ) );
+ "the project directory?" ), TQString(), i18n( "Populate" ), i18n( "Do Not Populate" ) );
if ( r == KMessageBox::Yes )
populateProject();
}
@@ -512,7 +512,7 @@ void CustomProjectPart::findNewFiles( const TQString& dir, TQStringList& filelis
// If the entry is blacklisted, proceed to next one.
// Note that by using generic isInBlacklist(),
// we are actually wasting resources,
- // because it also tests whether any parent directory of relativeEntry is blacklisted.
+ // because it also tests whether any tqparent directory of relativeEntry is blacklisted.
// But by the order we are traversing and processing the directories,
// we know it is not the case, ever.
if ( isInBlacklist( relativeEntry ) )
@@ -568,7 +568,7 @@ void CustomProjectPart::populateProject()
setFiletypes( lb->items() );
}
- TQApplication::setOverrideCursor( Qt::waitCursor );
+ TQApplication::setOverrideCursor( TQt::waitCursor );
removeFiles( allFiles() );
updateBlacklist( TQStringList() );
@@ -910,7 +910,7 @@ void CustomProjectPart::startMakeCommand( const TQString &dir, const TQString &t
cmdline = DomUtil::readEntry( dom, "/kdevcustomproject/other/otherbin" );
if ( cmdline.isEmpty() )
cmdline = "echo";
- else if ( cmdline.find( "/" ) == -1 )
+ else if ( cmdline.tqfind( "/" ) == -1 )
cmdline = "./" + cmdline;
cmdline += " " + DomUtil::readEntry( dom, "/kdevcustomproject/other/otheroptions" );
}
@@ -944,7 +944,7 @@ void CustomProjectPart::startMakeCommand( const TQString &dir, const TQString &t
TQString nice;
if ( prio != 0 )
{
- nice = TQString( "nice -n%1 " ).arg( prio );
+ nice = TQString( "nice -n%1 " ).tqarg( prio );
}
cmdline.prepend( nice );
@@ -1013,12 +1013,12 @@ void CustomProjectPart::slotCompileFile()
void CustomProjectPart::slotInstallActiveDir()
{
- startMakeCommand( buildDirectory() + "/" + activeDirectory(), TQString::fromLatin1( "install" ) );
+ startMakeCommand( buildDirectory() + "/" + activeDirectory(), TQString::tqfromLatin1( "install" ) );
}
void CustomProjectPart::slotInstall()
{
- startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ) );
+ startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ) );
}
@@ -1029,12 +1029,12 @@ void CustomProjectPart::slotInstallWithKdesu()
slotBuild();
// After that issue "make install" with the root user
- startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ), true );
+ startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ), true );
}
void CustomProjectPart::slotClean()
{
- startMakeCommand( buildDirectory(), TQString::fromLatin1( "clean" ) );
+ startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "clean" ) );
}
@@ -1056,7 +1056,7 @@ void CustomProjectPart::slotExecute()
// Use kdesu??
if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autokdesu", false ) )
//slotInstallWithKdesu assumes that it hasn't just been build...
- _auto ? slotInstallWithKdesu() : startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ), true );
+ _auto ? slotInstallWithKdesu() : startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ), true );
else
slotInstall();
_auto = true;
@@ -1186,7 +1186,7 @@ void CustomProjectPart::putEnvVarsInVarMap()
void CustomProjectPart::parseMakefile( const TQString& filename )
{
- if ( m_parsedMakefiles.contains( filename ) )
+ if ( m_parsedMakefiles.tqcontains( filename ) )
return;
m_parsedMakefiles.insert( filename, 1 );
@@ -1218,9 +1218,9 @@ void CustomProjectPart::parseMakefile( const TQString& filename )
while (( offset = variablesRe.search( str, offset + 1 ) ) != -1 )
{
TQString variableName = variablesRe.cap( 1 ).simplifyWhiteSpace();
- if ( m_makefileVars.contains( variableName ) )
+ if ( m_makefileVars.tqcontains( variableName ) )
{
- str.replace( variablesRe.cap( 0 ), m_makefileVars[variableName] );
+ str.tqreplace( variablesRe.cap( 0 ), m_makefileVars[variableName] );
}
}
@@ -1245,17 +1245,17 @@ void CustomProjectPart::parseMakefile( const TQString& filename )
TQString tmpTarget = targetRe.cap( 1 ).simplifyWhiteSpace();
if ( tmpTarget.endsWith( ".o" ) )
{
- if ( m_targetsObjectFiles.find( tmpTarget ) == m_targetsObjectFiles.end() )
+ if ( m_targetsObjectFiles.tqfind( tmpTarget ) == m_targetsObjectFiles.end() )
m_targetsObjectFiles += tmpTarget;
}
- else if ( tmpTarget.contains( '.' ) )
+ else if ( tmpTarget.tqcontains( '.' ) )
{
- if ( m_targetsOtherFiles.find( tmpTarget ) == m_targetsOtherFiles.end() )
+ if ( m_targetsOtherFiles.tqfind( tmpTarget ) == m_targetsOtherFiles.end() )
m_targetsOtherFiles += tmpTarget;
}
else
{
- if ( m_targets.find( tmpTarget ) == m_targets.end() )
+ if ( m_targets.tqfind( tmpTarget ) == m_targets.end() )
m_targets += tmpTarget;
}
}
@@ -1289,7 +1289,7 @@ void CustomProjectPart::updateMakeEnvironmentsMenu()
{
TQStringList l = allMakeEnvironments();
m_makeEnvironmentsSelector->setItems( l );
- m_makeEnvironmentsSelector->setCurrentItem( l.findIndex( currentMakeEnvironment() ) );
+ m_makeEnvironmentsSelector->setCurrentItem( l.tqfindIndex( currentMakeEnvironment() ) );
}
else
{
@@ -1322,7 +1322,7 @@ void CustomProjectPart::slotCommandFinished( const TQString& command )
if ( m_buildCommand != command )
return;
- m_buildCommand = TQString::null;
+ m_buildCommand = TQString();
m_timestamp.clear();
TQStringList fileList = allFiles();
@@ -1361,7 +1361,7 @@ bool CustomProjectPart::isDirty()
TQString fileName = *it;
++it;
- TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( fileName );
+ TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( fileName );
TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified();
if ( it == m_timestamp.end() || *it != t )
{
@@ -1401,7 +1401,7 @@ TQString CustomProjectPart::currentMakeEnvironment() const
TQStringList allEnvs = allMakeEnvironments();
TQDomDocument &dom = *projectDom();
TQString environment = DomUtil::readEntry( dom, "/kdevcustomproject/make/selectedenvironment" );
- if ( environment.isEmpty() || !allEnvs.contains( environment ) )
+ if ( environment.isEmpty() || !allEnvs.tqcontains( environment ) )
environment = allEnvs[0];
return environment;
}
@@ -1510,11 +1510,11 @@ bool CustomProjectPart::isProjectFileType( const TQString& filename ) const
re.setPattern( *it );
int pos = re.search( filename );
uint len = re.matchedLength();
- if ((( *it ).find( "*" ) != -1 || ( *it ).find( "?" ) != -1 ) && pos + len == filename.length() )
+ if ((( *it ).tqfind( "*" ) != -1 || ( *it ).tqfind( "?" ) != -1 ) && pos + len == filename.length() )
return true;
- else if ( filename.find( "/" ) != -1 && filename.find( *it ) != -1 )
+ else if ( filename.tqfind( "/" ) != -1 && filename.tqfind( *it ) != -1 )
return true;
- else if ( filename.find( "/" ) == -1 && filename == *it )
+ else if ( filename.tqfind( "/" ) == -1 && filename == *it )
return true;
}
return false;
@@ -1555,16 +1555,16 @@ bool CustomProjectPart::isInBlacklist( const TQString& path ) const
TQStringList blacklist = this->blacklist();
if ( !TQFileInfo( relpath ).isRelative() )
relpath = relativeToProject( path );
- if ( blacklist.find( relpath ) != blacklist.end() )
+ if ( blacklist.tqfind( relpath ) != blacklist.end() )
return true;
TQStringList paths = TQStringList::split( "/", relpath );
- TQString parentpath;
+ TQString tqparentpath;
for ( TQStringList::const_iterator it = paths.begin(); it != paths.end(); ++it )
{
- parentpath += *it;
- if ( blacklist.find( parentpath ) != blacklist.end() )
+ tqparentpath += *it;
+ if ( blacklist.tqfind( tqparentpath ) != blacklist.end() )
return true;
- parentpath = parentpath + "/";
+ tqparentpath = tqparentpath + "/";
}
return false;
}
@@ -1607,7 +1607,7 @@ void CustomProjectPart::addNewFilesToProject( const TQStringList& filelist )
{
for ( ProjectFilesSet::ConstIterator it2 = m_sourceFilesSet.constBegin(); it2 != m_sourceFilesSet.constEnd(); ++it2 )
{
- if ( it2.key().find( *it ) != -1 )
+ if ( it2.key().tqfind( *it ) != -1 )
{
removeFromExcludes << *it;
}
@@ -1637,7 +1637,7 @@ void CustomProjectPart::setFiletypes( const TQStringList& l )
*/
bool CustomProjectPart::isInProject( const TQString& fileName ) const
{
- return m_sourceFilesSet.contains( fileName );
+ return m_sourceFilesSet.tqcontains( fileName );
}
diff --git a/buildtools/custommakefiles/customprojectpart.h b/buildtools/custommakefiles/customprojectpart.h
index 288011e6..a31276f4 100644
--- a/buildtools/custommakefiles/customprojectpart.h
+++ b/buildtools/custommakefiles/customprojectpart.h
@@ -33,9 +33,10 @@ class KSelectAction;
class CustomProjectPart : public KDevBuildTool
{
Q_OBJECT
+ TQ_OBJECT
public:
- CustomProjectPart( TQObject *parent, const char *name, const TQStringList & );
+ CustomProjectPart( TQObject *tqparent, const char *name, const TQStringList & );
~CustomProjectPart();
TQStringList allMakeEnvironments() const;
@@ -155,4 +156,4 @@ private:
};
#endif
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/custommakefiles/selectnewfilesdialog.cpp b/buildtools/custommakefiles/selectnewfilesdialog.cpp
index a4c0db99..622d6012 100644
--- a/buildtools/custommakefiles/selectnewfilesdialog.cpp
+++ b/buildtools/custommakefiles/selectnewfilesdialog.cpp
@@ -20,8 +20,8 @@
#include <kdebug.h>
#include "selectnewfilesdialogbase.h"
-SelectNewFilesDialog::SelectNewFilesDialog( TQStringList paths, TQWidget* parent, const char* name )
- : KDialogBase( parent, name, true, i18n("Add newly created files to project"), KDialogBase::Ok|KDialogBase::Cancel )
+SelectNewFilesDialog::SelectNewFilesDialog( TQStringList paths, TQWidget* tqparent, const char* name )
+ : KDialogBase( tqparent, name, true, i18n("Add newly created files to project"), KDialogBase::Ok|KDialogBase::Cancel )
{
m_widget = new SelectNewFilesDialogBase(this);
m_widget->fileView->header()->hide();
@@ -87,13 +87,13 @@ void SelectNewFilesDialog::addPath( TQCheckListItem* item, const TQString& path
addPath(i, parts.join("/") );
}
-TQCheckListItem* SelectNewFilesDialog::createItem( TQCheckListItem* parent, const TQString& name, int count )
+TQCheckListItem* SelectNewFilesDialog::createItem( TQCheckListItem* tqparent, const TQString& name, int count )
{
TQCheckListItem::Type t = TQCheckListItem::CheckBox;
if( count > 0 )
t = TQCheckListItem::CheckBoxController;
- if( parent == 0 )
+ if( tqparent == 0 )
{
TQListViewItem* item = m_widget->fileView->firstChild();
while( item )
@@ -105,14 +105,14 @@ TQCheckListItem* SelectNewFilesDialog::createItem( TQCheckListItem* parent, cons
return new TQCheckListItem( m_widget->fileView, name, t );
}else
{
- TQListViewItem* item = parent->firstChild();
+ TQListViewItem* item = tqparent->firstChild();
while( item )
{
if( item->text( 0 ) == name )
return static_cast<TQCheckListItem*>(item);
item = item->nextSibling();
}
- return new TQCheckListItem( parent, name, t );
+ return new TQCheckListItem( tqparent, name, t );
}
}
@@ -128,4 +128,4 @@ TQStringList SelectNewFilesDialog::includedPaths() const
#include "selectnewfilesdialog.moc"
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/custommakefiles/selectnewfilesdialog.h b/buildtools/custommakefiles/selectnewfilesdialog.h
index cd9831ee..db0eee3d 100644
--- a/buildtools/custommakefiles/selectnewfilesdialog.h
+++ b/buildtools/custommakefiles/selectnewfilesdialog.h
@@ -21,9 +21,10 @@ class SelectNewFilesDialogBase;
class SelectNewFilesDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- SelectNewFilesDialog( TQStringList paths, TQWidget* parent = 0, const char* name = 0 );
+ SelectNewFilesDialog( TQStringList paths, TQWidget* tqparent = 0, const char* name = 0 );
~SelectNewFilesDialog();
TQStringList excludedPaths() const;
@@ -50,4 +51,4 @@ private:
#endif
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on
diff --git a/buildtools/custommakefiles/selectnewfilesdialogbase.ui b/buildtools/custommakefiles/selectnewfilesdialogbase.ui
index fbd5b5ec..43c3280c 100644
--- a/buildtools/custommakefiles/selectnewfilesdialogbase.ui
+++ b/buildtools/custommakefiles/selectnewfilesdialogbase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>SelectNewFilesDialogBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>SelectNewFilesDialogBase</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -43,7 +43,7 @@
</widget>
</vbox>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>