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 | |
| 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')
203 files changed, 2696 insertions, 2636 deletions
diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp index e44a15be..d91d165c 100644 --- a/buildtools/ada/adaglobaloptionsdlg.cpp +++ b/buildtools/ada/adaglobaloptionsdlg.cpp @@ -21,8 +21,8 @@ #include "adaproject_part.h" #include "adaglobaloptionsdlg.h" -AdaGlobalOptionsDlg::AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* parent, const char* name, WFlags fl) - :AdaProjectOptionsDlgBase(parent,name,fl), m_part(part) +AdaGlobalOptionsDlg::AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* tqparent, const char* name, WFlags fl) + :AdaProjectOptionsDlgBase(tqparent,name,fl), m_part(part) { delete config_label; delete config_combo; @@ -44,7 +44,7 @@ AdaGlobalOptionsDlg::AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* parent, if (offers.isEmpty()) options_button->setEnabled(false); - currentCompiler = TQString::null; + currentCompiler = TQString(); /*kdDebug() << ServiceComboBox::defaultCompiler() << endl; kdDebug() << ServiceComboBox::itemForText(ServiceComboBox::defaultCompiler(), service_names) << endl; diff --git a/buildtools/ada/adaglobaloptionsdlg.h b/buildtools/ada/adaglobaloptionsdlg.h index 1a186ce9..e72a1941 100644 --- a/buildtools/ada/adaglobaloptionsdlg.h +++ b/buildtools/ada/adaglobaloptionsdlg.h @@ -20,9 +20,10 @@ class AdaProjectPart; class AdaGlobalOptionsDlg : public AdaProjectOptionsDlgBase { Q_OBJECT + TQ_OBJECT public: - AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~AdaGlobalOptionsDlg(); public slots: diff --git a/buildtools/ada/adaproject_optionsdlgbase.ui b/buildtools/ada/adaproject_optionsdlgbase.ui index 72e99f74..d6219031 100644 --- a/buildtools/ada/adaproject_optionsdlgbase.ui +++ b/buildtools/ada/adaproject_optionsdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AdaProjectOptionsDlgBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AdaProjectOptionsDlgBase</cstring> </property> @@ -32,14 +32,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>160</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="5"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>configuration_layout</cstring> </property> @@ -48,7 +48,7 @@ <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>config_label</cstring> </property> @@ -64,7 +64,7 @@ <string>Configuration:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>config_combo</cstring> </property> @@ -90,14 +90,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>8</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addconfig_button</cstring> </property> @@ -105,7 +105,7 @@ <string>Add</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeconfig_button</cstring> </property> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -132,7 +132,7 @@ </spacer> </hbox> </widget> - <widget class="QPushButton" row="6" column="4"> + <widget class="TQPushButton" row="6" column="4"> <property name="name"> <cstring>options_button</cstring> </property> @@ -144,7 +144,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -154,7 +154,7 @@ <string>...</string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>options_label</cstring> </property> @@ -173,7 +173,7 @@ <cstring>compiler_box</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>compiler_label</cstring> </property> @@ -192,22 +192,22 @@ <cstring>compiler_box</cstring> </property> </widget> - <widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="4" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>exec_edit</cstring> </property> </widget> - <widget class="QLineEdit" row="6" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="6" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>options_edit</cstring> </property> </widget> - <widget class="QComboBox" row="2" column="1" rowspan="1" colspan="3"> + <widget class="TQComboBox" row="2" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>compiler_box</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>exec_label</cstring> </property> @@ -250,7 +250,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -267,7 +267,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -278,7 +278,7 @@ <property name="name"> <cstring>mainSourceUrl</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>26</height> @@ -288,7 +288,7 @@ <enum>WheelFocus</enum> </property> </widget> - <widget class="QLabel" row="9" column="0"> + <widget class="TQLabel" row="9" column="0"> <property name="name"> <cstring>mainSourceLabel</cstring> </property> @@ -317,7 +317,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -334,14 +334,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>400</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton" row="7" column="3" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="7" column="3" rowspan="1" colspan="2"> <property name="name"> <cstring>defaultopts_button</cstring> </property> @@ -447,7 +447,7 @@ <tabstop>addconfig_button</tabstop> <tabstop>removeconfig_button</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot access="protected">compiler_box_activated(const QString&)</slot> <slot access="protected">addconfig_button_clicked()</slot> <slot access="protected">configRemoved()</slot> @@ -457,14 +457,14 @@ <slot access="protected">configAdded()</slot> <slot access="protected">setDirty()</slot> <slot access="protected">setDefaultOptions()</slot> -</slots> +</Q_SLOTS> <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"/> <includehints> - <includehint>qwidget.h</includehint> + <includehint>tqwidget.h</includehint> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index f226809d..d747eb00 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -46,8 +46,8 @@ typedef KDevGenericFactory<AdaProjectPart> AdaProjectFactory; static const KDevPluginInfo data("kdevadaproject"); K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) ) -AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& ) - :KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" ) +AdaProjectPart::AdaProjectPart(TQObject *tqparent, const char *name, const TQStringList& ) + :KDevBuildTool(&data, tqparent, name ? name : "AdaProjectPart" ) { setInstance(AdaProjectFactory::instance()); setXMLFile("kdevadaproject.rc"); @@ -139,7 +139,7 @@ void AdaProjectPart::openProject(const TQString &dirName, const TQString &projec do { dir.setPath(s.pop()); kdDebug() << "AdaProjectPart::openProject examining: " << dir.path() << endl; - const QFileInfoList *dirEntries = dir.entryInfoList(); + const TQFileInfoList *dirEntries = dir.entryInfoList(); if( !dirEntries ) break; @@ -249,7 +249,7 @@ TQString AdaProjectPart::mainSource() const void AdaProjectPart::setMainSource(TQString fullPath) { TQString olddir = activeDirectory(); - m_mainSource = fullPath.replace(TQRegExp(TQString(projectDirectory() + TQString("/"))),""); + m_mainSource = fullPath.tqreplace(TQRegExp(TQString(projectDirectory() + TQString("/"))),""); emit activeDirectoryChanged( olddir, activeDirectory() ); } @@ -266,7 +266,7 @@ TQString AdaProjectPart::projectName() const TQString AdaProjectPart::activeDirectory() const { TQFileInfo fi(mainSource()); - return fi.dirPath(true).replace(TQRegExp(projectDirectory()),""); + return fi.dirPath(true).tqreplace(TQRegExp(projectDirectory()),""); } TQString AdaProjectPart::buildDirectory() const @@ -281,11 +281,11 @@ void AdaProjectPart::listOfFiles(TQStringList &result, TQString path) const if (!d.exists()) return; - const QFileInfoList *entries = d.entryInfoList(TQDir::Dirs | TQDir::Files | TQDir::Hidden); + const TQFileInfoList *entries = d.entryInfoList(TQDir::Dirs | TQDir::Files | TQDir::Hidden); if( !entries ) return; - QFileInfoListIterator it( *entries ); + TQFileInfoListIterator it( *entries ); while( const TQFileInfo* fileInfo = it.current() ) { ++it; @@ -420,7 +420,7 @@ KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name) if (!factory) { TQString errorMessage = KLibLoader::self()->lastErrorMessage(); KMessageBox::error(0, i18n("There was an error loading the module %1.\n" - "The diagnostics are:\n%2").arg(service->name()).arg(errorMessage)); + "The diagnostics are:\n%2").tqarg(service->name()).tqarg(errorMessage)); exit(1); } diff --git a/buildtools/ada/adaproject_part.h b/buildtools/ada/adaproject_part.h index b62cf204..d92205df 100644 --- a/buildtools/ada/adaproject_part.h +++ b/buildtools/ada/adaproject_part.h @@ -20,8 +20,9 @@ class KDevCompilerOptions; class AdaProjectPart : public KDevBuildTool { Q_OBJECT + TQ_OBJECT public: - AdaProjectPart(TQObject *parent, const char *name, const TQStringList &); + AdaProjectPart(TQObject *tqparent, const char *name, const TQStringList &); ~AdaProjectPart(); virtual void openProject(const TQString &dirName, const TQString &projectName); diff --git a/buildtools/ada/adaproject_widget.h b/buildtools/ada/adaproject_widget.h index 5e7038f2..e527cd0d 100644 --- a/buildtools/ada/adaproject_widget.h +++ b/buildtools/ada/adaproject_widget.h @@ -7,9 +7,10 @@ class KDevProject; class AdaProjectPart; -class AdaProjectWidget : public QWidget +class AdaProjectWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp index ee08da6d..f00a0bb1 100644 --- a/buildtools/ada/adaprojectoptionsdlg.cpp +++ b/buildtools/ada/adaprojectoptionsdlg.cpp @@ -24,10 +24,10 @@ #include "adaproject_part.h" #include "adaprojectoptionsdlg.h" -AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* parent, const char* name, WFlags fl) - : AdaProjectOptionsDlgBase(parent,name, fl), m_part(part) +AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* tqparent, const char* name, WFlags fl) + : AdaProjectOptionsDlgBase(tqparent,name, fl), m_part(part) { - config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); + config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Ada'"); @@ -42,7 +42,7 @@ AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* paren dirty = false; TQDomDocument &dom = *(m_part->projectDom()); - currentConfig = TQString::null; + currentConfig = TQString(); configChanged(DomUtil::readEntry(dom, "/kdevadaproject/general/useconfiguration", "default")); } @@ -94,7 +94,7 @@ void AdaProjectOptionsDlg::saveConfig( TQString config ) ServiceComboBox::currentText(compiler_box, service_names)); DomUtil::writeEntry(dom, prefix + "compileroptions", options_edit->text()); DomUtil::writeEntry(dom, prefix + "compilerexec", exec_edit->text()); - DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().replace(TQRegExp(m_part->projectDirectory() + TQString("/")),"")); + DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().tqreplace(TQRegExp(m_part->projectDirectory() + TQString("/")),"")); } void AdaProjectOptionsDlg::readConfig( TQString config ) @@ -128,8 +128,8 @@ void AdaProjectOptionsDlg::readConfig( TQString config ) void AdaProjectOptionsDlg::configComboTextChanged(const TQString &config) { - bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty(); - bool canRemove = allConfigs.contains(config) && config != "default"; + bool canAdd = !allConfigs.tqcontains(config) && !config.tqcontains("/") && !config.isEmpty(); + bool canRemove = allConfigs.tqcontains(config) && config != "default"; addconfig_button->setEnabled(canAdd); removeconfig_button->setEnabled(canRemove); } @@ -137,7 +137,7 @@ void AdaProjectOptionsDlg::configComboTextChanged(const TQString &config) void AdaProjectOptionsDlg::configChanged(const TQString &config) { - if (config == currentConfig || !allConfigs.contains(config)) + if (config == currentConfig || !allConfigs.tqcontains(config)) return; if (!currentConfig.isNull() && dirty) @@ -178,7 +178,7 @@ void AdaProjectOptionsDlg::configRemoved() config_combo->clear(); config_combo->insertStringList(allConfigs); - currentConfig = TQString::null; + currentConfig = TQString(); configChanged("default"); } diff --git a/buildtools/ada/adaprojectoptionsdlg.h b/buildtools/ada/adaprojectoptionsdlg.h index 5e40547d..e9f404f0 100644 --- a/buildtools/ada/adaprojectoptionsdlg.h +++ b/buildtools/ada/adaprojectoptionsdlg.h @@ -19,9 +19,10 @@ class KDevCompilerOptions; class AdaProjectOptionsDlg : public AdaProjectOptionsDlgBase { Q_OBJECT + TQ_OBJECT public: - AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~AdaProjectOptionsDlg(); public slots: diff --git a/buildtools/ada/service.cpp b/buildtools/ada/service.cpp index 97b4f2f5..27a7a691 100644 --- a/buildtools/ada/service.cpp +++ b/buildtools/ada/service.cpp @@ -32,7 +32,7 @@ void ServiceComboBox::insertStringList(TQComboBox *combo, const TQValueList<KSer TQString ServiceComboBox::currentText(TQComboBox *combo, const TQStringList &names) { if (combo->currentItem() == -1) - return TQString::null; + return TQString(); return names[combo->currentItem()]; } diff --git a/buildtools/ant/antoptionswidget.ui b/buildtools/ant/antoptionswidget.ui index fa78e97f..e7ba954d 100644 --- a/buildtools/ant/antoptionswidget.ui +++ b/buildtools/ant/antoptionswidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AntOptionsWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AntOptionsWidget</cstring> </property> @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>86</height> @@ -63,14 +63,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>86</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -81,7 +81,7 @@ <cstring>BuildXML</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -92,21 +92,21 @@ <cstring>Verbosity</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> <property name="text"> <string>&Properties:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> <cstring>Properties</cstring> </property> </widget> - <widget class="QTable" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQTable" row="2" column="1" rowspan="1" colspan="2"> <column> <property name="text"> <string>Property</string> @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>240</width> <height>16</height> @@ -162,8 +162,8 @@ <include location="global" impldecl="in implementation">kpushbutton.h</include> <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"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp index d6f66b46..84ad0a5e 100644 --- a/buildtools/ant/antprojectpart.cpp +++ b/buildtools/ant/antprojectpart.cpp @@ -45,8 +45,8 @@ AntOptions::AntOptions() } -AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &) - : KDevBuildTool(&data, parent, name ? name : "AntProjectPart") +AntProjectPart::AntProjectPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevBuildTool(&data, tqparent, name ? name : "AntProjectPart") { setInstance(AntProjectFactory::instance()); @@ -117,7 +117,7 @@ void AntProjectPart::openProject(const TQString &dirName, const TQString &projec void AntProjectPart::populateProject() { - TQApplication::setOverrideCursor(Qt::waitCursor); + TQApplication::setOverrideCursor(TQt::waitCursor); TQValueStack<TQString> s; int prefixlen = m_projectDirectory.length()+1; @@ -128,7 +128,7 @@ void AntProjectPart::populateProject() { dir.setPath(s.pop()); kdDebug() << "Examining: " << dir.path() << endl; - const QFileInfoList *dirEntries = dir.entryInfoList(); + const TQFileInfoList *dirEntries = dir.entryInfoList(); TQPtrListIterator<TQFileInfo> it(*dirEntries); for (; it.current(); ++it) { @@ -229,7 +229,7 @@ TQString AntProjectPart::runDirectory() const if ( directoryRadioString == "custom" ) return DomUtil::readEntry(dom, "/kdevantproject/run/customdirectory"); - int pos = DomMainProgram.findRev('/'); + int pos = DomMainProgram.tqfindRev('/'); if (pos != -1) return buildDirectory() + "/" + DomMainProgram.left(pos); @@ -458,7 +458,7 @@ void AntProjectPart::ant(const TQString &target) if (!m_classPath.count() == 0) cp = "CLASSPATH="+m_classPath.join(":"); - makeFrontend()->queueCommand(m_projectDirectory, cmd.arg(cp).arg(m_projectDirectory).arg(target).arg(m_antOptions.m_buildXML).arg(verb).arg(options)); + makeFrontend()->queueCommand(m_projectDirectory, cmd.tqarg(cp).tqarg(m_projectDirectory).tqarg(target).tqarg(m_antOptions.m_buildXML).tqarg(verb).tqarg(options)); } @@ -529,11 +529,11 @@ void AntProjectPart::optionsAccepted() for (int i=0; i<m_antOptionsWidget->Properties->numRows(); ++i) { TQString key = m_antOptionsWidget->Properties->text(i,0); - m_antOptions.m_properties.replace(key, m_antOptionsWidget->Properties->text(i,1)); + m_antOptions.m_properties.tqreplace(key, m_antOptionsWidget->Properties->text(i,1)); kdDebug() << "PROP: " << key << " = " << m_antOptionsWidget->Properties->text(i,1); TQCheckTableItem *item =(TQCheckTableItem*) m_antOptionsWidget->Properties->item(i,0); - m_antOptions.m_defineProperties.replace(key, item->isChecked()); + m_antOptions.m_defineProperties.tqreplace(key, item->isChecked()); } m_classPath = m_classPathWidget->ClassPath->items(); @@ -554,7 +554,7 @@ void AntProjectPart::contextMenu(TQPopupMenu *popup, const Context *context) return; m_contextFileName = url.fileName(); - bool inProject = project()->allFiles().contains(m_contextFileName.mid ( project()->projectDirectory().length() + 1 ) ); + bool inProject = project()->allFiles().tqcontains(m_contextFileName.mid ( project()->projectDirectory().length() + 1 ) ); TQString popupstr = TQFileInfo(m_contextFileName).fileName(); if (m_contextFileName.startsWith(projectDirectory()+ "/")) m_contextFileName.remove(0, projectDirectory().length()+1); @@ -562,15 +562,15 @@ void AntProjectPart::contextMenu(TQPopupMenu *popup, const Context *context) popup->insertSeparator(); if (inProject) { - int id = popup->insertItem( i18n("Remove %1 From Project").arg(popupstr), + int id = popup->insertItem( i18n("Remove %1 From Project").tqarg(popupstr), this, TQT_SLOT(slotRemoveFromProject()) ); - popup->setWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project.")); + popup->tqsetWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project.")); } else { - int id = popup->insertItem( i18n("Add %1 to Project").arg(popupstr), + int id = popup->insertItem( i18n("Add %1 to Project").tqarg(popupstr), this, TQT_SLOT(slotAddToProject()) ); - popup->setWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project.")); + popup->tqsetWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project.")); } } diff --git a/buildtools/ant/antprojectpart.h b/buildtools/ant/antprojectpart.h index 87cbb6dd..411579e2 100644 --- a/buildtools/ant/antprojectpart.h +++ b/buildtools/ant/antprojectpart.h @@ -43,10 +43,11 @@ public: class AntProjectPart : public KDevBuildTool { Q_OBJECT + TQ_OBJECT public: - AntProjectPart(TQObject *parent, const char *name, const TQStringList &args); + AntProjectPart(TQObject *tqparent, const char *name, const TQStringList &args); ~AntProjectPart(); TQStringList distFiles() const; diff --git a/buildtools/ant/classpathwidget.ui b/buildtools/ant/classpathwidget.ui index 8bfde971..52ef6fc5 100644 --- a/buildtools/ant/classpathwidget.ui +++ b/buildtools/ant/classpathwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>ClassPathWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ClassPathWidget</cstring> </property> @@ -30,8 +30,8 @@ <include location="global" impldecl="in implementation">keditlistbox.h</include> <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"/> <includehints> <includehint>keditlistbox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/autotools/addapplicationdlg.cpp b/buildtools/autotools/addapplicationdlg.cpp index f0cd3693..d70dc2d5 100644 --- a/buildtools/autotools/addapplicationdlg.cpp +++ b/buildtools/autotools/addapplicationdlg.cpp @@ -33,8 +33,8 @@ AddApplicationDialog::AddApplicationDialog(AutoProjectWidget *widget, SubprojectItem *spitem, - TQWidget *parent, const char *name) - : AddApplicationDialogBase(parent, name, true) + TQWidget *tqparent, const char *name) + : AddApplicationDialogBase(tqparent, name, true) { filename_edit->setText(".desktop"); filename_edit->home(false); diff --git a/buildtools/autotools/addapplicationdlg.h b/buildtools/autotools/addapplicationdlg.h index 4ab74ef2..05314582 100644 --- a/buildtools/autotools/addapplicationdlg.h +++ b/buildtools/autotools/addapplicationdlg.h @@ -22,10 +22,11 @@ class TargetItem; class AddApplicationDialog : public AddApplicationDialogBase { Q_OBJECT + TQ_OBJECT public: AddApplicationDialog( AutoProjectWidget *widget, SubprojectItem *spitem, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~AddApplicationDialog(); protected: diff --git a/buildtools/autotools/addapplicationdlgbase.ui b/buildtools/autotools/addapplicationdlgbase.ui index 5e6def81..3380dc4c 100644 --- a/buildtools/autotools/addapplicationdlgbase.ui +++ b/buildtools/autotools/addapplicationdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AddApplicationDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>add_application_dialog</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox7</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>terminal_box</cstring> </property> @@ -51,7 +51,7 @@ <cstring>filename_edit</cstring> </property> </widget> - <widget class="QLayoutWidget" row="1" column="3"> + <widget class="TQLayoutWidget" row="1" column="3"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -62,11 +62,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>icon_button</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>24</width> <height>24</height> @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -98,7 +98,7 @@ </spacer> </hbox> </widget> - <widget class="QComboBox" row="0" column="3"> + <widget class="TQComboBox" row="0" column="3"> <property name="name"> <cstring>executable_combo</cstring> </property> @@ -111,7 +111,7 @@ <cstring>name_edit</cstring> </property> </widget> - <widget class="QComboBox" row="2" column="3"> + <widget class="TQComboBox" row="2" column="3"> <item> <property name="text"> <string>Application</string> @@ -181,7 +181,7 @@ <cstring>section_combo</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>name_label_2</cstring> </property> @@ -192,14 +192,14 @@ <property name="text"> <string>E&xecutable:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>executable_combo</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>icon_label</cstring> </property> @@ -210,14 +210,14 @@ <property name="text"> <string>&Icon:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>icon_button</cstring> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>section_label</cstring> </property> @@ -228,14 +228,14 @@ <property name="text"> <string>&Section:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>section_combo</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>filename_label</cstring> </property> @@ -246,14 +246,14 @@ <property name="text"> <string>&File name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>filename_edit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>name_label</cstring> </property> @@ -264,14 +264,14 @@ <property name="text"> <string>&Name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>name_edit</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>comment_label</cstring> </property> @@ -282,7 +282,7 @@ <property name="text"> <string>Co&mment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -301,14 +301,14 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox6</cstring> </property> @@ -319,7 +319,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -330,7 +330,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string></string> @@ -349,7 +349,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -370,14 +370,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>add_button</cstring> </property> @@ -385,7 +385,7 @@ <string><-</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>remove_button</cstring> </property> @@ -403,7 +403,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -412,7 +412,7 @@ </spacer> </vbox> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string></string> @@ -435,7 +435,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -456,14 +456,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>okbutton</cstring> </property> @@ -477,7 +477,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelbutton</cstring> </property> @@ -542,11 +542,11 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">addTypeClicked()</slot> <slot access="protected">iconClicked()</slot> <slot access="protected">removeTypeClicked()</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/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp index 912edc52..19d400fb 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.cpp +++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp @@ -34,8 +34,8 @@ #include "addexistingdirectoriesdlg.h" -AddExistingDirectoriesDialog::AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TQWidget* parent, const char* name, bool modal, WFlags fl ) - : AddExistingDlgBase ( parent, name, modal, fl ) +AddExistingDirectoriesDialog::AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) + : AddExistingDlgBase ( tqparent, name, modal, fl ) { setIcon ( SmallIcon ( "fileimport.png" ) ); @@ -186,7 +186,7 @@ void AddExistingDirectoriesDialog::slotOk() TQString name = *it; // Adjust SUBDIRS variable in containing Makefile.am - if (m_spitem->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) + if (m_spitem->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1) { TQFile subdirsfile( m_spitem->path + "/subdirs" ); if ( subdirsfile.open( IO_WriteOnly | IO_Append ) ) @@ -196,7 +196,7 @@ void AddExistingDirectoriesDialog::slotOk() subdirsfile.close(); } } - else if (m_spitem->variables["SUBDIRS"].find("$(AUTODIRS)") != -1) + else if (m_spitem->variables["SUBDIRS"].tqfind("$(AUTODIRS)") != -1) { } else @@ -229,7 +229,7 @@ void AddExistingDirectoriesDialog::slotOk() m_widget->getSubprojectView()->parse( newitem ); } else { if (!f.open(IO_WriteOnly)) { -// KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name)); +// KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").tqarg(name)); continue; } TQTextStream stream(&f); @@ -243,7 +243,7 @@ void AddExistingDirectoriesDialog::slotOk() if ( !m_part->isKDE() ) { TQString projroot = m_part->projectDirectory() + "/"; TQString subdirectory = dir.path(); - TQString relpath = subdirectory.replace(0, projroot.length(),""); + TQString relpath = subdirectory.tqreplace(0, projroot.length(),""); TQString configureFile = m_part->getAutoConfFile(projroot); @@ -270,7 +270,7 @@ void AddExistingDirectoriesDialog::slotAddSelected() TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url()); if (relPath[relPath.length()-1] == '/') relPath = relPath.left(relPath.length()-1); - if ( (relPath.isEmpty()) || (! m_widget->allSubprojects().contains( relPath )) ) + if ( (relPath.isEmpty()) || (! m_widget->allSubprojects().tqcontains( relPath )) ) { m_importList.append ( ( *it ) ); } @@ -288,7 +288,7 @@ void AddExistingDirectoriesDialog::slotAddAll() TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url()); if (relPath[relPath.length()-1] == '/') relPath = relPath.left(relPath.length()-1); - if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().contains( relPath )) ) + if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().tqcontains( relPath )) ) { m_importList.append ( ( *it ) ); } @@ -363,7 +363,7 @@ void AddExistingDirectoriesDialog::slotDropped ( TQDropEvent* ev ) TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), *it); if (relPath[relPath.length()-1] == '/') relPath = relPath.left(relPath.length()-1); - if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().contains( relPath )) ) + if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().tqcontains( relPath )) ) { type = KMimeType::findByURL ( ( *it ) ); diff --git a/buildtools/autotools/addexistingdirectoriesdlg.h b/buildtools/autotools/addexistingdirectoriesdlg.h index 3b8853ee..1db1f328 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.h +++ b/buildtools/autotools/addexistingdirectoriesdlg.h @@ -36,10 +36,11 @@ class KImportIconView; class AddExistingDirectoriesDialog : public AddExistingDlgBase { Q_OBJECT + TQ_OBJECT public: AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, - SubprojectItem* spitem, TQWidget* parent = 0, + SubprojectItem* spitem, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddExistingDirectoriesDialog(); diff --git a/buildtools/autotools/addexistingdlgbase.ui b/buildtools/autotools/addexistingdlgbase.ui index cf73ee21..e70d5479 100644 --- a/buildtools/autotools/addexistingdlgbase.ui +++ b/buildtools/autotools/addexistingdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>AddExistingDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>AddExistingDlgBase</cstring> </property> @@ -27,9 +27,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -45,14 +45,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>317</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>okButton</cstring> </property> @@ -63,7 +63,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelButton</cstring> </property> @@ -81,7 +81,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>infoGroupBox</cstring> </property> @@ -93,7 +93,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -112,7 +112,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>infoLayout1</cstring> </property> @@ -123,7 +123,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>directoryStaticLabel</cstring> </property> @@ -143,7 +143,7 @@ <string>Directory:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>targetStaticLabel</cstring> </property> @@ -165,7 +165,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>infoLayout2</cstring> </property> @@ -192,7 +192,7 @@ <string>[DIRECTORY]</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>targetLabel</cstring> </property> @@ -204,7 +204,7 @@ </widget> </hbox> </widget> - <widget class="QSplitter" row="1" column="0"> + <widget class="TQSplitter" row="1" column="0"> <property name="name"> <cstring>splitter2</cstring> </property> @@ -219,17 +219,17 @@ <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -245,14 +245,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>84</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addAllButton</cstring> </property> @@ -263,7 +263,7 @@ <string>Import by creating symbolic links (recommended)</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addSelectedButton</cstring> </property> @@ -284,7 +284,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>84</width> <height>20</height> @@ -293,17 +293,17 @@ </spacer> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>sourceGroupBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>240</width> <height>250</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -323,17 +323,17 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -349,14 +349,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeAllButton</cstring> </property> @@ -367,7 +367,7 @@ <string>Removes all added files.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeSelectedButton</cstring> </property> @@ -388,7 +388,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -397,17 +397,17 @@ </spacer> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>destGroupBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>140</width> <height>100</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -450,8 +450,8 @@ <include location="global" impldecl="in implementation">kprogress.h</include> <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"/> <includehints> <includehint>kprogress.h</includehint> <includehint>ksqueezedtextlabel.h</includehint> diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp index 6d3224df..519acb33 100644 --- a/buildtools/autotools/addexistingfilesdlg.cpp +++ b/buildtools/autotools/addexistingfilesdlg.cpp @@ -49,15 +49,15 @@ #include "addexistingfilesdlg.h" /* - * Constructs a AddExistingFilesDialog which is a child of 'parent', with the + * Constructs a AddExistingFilesDialog which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TargetItem* titem, TQWidget* parent, const char* name, bool modal, WFlags fl ) - : AddExistingDlgBase ( parent, name, modal, fl ) +AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TargetItem* titem, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) + : AddExistingDlgBase ( tqparent, name, modal, fl ) { m_spitem = spitem; m_titem = titem; @@ -110,7 +110,7 @@ AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProj */ AddExistingFilesDialog::~AddExistingFilesDialog() { - // no need to delete child widgets, Qt does it all for me + // no need to delete child widgets, TQt does it all for me } @@ -234,7 +234,7 @@ void AddExistingFilesDialog::slotOk() progressBar->show(); progressBar->setFormat ( i18n ( "Importing... %p%" ) ); - qApp->processEvents(); + tqApp->processEvents(); KFileItemListIterator items ( *importView->items() ); diff --git a/buildtools/autotools/addexistingfilesdlg.h b/buildtools/autotools/addexistingfilesdlg.h index aa00a99e..6cf69364 100644 --- a/buildtools/autotools/addexistingfilesdlg.h +++ b/buildtools/autotools/addexistingfilesdlg.h @@ -39,10 +39,11 @@ class KFileItem; class AddExistingFilesDialog : public AddExistingDlgBase { Q_OBJECT + TQ_OBJECT public: AddExistingFilesDialog( AutoProjectPart* part, AutoProjectWidget *widget, - SubprojectItem* spitem, TargetItem* titem, TQWidget* parent = 0, + SubprojectItem* spitem, TargetItem* titem, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddExistingFilesDialog(); diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp index 56df4998..407e5109 100644 --- a/buildtools/autotools/addfiledlg.cpp +++ b/buildtools/autotools/addfiledlg.cpp @@ -40,8 +40,8 @@ AddFileDialog::AddFileDialog(AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *item, - TQWidget *parent, const char *name) - : AddFileDlgBase(parent, name, true) + TQWidget *tqparent, const char *name) + : AddFileDlgBase(tqparent, name, true) { connect ( createButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); @@ -68,7 +68,7 @@ AddFileDialog::~AddFileDialog() void AddFileDialog::accept() { TQString name = fileEdit->text(); - if (name.find('/') != -1) { + if (name.tqfind('/') != -1) { KMessageBox::sorry(this, i18n("Please enter the file name without '/' and so on.")); return; } diff --git a/buildtools/autotools/addfiledlg.h b/buildtools/autotools/addfiledlg.h index 867c88cc..e4a6ead4 100644 --- a/buildtools/autotools/addfiledlg.h +++ b/buildtools/autotools/addfiledlg.h @@ -27,11 +27,12 @@ class TargetItem; class AddFileDialog : public AddFileDlgBase { Q_OBJECT + TQ_OBJECT public: AddFileDialog( AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *item, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~AddFileDialog(); protected: diff --git a/buildtools/autotools/addfiledlgbase.ui b/buildtools/autotools/addfiledlgbase.ui index dc8e38b2..2c73254d 100644 --- a/buildtools/autotools/addfiledlgbase.ui +++ b/buildtools/autotools/addfiledlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AddFileDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>AddFileDlgBase</cstring> </property> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -39,7 +39,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>targetBox</cstring> </property> @@ -56,7 +56,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>targetLayout</cstring> </property> @@ -75,7 +75,7 @@ <string>[TARGET DIRECTORY]</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>targetLabel</cstring> </property> @@ -83,7 +83,7 @@ <string>[TARGET NAME]</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>directoryStaticLabel</cstring> </property> @@ -103,7 +103,7 @@ <string>Directory:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>targetStaticLabel</cstring> </property> @@ -127,7 +127,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>fileGroupBox</cstring> </property> @@ -150,14 +150,14 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>templateCheckBox</cstring> </property> @@ -176,7 +176,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>fileStaticLabel</cstring> </property> @@ -188,7 +188,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -217,14 +217,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> <cstring>buttonLayout</cstring> </property> @@ -245,14 +245,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>createButton</cstring> </property> @@ -263,7 +263,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelButton</cstring> </property> @@ -280,8 +280,8 @@ <include location="global" impldecl="in implementation">klineedit.h</include> <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"/> <includehints> <includehint>ksqueezedtextlabel.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/autotools/addicondlg.cpp b/buildtools/autotools/addicondlg.cpp index 5531c656..79aaab0e 100644 --- a/buildtools/autotools/addicondlg.cpp +++ b/buildtools/autotools/addicondlg.cpp @@ -39,8 +39,8 @@ const char *size_map[] = { AddIconDialog::AddIconDialog(AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *titem, - TQWidget *parent, const char *name) - : AddIconDialogBase(parent, name, true) + TQWidget *tqparent, const char *name) + : AddIconDialogBase(tqparent, name, true) { type_combo->insertItem(i18n("Application")); type_combo->insertItem(i18n("Action")); @@ -105,7 +105,7 @@ void AddIconDialog::accept() m_target->sources.append(fitem); m_target->insertItem(fitem); - m_part->startMakeCommand(destdir, TQString::fromLatin1("force-reedit")); + m_part->startMakeCommand(destdir, TQString::tqfromLatin1("force-reedit")); m_widget->emitAddedFile(destpath); diff --git a/buildtools/autotools/addicondlg.h b/buildtools/autotools/addicondlg.h index 8ab8437f..94dd8306 100644 --- a/buildtools/autotools/addicondlg.h +++ b/buildtools/autotools/addicondlg.h @@ -23,11 +23,12 @@ class TargetItem; class AddIconDialog : public AddIconDialogBase { Q_OBJECT + TQ_OBJECT public: AddIconDialog( AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *titem, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~AddIconDialog(); diff --git a/buildtools/autotools/addicondlgbase.ui b/buildtools/autotools/addicondlgbase.ui index 7fec5097..ad087c56 100644 --- a/buildtools/autotools/addicondlgbase.ui +++ b/buildtools/autotools/addicondlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AddIconDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>add_icon_dialog</cstring> </property> @@ -23,7 +23,7 @@ <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>type_label</cstring> </property> @@ -34,14 +34,14 @@ <property name="text"> <string>&Type:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>type_combo</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>size_label</cstring> </property> @@ -52,19 +52,19 @@ <property name="text"> <string>&Size:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>size_combo</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>size_combo</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>filename_label</cstring> </property> @@ -75,14 +75,14 @@ <property name="text"> <string>File name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>filename_edit</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>name_label</cstring> </property> @@ -93,7 +93,7 @@ <property name="text"> <string>&Name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -114,7 +114,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -136,14 +136,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>okbutton</cstring> </property> @@ -157,7 +157,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelbutton</cstring> </property> @@ -178,12 +178,12 @@ <string>unknown</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>type_combo</cstring> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>filename_edit</cstring> </property> @@ -212,7 +212,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -260,14 +260,14 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>somethingChanged()</slot> -</slots> +</Q_SLOTS> <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/autotools/addprefixdlg.cpp b/buildtools/autotools/addprefixdlg.cpp index c4570d8f..105c1457 100644 --- a/buildtools/autotools/addprefixdlg.cpp +++ b/buildtools/autotools/addprefixdlg.cpp @@ -21,8 +21,8 @@ #include <kdeversion.h> AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& pathEdit, - TQWidget *parent, const char *name) - : TQDialog(parent, name, true) + TQWidget *tqparent, const char *name) + : TQDialog(tqparent, name, true) { setCaption(i18n("Add Prefix")); @@ -39,10 +39,10 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path path_edit->setMinimumWidth(fm.width('X')*35); connect( path_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotPrefixChanged() ) ); - 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(name_label, 0, 0); grid->addWidget(name_edit, 0, 1); grid->addWidget(path_label, 1, 0); @@ -50,7 +50,7 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path 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(); @@ -59,8 +59,8 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path 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); slotPrefixChanged(); } diff --git a/buildtools/autotools/addprefixdlg.h b/buildtools/autotools/addprefixdlg.h index 43630ab4..48dc09b4 100644 --- a/buildtools/autotools/addprefixdlg.h +++ b/buildtools/autotools/addprefixdlg.h @@ -16,13 +16,14 @@ #include <klineedit.h> class TQPushButton; -class AddPrefixDialog : public QDialog +class AddPrefixDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: AddPrefixDialog( const TQString& nameEdit = "", const TQString& pathEdit = "", - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~AddPrefixDialog(); TQString name() const diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp index dde34053..a53b2551 100644 --- a/buildtools/autotools/addservicedlg.cpp +++ b/buildtools/autotools/addservicedlg.cpp @@ -32,8 +32,8 @@ AddServiceDialog::AddServiceDialog(AutoProjectWidget *widget, SubprojectItem *spitem, - TQWidget *parent, const char *name) - : AddServiceDialogBase(parent, name, true) + TQWidget *tqparent, const char *name) + : AddServiceDialogBase(tqparent, name, true) { filename_edit->setText(".desktop"); filename_edit->home(false); @@ -77,7 +77,7 @@ void AddServiceDialog::updateProperties() TQStringList stprops = type->propertyDefNames(); TQStringList::ConstIterator stit; for (stit = stprops.begin(); stit != stprops.end(); ++stit) - if (props.find(*stit) == props.end() && (*stit) != "Name" && (*stit) != "Comment" + if (props.tqfind(*stit) == props.end() && (*stit) != "Name" && (*stit) != "Comment" && (*stit) != "Icon") props.append(*stit); } @@ -136,7 +136,7 @@ void AddServiceDialog::propertyExecuted(TQListViewItem *item) TQString prop = item->text(0); TQString value = item->text(1); bool ok; - value = KInputDialog::getText(i18n("Enter Value"), i18n("Property %1:").arg(prop), value, &ok, this); + value = KInputDialog::getText(i18n("Enter Value"), i18n("Property %1:").tqarg(prop), value, &ok, this); if (!ok) return; diff --git a/buildtools/autotools/addservicedlg.h b/buildtools/autotools/addservicedlg.h index 84469e0c..7799a184 100644 --- a/buildtools/autotools/addservicedlg.h +++ b/buildtools/autotools/addservicedlg.h @@ -22,10 +22,11 @@ class TargetItem; class AddServiceDialog : public AddServiceDialogBase { Q_OBJECT + TQ_OBJECT public: AddServiceDialog( AutoProjectWidget *widget, SubprojectItem *spitem, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~AddServiceDialog(); protected: diff --git a/buildtools/autotools/addservicedlgbase.ui b/buildtools/autotools/addservicedlgbase.ui index 050f8066..99370d6e 100644 --- a/buildtools/autotools/addservicedlgbase.ui +++ b/buildtools/autotools/addservicedlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AddServiceDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>add_service_dialog</cstring> </property> @@ -23,7 +23,7 @@ <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -43,7 +43,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>icon_label</cstring> </property> @@ -54,14 +54,14 @@ <property name="text"> <string>&Icon:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>icon_button</cstring> </property> </widget> - <widget class="QLayoutWidget" row="1" column="3"> + <widget class="TQLayoutWidget" row="1" column="3"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -73,11 +73,11 @@ <number>0</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>icon_button</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>24</width> <height>24</height> @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -119,7 +119,7 @@ <cstring>name_edit</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="3"> + <widget class="TQComboBox" row="0" column="3"> <property name="name"> <cstring>library_combo</cstring> </property> @@ -127,7 +127,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>library_label</cstring> </property> @@ -138,14 +138,14 @@ <property name="text"> <string>&Library:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>library_combo</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>filename_label</cstring> </property> @@ -156,14 +156,14 @@ <property name="text"> <string>&File name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>filename_edit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>name_label</cstring> </property> @@ -174,14 +174,14 @@ <property name="text"> <string>&Name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>name_edit</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>comment_label</cstring> </property> @@ -192,7 +192,7 @@ <property name="text"> <string>Co&mment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -201,7 +201,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -213,7 +213,7 @@ <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -225,7 +225,7 @@ <number>0</number> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string></string> @@ -252,7 +252,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -274,14 +274,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>add_button</cstring> </property> @@ -289,7 +289,7 @@ <string><-</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>remove_button</cstring> </property> @@ -307,7 +307,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -316,7 +316,7 @@ </spacer> </vbox> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string></string> @@ -345,7 +345,7 @@ </widget> </hbox> </widget> - <widget class="QListView" row="1" column="1"> + <widget class="TQListView" row="1" column="1"> <column> <property name="text"> <string>Property</string> @@ -386,7 +386,7 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>properties_label</cstring> </property> @@ -405,7 +405,7 @@ <property name="text"> <string>&Properties:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -414,7 +414,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -436,14 +436,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>okbutton</cstring> </property> @@ -457,7 +457,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelbutton</cstring> </property> @@ -493,15 +493,15 @@ </connection> <connection> <sender>properties_listview</sender> - <signal>doubleClicked(QListViewItem*)</signal> + <signal>doubleClicked(TQListViewItem*)</signal> <receiver>add_service_dialog</receiver> - <slot>propertyExecuted(QListViewItem*)</slot> + <slot>propertyExecuted(TQListViewItem*)</slot> </connection> <connection> <sender>properties_listview</sender> - <signal>returnPressed(QListViewItem*)</signal> + <signal>returnPressed(TQListViewItem*)</signal> <receiver>add_service_dialog</receiver> - <slot>propertyExecuted(QListViewItem*)</slot> + <slot>propertyExecuted(TQListViewItem*)</slot> </connection> <connection> <sender>icon_button</sender> @@ -530,15 +530,15 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot access="protected">iconClicked()</slot> <slot access="protected">addTypeClicked()</slot> - <slot access="protected">propertyExecuted(QListViewItem*)</slot> + <slot access="protected">propertyExecuted(TQListViewItem*)</slot> <slot access="protected">removeTypeClicked()</slot> -</slots> +</Q_SLOTS> <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/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp index 9aeef695..bb0e5527 100644 --- a/buildtools/autotools/addsubprojectdlg.cpp +++ b/buildtools/autotools/addsubprojectdlg.cpp @@ -32,8 +32,8 @@ AddSubprojectDialog::AddSubprojectDialog(AutoProjectPart *part, AutoSubprojectView *view, - SubprojectItem *item, TQWidget *parent, const char *name) - : AddSubprojectDlgBase(parent, name, true) + SubprojectItem *item, TQWidget *tqparent, const char *name) + : AddSubprojectDlgBase(tqparent, name, true) { setIcon(SmallIcon("folder_new.png")); @@ -82,31 +82,31 @@ void AddSubprojectDialog::accept() TQFileInfo file( dir, name ); if( file.exists() && !file.isDir() ) { - KMessageBox::sorry(this, i18n("A file named %1 already exists.").arg(name)); + KMessageBox::sorry(this, i18n("A file named %1 already exists.").tqarg(name)); TQDialog::accept(); return; } else if( file.isDir() ) { if( KMessageBox::warningContinueCancel(this, i18n("A subdirectory %1 already exists. " - "Do you wish to add it as a subproject?").arg(name)) + "Do you wish to add it as a subproject?").tqarg(name)) == KMessageBox::Cancel ){ TQDialog::accept(); return; } } else if (!dir.mkdir(name)) { - KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").arg(name)); + KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").tqarg(name)); TQDialog::accept(); return; } if(!dir.cd(name)) { - KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").arg(name)); + KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").tqarg(name)); TQDialog::accept(); return; } // Adjust SUBDIRS variable in containing Makefile.am - if (m_subProject->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) + if (m_subProject->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1) { TQFile subdirsfile( m_subProject->path + "/subdirs" ); if ( subdirsfile.open( IO_WriteOnly | IO_Append ) ) @@ -116,7 +116,7 @@ void AddSubprojectDialog::accept() subdirsfile.close(); } } - else if (m_subProject->variables["SUBDIRS"].find("$(AUTODIRS)") != -1) + else if (m_subProject->variables["SUBDIRS"].tqfind("$(AUTODIRS)") != -1) { } else @@ -148,7 +148,7 @@ void AddSubprojectDialog::accept() m_subprojectView->parse( newitem ); } else { if (!f.open(IO_WriteOnly)) { - KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name)); + KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").tqarg(name)); return; } TQTextStream stream(&f); @@ -162,7 +162,7 @@ void AddSubprojectDialog::accept() if ( !m_part->isKDE() ) { TQString projroot = m_part->projectDirectory() + "/"; TQString subdirectory = dir.path(); - TQString relpath = subdirectory.replace(0, projroot.length(),""); + TQString relpath = subdirectory.tqreplace(0, projroot.length(),""); TQString configureFile = m_part->getAutoConfFile(projroot); diff --git a/buildtools/autotools/addsubprojectdlg.h b/buildtools/autotools/addsubprojectdlg.h index c1d3b7bf..9ccd1373 100644 --- a/buildtools/autotools/addsubprojectdlg.h +++ b/buildtools/autotools/addsubprojectdlg.h @@ -25,10 +25,11 @@ class SubprojectItem; class AddSubprojectDialog : public AddSubprojectDlgBase { Q_OBJECT + TQ_OBJECT public: AddSubprojectDialog( AutoProjectPart *part, AutoSubprojectView *widget, - SubprojectItem *item, TQWidget *parent = 0, const char *name = 0 ); + SubprojectItem *item, TQWidget *tqparent = 0, const char *name = 0 ); ~AddSubprojectDialog(); private: diff --git a/buildtools/autotools/addsubprojectdlgbase.ui b/buildtools/autotools/addsubprojectdlgbase.ui index b4c762b1..73851ee4 100644 --- a/buildtools/autotools/addsubprojectdlgbase.ui +++ b/buildtools/autotools/addsubprojectdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AddSubprojectDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>AddSubprojectDlgBase</cstring> </property> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -39,7 +39,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>fileGroupBox</cstring> </property> @@ -50,7 +50,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -61,7 +61,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>spStaticLabel</cstring> </property> @@ -73,7 +73,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -102,7 +102,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -123,14 +123,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>buttonLayout</cstring> </property> @@ -151,14 +151,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>createButton</cstring> </property> @@ -169,7 +169,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelButton</cstring> </property> @@ -190,8 +190,8 @@ <include location="global" impldecl="in implementation">klineedit.h</include> <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"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/buildtools/autotools/addtargetdlg.cpp b/buildtools/autotools/addtargetdlg.cpp index 5ca96c45..8a0c400c 100644 --- a/buildtools/autotools/addtargetdlg.cpp +++ b/buildtools/autotools/addtargetdlg.cpp @@ -29,8 +29,8 @@ AddTargetDialog::AddTargetDialog(AutoProjectWidget *widget, SubprojectItem *item, - TQWidget *parent, const char *name) - : AddTargetDialogBase(parent, name, true) + TQWidget *tqparent, const char *name) + : AddTargetDialogBase(tqparent, name, true) { m_subproject = item; m_widget = widget; @@ -54,7 +54,7 @@ AddTargetDialog::AddTargetDialog(AutoProjectWidget *widget, SubprojectItem *item setIcon ( SmallIcon ( "targetnew_kdevelop.png" ) ); - canonicalLabel->setText ( TQString::null ); + canonicalLabel->setText ( TQString() ); } @@ -165,13 +165,13 @@ void AddTargetDialog::accept() #endif if( primary.endsWith("LIBRARIES") && !name.startsWith("lib") && !module_box->isChecked() ) - name.prepend( TQString::fromLatin1("lib") ); + name.prepend( TQString::tqfromLatin1("lib") ); if( primary == "LTLIBRARIES" && !name.endsWith(".la") ) - name.append( TQString::fromLatin1(".la") ); + name.append( TQString::tqfromLatin1(".la") ); if ( primary == "LIBRARIES" && !name.endsWith(".a") ) - name.append ( TQString::fromLatin1(".a") ); + name.append ( TQString::tqfromLatin1(".a") ); TQPtrListIterator<TargetItem> it(m_subproject->targets); for (; it.current(); ++it) diff --git a/buildtools/autotools/addtargetdlg.h b/buildtools/autotools/addtargetdlg.h index 8c44aef4..f05cdb94 100644 --- a/buildtools/autotools/addtargetdlg.h +++ b/buildtools/autotools/addtargetdlg.h @@ -22,10 +22,11 @@ class SubprojectItem; class AddTargetDialog : public AddTargetDialogBase { Q_OBJECT + TQ_OBJECT public: AddTargetDialog( AutoProjectWidget *widget, SubprojectItem *item, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~AddTargetDialog(); protected slots: diff --git a/buildtools/autotools/addtargetdlgbase.ui b/buildtools/autotools/addtargetdlgbase.ui index 25687563..f8b8d689 100644 --- a/buildtools/autotools/addtargetdlgbase.ui +++ b/buildtools/autotools/addtargetdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AddTargetDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>add_target_dialog</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</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>primary_label</cstring> </property> @@ -44,19 +44,19 @@ <property name="text"> <string>&Primary:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>primary_combo</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>primary_combo</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>prefix_label</cstring> </property> @@ -67,19 +67,19 @@ <property name="text"> <string>Pre&fix:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>prefix_combo</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>prefix_combo</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>filename_label</cstring> </property> @@ -90,7 +90,7 @@ <property name="text"> <string>File &name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -112,7 +112,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>246</width> <height>20</height> @@ -127,7 +127,7 @@ <string>[CANONICALIZED NAME]</string> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -155,14 +155,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="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>ldflags_group</cstring> </property> @@ -173,7 +173,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>allstatic_box</cstring> </property> @@ -181,7 +181,7 @@ <string>Do not link against shared libraries (-all-static)</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>avoidversion_box</cstring> </property> @@ -189,7 +189,7 @@ <string>Do not assign version numbers to libraries (-avoid-version)</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>module_box</cstring> </property> @@ -197,7 +197,7 @@ <string>Create a library that can be dynamically loaded (-module)</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>noundefined_box</cstring> </property> @@ -205,7 +205,7 @@ <string>Library does not depend on external symbols (-no-undefined)</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout11_2</cstring> </property> @@ -216,7 +216,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>ldflagsother_label</cstring> </property> @@ -240,7 +240,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -261,14 +261,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>okbutton</cstring> </property> @@ -282,7 +282,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelbutton</cstring> </property> @@ -337,11 +337,11 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">primaryChanged()</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>ksqueezedtextlabel.h</includehint> </includehints> diff --git a/buildtools/autotools/addtranslationdlg.cpp b/buildtools/autotools/addtranslationdlg.cpp index 559e1369..6057bb65 100644 --- a/buildtools/autotools/addtranslationdlg.cpp +++ b/buildtools/autotools/addtranslationdlg.cpp @@ -31,8 +31,8 @@ #include "autoprojectpart.h" -AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *parent, const char *name) - : TQDialog(parent, name, true) +AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *tqparent, const char *name) + : TQDialog(tqparent, name, true) { setCaption(i18n("Add Translation")); @@ -42,12 +42,12 @@ AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *pare (void) new TQLabel(i18n("Language:"), hbox); lang_combo = new TQComboBox(hbox); - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - layout->addWidget(hbox); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout->addWidget(hbox); 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(); @@ -56,8 +56,8 @@ AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *pare ok_button->setDefault(true); connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); - buttonbox->layout(); - layout->addWidget(buttonbox, 0); + buttonbox->tqlayout(); + tqlayout->addWidget(buttonbox, 0); TQStringList rawlist, list; rawlist << "af" << "ar" << "bg" << "bo" << "br" << "bs" << "ca" << "cs" << "cy" << "da" @@ -101,7 +101,7 @@ void AddTranslationDialog::accept() f.close(); dir = m_part->buildDirectory() + "/po"; - m_part->startMakeCommand(dir, TQString::fromLatin1("force-reedit")); + m_part->startMakeCommand(dir, TQString::tqfromLatin1("force-reedit")); TQDialog::accept(); } diff --git a/buildtools/autotools/addtranslationdlg.h b/buildtools/autotools/addtranslationdlg.h index 762c9790..5fb8b288 100644 --- a/buildtools/autotools/addtranslationdlg.h +++ b/buildtools/autotools/addtranslationdlg.h @@ -18,12 +18,13 @@ class TQComboBox; class AutoProjectPart; -class AddTranslationDialog : public QDialog +class AddTranslationDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - AddTranslationDialog( AutoProjectPart *part, TQWidget *parent = 0, const char *name = 0 ); + AddTranslationDialog( AutoProjectPart *part, TQWidget *tqparent = 0, const char *name = 0 ); ~AddTranslationDialog(); private: diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index d3cf3864..7002b7c8 100644 --- a/buildtools/autotools/autodetailsview.cpp +++ b/buildtools/autotools/autodetailsview.cpp @@ -15,7 +15,7 @@ #include "autodetailsview.h" -/** Qt */ +/** TQt */ #include <tqregexp.h> #include <tqlistview.h> #include <tqwidget.h> @@ -57,8 +57,8 @@ #include "subclassesdlg.h" -AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name) - : AutoProjectViewBase(parent, name) +AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *tqparent, const char *name) + : AutoProjectViewBase(tqparent, name) { m_widget = widget; m_part = part; @@ -71,7 +71,7 @@ AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* par m_listView->setAllColumnsShowFocus( true ); m_listView->setRootIsDecorated( true ); m_listView->setResizeMode( TQListView::LastColumn ); - m_listView->addColumn( TQString::null ); + m_listView->addColumn( TQString() ); m_listView->header()->hide(); targetOptionsAction->setEnabled( false ); addNewFileAction->setEnabled( false ); @@ -126,7 +126,7 @@ void AutoDetailsView::slotSelectionChanged( TQListViewItem* item ) if ( pvitem->type() == ProjectItem::File ) { - titem = static_cast <TargetItem*> ( pvitem->parent() ); + titem = static_cast <TargetItem*> ( pvitem->tqparent() ); TQString primary = titem->primary; if ( primary == "PROGRAMS" || primary == "LIBRARIES" || @@ -177,7 +177,7 @@ void AutoDetailsView::initActions() KActionCollection * actions = new KActionCollection( this ); targetOptionsAction = new AutoToolsAction( i18n( "Options..." ), "configure", 0, - this, TQT_SLOT( slotTargetOptions() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotTargetOptions() ), actions, "target options" ); targetOptionsAction->setWhatsThis(i18n("<b>Options</b><p>Target options dialog that " "provides settings for linker flags and lists " @@ -188,7 +188,7 @@ void AutoDetailsView::initActions() TQToolTip::add( m_button1, tr2i18n( "Create New File..." ) ); addNewFileAction = new AutoToolsAction( i18n( "Create New File..." ), "filenew", 0, - this, TQT_SLOT( slotAddNewFile() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotAddNewFile() ), actions, "add new file" ); addNewFileAction->setWhatsThis(i18n("<b>Create new file</b><p>Creates a new file and " "adds it to a currently selected target.")); @@ -197,7 +197,7 @@ void AutoDetailsView::initActions() TQToolTip::add( m_button2, tr2i18n( "Add Existing Files..." ) ); addExistingFileAction = new AutoToolsAction( i18n( "Add Existing Files..." ), "fileimport", 0, - this, TQT_SLOT( slotAddExistingFile() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotAddExistingFile() ), actions, "add existing file" ); addExistingFileAction->setWhatsThis(i18n("<b>Add existing files</b><p>Adds existing " "file to a currently selected target. Header " @@ -208,12 +208,12 @@ void AutoDetailsView::initActions() addExistingFileAction->setEnabled( false ); addIconAction = new KAction( i18n( "Add Icon..." ), "iconadd_kdevelop", 0, - this, TQT_SLOT( slotAddIcon() ), actions, "add icon" ); + TQT_TQOBJECT(this), TQT_SLOT( slotAddIcon() ), actions, "add icon" ); addIconAction->setWhatsThis(i18n("<b>Add icon</b><p>Adds an icon to a KDEICON target.")); TQToolTip::add( m_button4, tr2i18n( "Build Target")); buildTargetAction = new AutoToolsAction( i18n( "Build Target..." ), "launch", 0, - this, TQT_SLOT( slotBuildTarget() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotBuildTarget() ), actions, "build target" ); buildTargetAction->setWhatsThis(i18n("<b>Build target</b><p>Constructs a series of " "make commands to build the selected target. " @@ -223,7 +223,7 @@ void AutoDetailsView::initActions() TQToolTip::add( m_button5, tr2i18n( "Execute Target...")); executeTargetAction = new AutoToolsAction( i18n( "Execute Target..." ), "exec", 0, - this, TQT_SLOT( slotExecuteTarget() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotExecuteTarget() ), actions, "execute target" ); executeTargetAction->setWhatsThis(i18n("<b>Execute target</b><p>Executes the target " "and tries to build in case it is not built.")); @@ -231,7 +231,7 @@ void AutoDetailsView::initActions() executeTargetAction->setEnabled( false ); setActiveTargetAction = new KAction( i18n( "Make Target Active" ), "", 0, - this, TQT_SLOT( slotSetActiveTarget() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotSetActiveTarget() ), actions, "set active target" ); setActiveTargetAction->setWhatsThis(i18n("<b>Make target active</b><p>Marks the " "currently selected target as 'active'. New " @@ -241,7 +241,7 @@ void AutoDetailsView::initActions() "command builds it.")); TQToolTip::add( m_button3, tr2i18n( "Remove")); - removeDetailAction = new AutoToolsAction( i18n( "Remove" ), "editdelete", 0, this, + removeDetailAction = new AutoToolsAction( i18n( "Remove" ), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveDetail() ), actions, "remove detail" ); removeDetailAction->setWhatsThis(i18n("<b>Remove</b><p>Shows a list of targets " @@ -269,7 +269,7 @@ TQString AutoDetailsView::getUiFileLink(const TQString& relpath, const TQString& return (*it).second; } - return TQString::null; + return TQString(); } void AutoDetailsView::slotTargetOptions() @@ -298,7 +298,7 @@ void AutoDetailsView::slotAddNewFile() if (createFileSupport) { KDevCreateFile::CreatedFile crFile = - createFileSupport->createNewFile(TQString::null, + createFileSupport->createNewFile(TQString(), m_widget->selectedSubproject()->path); /* if (crFile.status == KDevCreateFile::CreatedFile::STATUS_OK) { @@ -365,7 +365,7 @@ void AutoDetailsView::slotBuildTarget() TargetItem* titem = 0; if ( pvitem->type() == ProjectItem::File ) - titem = static_cast <TargetItem*> ( pvitem->parent() ); + titem = static_cast <TargetItem*> ( pvitem->tqparent() ); else titem = static_cast <TargetItem*> ( m_listView->selectedItem() ); @@ -383,7 +383,7 @@ void AutoDetailsView::slotExecuteTarget() TargetItem* titem = 0; if ( pvitem->type() == ProjectItem::File ) - titem = static_cast <TargetItem*> ( pvitem->parent() ); + titem = static_cast <TargetItem*> ( pvitem->tqparent() ); else titem = static_cast <TargetItem*> ( m_listView->selectedItem() ); @@ -409,7 +409,7 @@ void AutoDetailsView::slotRemoveDetail() if ( !fitem ) return; - TargetItem *titem = static_cast<TargetItem*>( fitem->parent() ); + TargetItem *titem = static_cast<TargetItem*>( fitem->tqparent() ); RemoveFileDialog dlg( m_widget, m_part, m_widget->selectedSubproject(), titem, fitem->text( 0 ), this, "remove file dialog" ); @@ -499,7 +499,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, else caption = titem->name; - KPopupMenu popup( i18n( "Target: %1" ).arg( caption ), this ); + KPopupMenu popup( i18n( "Target: %1" ).tqarg( caption ), this ); if ( titem->primary == "PROGRAMS" || titem->primary == "LIBRARIES" || titem->primary == "LTLIBRARIES" || titem->primary == "JAVA" ) @@ -554,7 +554,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, return; } - KPopupMenu popup( i18n( "File: %1" ).arg( fitem->name ), this ); + KPopupMenu popup( i18n( "File: %1" ).tqarg( fitem->name ), this ); removeDetailAction->plug( &popup ); KURL::List urls; @@ -563,7 +563,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, int idSubclassWidget = popup.insertItem(SmallIconSet("qmake_subclass"), i18n("Subclassing Wizard...") ); - popup.setWhatsThis(idSubclassWidget, i18n("<b>Subclass widget</b><p>Launches " + popup.tqsetWhatsThis(idSubclassWidget, i18n("<b>Subclass widget</b><p>Launches " "<b>Subclassing</b> wizard. " "It allows to create a subclass from the " "class defined in .ui file. " @@ -572,22 +572,22 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, "class.")); int idUISubclasses = popup.insertItem(SmallIconSet("qmake_subclass"), i18n("List of Subclasses...")); - popup.setWhatsThis(idUISubclasses, i18n("<b>List of subclasses</b><p>Shows " + popup.tqsetWhatsThis(idUISubclasses, i18n("<b>List of subclasses</b><p>Shows " "subclasses list editor. " "There is possibility to add or remove " "subclasses from the list.")); int idUpdateWidgetclass = popup.insertItem(SmallIconSet("qmake_subclass"), i18n("Edit ui-Subclass...")); - popup.setWhatsThis(idUpdateWidgetclass, i18n("<b>Edit ui-subclass</b><p>Launches " + popup.tqsetWhatsThis(idUpdateWidgetclass, i18n("<b>Edit ui-subclass</b><p>Launches " "<b>Subclassing</b> wizard and prompts " "to implement missing in childclass " "slots and functions.")); int idViewUIH = popup.insertItem(SmallIconSet("qmake_ui_h"), i18n("Open ui.h File")); - popup.setWhatsThis(idViewUIH, i18n("<b>Open ui.h file</b><p>Opens .ui.h file " + popup.tqsetWhatsThis(idViewUIH, i18n("<b>Open ui.h file</b><p>Opens .ui.h file " "associated with the selected .ui.")); - if (!fitem->name.contains(TQRegExp("ui$")) || fitem->is_subst == true) + if (!fitem->name.tqcontains(TQRegExp("ui$")) || fitem->is_subst == true) { popup.removeItem(idUISubclasses); popup.removeItem(idViewUIH); @@ -625,7 +625,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, list << DomUtil::Pair(srcfile_relpath,uifile_relpath); DomUtil::writePairListEntry(dom, "/kdevautoproject/subclassing", "subclass", "sourcefile", "uifile", list); - newFileNames[i] = newFileNames[i].replace(TQRegExp(m_part->projectDirectory()+"/"),""); + newFileNames[i] = newFileNames[i].tqreplace(TQRegExp(m_part->projectDirectory()+"/"),""); } m_subclasslist = DomUtil::readPairListEntry(dom,"/kdevautoproject/subclassing", "subclass","sourcefile", "uifile"); @@ -636,13 +636,13 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, { TQString noext = m_widget->selectedSubproject()->path + "/" + fitem->name; - if (noext.findRev('.')>-1) - noext = noext.left(noext.findRev('.')); + if (noext.tqfindRev('.')>-1) + noext = noext.left(noext.tqfindRev('.')); TQStringList dummy; TQString uifile = fitem->uiFileLink; - if (uifile.findRev('/')>-1) + if (uifile.tqfindRev('/')>-1) { TQStringList uisplit = TQStringList::split('/',uifile); uifile=uisplit[uisplit.count()-1]; diff --git a/buildtools/autotools/autodetailsview.h b/buildtools/autotools/autodetailsview.h index 60f10738..0c649b95 100644 --- a/buildtools/autotools/autodetailsview.h +++ b/buildtools/autotools/autodetailsview.h @@ -32,9 +32,10 @@ class AutoDetailsView : protected AutoProjectViewBase friend class RemoveFileDialog; friend class FileItem; Q_OBJECT + TQ_OBJECT public: - AutoDetailsView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name ); + AutoDetailsView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *tqparent, const char *name ); virtual ~AutoDetailsView(); TQString getUiFileLink( const TQString &path, const TQString& filename ); diff --git a/buildtools/autotools/autolistviewitems.cpp b/buildtools/autotools/autolistviewitems.cpp index 865e82d0..3fb0bffd 100644 --- a/buildtools/autotools/autolistviewitems.cpp +++ b/buildtools/autotools/autolistviewitems.cpp @@ -27,22 +27,22 @@ * Class ProjectItem */ -ProjectItem::ProjectItem( Type type, TQListView *parent, const TQString &text ) - : TQListViewItem( parent, text ), typ( type ) +ProjectItem::ProjectItem( Type type, TQListView *tqparent, const TQString &text ) + : TQListViewItem( tqparent, text ), typ( type ) { bld = false; } -ProjectItem::ProjectItem( Type type, ProjectItem *parent, const TQString &text ) - : TQListViewItem( parent, text ), typ( type ) +ProjectItem::ProjectItem( Type type, ProjectItem *tqparent, const TQString &text ) + : TQListViewItem( tqparent, text ), typ( type ) { bld = false; } void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment ) + int column, int width, int tqalignment ) { if ( isBold() ) { @@ -50,7 +50,7 @@ void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg, font.setBold( true ); p->setFont( font ); } - TQListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, tqalignment ); } @@ -58,15 +58,15 @@ void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg, * Class SubprojectItem */ -SubprojectItem::SubprojectItem( TQListView *parent, const TQString &text ) - : ProjectItem( Subproject, parent, text ) +SubprojectItem::SubprojectItem( TQListView *tqparent, const TQString &text ) + : ProjectItem( Subproject, tqparent, text ) { init(); } -SubprojectItem::SubprojectItem( SubprojectItem *parent, const TQString &text ) - : ProjectItem( Subproject, parent, text ) +SubprojectItem::SubprojectItem( SubprojectItem *tqparent, const TQString &text ) + : ProjectItem( Subproject, tqparent, text ) { init(); } @@ -84,7 +84,7 @@ TQString SubprojectItem::relativePath() TQString relpath = subdir; SubprojectItem *it = this; - while ( (it= dynamic_cast<SubprojectItem*>(it->parent())) ) + while ( (it= dynamic_cast<SubprojectItem*>(it->tqparent())) ) { relpath.prepend(it->subdir + "/"); } @@ -130,7 +130,7 @@ if(!is_subst) return; bool ok; - TQString text = QInputDialog::getText( + TQString text = TQInputDialog::getText( i18n("Edit Substitution"), i18n("Substitution:"), TQLineEdit::Normal, name, &ok ); if ( ok && !text.isEmpty() ) @@ -152,7 +152,7 @@ return; void FileItem::changeMakefileEntry(const TQString& new_name) { - TargetItem* target = dynamic_cast<TargetItem*>(parent()); + TargetItem* target = dynamic_cast<TargetItem*>(tqparent()); TQMap<TQString,TQString> replaceMap; @@ -167,7 +167,7 @@ void FileItem::changeMakefileEntry(const TQString& new_name) if ( SubprojectItem* subProject = lv->m_part->m_widget->selectedSubproject() ) { TQStringList sources = TQStringList::split(TQRegExp("[ \t\n]"), subProject->variables[varname]); - TQStringList::iterator it = sources.find(name); + TQStringList::iterator it = sources.tqfind(name); (*it) = new_name; subProject->variables[varname] = sources.join(" "); replaceMap.insert(varname, subProject->variables[varname]); diff --git a/buildtools/autotools/autolistviewitems.h b/buildtools/autotools/autolistviewitems.h index 008fecc4..5f61fef0 100644 --- a/buildtools/autotools/autolistviewitems.h +++ b/buildtools/autotools/autolistviewitems.h @@ -26,16 +26,16 @@ class AutoProjectPart; /** * Base class for all items appearing in ProjectOverview and ProjectDetails. */ -class ProjectItem : public QListViewItem +class ProjectItem : public TQListViewItem { public: enum Type { Subproject, Target, File }; - ProjectItem( Type type, TQListView *parent, const TQString &text ); - ProjectItem( Type type, ProjectItem *parent, const TQString &text ); + ProjectItem( Type type, TQListView *tqparent, const TQString &text ); + ProjectItem( Type type, ProjectItem *tqparent, const TQString &text ); void paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment ); + int column, int width, int tqalignment ); void setBold( bool b ) { bld = b; @@ -62,8 +62,8 @@ private: class SubprojectItem : public ProjectItem { public: - SubprojectItem( TQListView *parent, const TQString &text ); - SubprojectItem( SubprojectItem *parent, const TQString &text ); + SubprojectItem( TQListView *tqparent, const TQString &text ); + SubprojectItem( SubprojectItem *tqparent, const TQString &text ); /** name of the directory */ TQString subdir; diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index 38604ee0..a2c500a4 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -65,8 +65,8 @@ static const KDevPluginInfo data("kdevautoproject"); K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) ) -AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args) - : KDevBuildTool(&data, parent, name ? name : "AutoProjectPart") +AutoProjectPart::AutoProjectPart(TQObject *tqparent, const char *name, const TQStringList &args) + : KDevBuildTool(&data, tqparent, name ? name : "AutoProjectPart") , m_lastCompilationFailed(false) { setInstance(AutoProjectFactory::instance()); @@ -407,16 +407,16 @@ TQString AutoProjectPart::mainProgram() const KMessageBox::error( m_widget, i18n("There is no active target.\n" "Unable to determine the main program."), i18n("No active target found") ); kdDebug ( 9020 ) << k_funcinfo << "Error! : There's no active target! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl; - return TQString::null; + return TQString(); } if ( titem->primary != "PROGRAMS" ) { KMessageBox::error( m_widget, i18n("Active target \"%1\" is not binary ( %2 ).\n" "Unable to determine the main program. If you want this\n" "to be the active target, set a main program under\n" - "Project -> Project Options -> Run Options").arg(titem->name).arg(titem->primary), i18n("Active target is not a library") ); + "Project -> Project Options -> Run Options").tqarg(titem->name).tqarg(titem->primary), i18n("Active target is not a library") ); kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl; - return TQString::null; + return TQString(); } TQString relprojectpath = URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ); @@ -525,7 +525,7 @@ void AutoProjectPart::addFiles ( const TQStringList& fileList ) for ( it = fileList.begin(); it != fileList.end(); ++it ) { - int pos = ( *it ).findRev('/'); + int pos = ( *it ).tqfindRev('/'); if (pos != -1) { directory = ( *it ).left(pos); @@ -597,7 +597,7 @@ TQString AutoProjectPart::currentBuildConfig() const TQDomDocument &dom = *projectDom(); TQString config = DomUtil::readEntry(dom, "/kdevautoproject/general/useconfiguration"); - if (config.isEmpty() || !allBuildConfigs().contains(config)) + if (config.isEmpty() || !allBuildConfigs().tqcontains(config)) config = "default"; return config; @@ -643,20 +643,20 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ { int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory\n" "and no configure script for this project.\n" - "Run automake & friends and configure first?").arg(buildDirectory()), TQString::null, i18n("Run Them"), i18n("Do Not Run")); + "Run automake & friends and configure first?").tqarg(buildDirectory()), TQString(), i18n("Run Them"), i18n("Do Not Run")); if (r == KMessageBox::No) - return TQString::null; + return TQString(); preCommand = makefileCvsCommand(); if (preCommand.isNull()) - return TQString::null; + return TQString(); preCommand += " && "; preCommand += configureCommand() + " && "; } else { - int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").arg(dir), TQString::null, i18n("Run configure"), i18n("Do Not Run")); + int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").tqarg(dir), TQString(), i18n("Run configure"), i18n("Do Not Run")); if (r == KMessageBox::No) - return TQString::null; + return TQString(); preCommand = configureCommand() + " && "; } } @@ -668,7 +668,7 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ kdDebug(9020) << k_funcinfo << "nice = " << prio<< endl; if (prio != 0) { - nice = TQString("nice -n%1 ").arg(prio); + nice = TQString("nice -n%1 ").tqarg(prio); } if (cmdline.isEmpty()) @@ -732,13 +732,13 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr // These are the internal libraries dependency.remove("$(top_builddir)/"); - if( !alreadyScheduledDeps.contains(*l2it) ) + if( !alreadyScheduledDeps.tqcontains(*l2it) ) { alreadyScheduledDeps << *l2it; tdir = buildDirectory(); if (!tdir.endsWith("/") && !tdir.isEmpty()) tdir += "/"; - int pos = dependency.findRev('/'); + int pos = dependency.tqfindRev('/'); if (pos == -1) { tname = dependency; @@ -782,7 +782,7 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr tdir = buildDirectory(); if (!tdir.endsWith("/") && !tdir.isEmpty()) tdir += "/"; - int pos = dependency.findRev('/'); + int pos = dependency.tqfindRev('/'); if (pos == -1) { tname = dependency; @@ -792,7 +792,7 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr tdir += dependency.left(pos+1); tname = dependency.mid(pos+1); } - KMessageBox::error( 0, i18n("Found a circular dependency in the project, between this target and %1.\nCannot build this project until this is resolved.").arg(tname), i18n("Circular Dependency found") ); + KMessageBox::error( 0, i18n("Found a circular dependency in the project, between this target and %1.\nCannot build this project until this is resolved.").tqarg(tname), i18n("Circular Dependency found") ); return false; } } @@ -812,7 +812,7 @@ void AutoProjectPart::slotBuild() m_needMakefileCvs = false; } - startMakeCommand(buildDirectory(), TQString::fromLatin1("")); + startMakeCommand(buildDirectory(), TQString::tqfromLatin1("")); } @@ -912,28 +912,28 @@ TQString AutoProjectPart::configureCommand() const cmdline += "/configure\""; TQString cc = DomUtil::readEntry(dom, prefix + "ccompilerbinary"); if (!cc.isEmpty()) - cmdline.prepend(TQString("CC=%1 ").arg(cc)); + cmdline.prepend(TQString("CC=%1 ").tqarg(cc)); TQString cflags = DomUtil::readEntry(dom, prefix + "cflags"); if (!cflags.isEmpty()) - cmdline.prepend(TQString("CFLAGS=\"%1\" ").arg(cflags)); + cmdline.prepend(TQString("CFLAGS=\"%1\" ").tqarg(cflags)); TQString cxx = DomUtil::readEntry(dom, prefix + "cxxcompilerbinary"); if (!cxx.isEmpty()) - cmdline.prepend(TQString("CXX=%1 ").arg(cxx)); + cmdline.prepend(TQString("CXX=%1 ").tqarg(cxx)); TQString cxxflags = DomUtil::readEntry(dom, prefix + "cxxflags"); if (!cxxflags.isEmpty()) - cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").arg(cxxflags)); + cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").tqarg(cxxflags)); TQString f77 = DomUtil::readEntry(dom, prefix + "f77compilerbinary"); if (!f77.isEmpty()) - cmdline.prepend(TQString("F77=%1 ").arg(f77)); + cmdline.prepend(TQString("F77=%1 ").tqarg(f77)); TQString fflags = DomUtil::readEntry(dom, prefix + "f77flags"); if (!fflags.isEmpty()) - cmdline.prepend(TQString("FFLAGS=\"%1\" ").arg(fflags)); + cmdline.prepend(TQString("FFLAGS=\"%1\" ").tqarg(fflags)); TQString cppflags = DomUtil::readEntry(dom, prefix + "cppflags"); if (!cppflags.isEmpty()) - cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").arg(cppflags)); + cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").tqarg(cppflags)); TQString ldflags = DomUtil::readEntry(dom, prefix + "ldflags"); if (!ldflags.isEmpty()) - cmdline.prepend(TQString("LDFLAGS=\"%1\" ").arg(ldflags)); + cmdline.prepend(TQString("LDFLAGS=\"%1\" ").tqarg(ldflags)); TQString configargs = DomUtil::readEntry(dom, prefix + "configargs"); if (!configargs.isEmpty()) { @@ -997,7 +997,7 @@ TQString AutoProjectPart::makefileCvsCommand() const TQString nice; kdDebug(9020) << "makefileCvsCommand() nice = " << prio<< endl; if (prio != 0) { - nice = TQString("nice -n%1 ").arg(prio); + nice = TQString("nice -n%1 ").tqarg(prio); } if (TQFile::exists(topsourceDirectory() + "/Makefile.cvs")) @@ -1009,7 +1009,7 @@ TQString AutoProjectPart::makefileCvsCommand() const else { KMessageBox::sorry(m_widget, i18n("There is neither a Makefile.cvs file nor an " "autogen.sh script in the project directory.")); - return TQString::null; + return TQString(); } cmdline.prepend(nice); @@ -1034,7 +1034,7 @@ void AutoProjectPart::slotMakefilecvs() void AutoProjectPart::slotInstall() { - startMakeCommand(buildDirectory(), TQString::fromLatin1("install")); + startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install")); } @@ -1045,25 +1045,25 @@ void AutoProjectPart::slotInstallWithKdesu() slotBuild(); // After that issue "make install" with the root user - startMakeCommand(buildDirectory(), TQString::fromLatin1("install"), true); + startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install"), true); } void AutoProjectPart::slotClean() { - startMakeCommand(buildDirectory(), TQString::fromLatin1("clean")); + startMakeCommand(buildDirectory(), TQString::tqfromLatin1("clean")); } void AutoProjectPart::slotDistClean() { - startMakeCommand(buildDirectory(), TQString::fromLatin1("distclean")); + startMakeCommand(buildDirectory(), TQString::tqfromLatin1("distclean")); } void AutoProjectPart::slotMakeMessages() { - startMakeCommand(buildDirectory(), TQString::fromLatin1("package-messages")); + startMakeCommand(buildDirectory(), TQString::tqfromLatin1("package-messages")); } @@ -1103,7 +1103,7 @@ void AutoProjectPart::slotExecute() if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/autokdesu", false) ){ //slotInstallWithKdesu assumes that it hasn't just been build... kdDebug(9020) << "slotExecute: before startMakeCommand" << endl; - _auto ? slotInstallWithKdesu() : startMakeCommand(buildDirectory(), TQString::fromLatin1("install"), true); + _auto ? slotInstallWithKdesu() : startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install"), true); } else{ kdDebug(9020) << "slotExecute: before slotInstall" << endl; @@ -1171,7 +1171,7 @@ void AutoProjectPart::executeTarget(const TQDir& dir, const TargetItem* titem) KMessageBox::error( m_widget, i18n("Active target \"%1\" is not binary ( %2 ).\n" "Unable to determine the main program. If you want this\n" "to be the active target, set a main program under\n" - "Project -> Project Options -> Run Options").arg(titem->name).arg(titem->primary), i18n("Active target is not a library") ); + "Project -> Project Options -> Run Options").tqarg(titem->name).tqarg(titem->primary), i18n("Active target is not a library") ); kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl; program += titem->name; }else @@ -1282,7 +1282,7 @@ void AutoProjectPart::slotBuildConfigAboutToShow() { TQStringList l = allBuildConfigs(); buildConfigAction->setItems(l); - buildConfigAction->setCurrentItem(l.findIndex(currentBuildConfig())); + buildConfigAction->setCurrentItem(l.tqfindIndex(currentBuildConfig())); } void AutoProjectPart::restorePartialProjectSession ( const TQDomElement* el ) @@ -1316,7 +1316,7 @@ void AutoProjectPart::slotCommandFinished( const TQString& command ) if( m_buildCommand != command ) return; - m_buildCommand = TQString::null; + m_buildCommand = TQString(); m_timestamp.clear(); TQStringList fileList = allFiles(); @@ -1356,7 +1356,7 @@ bool AutoProjectPart::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 ){ return true; @@ -1386,7 +1386,7 @@ TQStringList recursiveATFind( const TQString &currDir, const TQString &baseDir ) kdDebug(9020) << "Dir " << currDir << endl; TQStringList fileList; - if( !currDir.contains( "/..") && !currDir.contains("/.") ) + if( !currDir.tqcontains( "/..") && !currDir.tqcontains("/.") ) { TQDir dir(currDir); TQStringList dirList = dir.entryList(TQDir::Dirs ); diff --git a/buildtools/autotools/autoprojectpart.h b/buildtools/autotools/autoprojectpart.h index 706eacae..16be5886 100644 --- a/buildtools/autotools/autoprojectpart.h +++ b/buildtools/autotools/autoprojectpart.h @@ -34,9 +34,10 @@ class ConfigWidgetProxy; class AutoProjectPart : public KDevBuildTool { Q_OBJECT + TQ_OBJECT public: - AutoProjectPart( TQObject *parent, const char *name, const TQStringList &args ); + AutoProjectPart( TQObject *tqparent, const char *name, const TQStringList &args ); virtual ~AutoProjectPart(); /** @@ -132,7 +133,7 @@ private: bool m_needMakefileCvs; bool m_lastCompilationFailed; bool m_isKDE; - QPair<TQDir, TargetItem*> m_executeTargetAfterBuild; + TQPair<TQDir, TargetItem*> m_executeTargetAfterBuild; TQString m_runProg; ConfigWidgetProxy * _configProxy; diff --git a/buildtools/autotools/autoprojectviewbase.ui b/buildtools/autotools/autoprojectviewbase.ui index ad5142ba..0285c110 100644 --- a/buildtools/autotools/autoprojectviewbase.ui +++ b/buildtools/autotools/autoprojectviewbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>AutoProjectViewBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AutoProjectViewBase</cstring> </property> @@ -19,9 +19,9 @@ <property name="margin"> <number>4</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -30,7 +30,7 @@ <property name="spacing"> <number>2</number> </property> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_button1</cstring> </property> @@ -38,7 +38,7 @@ <string></string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_button2</cstring> </property> @@ -46,7 +46,7 @@ <string></string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_button3</cstring> </property> @@ -54,7 +54,7 @@ <string></string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_button4</cstring> </property> @@ -62,7 +62,7 @@ <string></string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_button5</cstring> </property> @@ -80,14 +80,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_optionsButton</cstring> </property> @@ -116,7 +116,7 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index 321aa349..57b63573 100644 --- a/buildtools/autotools/autoprojectwidget.cpp +++ b/buildtools/autotools/autoprojectwidget.cpp @@ -72,7 +72,7 @@ static TQString nicePrimary( const TQString &primary ) else if ( primary == "JAVA" ) return i18n( "Java" ); else - return TQString::null; + return TQString(); } @@ -87,7 +87,7 @@ AutoProjectWidget::AutoProjectWidget( AutoProjectPart *part, bool kde ) m_choosenTarget = 0; m_makefileHandler = new MakefileHandler(); - TQSplitter *splitter = new TQSplitter(Vertical, this); + TQSplitter *splitter = new TQSplitter(Qt::Vertical, this); initOverview ( splitter ); initDetailview ( splitter ); @@ -101,14 +101,14 @@ AutoProjectWidget::~AutoProjectWidget() delete m_makefileHandler; } -void AutoProjectWidget::initOverview ( TQWidget* parent ) +void AutoProjectWidget::initOverview ( TQWidget* tqparent ) { - m_subprojectView = new AutoSubprojectView( this, m_part, parent, "project overview widget" ); + m_subprojectView = new AutoSubprojectView( this, m_part, tqparent, "project overview widget" ); } -void AutoProjectWidget::initDetailview ( TQWidget* parent ) +void AutoProjectWidget::initDetailview ( TQWidget* tqparent ) { - m_detailView = new AutoDetailsView( this, m_part, parent, "project details widget" ); + m_detailView = new AutoDetailsView( this, m_part, tqparent, "project details widget" ); } void AutoProjectWidget::initActions() @@ -216,7 +216,7 @@ TQString AutoProjectWidget::pathForTarget(const TargetItem *titem) const { if (!titem) - return TQString::null; + return TQString(); kdDebug(9020) << "Looking for target " << titem->name << endl; int prefixLen = m_part->projectDirectory().length() + 1; @@ -225,7 +225,7 @@ TQString AutoProjectWidget::pathForTarget(const TargetItem *titem) const { SubprojectItem* spitem = static_cast<SubprojectItem*>(it.current() ); kdDebug(9020) << "Checking: " << spitem->path << endl; - if (spitem->targets.containsRef(titem)) + if (spitem->targets.tqcontainsRef(titem)) { kdDebug(9020) << "Found it!" << endl; TQString relpath = (spitem->path).mid(prefixLen); @@ -233,7 +233,7 @@ TQString AutoProjectWidget::pathForTarget(const TargetItem *titem) const } } kdDebug(9020) << "Not found" << endl; - return TQString::null; + return TQString(); } TQStringList AutoProjectWidget::allLibraries() @@ -314,7 +314,7 @@ TQStringList AutoProjectWidget::allFiles() TQString AutoProjectWidget::subprojectDirectory() { if ( !selectedSubproject() ) - return TQString::null; + return TQString(); return selectedSubproject()->path; } @@ -387,7 +387,7 @@ TQString AutoProjectWidget::activeDirectory() /* if ( selectedSubproject() ) return selectedSubproject()->path; else*/ - return TQString::null; + return TQString(); } } @@ -405,7 +405,7 @@ void AutoProjectWidget::addFiles( const TQStringList &list ) for ( it = fileList.begin(); it != fileList.end(); ++it ) { - int pos = ( *it ).findRev('/'); + int pos = ( *it ).tqfindRev('/'); if (pos != -1) fileName = ( *it ).mid(pos+1); else @@ -557,7 +557,7 @@ void AutoProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item ) // Delete the items from the details view first. if ( m_shownSubproject ) { - // Remove all TargetItems and all of their children from the view + // Remove all TargetItems and all of their tqchildren from the view kdDebug ( 9020 ) << "m_shownSubproject (before takeItem()): " << m_shownSubproject->subdir << endl; TQListViewItem* i = m_detailView->listView()->firstChild(); @@ -575,7 +575,7 @@ void AutoProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item ) if ( !m_shownSubproject) return; kdDebug ( 9020 ) << "m_shownSubproject (after takeItem()): " << selectedSubproject()->subdir << endl; - // Insert all TargetItems and all of their children into the view + // Insert all TargetItems and all of their tqchildren into the view TQPtrListIterator<TargetItem> it2( selectedSubproject()->targets ); for ( ; it2.current(); ++it2 ) { @@ -632,9 +632,9 @@ TargetItem *AutoProjectWidget::createTargetItem( const TQString &name, if ( docgroup ) text = i18n( "Documentation data" ); else if ( icongroup ) - text = i18n( "KDE Icon data" ).arg( prefix ); + text = i18n( "KDE Icon data" ).tqarg( prefix ); else - text = i18n( "%1 (%2 in %3)" ).arg( name ).arg( nicePrimary( primary ) ).arg( prefix ); + text = i18n( "%1 (%2 in %3)" ).tqarg( name ).tqarg( nicePrimary( primary ) ).tqarg( prefix ); // Workaround because of TQListView not being able to create // items without actually inserting them @@ -652,7 +652,7 @@ TargetItem *AutoProjectWidget::createTargetItem( const TQString &name, FileItem *AutoProjectWidget::createFileItem( const TQString &name, SubprojectItem *subproject ) { bool is_subst; - if(name.find("$(") == 0 || name.find("${") == 0) + if(name.tqfind("$(") == 0 || name.tqfind("${") == 0) is_subst = true; else is_subst = false; diff --git a/buildtools/autotools/autoprojectwidget.h b/buildtools/autotools/autoprojectwidget.h index ff79ce71..7d21fd55 100644 --- a/buildtools/autotools/autoprojectwidget.h +++ b/buildtools/autotools/autoprojectwidget.h @@ -45,9 +45,10 @@ class KListViewItem; class TQListViewItem; class MakefileHandler; -class AutoProjectWidget : public QVBox +class AutoProjectWidget : public TQVBox { Q_OBJECT + TQ_OBJECT friend class RemoveFileDialog; friend class TargetOptionsDialog; // to access projectDom() via m_part->projectDom() public: @@ -132,13 +133,13 @@ public: SubprojectItem* selectedSubproject(); /** - * Creates a TargetItem instance without a parent item. + * Creates a TargetItem instance without a tqparent item. */ TargetItem *createTargetItem( const TQString &name, const TQString &prefix, const TQString &primary, bool take = true ); /** - * Creates a FileItem instance without a parent item. + * Creates a FileItem instance without a tqparent item. */ FileItem *createFileItem( const TQString &name, SubprojectItem *subproject ); @@ -202,8 +203,8 @@ public slots: void slotOverviewSelectionChanged( TQListViewItem *item ); protected: - void initOverview ( TQWidget* parent ); - void initDetailview ( TQWidget* parent ); + void initOverview ( TQWidget* tqparent ); + void initDetailview ( TQWidget* tqparent ); void initActions (); virtual void focusInEvent( TQFocusEvent *e ); diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 9e1f9735..e1d15d90 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -13,7 +13,7 @@ *************************************************************************** */ -/** Qt */ +/** TQt */ #include <tqregexp.h> #include <tqcheckbox.h> #include <tqstringlist.h> @@ -60,7 +60,7 @@ namespace AutoProjectPrivate bool isHeader( const TQString& fileName ) { - return TQStringList::split( ";", "h;H;hh;hxx;hpp;tcc;h++" ).contains( TQFileInfo(fileName).extension(false) ); + return TQStringList::split( ";", "h;H;hh;hxx;hpp;tcc;h++" ).tqcontains( TQFileInfo(fileName).extension(false) ); } static TQString cleanWhitespace( const TQString &str ) @@ -81,11 +81,11 @@ static TQString cleanWhitespace( const TQString &str ) static void removeDir( const TQString& dirName ) { TQDir d( dirName ); - const QFileInfoList* fileList = d.entryInfoList(); + const TQFileInfoList* fileList = d.entryInfoList(); if( !fileList ) return; - QFileInfoListIterator it( *fileList ); + TQFileInfoListIterator it( *fileList ); while( it.current() ){ const TQFileInfo* fileInfo = it.current(); ++it; @@ -107,8 +107,8 @@ static void removeDir( const TQString& dirName ) } -AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name) -: AutoProjectViewBase(parent, name) +AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *tqparent, const char *name) +: AutoProjectViewBase(tqparent, name) { m_widget = widget; @@ -116,7 +116,7 @@ AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPar m_listView->setSorting(-1); m_listView->header()->hide(); - m_listView->addColumn( TQString::null ); + m_listView->addColumn( TQString() ); connect( m_listView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); @@ -173,7 +173,7 @@ void AutoSubprojectView::initActions() KActionCollection * actions = new KActionCollection( this ); subProjectOptionsAction = new AutoToolsAction( i18n( "Options..." ), "configure", 0, - this, TQT_SLOT( slotSubprojectOptions() ), actions, "subproject options" ); + TQT_TQOBJECT(this), TQT_SLOT( slotSubprojectOptions() ), actions, "subproject options" ); subProjectOptionsAction->setWhatsThis(i18n("<qt><b>Options</b><p>Shows subproject options dialog " "that provides settings for compiler, include paths, " "prefixes and build order.</qt>")); @@ -181,24 +181,24 @@ void AutoSubprojectView::initActions() TQToolTip::add( m_button1, tr2i18n( "Add new subproject...")); addSubprojectAction = new AutoToolsAction( i18n( "Add new subproject..." ), "folder_new", 0, - this, TQT_SLOT( slotAddSubproject() ), actions, "add subproject" ); + TQT_TQOBJECT(this), TQT_SLOT( slotAddSubproject() ), actions, "add subproject" ); addSubprojectAction->setWhatsThis(i18n("<qt><b>Add new subproject</b><p>Creates a new " "subproject in currently selected subproject.</qt>")); addSubprojectAction->plug( m_button1 ); removeSubprojectAction = new KAction( i18n( "Remove Subproject..." ), "remove_subdir", 0, - this, TQT_SLOT( slotRemoveSubproject() ), actions, "remove subproject" ); + TQT_TQOBJECT(this), TQT_SLOT( slotRemoveSubproject() ), actions, "remove subproject" ); removeSubprojectAction->setWhatsThis(i18n("<qt><b>Remove subproject</b><p>Removes the subproject. Asks if the " "subproject should be also removed from disk. Only subprojects " "which do not hold other subprojects can be removed.</qt>")); addExistingSubprojectAction = new KAction( i18n( "Add Existing Subprojects..." ), "fileimport", 0, - this, TQT_SLOT( slotAddExistingSubproject() ), actions, "add existing subproject" ); + TQT_TQOBJECT(this), TQT_SLOT( slotAddExistingSubproject() ), actions, "add existing subproject" ); addExistingSubprojectAction->setWhatsThis(i18n("<qt><b>Add existing subprojects</b><p>Imports existing " "subprojects containing Makefile.am.</qt>")); TQToolTip::add( m_button2, tr2i18n( "Add Target...")); addTargetAction = new AutoToolsAction( i18n( "Add Target..." ), "targetnew_kdevelop", 0, - this, TQT_SLOT( slotAddTarget() ), actions, "add target" ); + TQT_TQOBJECT(this), TQT_SLOT( slotAddTarget() ), actions, "add target" ); addTargetAction->setWhatsThis(i18n( "<qt><b>Add target</b><p>Adds a new target to " "the currently selected subproject. Target can be a " "binary program, library, script, also a collection of " @@ -206,19 +206,19 @@ void AutoSubprojectView::initActions() addTargetAction->plug( m_button2 ); TQToolTip::add( m_button3, tr2i18n( "Add Service...")); - addServiceAction = new AutoToolsAction( i18n( "Add Service..." ), "servicenew_kdevelop", 0, this, + addServiceAction = new AutoToolsAction( i18n( "Add Service..." ), "servicenew_kdevelop", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddService() ), actions, "add service" ); addServiceAction->setWhatsThis(i18n("<qt><b>Add service</b><p>Creates a .desktop file describing the service.</qt>")); addServiceAction->plug( m_button3 ); TQToolTip::add( m_button4, tr2i18n( "Add Application...")); - addApplicationAction = new AutoToolsAction( i18n( "Add Application..." ), "window_new", 0, this, + addApplicationAction = new AutoToolsAction( i18n( "Add Application..." ), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddApplication() ), actions, "add application" ); addApplicationAction->setWhatsThis(i18n("<qt><b>Add application</b><p>Creates an application .desktop file.</qt>")); addApplicationAction->plug( m_button4 ); TQToolTip::add( m_button5, tr2i18n( "Build")); - buildSubprojectAction = new AutoToolsAction( i18n( "Build" ), "launch", 0, this, + buildSubprojectAction = new AutoToolsAction( i18n( "Build" ), "launch", 0, TQT_TQOBJECT(this), TQT_SLOT( slotBuildSubproject() ), actions, "build subproject" ); buildSubprojectAction->setWhatsThis(i18n("<qt><b>Build</b><p>Runs <b>make</b> from the directory of " "the selected subproject.<br> Environment variables and " @@ -226,11 +226,11 @@ void AutoSubprojectView::initActions() "dialog, <b>Make Options</b> tab.</qt>")); buildSubprojectAction->plug( m_button5 ); - forceReeditSubprojectAction = new KAction( i18n( "Force Reedit" ), 0, 0, this, + forceReeditSubprojectAction = new KAction( i18n( "Force Reedit" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotForceReeditSubproject() ), actions, "force-reedit subproject" ); forceReeditSubprojectAction->setWhatsThis(i18n("<qt><b>Force Reedit</b><p>Runs <b>make force-reedit</b> " "from the directory of the selected subproject.<br>This " - "recreates makefile (tip: and solves most of .moc related " + "recreates makefile (tip: and solves most of .tqmoc related " "problems)<br>Environment variables and make arguments can " "be specified in the project settings dialog, " "<b>Make Options</b> tab.</qt>")); @@ -238,21 +238,21 @@ void AutoSubprojectView::initActions() if (!m_part->isKDE()) forceReeditSubprojectAction->setEnabled(false); - cleanSubprojectAction = new KAction( i18n( "Clean" ), 0, 0, this, + cleanSubprojectAction = new KAction( i18n( "Clean" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotCleanSubproject() ), actions, "clean subproject" ); cleanSubprojectAction->setWhatsThis(i18n("<qt><b>Clean</b><p>Runs <b>make clean</b> from the directory of " "the selected subproject.<br> Environment variables and make " "arguments can be specified in the project settings dialog, " "<b>Make Options</b> tab.</qt>")); - installSubprojectAction = new KAction( i18n( "Install" ), 0, 0, this, + installSubprojectAction = new KAction( i18n( "Install" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotInstallSubproject() ), actions, "install subproject" ); installSubprojectAction->setWhatsThis(i18n("<qt><b>Install</b><p>Runs <b>make install</b> from the directory " "of the selected subproject.<br> Environment variables and " "make arguments can be specified in the project settings " "dialog, <b>Make Options</b> tab.</qt>")); installSuSubprojectAction = new KAction( i18n( "Install (as root user)" ), 0, 0, - this, TQT_SLOT( slotInstallSuSubproject() ), actions, "install subproject as root" ); + TQT_TQOBJECT(this), TQT_SLOT( slotInstallSuSubproject() ), actions, "install subproject as root" ); installSuSubprojectAction->setWhatsThis(i18n("<qt><b>Install as root user</b><p>Runs <b>make install</b> " "command from the directory of the selected subproject " "with root privileges.<br> It is executed via kdesu " @@ -260,12 +260,12 @@ void AutoSubprojectView::initActions() "can be specified in the project settings dialog, " "<b>Make Options</b> tab.</qt>")); - expandAction = new KAction( i18n( "Expand Subtree" ), 0, 0, this, + expandAction = new KAction( i18n( "Expand Subtree" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotExpandTree()), actions, "expandAction" ); - collapseAction = new KAction( i18n( "Collapse Subtree" ), 0, 0, this, + collapseAction = new KAction( i18n( "Collapse Subtree" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCollapseTree()), actions, "collapseAction" ); - otherAction = new KAction( i18n( "Manage Custom Commands..." ), 0, 0, this, + otherAction = new KAction( i18n( "Manage Custom Commands..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotManageBuildCommands() ), actions, "manage custom commands" ); otherAction->setWhatsThis(i18n("<qt><b>Manage custom commands</b><p>Allows to create, edit and " "delete custom build commands which appears in the subproject " @@ -280,7 +280,7 @@ void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, con if ( !item ) return ; - KPopupMenu popup( i18n( "Subproject: %1" ).arg( item->text( 0 ) ), this ); + KPopupMenu popup( i18n( "Subproject: %1" ).tqarg( item->text( 0 ) ), this ); subProjectOptionsAction->plug( &popup ); popup.insertSeparator(); @@ -317,7 +317,7 @@ void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, con } int id = popup.insertItem(it.key(), this, TQT_SLOT(slotCustomBuildCommand(int))); m_commandList.append(it.data()); - popup.setItemParameter(id, m_commandList.findIndex(it.data())); + popup.setItemParameter(id, m_commandList.tqfindIndex(it.data())); } popup.insertSeparator(); @@ -422,7 +422,7 @@ void AutoSubprojectView::slotBuildSubproject() TQString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); - m_part->startMakeCommand( m_part->buildDirectory() + relpath, TQString::fromLatin1( "" ) ); + m_part->startMakeCommand( m_part->buildDirectory() + relpath, TQString::tqfromLatin1( "" ) ); } void AutoSubprojectView::slotRemoveSubproject() @@ -433,28 +433,28 @@ void AutoSubprojectView::slotRemoveSubproject() if( !spitem ) return; - SubprojectItem* parent = static_cast<SubprojectItem*>( spitem->parent() ); - if( !parent || !parent->listView() || spitem->childCount() != 0 ){ + SubprojectItem* tqparent = static_cast<SubprojectItem*>( spitem->tqparent() ); + if( !tqparent || !tqparent->listView() || spitem->childCount() != 0 ){ KMessageBox::error( 0, i18n("This item cannot be removed"), i18n("Automake Manager") ); return; } - TQStringList list = TQStringList::split( TQRegExp("[ \t]"), parent->variables["SUBDIRS"] ); - TQStringList::Iterator it = list.find( spitem->subdir ); + TQStringList list = TQStringList::split( TQRegExp("[ \t]"), tqparent->variables["SUBDIRS"] ); + TQStringList::Iterator it = list.tqfind( spitem->subdir ); TQString subdirToRemove = spitem->subdir; bool topsubdirs = true; - if ((parent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") == -1) - && (parent->variables["SUBDIRS"].find("$(AUTODIRS)") == -1)) + if ((tqparent->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") == -1) + && (tqparent->variables["SUBDIRS"].tqfind("$(AUTODIRS)") == -1)) { topsubdirs = false; if( it == list.end() ){ - KMessageBox::sorry(this, i18n("There is no subproject %1 in SUBDIRS").arg(spitem->subdir)); + KMessageBox::sorry(this, i18n("There is no subproject %1 in SUBDIRS").tqarg(spitem->subdir)); return; } } - RemoveSubprojectDialog dlg(i18n("Remove Subproject %1").arg(spitem->text(0)), - i18n("Do you really want to remove subproject %1 with all targets and files?").arg(spitem->text(0))); + RemoveSubprojectDialog dlg(i18n("Remove Subproject %1").tqarg(spitem->text(0)), + i18n("Do you really want to remove subproject %1 with all targets and files?").tqarg(spitem->text(0))); if( dlg.exec() ){ bool removeSources = dlg.removeFromDisk(); @@ -462,11 +462,11 @@ void AutoSubprojectView::slotRemoveSubproject() if (!topsubdirs) { list.remove( it ); - parent->variables[ "SUBDIRS" ] = list.join( " " ); + tqparent->variables[ "SUBDIRS" ] = list.join( " " ); } - parent->listView()->setSelected( parent, true ); - kapp->processEvents( 500 ); + tqparent->listView()->setSelected( tqparent, true ); + kapp->tqprocessEvents( 500 ); if( removeSources ){ @@ -483,7 +483,7 @@ void AutoSubprojectView::slotRemoveSubproject() TQString projroot = m_part->projectDirectory() + "/"; TQString subdirectory = spitem->path; - TQString relpath = subdirectory.replace(0, projroot.length(),""); + TQString relpath = subdirectory.tqreplace(0, projroot.length(),""); TQString configureFile = m_part->getAutoConfFile(projroot); @@ -511,9 +511,9 @@ void AutoSubprojectView::slotRemoveSubproject() // Adjust SUBDIRS variable in containing Makefile.am - if (parent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) + if (tqparent->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1) { - TQFile subdirsfile( parent->path + "/subdirs" ); + TQFile subdirsfile( tqparent->path + "/subdirs" ); TQStringList topdirs; if ( subdirsfile.open( IO_ReadOnly ) ) { @@ -534,9 +534,9 @@ void AutoSubprojectView::slotRemoveSubproject() TQMap<TQString,TQString> replaceMap; replaceMap.insert( "SUBDIRS", subdirToRemove ); - AutoProjectTool::removeFromMakefileam( parent->path + "/Makefile.am", replaceMap ); + AutoProjectTool::removeFromMakefileam( tqparent->path + "/Makefile.am", replaceMap ); - TQString relmakefile = ( parent->path + "/Makefile" ).mid( m_part->projectDirectory().length()+1 ); + TQString relmakefile = ( tqparent->path + "/Makefile" ).mid( m_part->projectDirectory().length()+1 ); kdDebug(9020) << "Relative makefile path: " << relmakefile << endl; // check for config.status @@ -563,7 +563,7 @@ void AutoSubprojectView::parsePrimary( SubprojectItem *item, { // Parse line foo_bar = bla bla - int pos = lhs.findRev( '_' ); + int pos = lhs.tqfindRev( '_' ); TQString prefix = lhs.left( pos ); TQString primary = lhs.right( lhs.length() - pos - 1 ); // kdDebug(9020) << "Prefix:" << prefix << ",Primary:" << primary << endl; @@ -707,7 +707,7 @@ void AutoSubprojectView::parseKDEICON( SubprojectItem *item, { // Parse a line foo_ICON = bla bla - int pos = lhs.find( "_ICON" ); + int pos = lhs.tqfind( "_ICON" ); TQString prefix = lhs.left( pos ); if ( prefix == "KDE" ) prefix = "kde_icon"; @@ -766,7 +766,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, // Take care of KDE hacks: // TOPSUBDIRS is an alias for all directories // listed in the subdirs file - if ( subdirs.find( "$(TOPSUBDIRS)" ) != -1 ) + if ( subdirs.tqfind( "$(TOPSUBDIRS)" ) != -1 ) { TQStringList dirs; TQFile subdirsfile( item->path + "/subdirs" ); @@ -795,18 +795,18 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, } } - subdirs.replace( TQRegExp( "\\$\\(TOPSUBDIRS\\)" ), dirs.join( " " ) ); + subdirs.tqreplace( TQRegExp( "\\$\\(TOPSUBDIRS\\)" ), dirs.join( " " ) ); } // AUTODIRS is an alias for all subdirectories - if ( subdirs.find( "$(AUTODIRS)" ) != -1 ) + if ( subdirs.tqfind( "$(AUTODIRS)" ) != -1 ) { TQDir d( item->path ); TQStringList dirs = d.entryList( TQDir::Dirs ); dirs.remove( "." ); dirs.remove( ".." ); dirs.remove( "CVS" ); - subdirs.replace( TQRegExp( "\\$\\(AUTODIRS\\)" ), dirs.join( " " ) ); + subdirs.tqreplace( TQRegExp( "\\$\\(AUTODIRS\\)" ), dirs.join( " " ) ); } // If there are any variables in the subdirs line then search @@ -822,7 +822,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, // Search the whole Makefile(.am?) // Note that if the variable isn't found it just disappears // (Perhaps we should add it back in this case?) - TQMap<TQString, TQString>::ConstIterator varit = item->variables.find( varname ); + TQMap<TQString, TQString>::ConstIterator varit = item->variables.tqfind( varname ); if ( varit != item->variables.end() ) { kdDebug( 9020 ) << "Found Makefile var " << varname << ", adding dirs <" << varit.data() << ">" << endl; @@ -832,7 +832,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, { kdDebug( 9020 ) << "Not found Makefile var " << varname << endl; } - subdirs.replace( TQRegExp( "\\$\\(\\s*" + varname + "\\s*\\)" ), varvalue ); + subdirs.tqreplace( TQRegExp( "\\$\\(\\s*" + varname + "\\s*\\)" ), varvalue ); } //search for AC_SUBST variables and try to replace them with variables @@ -847,7 +847,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, // Search the whole Makefile(.am?) // Note that if the variable isn't found it just disappears // (Perhaps we should add it back in this case?) - TQMap<TQString, TQString>::ConstIterator varit = item->variables.find( varname ); + TQMap<TQString, TQString>::ConstIterator varit = item->variables.tqfind( varname ); if ( varit != item->variables.end() ) { kdDebug( 9020 ) << "Found Makefile var " << varname << ", adding dirs <" << varit.data() << ">" << endl; @@ -857,7 +857,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, { kdDebug( 9020 ) << "Not found Makefile var " << varname << endl; } - subdirs.replace( TQRegExp( "\\@" + varname + "\\@" ), varvalue ); + subdirs.tqreplace( TQRegExp( "\\@" + varname + "\\@" ), varvalue ); } TQStringList l = TQStringList::split( TQRegExp( "[ \t]" ), subdirs ); @@ -879,14 +879,14 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, open = false; if ( newitem->subdir == "pics" ) open = false; - if ( newitem && static_cast<SubprojectItem*>( newitem->parent() ) + if ( newitem && static_cast<SubprojectItem*>( newitem->tqparent() ) ->subdir == "doc" ) open = false; if ( newitem && static_cast<SubprojectItem*> - ( newitem->parent() ) ->subdir == "po" ) + ( newitem->tqparent() ) ->subdir == "po" ) open = false; if ( newitem && static_cast<SubprojectItem*> - ( newitem->parent() ) ->subdir == "pics" ) + ( newitem->tqparent() ) ->subdir == "pics" ) open = false; newitem->setOpen( open ); @@ -914,7 +914,7 @@ void AutoSubprojectView::parse( SubprojectItem *item ) parseKDEDOCS( item, lhs, rhs ); else if ( lhs.right( 5 ) == "_ICON" ) parseKDEICON( item, lhs, rhs ); - else if ( lhs.find( '_' ) > 0 ) + else if ( lhs.tqfind( '_' ) > 0 ) parsePrimary( item, lhs, rhs ); else if ( lhs.right( 3 ) == "dir" ) parsePrefix( item, lhs, rhs ); @@ -937,7 +937,7 @@ void AutoSubprojectView::parse( SubprojectItem *item ) TQString fname = *fileIt; ++fileIt; - if( AutoProjectPrivate::isHeader(fname) && !headers.contains(fname) ){ + if( AutoProjectPrivate::isHeader(fname) && !headers.tqcontains(fname) ){ FileItem *fitem = m_widget->createFileItem( fname, item ); noinst_HEADERS_item->sources.append( fitem ); } @@ -1045,7 +1045,7 @@ void AutoSubprojectView::slotManageBuildCommands( ) { config->writeEntry(widget->commandsTable->text(i, 0), widget->commandsTable->text(i, 1)+":::"+ - TQString("%1").arg(static_cast<TQComboTableItem*>(widget-> + TQString("%1").tqarg(static_cast<TQComboTableItem*>(widget-> commandsTable->item(i, 2))->currentItem())); } config->sync(); diff --git a/buildtools/autotools/autosubprojectview.h b/buildtools/autotools/autosubprojectview.h index 81c772dc..f7a6b6e6 100644 --- a/buildtools/autotools/autosubprojectview.h +++ b/buildtools/autotools/autosubprojectview.h @@ -41,9 +41,10 @@ namespace AutoProjectPrivate class AutoSubprojectView : public AutoProjectViewBase { Q_OBJECT + TQ_OBJECT public: - AutoSubprojectView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name ); + AutoSubprojectView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *tqparent, const char *name ); virtual ~AutoSubprojectView(); public: diff --git a/buildtools/autotools/autotoolsaction.cpp b/buildtools/autotools/autotoolsaction.cpp index b5191b37..2d336c9b 100644 --- a/buildtools/autotools/autotoolsaction.cpp +++ b/buildtools/autotools/autotoolsaction.cpp @@ -26,73 +26,73 @@ AutoToolsAction::~AutoToolsAction() AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ) -: KAction( text, cut, receiver, slot, parent, name ) + KActionCollection* tqparent, const char* name ) +: KAction( text, cut, receiver, slot, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ) -: KAction( text, pix, cut, receiver, slot, parent, name ) + KActionCollection* tqparent, const char* name ) +: KAction( text, pix, cut, receiver, slot, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ) -: KAction( text, pix, cut, receiver, slot, parent, name ) + KActionCollection* tqparent, const char* name ) +: KAction( text, pix, cut, receiver, slot, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const KGuiItem& item, const KShortcut & cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ) -: KAction( item, cut, receiver, slot, parent, name ) + KActionCollection* tqparent, const char* name ) +: KAction( item, cut, receiver, slot, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, - TQObject* parent, const char* name ) -: KAction( text, cut, parent, name ) + TQObject* tqparent, const char* name ) +: KAction( text, cut, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* parent, const char* name ) -: KAction( text, cut, receiver, slot, parent, name ) + TQObject* tqparent, const char* name ) +: KAction( text, cut, receiver, slot, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, - const KShortcut& cut, TQObject* parent, const char* name ) -: KAction( text, pix, cut, parent, name ) + const KShortcut& cut, TQObject* tqparent, const char* name ) +: KAction( text, pix, cut, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, - const KShortcut& cut, TQObject* parent, const char* name ) -: KAction( text, pix, cut, parent, name ) + const KShortcut& cut, TQObject* tqparent, const char* name ) +: KAction( text, pix, cut, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, const TQObject* receiver, - const char* slot, TQObject* parent, const char * name ) -: KAction( text, pix, cut, receiver, slot, parent, name ) + const char* slot, TQObject* tqparent, const char * name ) +: KAction( text, pix, cut, receiver, slot, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut & cut, const TQObject* receiver, - const char* slot, TQObject* parent, const char * name ) -: KAction( text, pix, cut, receiver, slot, parent, name ) + const char* slot, TQObject* tqparent, const char * name ) +: KAction( text, pix, cut, receiver, slot, tqparent, name ) { } -AutoToolsAction::AutoToolsAction( TQObject * parent, const char * name ) -: KAction( parent, name ) +AutoToolsAction::AutoToolsAction( TQObject * tqparent, const char * name ) +: KAction( tqparent, name ) { } @@ -107,7 +107,7 @@ int AutoToolsAction::plug( TQWidget* w, int index ) if (kapp && !kapp->authorizeKAction(name())) return -1; - if ( ::qt_cast<TQToolButton*>( w ) ) + if ( ::tqqt_cast<TQToolButton*>( w ) ) { TQToolButton* tb = static_cast<TQToolButton*>( w ); connect( tb, TQT_SIGNAL( clicked() ), this, TQT_SLOT( activate() ) ); @@ -145,7 +145,7 @@ void AutoToolsAction::updateEnabled( int i ) { TQWidget* w = container( i ); - if ( ::qt_cast<TQToolButton*>( w ) ) + if ( ::tqqt_cast<TQToolButton*>( w ) ) static_cast<TQToolButton*>( w )->setEnabled( isEnabled() ); else KAction::updateEnabled( i ) ; diff --git a/buildtools/autotools/autotoolsaction.h b/buildtools/autotools/autotoolsaction.h index 574b20b1..990102f1 100644 --- a/buildtools/autotools/autotoolsaction.h +++ b/buildtools/autotools/autotoolsaction.h @@ -21,7 +21,7 @@ class TQObject; class KActionCollection; /** - * A KAction derivative that will work with the QToolButtons used in + * A KAction derivative that will work with the TQToolButtons used in * the Automake Manager * @author Matt Rogers */ @@ -32,33 +32,33 @@ public: AutoToolsAction( const TQString& text, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ); + KActionCollection* tqparent, const char* name ); AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ); + KActionCollection* tqparent, const char* name ); AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ); + KActionCollection* tqparent, const char* name ); AutoToolsAction( const KGuiItem& item, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ); + KActionCollection* tqparent, const char* name ); - AutoToolsAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 ); + AutoToolsAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* tqparent = 0, const char* name = 0 ); AutoToolsAction( const TQString& text, const KShortcut& cut, - const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); + const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(), - TQObject* parent = 0, const char* name = 0 ); + TQObject* tqparent = 0, const char* name = 0 ); AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(), - TQObject* parent = 0, const char* name = 0 ); + TQObject* tqparent = 0, const char* name = 0 ); AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, - const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); + const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, - const TQObject* receiver, const char* slot, TQObject* parent, + const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); - AutoToolsAction( TQObject* parent = 0, const char* name = 0 ); + AutoToolsAction( TQObject* tqparent = 0, const char* name = 0 ); virtual int plug( TQWidget *widget, int index = -1 ); diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp index 4ffc326b..d09f0a7b 100644 --- a/buildtools/autotools/choosetargetdialog.cpp +++ b/buildtools/autotools/choosetargetdialog.cpp @@ -58,12 +58,12 @@ public: }; ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectPart* part, - TQStringList fileList, TQWidget* parent, const char* name ) -: KDialogBase( parent, name, false, i18n("Automake Manager - Choose Target"), + TQStringList fileList, TQWidget* tqparent, const char* name ) +: KDialogBase( tqparent, name, false, i18n("Automake Manager - Choose Target"), Ok | Cancel, KDialogBase::Ok, true /* seperator */ ) { - Q_UNUSED( parent ); + Q_UNUSED( tqparent ); Q_UNUSED( name ); d = new ChooseTargetDialog::Private; d->widget = widget; @@ -76,7 +76,7 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP d->baseUI->subprojectComboBox->setAutoCompletion( true ); d->baseUI->targetComboBox->setAutoCompletion( true ); d->baseUI->newFileList->header()->hide(); - d->baseUI->newFileList->addColumn( TQString::null ); + d->baseUI->newFileList->addColumn( TQString() ); d->baseUI->newFileList->setSorting(-1); setIcon ( SmallIcon ( "target_kdevelop" ) ); @@ -128,7 +128,7 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP for ( it = fileList.begin(); it != fileList.end(); ++it ) { - int pos = ( *it ).findRev('/'); + int pos = ( *it ).tqfindRev('/'); if (pos != -1) fileName = ( *it ).mid(pos+1); else @@ -246,7 +246,7 @@ void ChooseTargetDialog::slotOk() { bool found = false; - int pos = ( *it ).findRev('/'); + int pos = ( *it ).tqfindRev('/'); if (pos != -1) { directory = ( *it ).left(pos); diff --git a/buildtools/autotools/choosetargetdialog.h b/buildtools/autotools/choosetargetdialog.h index 7ca7a3f4..d1ebdab6 100644 --- a/buildtools/autotools/choosetargetdialog.h +++ b/buildtools/autotools/choosetargetdialog.h @@ -29,9 +29,10 @@ class TQWidget; class ChooseTargetDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: ChooseTargetDialog( AutoProjectWidget* widget, AutoProjectPart* part, - TQStringList fileList, TQWidget* parent = 0, + TQStringList fileList, TQWidget* tqparent = 0, const char* name = 0 ); ~ChooseTargetDialog(); diff --git a/buildtools/autotools/choosetargetdlgbase.ui b/buildtools/autotools/choosetargetdlgbase.ui index 3581e595..f41433cd 100644 --- a/buildtools/autotools/choosetargetdlgbase.ui +++ b/buildtools/autotools/choosetargetdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ChooseTargetDlgBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ChooseTargetDlgBase</cstring> </property> @@ -12,7 +12,7 @@ <height>306</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>444</width> <height>306</height> @@ -25,7 +25,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -51,7 +51,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>activeTargetRadioButton</cstring> </property> @@ -62,7 +62,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>chooseTargetRadioButton</cstring> </property> @@ -72,7 +72,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>chosenTargetGroupBox</cstring> </property> @@ -102,7 +102,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>targetStaticLabel</cstring> </property> @@ -114,7 +114,7 @@ <string>Target:</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>chosenTargetLabel</cstring> </property> @@ -132,7 +132,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -151,20 +151,20 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>cancelNoticeLabel</cstring> </property> <property name="text"> <string><qt><b>Note:</b> If you cancel, your files will be created but will <b>not</b> be added to the project.</qt></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> </vbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>neverAskAgainCheckbox</cstring> </property> @@ -205,13 +205,13 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">slotActiveTargetToggled(bool)</slot> <slot access="protected">slotChooseTargetToggled(bool)</slot> <slot access="private">slotSubprojectChanged(const QString&)</slot> <slot access="private">slotTargetChanged(const QString&)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp index 0be8903b..1e877a5c 100644 --- a/buildtools/autotools/configureoptionswidget.cpp +++ b/buildtools/autotools/configureoptionswidget.cpp @@ -51,7 +51,7 @@ public: static TQString currentText(TQComboBox *combo, const TQStringList &names) { if (combo->currentItem() == -1) - return TQString::null; + return TQString(); return names[combo->currentItem()]; } static void setCurrentText(TQComboBox *combo, const TQString &str, const TQStringList &names) @@ -69,10 +69,10 @@ public: }; -ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget *parent, const char *name) - : ConfigureOptionsWidgetBase(parent, name) +ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget *tqparent, const char *name) + : ConfigureOptionsWidgetBase(tqparent, name) { - config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); + config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); m_part = part; env_groupBox->setColumnLayout( 1, Qt::Vertical ); @@ -98,7 +98,7 @@ ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget * config_combo->insertStringList(allConfigs); dirty = false; - currentConfig = TQString::null; + currentConfig = TQString(); configChanged(part->currentBuildConfig()); fixLayout(); @@ -111,20 +111,20 @@ ConfigureOptionsWidget::~ConfigureOptionsWidget() void ConfigureOptionsWidget::fixLayout() { - int w1 = ccompiler_label->sizeHint().width(); - int w2 = cbinary_label->sizeHint().width(); - int w3 = cflags_label->sizeHint().width(); - int w4 = cxxcompiler_label->sizeHint().width(); - int w5 = cxxbinary_label->sizeHint().width(); - int w6 = cxxflags_label->sizeHint().width(); - int w7 = f77compiler_label->sizeHint().width(); - int w8 = f77binary_label->sizeHint().width(); - int w9 = f77flags_label->sizeHint().width(); - - int w = QMAX(w1, QMAX(w2, w3)); - w = QMAX(w, QMAX(w4, w5)); - w = QMAX(w, QMAX(w6, w7)); - w = QMAX(w, QMAX(w8, w9)); + int w1 = ccompiler_label->tqsizeHint().width(); + int w2 = cbinary_label->tqsizeHint().width(); + int w3 = cflags_label->tqsizeHint().width(); + int w4 = cxxcompiler_label->tqsizeHint().width(); + int w5 = cxxbinary_label->tqsizeHint().width(); + int w6 = cxxflags_label->tqsizeHint().width(); + int w7 = f77compiler_label->tqsizeHint().width(); + int w8 = f77binary_label->tqsizeHint().width(); + int w9 = f77flags_label->tqsizeHint().width(); + + int w = TQMAX(w1, TQMAX(w2, w3)); + w = TQMAX(w, TQMAX(w4, w5)); + w = TQMAX(w, TQMAX(w6, w7)); + w = TQMAX(w, TQMAX(w8, w9)); ccompiler_label->setMinimumWidth(w); cxxcompiler_label->setMinimumWidth(w); @@ -236,7 +236,7 @@ void ConfigureOptionsWidget::saveSettings(const TQString &config) DomUtil::writeEntry(dom, prefix + "cxxflags", cxxflags_edit->text()); DomUtil::writeEntry(dom, prefix + "f77flags", f77flags_edit->text()); - if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").arg(config), TQString::null, i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").tqarg(config), TQString(), i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes) TQTimer::singleShot(0, m_part, TQT_SLOT(slotConfigure())); } @@ -267,8 +267,8 @@ void ConfigureOptionsWidget::topsourcedirClicked() void ConfigureOptionsWidget::configComboTextChanged(const TQString &config) { - bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty(); - bool canRemove = allConfigs.contains(config) && config != "default"; + bool canAdd = !allConfigs.tqcontains(config) && !config.tqcontains("/") && !config.isEmpty(); + bool canRemove = allConfigs.tqcontains(config) && config != "default"; addconfig_button->setEnabled(canAdd); removeconfig_button->setEnabled(canRemove); } @@ -276,7 +276,7 @@ void ConfigureOptionsWidget::configComboTextChanged(const TQString &config) void ConfigureOptionsWidget::configChanged(const TQString &config) { - if (config == currentConfig || !allConfigs.contains(config)) + if (config == currentConfig || !allConfigs.tqcontains(config)) return; if (!currentConfig.isNull() && dirty) @@ -317,7 +317,7 @@ void ConfigureOptionsWidget::configRemoved() config_combo->clear(); config_combo->insertStringList(allConfigs); - currentConfig = TQString::null; + currentConfig = TQString(); configChanged("default"); } @@ -396,7 +396,7 @@ KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin if (!factory) { TQString errorMessage = KLibLoader::self()->lastErrorMessage(); KMessageBox::error(0, i18n("There was an error loading the module %1.\n" - "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage)); + "The diagnostics is:\n%2").tqarg(service->name()).tqarg(errorMessage)); exit(1); } @@ -405,7 +405,7 @@ KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin if (prop.isValid()) args = TQStringList::split(" ", prop.toString()); - TQObject *obj = factory->create(this, service->name().latin1(), + TQObject *obj = factory->create(TQT_TQOBJECT(this), service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) { diff --git a/buildtools/autotools/configureoptionswidget.h b/buildtools/autotools/configureoptionswidget.h index 9272b3f2..fd8afade 100644 --- a/buildtools/autotools/configureoptionswidget.h +++ b/buildtools/autotools/configureoptionswidget.h @@ -25,9 +25,10 @@ class EnvironmentVariablesWidget; class ConfigureOptionsWidget : public ConfigureOptionsWidgetBase { Q_OBJECT + TQ_OBJECT public: - ConfigureOptionsWidget( AutoProjectPart *part, TQWidget *parent = 0, const char *name = 0 ); + ConfigureOptionsWidget( AutoProjectPart *part, TQWidget *tqparent = 0, const char *name = 0 ); ~ConfigureOptionsWidget(); public slots: diff --git a/buildtools/autotools/configureoptionswidgetbase.ui b/buildtools/autotools/configureoptionswidgetbase.ui index 0eb47ac7..c8374366 100644 --- a/buildtools/autotools/configureoptionswidgetbase.ui +++ b/buildtools/autotools/configureoptionswidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ConfigureOptionsWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>configure_options_widget</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>config_label</cstring> </property> @@ -49,7 +49,7 @@ <cstring>config_combo</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>config_combo</cstring> </property> @@ -81,14 +81,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>8</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addconfig_button</cstring> </property> @@ -99,7 +99,7 @@ <bool>false</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeconfig_button</cstring> </property> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -129,11 +129,11 @@ </spacer> </hbox> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabwidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>general_tab</cstring> </property> @@ -155,7 +155,7 @@ <string>Options to pass to configure, e.g. --prefix=<install dir></string> </property> </widget> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>builddir_label</cstring> </property> @@ -176,14 +176,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="QLabel" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>topsourcedir_label</cstring> </property> @@ -229,17 +229,17 @@ building in the project directory, you probably want this to be blank.</string> </property> </widget> - <widget class="QPushButton" row="4" column="4"> + <widget class="TQPushButton" row="4" column="4"> <property name="name"> <cstring>builddir_button</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -259,24 +259,24 @@ probably want this to be blank.</string> <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="QPushButton" row="6" column="4"> + <widget class="TQPushButton" row="6" column="4"> <property name="name"> <cstring>topsourcedir_button</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -313,14 +313,14 @@ then it is relative to the project directory. <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="QLabel" row="10" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="10" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>ldflags_label</cstring> </property> @@ -345,7 +345,7 @@ nonstandard directory <lib dir></string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -388,14 +388,14 @@ headers in a nonstandard directory <include dir></string> <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="QLabel" row="8" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="8" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>cppflags_label</cstring> </property> @@ -410,7 +410,7 @@ headers in a nonstandard directory <include dir></string> headers in a nonstandard directory <include dir></string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>configargs_label</cstring> </property> @@ -421,7 +421,7 @@ headers in a nonstandard directory <include dir></string> <cstring>configargs_edit</cstring> </property> </widget> - <widget class="QGroupBox" row="12" column="0" rowspan="1" colspan="5"> + <widget class="TQGroupBox" row="12" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>env_groupBox</cstring> </property> @@ -444,7 +444,7 @@ headers in a nonstandard directory <include dir></string> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>c_tab</cstring> </property> @@ -455,7 +455,7 @@ headers in a nonstandard directory <include dir></string> <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>ccompiler_label</cstring> </property> @@ -466,7 +466,7 @@ headers in a nonstandard directory <include dir></string> <cstring>cservice_combo</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>cservice_combo</cstring> </property> @@ -481,14 +481,14 @@ headers in a nonstandard directory <include dir></string> <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="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>cflags_label</cstring> </property> @@ -504,7 +504,7 @@ headers in a nonstandard directory <include dir></string> <cstring>cflags_edit</cstring> </property> </widget> - <widget class="QPushButton" row="4" column="2"> + <widget class="TQPushButton" row="4" column="2"> <property name="name"> <cstring>cflags_button</cstring> </property> @@ -516,7 +516,7 @@ headers in a nonstandard directory <include dir></string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -536,14 +536,14 @@ headers in a nonstandard directory <include dir></string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>168</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>cbinary_label</cstring> </property> @@ -569,7 +569,7 @@ headers in a nonstandard directory <include dir></string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -578,7 +578,7 @@ headers in a nonstandard directory <include dir></string> </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>cxx_tab</cstring> </property> @@ -589,7 +589,7 @@ headers in a nonstandard directory <include dir></string> <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>cxxcompiler_label</cstring> </property> @@ -600,7 +600,7 @@ headers in a nonstandard directory <include dir></string> <cstring>cxxservice_combo</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>cxxservice_combo</cstring> </property> @@ -615,14 +615,14 @@ headers in a nonstandard directory <include dir></string> <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="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>cxxbinary_label</cstring> </property> @@ -648,14 +648,14 @@ headers in a nonstandard directory <include dir></string> <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="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>cxxflags_label</cstring> </property> @@ -671,7 +671,7 @@ headers in a nonstandard directory <include dir></string> <cstring>cxxflags_edit</cstring> </property> </widget> - <widget class="QPushButton" row="4" column="2"> + <widget class="TQPushButton" row="4" column="2"> <property name="name"> <cstring>cxxflags_button</cstring> </property> @@ -683,7 +683,7 @@ headers in a nonstandard directory <include dir></string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -703,7 +703,7 @@ headers in a nonstandard directory <include dir></string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -712,7 +712,7 @@ headers in a nonstandard directory <include dir></string> </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>fortran_tab</cstring> </property> @@ -723,7 +723,7 @@ headers in a nonstandard directory <include dir></string> <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>f77compiler_label</cstring> </property> @@ -734,7 +734,7 @@ headers in a nonstandard directory <include dir></string> <cstring>f77service_combo</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>f77service_combo</cstring> </property> @@ -749,14 +749,14 @@ headers in a nonstandard directory <include dir></string> <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="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>f77binary_label</cstring> </property> @@ -782,14 +782,14 @@ headers in a nonstandard directory <include dir></string> <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="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>f77flags_label</cstring> </property> @@ -805,7 +805,7 @@ headers in a nonstandard directory <include dir></string> <cstring>f77flags_edit</cstring> </property> </widget> - <widget class="QPushButton" row="4" column="2"> + <widget class="TQPushButton" row="4" column="2"> <property name="name"> <cstring>f77flags_button</cstring> </property> @@ -817,7 +817,7 @@ headers in a nonstandard directory <include dir></string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -837,7 +837,7 @@ headers in a nonstandard directory <include dir></string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1017,7 +1017,7 @@ headers in a nonstandard directory <include dir></string> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">builddirClicked()</slot> <slot access="protected">cflagsClicked()</slot> <slot access="protected">configAdded()</slot> @@ -1031,9 +1031,9 @@ headers in a nonstandard directory <include dir></string> <slot access="protected">f77serviceChanged()</slot> <slot access="protected">setDirty()</slot> <slot access="protected">topsourcedirClicked()</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> </includehints> diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp index 2235f357..f67d9295 100644 --- a/buildtools/autotools/fileselectorwidget.cpp +++ b/buildtools/autotools/fileselectorwidget.cpp @@ -48,20 +48,20 @@ #include "kfilednddetailview.h" #include "kfiledndiconview.h" -KDnDDirOperator::KDnDDirOperator ( const KURL &urlName, TQWidget* parent, const char* name ) : KDirOperator ( urlName, parent, name ) +KDnDDirOperator::KDnDDirOperator ( const KURL &urlName, TQWidget* tqparent, const char* name ) : KDirOperator ( urlName, tqparent, name ) { } -KFileView* KDnDDirOperator::createView( TQWidget* parent, KFile::FileView view ) +KFileView* KDnDDirOperator::createView( TQWidget* tqparent, KFile::FileView view ) { KFileView* new_view = 0L; if( (view & KFile::Detail) == KFile::Detail ) { - new_view = new KFileDnDDetailView( parent, "detail view"); + new_view = new KFileDnDDetailView( tqparent, "detail view"); } else if ((view & KFile::Simple) == KFile::Simple ) { - new_view = new KFileDnDIconView( parent, "simple view"); + new_view = new KFileDnDIconView( tqparent, "simple view"); new_view->setViewName( i18n("Short View") ); } @@ -69,11 +69,11 @@ KFileView* KDnDDirOperator::createView( TQWidget* parent, KFile::FileView view ) } -FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, TQWidget* parent, const char* name ) : TQWidget(parent, name) +FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, TQWidget* tqparent, const char* name ) : TQWidget(tqparent, name) { m_part = part; - // widgets and layout + // widgets and tqlayout TQVBoxLayout* lo = new TQVBoxLayout(this); TQHBox *hlow = new TQHBox (this); @@ -98,7 +98,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, hlow->setMaximumHeight(up->height()); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); - cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); KURLCompletion* cmpl = new KURLCompletion(); cmbPath->setCompletionObject( cmpl ); lo->addWidget(cmbPath); @@ -114,7 +114,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, filterIcon = new TQLabel(filterBox); filterIcon->setPixmap( BarIcon("filter") ); filter = new KHistoryCombo(filterBox, "filter"); - filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); lo->addWidget(filterBox); @@ -148,7 +148,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, { if (groupEl.tagName() == "group") { - list << groupEl.attribute("pattern").replace ( TQRegExp ( ";" ), " " ) + " (" + groupEl.attribute("name") + ")"; + list << groupEl.attribute("pattern").tqreplace ( TQRegExp ( ";" ), " " ) + " (" + groupEl.attribute("name") + ")"; } groupEl = groupEl.nextSibling().toElement(); } diff --git a/buildtools/autotools/fileselectorwidget.h b/buildtools/autotools/fileselectorwidget.h index 636cec87..187348fa 100644 --- a/buildtools/autotools/fileselectorwidget.h +++ b/buildtools/autotools/fileselectorwidget.h @@ -40,20 +40,22 @@ class KFile; class KDnDDirOperator : public KDirOperator { Q_OBJECT + TQ_OBJECT public: - KDnDDirOperator ( const KURL& urlName = KURL(), TQWidget *parent = 0, const char* name = 0 ); + KDnDDirOperator ( const KURL& urlName = KURL(), TQWidget *tqparent = 0, const char* name = 0 ); protected: - virtual KFileView* createView( TQWidget* parent, KFile::FileView view ); + virtual KFileView* createView( TQWidget* tqparent, KFile::FileView view ); }; -class FileSelectorWidget : public QWidget +class FileSelectorWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - FileSelectorWidget( AutoProjectPart* part, KFile::Mode, TQWidget* parent = 0, const char* name = 0 ); + FileSelectorWidget( AutoProjectPart* part, KFile::Mode, TQWidget* tqparent = 0, const char* name = 0 ); ~FileSelectorWidget(); KDnDDirOperator * dirOperator() diff --git a/buildtools/autotools/kfilednddetailview.cpp b/buildtools/autotools/kfilednddetailview.cpp index 098d975f..d98e7a81 100644 --- a/buildtools/autotools/kfilednddetailview.cpp +++ b/buildtools/autotools/kfilednddetailview.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ ////////////////////////////////////////////////////// -// Qt specific includes +// TQt specific includes #include <tqptrlist.h> #include <tqapplication.h> ////////////////////////////////////////////////////// @@ -33,8 +33,8 @@ static int autoOpenTime = 750; #endif //----------------------------------------------- -KFileDnDDetailView::KFileDnDDetailView(TQWidget *parent, const char *name ) - : KFileDetailView(parent,name), m_autoOpenTimer( this ), +KFileDnDDetailView::KFileDnDDetailView(TQWidget *tqparent, const char *name ) + : KFileDetailView(tqparent,name), m_autoOpenTimer( this ), m_autoOpenTime( autoOpenTime ), m_useAutoOpenTimer( true ), m_dropItem(0), m_dndEnabled( true ) { @@ -207,6 +207,6 @@ void KFileDnDDetailView::setDnDEnabled( bool useDnD ){ viewport()->setAcceptDrops( useDnD ); } //----------------------------------------------- -#ifndef NO_INCLUDE_MOCFILES +#ifndef NO_INCLUDE_TQMOCFILES #include "kfilednddetailview.moc" #endif diff --git a/buildtools/autotools/kfilednddetailview.h b/buildtools/autotools/kfilednddetailview.h index 0cf13f7e..762d6921 100644 --- a/buildtools/autotools/kfilednddetailview.h +++ b/buildtools/autotools/kfilednddetailview.h @@ -19,7 +19,7 @@ #define KFILEDNDDETAILVIEW_H ////////////////////////////////////////////////////////////////////// -// Qt specific include files +// TQt specific include files #include <tqwidget.h> #include <tqtimer.h> ////////////////////////////////////////////////////////////////////// @@ -40,9 +40,10 @@ class KFileDnDDetailView : public KFileDetailView { Q_OBJECT + TQ_OBJECT public: /** */ - KFileDnDDetailView( TQWidget *parent = 0, const char *name = 0 ); + KFileDnDDetailView( TQWidget *tqparent = 0, const char *name = 0 ); /** */ virtual ~KFileDnDDetailView(); /** @@ -78,9 +79,9 @@ public: return m_useAutoOpenTimer; } /** */ - virtual void readConfig( KConfig*, const TQString& group = TQString::null ); + virtual void readConfig( KConfig*, const TQString& group = TQString() ); /** */ - virtual void writeConfig( KConfig*, const TQString& group = TQString::null ); + virtual void writeConfig( KConfig*, const TQString& group = TQString() ); signals: // Signals /** * Emitted whenever an decodable item is dropped in the view. diff --git a/buildtools/autotools/kfiledndiconview.cpp b/buildtools/autotools/kfiledndiconview.cpp index 1a491c62..d230eee7 100644 --- a/buildtools/autotools/kfiledndiconview.cpp +++ b/buildtools/autotools/kfiledndiconview.cpp @@ -2,7 +2,7 @@ * kfiledndiconview.cpp - description * ------------------- * begin : Wed Nov 1 2000 -* copyright : (C) 2000 by Björn Sahlström +* copyright : (C) 2000 by Bj�rn Sahlstr�m * email : kbjorn@users.sourceforge.net ***************************************************************************/ @@ -16,7 +16,7 @@ ***************************************************************************/ ////////////////////////////////////////////////////// -// Qt specific includes +// TQt specific includes #include <tqptrlist.h> #include <tqapplication.h> ////////////////////////////////////////////////////// @@ -33,8 +33,8 @@ static int autoOpenTime = 750; #endif //----------------------------------------------- -KFileDnDIconView::KFileDnDIconView( TQWidget *parent, const char *name ) - : KFileIconView(parent,name), m_autoOpenTimer( this ), +KFileDnDIconView::KFileDnDIconView( TQWidget *tqparent, const char *name ) + : KFileIconView(tqparent,name), m_autoOpenTimer( this ), m_autoOpenTime( autoOpenTime ), m_useAutoOpenTimer( true ), m_dropItem(0), m_dndEnabled( true ) { @@ -84,7 +84,7 @@ void KFileDnDIconView::contentsDragEnterEvent( TQDragEnterEvent *e ) { return; } e->acceptAction(); // Yes - TQIconViewItem *i = findItem( contentsToViewport( e->pos() ) ); + TQIconViewItem *i = tqfindItem( contentsToViewport( e->pos() ) ); if ( i && m_useAutoOpenTimer) { // are we over an item ? m_dropItem = i; // set new m_dropItem m_autoOpenTimer.start( m_autoOpenTime ); // restart timer @@ -97,7 +97,7 @@ void KFileDnDIconView::contentsDragMoveEvent( TQDragMoveEvent *e ) { return; } e->acceptAction(); // Yes - TQIconViewItem *i = findItem( contentsToViewport( e->pos() ) ); + TQIconViewItem *i = tqfindItem( contentsToViewport( e->pos() ) ); if( ! m_useAutoOpenTimer ) return; if ( i ) { // are we over an item ? @@ -189,6 +189,6 @@ bool KFileDnDIconView::acceptDrag(TQDropEvent* e ) const { || e->action() == TQDropEvent::Link ); } //----------------------------------------------- -#ifndef NO_INCLUDE_MOCFILES +#ifndef NO_INCLUDE_TQMOCFILES #include "kfiledndiconview.moc" #endif diff --git a/buildtools/autotools/kfiledndiconview.h b/buildtools/autotools/kfiledndiconview.h index e2b3402e..e58062b3 100644 --- a/buildtools/autotools/kfiledndiconview.h +++ b/buildtools/autotools/kfiledndiconview.h @@ -35,9 +35,10 @@ class KFileDnDIconView : public KFileIconView { Q_OBJECT + TQ_OBJECT public: // Public methods - KFileDnDIconView( TQWidget *parent = 0, const char *name = 0 ); + KFileDnDIconView( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~KFileDnDIconView(); /** @@ -77,8 +78,8 @@ public: // Public methods return m_useAutoOpenTimer; } - virtual void readConfig( KConfig*, const TQString& group = TQString::null ); - virtual void writeConfig( KConfig*, const TQString& group = TQString::null ); + virtual void readConfig( KConfig*, const TQString& group = TQString() ); + virtual void writeConfig( KConfig*, const TQString& group = TQString() ); signals: /** @@ -101,7 +102,7 @@ protected: /** * Creates a @ref TQDragObject containing all urls of the selected @ref KFileItem of the view, - * @returns the @ref QDragObject + * @returns the @ref TQDragObject */ virtual TQDragObject* dragObject(); diff --git a/buildtools/autotools/kimporticonview.cpp b/buildtools/autotools/kimporticonview.cpp index 3634886a..87c0d19f 100644 --- a/buildtools/autotools/kimporticonview.cpp +++ b/buildtools/autotools/kimporticonview.cpp @@ -26,8 +26,8 @@ #include "kimporticonview.h" -KImportIconView::KImportIconView(const TQString& strIntro, TQWidget *parent, const char *name) - : KFileDnDIconView(parent, name) +KImportIconView::KImportIconView(const TQString& strIntro, TQWidget *tqparent, const char *name) + : KFileDnDIconView(tqparent, name) { m_strIntro = strIntro; m_bDropped = false; diff --git a/buildtools/autotools/kimporticonview.h b/buildtools/autotools/kimporticonview.h index 3cfd5745..c0674eb7 100644 --- a/buildtools/autotools/kimporticonview.h +++ b/buildtools/autotools/kimporticonview.h @@ -24,9 +24,10 @@ class KImportIconView : public KFileDnDIconView { Q_OBJECT + TQ_OBJECT public: - KImportIconView( const TQString& strIntro, TQWidget *parent, const char *name ); + KImportIconView( const TQString& strIntro, TQWidget *tqparent, const char *name ); virtual ~KImportIconView(); void somethingDropped ( bool dropped ); diff --git a/buildtools/autotools/makefilehandler.cpp b/buildtools/autotools/makefilehandler.cpp index db30508d..ef2354f1 100644 --- a/buildtools/autotools/makefilehandler.cpp +++ b/buildtools/autotools/makefilehandler.cpp @@ -81,7 +81,7 @@ void MakefileHandler::parse( const TQString& folder, bool recursive ) if ( recursive && ast && ast->hasChildren() ) { - TQValueList<AutoTools::AST*> astChildList = ast->children(); + TQValueList<AutoTools::AST*> astChildList = ast->tqchildren(); TQValueList<AutoTools::AST*>::iterator it(astChildList.begin()), clEnd(astChildList.end()); for ( ; it != clEnd; ++it ) { @@ -122,7 +122,7 @@ void MakefileHandler::parse( const TQString& folder, bool recursive ) AutoTools::ProjectAST* MakefileHandler::astForFolder( const TQString& folderPath ) { - if ( d->folderToFileMap.contains( folderPath ) ) + if ( d->folderToFileMap.tqcontains( folderPath ) ) { TQString filePath = d->folderToFileMap[folderPath]; return d->projects[filePath]; @@ -145,14 +145,14 @@ TQString MakefileHandler::resolveVariable( const TQString& variable, AutoTools:: return variable; kdDebug(9020) << k_funcinfo << "attempting to resolve '" << variable << "'"<< endl; - ASTList childList = ast->children(); + ASTList childList = ast->tqchildren(); ASTList::iterator it( childList.begin() ), clEnd( childList.end() ); for ( ; it != clEnd; ++it ) { if ( ( *it )->nodeType() == AutoTools::AST::AssignmentAST ) { AutoTools::AssignmentAST* assignment = static_cast<AutoTools::AssignmentAST*>( ( *it ) ); - if ( variable.find( assignment->scopedID ) != -1 ) + if ( variable.tqfind( assignment->scopedID ) != -1 ) { kdDebug(9020) << k_funcinfo << "Resolving variable '" << variable << "' to '" << assignment->values.join( TQString::null ).stripWhiteSpace() << "'" << endl; diff --git a/buildtools/autotools/managecustomcommand.cpp b/buildtools/autotools/managecustomcommand.cpp index a602a3a9..92db0620 100644 --- a/buildtools/autotools/managecustomcommand.cpp +++ b/buildtools/autotools/managecustomcommand.cpp @@ -22,8 +22,8 @@ #include <klocale.h> -ManageCustomCommand::ManageCustomCommand(TQWidget *parent, const char *name) - :ManageCustomBuildCommandsBase(parent, name) +ManageCustomCommand::ManageCustomCommand(TQWidget *tqparent, const char *name) + :ManageCustomBuildCommandsBase(tqparent, name) { } diff --git a/buildtools/autotools/managecustomcommand.h b/buildtools/autotools/managecustomcommand.h index b4e4af49..22f78431 100644 --- a/buildtools/autotools/managecustomcommand.h +++ b/buildtools/autotools/managecustomcommand.h @@ -24,8 +24,9 @@ class ManageCustomCommand: public ManageCustomBuildCommandsBase { Q_OBJECT + TQ_OBJECT public: - ManageCustomCommand( TQWidget *parent = 0, const char *name = 0 ); + ManageCustomCommand( TQWidget *tqparent = 0, const char *name = 0 ); void setRowProperties( int row ); public slots: diff --git a/buildtools/autotools/managecustomcommandsbase.ui b/buildtools/autotools/managecustomcommandsbase.ui index 43164ef5..47c018ea 100644 --- a/buildtools/autotools/managecustomcommandsbase.ui +++ b/buildtools/autotools/managecustomcommandsbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ManageCustomBuildCommandsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ManageCustomBuildCommandsBase</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>addButton</cstring> </property> @@ -30,7 +30,7 @@ <string>&Add</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>removeButton</cstring> </property> @@ -38,7 +38,7 @@ <string>&Remove</string> </property> </widget> - <widget class="QTable" row="0" column="0" rowspan="3" colspan="1"> + <widget class="TQTable" row="0" column="0" rowspan="3" colspan="1"> <column> <property name="text"> <string>Menu Text</string> @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -117,9 +117,9 @@ <tabstop>addButton</tabstop> <tabstop>removeButton</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>addButton_clicked()</slot> <slot>removeButton_clicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp index e44a32c3..9dfffefb 100644 --- a/buildtools/autotools/misc.cpp +++ b/buildtools/autotools/misc.cpp @@ -24,7 +24,7 @@ #include "kdevcompileroptions.h" -static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent ) +static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *tqparent ) { KService::Ptr service = KService::serviceByDesktopName( name ); if ( !service ) @@ -47,7 +47,7 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec if (prop.isValid()) args = TQStringList::split(" ", prop.toString()); - TQObject *obj = factory->create(parent, service->name().latin1(), + TQObject *obj = factory->create(tqparent, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) { @@ -65,22 +65,22 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec args = TQStringList::split( " ", prop.toString() ); return KParts::ComponentFactory - ::createInstanceFromService<KDevCompilerOptions>( service, parent, + ::createInstanceFromService<KDevCompilerOptions>( service, tqparent, service->name().latin1(), args );*/ } -TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent ) +TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *tqparent ) { - KDevCompilerOptions * plugin = createCompilerOptions( compiler, parent ); + KDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(tqparent) ); if ( plugin ) { - TQString newflags = plugin->exec( parent, flags ); + TQString newflags = plugin->exec( tqparent, flags ); delete plugin; return newflags; } - return TQString::null; + return TQString(); } @@ -128,7 +128,7 @@ void AutoProjectTool::parseMakefileam(const TQString &fileName, TQMap<TQString, rhs[rhs.length() - 1] = ' '; } - // The need for stripWhiteSpace seems to be a Qt bug. + // The need for stripWhiteSpace seems to be a TQt bug. // make our list nice and neat. TQStringList bits = TQStringList::split(" ", rhs); rhs = bits.join(" "); @@ -238,11 +238,11 @@ void AutoProjectTool::setMakefileam ( const TQString &fileName, TQMap<TQString, if ( re.exactMatch ( s ) ) { TQString lhs = re.cap ( 2 ); - bool notFound = ( variables.find ( lhs ) == variables.end() ); + bool notFound = ( variables.tqfind ( lhs ) == variables.end() ); if ( notFound ) { - if ( seenLhs.find ( lhs ) == seenLhs.end() ) + if ( seenLhs.tqfind ( lhs ) == seenLhs.end() ) { // not interested in this line at all // write it out as is.. @@ -446,7 +446,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri if (re.exactMatch(s)) { TQString lhs = re.cap(2); - TQMap<TQString, bool>* ourRhs = interest.find(lhs); + TQMap<TQString, bool>* ourRhs = interest.tqfind(lhs); if (!ourRhs) { @@ -478,7 +478,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri // add this line to we we want to add to remove duplicates. for (uint index = 0; index < bits.size(); index++) { - TQMap<TQString, bool>::iterator findEntry = ourRhs->find(bits[index]); + TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(bits[index]); if (findEntry == ourRhs->end()) { // we haven't seen it, so add it, so we don't add it again later.. @@ -490,7 +490,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri } // now write the line out if it is not going to be empty. TQString newLine(lhs); - if (seenLhs.find(lhs) == seenLhs.end()) + if (seenLhs.tqfind(lhs) == seenLhs.end()) { newLine += " = "; seenLhs[lhs] = ""; @@ -537,7 +537,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri { // check if any of these values are down to remove. TQString newLine(lhs); - if (seenLhs.find(lhs) == seenLhs.end()) + if (seenLhs.tqfind(lhs) == seenLhs.end()) { newLine += " = "; seenLhs[lhs] = ""; @@ -551,7 +551,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri bool added = false; for (TQStringList::Iterator posIter = bits.begin(); posIter != bits.end();posIter++) { - TQMap<TQString, bool>::iterator findEntry = ourRhs->find(*posIter); + TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(*posIter); if (findEntry == ourRhs->end()) { // we do not want to remove it.. @@ -598,7 +598,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri { // now we have to deal with this multiLine value.. // ourRhs will always be a value, as we only get multiLine if we're interested in it.. - TQMap<TQString, bool>* ourRhs = interest.find(lastLhs); + TQMap<TQString, bool>* ourRhs = interest.tqfind(lastLhs); if (add) { @@ -607,7 +607,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri // add this line to we we want to add to remove duplicates. for (uint index = 0; index < lastRhs.size(); index++) { - TQMap<TQString, bool>::iterator findEntry = ourRhs->find(lastRhs[index]); + TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(lastRhs[index]); if (findEntry == ourRhs->end()) { // we haven't seen it, so add it, so we don't add it again later.. @@ -619,7 +619,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri } // now write the line out if it is not going to be empty. TQString newLine(lastLhs); - if (seenLhs.find(lastLhs) == seenLhs.end()) + if (seenLhs.tqfind(lastLhs) == seenLhs.end()) { newLine += " = "; seenLhs[lastLhs] = ""; @@ -665,7 +665,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri { // check if any of these values are down to remove. TQString newLine(lastLhs); - if (seenLhs.find(lastLhs) == seenLhs.end()) + if (seenLhs.tqfind(lastLhs) == seenLhs.end()) { newLine += " = "; seenLhs[lastLhs] = ""; @@ -678,7 +678,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri bool added = false; for (TQStringList::Iterator posIter = lastRhs.begin(); posIter != lastRhs.end();posIter++) { - TQMap<TQString, bool>::iterator findEntry = ourRhs->find(*posIter); + TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(*posIter); if (findEntry == ourRhs->end()) { // we do not want to remove it.. @@ -724,7 +724,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri TQMap<TQString, bool>* ourRhs = it.current(); TQString newLine(lhs); - if (seenLhs.find(lhs) == seenLhs.end()) + if (seenLhs.tqfind(lhs) == seenLhs.end()) { newLine += " = "; seenLhs[lastLhs] = ""; @@ -814,7 +814,7 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath) { if (close.search(line) >= 0) { - line = line.replace(close.search(line), 1, ""); + line = line.tqreplace(close.search(line), 1, ""); list += TQStringList::split(" ", line); break; } @@ -829,11 +829,11 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath) } else if (ac_regex.search(line) >= 0) { - line = line.replace(ac_regex.search(line), ac_match.length() - 1, ""); + line = line.tqreplace(ac_regex.search(line), ac_match.length() - 1, ""); if (open.search(line) >= 0) { - line = line.replace(open.search(line), 1, ""); + line = line.tqreplace(open.search(line), 1, ""); } if (line.endsWith(cont)) @@ -845,7 +845,7 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath) { if (close.search(line) >= 0) { - line = line.replace(close.search(line), 1, ""); + line = line.tqreplace(close.search(line), 1, ""); } } @@ -946,7 +946,7 @@ void AutoProjectTool::configureinSaveMakefiles(TQString fileName, TQStringList m else if (ac_regex.search(line) >= 0) { line = line.stripWhiteSpace(); - line = line.replace(ac_regex.search(line), ac_match.length() - 1, ""); + line = line.tqreplace(ac_regex.search(line), ac_match.length() - 1, ""); if (line.endsWith(cont)) { line.setLength(line.length() - 1); @@ -954,11 +954,11 @@ void AutoProjectTool::configureinSaveMakefiles(TQString fileName, TQStringList m } if (open.search(line) >= 0) { - line = line.replace(open.search(line), 1, ""); + line = line.tqreplace(open.search(line), 1, ""); } if (close.search(line) >= 0) { - line = line.replace(close.search(line), 1, ""); + line = line.tqreplace(close.search(line), 1, ""); } if (!multiLine) diff --git a/buildtools/autotools/misc.h b/buildtools/autotools/misc.h index 2f8a092d..26bb0e83 100644 --- a/buildtools/autotools/misc.h +++ b/buildtools/autotools/misc.h @@ -27,7 +27,7 @@ public: * Loads the compiler options plugin for the given compiler, executes the dialog * with some initial flags, and returns the new flags. */ - static TQString execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent ); + static TQString execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *tqparent ); /** * Returns the canonicalized version of a file name, i.e. @@ -48,7 +48,7 @@ public: static void addRemoveMakefileam(const TQString &fileName, TQMap<TQString, TQString> variables, bool add); /** - * Parses configure.in and splits AC_OUTPUT into a QStringList + * Parses configure.in and splits AC_OUTPUT into a TQStringList */ static TQStringList configureinLoadMakefiles( TQString configureinpath ); diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp index e265a969..a650fd53 100644 --- a/buildtools/autotools/removefiledlg.cpp +++ b/buildtools/autotools/removefiledlg.cpp @@ -43,8 +43,8 @@ static bool fileListContains(const TQPtrList<FileItem> &list, const TQString &na RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, TargetItem *item, const TQString &filename, - TQWidget *parent, const char *name) - : RemoveFileDlgBase(parent, name, true) + TQWidget *tqparent, const char *name) + : RemoveFileDlgBase(tqparent, name, true) { removeFromTargetsCheckBox = 0; @@ -63,7 +63,7 @@ RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* p TQString joinedtargets = " *" + targets.join("\n *"); removeFromTargetsCheckBox->setText ( i18n ( "The file %1 is still used by the following targets:\n%2\n" - "Remove it from all of them?").arg(filename).arg(joinedtargets) ); + "Remove it from all of them?").tqarg(filename).tqarg(joinedtargets) ); setMinimumSize(TQSize(size().width(), size().height() + removeFromTargetsCheckBox->size().height()*2) ); } diff --git a/buildtools/autotools/removefiledlg.h b/buildtools/autotools/removefiledlg.h index 81e24d5f..36e1c2bd 100644 --- a/buildtools/autotools/removefiledlg.h +++ b/buildtools/autotools/removefiledlg.h @@ -26,11 +26,12 @@ class TargetItem; class RemoveFileDialog : public RemoveFileDlgBase { Q_OBJECT + TQ_OBJECT public: RemoveFileDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, TargetItem *item, const TQString &filename, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~RemoveFileDialog(); protected: diff --git a/buildtools/autotools/removefiledlgbase.ui b/buildtools/autotools/removefiledlgbase.ui index d7b66011..6aaab95e 100644 --- a/buildtools/autotools/removefiledlgbase.ui +++ b/buildtools/autotools/removefiledlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>RemoveFileDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>RemoveFileDlgBase</cstring> </property> @@ -19,9 +19,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -37,14 +37,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>247</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeButton</cstring> </property> @@ -55,7 +55,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelButton</cstring> </property> @@ -65,11 +65,11 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>fileGroupBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -82,7 +82,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>fileLayout</cstring> </property> @@ -90,7 +90,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>removeLabel</cstring> </property> @@ -98,7 +98,7 @@ <string>[REMOVE QUESTION]</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>removeCheckBox</cstring> </property> @@ -106,11 +106,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> @@ -124,7 +124,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>targetBox</cstring> </property> @@ -143,7 +143,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>targetLabel</cstring> </property> @@ -159,7 +159,7 @@ <string>[TARGET NAME]</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>directoryStaticLabel</cstring> </property> @@ -179,7 +179,7 @@ <string>Directory:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>targetStaticLabel</cstring> </property> @@ -199,7 +199,7 @@ <string>Target:</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>directoryLabel</cstring> </property> @@ -228,6 +228,6 @@ <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include> <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/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp index 5783900c..962a386c 100644 --- a/buildtools/autotools/removetargetdlg.cpp +++ b/buildtools/autotools/removetargetdlg.cpp @@ -42,8 +42,8 @@ RemoveTargetDialog::RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, - TargetItem *titem, TQWidget* parent, const char* name ) - : RemoveTargetDlgBase ( parent, name, true, 0 ) + TargetItem *titem, TQWidget* tqparent, const char* name ) + : RemoveTargetDlgBase ( tqparent, name, true, 0 ) { removeLabel->setText ( i18n ( "Do you really want to remove <b>%1</b><br>with <b>all files</b> that are attached to it<br>and <b>all dependencies</b>?" ).arg ( titem->name ) ); directoryLabel->setText ( spitem->path ); @@ -96,8 +96,8 @@ void RemoveTargetDialog::init() { TQString canonname = AutoProjectTool::canonicalize ( titem->name ); - if ( spitem->variables[canonname + "_LIBADD"].contains ( m_titem->name ) > 0 || - spitem->variables[canonname + "_LDADD"].contains ( m_titem->name ) > 0 ) + if ( spitem->variables[canonname + "_LIBADD"].tqcontains ( m_titem->name ) > 0 || + spitem->variables[canonname + "_LDADD"].tqcontains ( m_titem->name ) > 0 ) { dependencyListBox->insertItem ( SmallIcon ( "target_kdevelop" ), spitem->path + " (" + titem->name + ")" ); @@ -116,7 +116,7 @@ void RemoveTargetDialog::accept () progressBar->show(); progressBar->setFormat ( i18n ( "Removing Target... %p%" ) ); - qApp->processEvents(); + tqApp->processEvents(); TQString canonname = AutoProjectTool::canonicalize ( m_titem->name ); TQString varname = m_titem->prefix + "_" + m_titem->primary; @@ -136,7 +136,7 @@ void RemoveTargetDialog::accept () TQString curCanonname = AutoProjectTool::canonicalize ( titem->name ); TQStringList dependencies; - if ( spitem->variables[curCanonname + "_LIBADD"].contains ( m_titem->name ) ) + if ( spitem->variables[curCanonname + "_LIBADD"].tqcontains ( m_titem->name ) ) curVarname = curCanonname + "_LIBADD"; else curVarname = curCanonname + "_LDADD"; @@ -148,7 +148,7 @@ void RemoveTargetDialog::accept () for ( uint i = 0; i < dependencies.size(); ++i ) { TQString s = dependencies[i]; - if ( s.contains ( m_titem->name ) > 0 ) + if ( s.tqcontains ( m_titem->name ) > 0 ) dependencies.remove ( s ); } @@ -250,7 +250,7 @@ void RemoveTargetDialog::accept () // before removing the files, check if they are mentioned in "noinst_HEADERS = blabla1.h blabla2.h" TQStringList noInstHeaders = TQStringList::split ( TQRegExp ( "[ \t\n]" ), m_spitem->variables["noinst_HEADERS"] ); - if ( noInstHeaders.contains ( fitem->name ) ) + if ( noInstHeaders.tqcontains ( fitem->name ) ) { noInstHeaders.remove ( fitem->name ); @@ -265,7 +265,7 @@ void RemoveTargetDialog::accept () fileList.append ( m_spitem->path.mid ( m_part->projectDirectory().length() + 1 ) + "/" + fitem->name ); - qApp->processEvents(); + tqApp->processEvents(); progressBar->setValue ( progressBar->value() + 1 ); } diff --git a/buildtools/autotools/removetargetdlg.h b/buildtools/autotools/removetargetdlg.h index a9981007..8a376678 100644 --- a/buildtools/autotools/removetargetdlg.h +++ b/buildtools/autotools/removetargetdlg.h @@ -35,7 +35,7 @@ class RemoveTargetDialog : public RemoveTargetDlgBase public: RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, - TargetItem *titem, TQWidget* parent = 0, const char* name = 0 ); + TargetItem *titem, TQWidget* tqparent = 0, const char* name = 0 ); ~RemoveTargetDialog(); private: diff --git a/buildtools/autotools/removetargetdlgbase.ui b/buildtools/autotools/removetargetdlgbase.ui index 8e3660d3..860dfb4a 100644 --- a/buildtools/autotools/removetargetdlgbase.ui +++ b/buildtools/autotools/removetargetdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>RemoveTargetDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>RemoveTargetDlgBase</cstring> </property> @@ -19,7 +19,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>targetBox</cstring> </property> @@ -46,7 +46,7 @@ <string>[TARGET DIRECTORY]</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>targetLabel</cstring> </property> @@ -54,7 +54,7 @@ <string>[TARGET NAME]</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>directoryStaticLabel</cstring> </property> @@ -74,7 +74,7 @@ <string>Directory:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>targetStaticLabel</cstring> </property> @@ -96,17 +96,17 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <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> @@ -119,7 +119,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>removeLabel</cstring> </property> @@ -127,7 +127,7 @@ <string>[REMOVE QUESTION]</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>removeCheckBox</cstring> </property> @@ -135,11 +135,11 @@ <string>Also &remove it from disk</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> @@ -151,7 +151,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> @@ -193,14 +193,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="5" column="0"> + <widget class="TQLayoutWidget" row="5" column="0"> <property name="name"> <cstring>buttonLayout</cstring> </property> @@ -221,14 +221,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> @@ -239,7 +239,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelButton</cstring> </property> @@ -254,8 +254,8 @@ <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"/> <includehints> <includehint>ksqueezedtextlabel.h</includehint> <includehint>klistbox.h</includehint> diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp index a7fd2c11..314fc710 100644 --- a/buildtools/autotools/subprojectoptionsdlg.cpp +++ b/buildtools/autotools/subprojectoptionsdlg.cpp @@ -42,10 +42,10 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProjectWidget *widget, - SubprojectItem *item, TQWidget *parent, const char *name) - : SubprojectOptionsDialogBase(parent, name, true) + SubprojectItem *item, TQWidget *tqparent, const char *name) + : SubprojectOptionsDialogBase(tqparent, name, true) { - setCaption(i18n("Subproject Options for '%1'").arg(item->subdir)); + setCaption(i18n("Subproject Options for '%1'").tqarg(item->subdir)); subProject = item; m_part = part; @@ -90,7 +90,7 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj TQString subProjectName = *it; if( subProjectName.isEmpty() ){ - subProjectName = TQString::fromLatin1( "." ); + subProjectName = TQString::tqfromLatin1( "." ); } TQCheckListItem *clitem = new TQCheckListItem(insideinc_listview, subProjectName, TQCheckListItem::CheckBox); if (lastItem) @@ -182,7 +182,7 @@ void SubprojectOptionsDialog::storeConfig() } TQString old_metasources = subProject->variables["METASOURCES"]; - TQString new_metasources = metasources_checkbox->isChecked() ? TQString::fromLatin1("AUTO") : TQString::null; + TQString new_metasources = metasources_checkbox->isChecked() ? TQString::tqfromLatin1("AUTO") : TQString(); if (new_metasources != old_metasources) { subProject->variables["METASOURCES"] = new_metasources; replaceMap.insert("METASOURCES", new_metasources); @@ -304,7 +304,7 @@ void SubprojectOptionsDialog::outsideAddClicked() { KURLRequesterDlg dialog( "", i18n( "Add Include directory: Choose directory, give -Idirectory or use a variable with -I$(FOOBAR)" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - dialog.urlRequester() ->setURL( TQString::null ); + dialog.urlRequester() ->setURL( TQString() ); if ( dialog.exec() != TQDialog::Accepted ) return ; TQString file = dialog.urlRequester() ->url(); diff --git a/buildtools/autotools/subprojectoptionsdlg.h b/buildtools/autotools/subprojectoptionsdlg.h index 648c007d..2e54af32 100644 --- a/buildtools/autotools/subprojectoptionsdlg.h +++ b/buildtools/autotools/subprojectoptionsdlg.h @@ -22,10 +22,11 @@ class SubprojectItem; class SubprojectOptionsDialog : public SubprojectOptionsDialogBase { Q_OBJECT + TQ_OBJECT public: SubprojectOptionsDialog( AutoProjectPart *part, AutoProjectWidget *widget, - SubprojectItem *item, TQWidget *parent = 0, const char *name = 0 ); + SubprojectItem *item, TQWidget *tqparent = 0, const char *name = 0 ); ~SubprojectOptionsDialog(); private: diff --git a/buildtools/autotools/subprojectoptionsdlgbase.ui b/buildtools/autotools/subprojectoptionsdlgbase.ui index f2723e5a..89f5b4f3 100644 --- a/buildtools/autotools/subprojectoptionsdlgbase.ui +++ b/buildtools/autotools/subprojectoptionsdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>SubprojectOptionsDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>sub project options widget</cstring> </property> @@ -19,11 +19,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>subprojectoptions_tabwidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>cflags_label</cstring> </property> @@ -49,7 +49,7 @@ <cstring>cflags_edit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -73,7 +73,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cflags_button</cstring> </property> @@ -85,7 +85,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>25</height> @@ -110,14 +110,14 @@ <property name="sizeType"> <enum>Preferred</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>cxxflags_label</cstring> </property> @@ -132,7 +132,7 @@ <cstring>cxxflags_edit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -148,7 +148,7 @@ <cstring>cxxflags_edit</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cxxflags_button</cstring> </property> @@ -160,7 +160,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>25</height> @@ -185,14 +185,14 @@ <property name="sizeType"> <enum>Preferred</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>fflags_label</cstring> </property> @@ -207,7 +207,7 @@ <cstring>fflags_edit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -223,7 +223,7 @@ <cstring>fflags_edit</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>fflags_button</cstring> </property> @@ -235,7 +235,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>25</height> @@ -260,7 +260,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -269,7 +269,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -280,15 +280,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>metasources_checkbox</cstring> </property> @@ -296,15 +296,15 @@ <string>Automatically &generate metasources</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -325,14 +325,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>insidemoveup_button</cstring> </property> @@ -340,7 +340,7 @@ <string>Move &Up</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>insidemovedown_button</cstring> </property> @@ -358,7 +358,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -367,7 +367,7 @@ </spacer> </vbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>insideinc_label</cstring> </property> @@ -382,7 +382,7 @@ <cstring>insideinc_listview</cstring> </property> </widget> - <widget class="QListView" row="1" column="0"> + <widget class="TQListView" row="1" column="0"> <column> <property name="text"> <string></string> @@ -403,15 +403,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -432,14 +432,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>outsideadd_button</cstring> </property> @@ -447,7 +447,7 @@ <string>&Add...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsideedit_button</cstring> </property> @@ -455,7 +455,7 @@ <string>&Edit...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsideremove_button</cstring> </property> @@ -463,7 +463,7 @@ <string>&Remove</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsidemoveup_button</cstring> </property> @@ -471,7 +471,7 @@ <string>Move U&p</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsidemovedown_button</cstring> </property> @@ -489,7 +489,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -498,7 +498,7 @@ </spacer> </vbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -513,7 +513,7 @@ <cstring>outsideinc_listview</cstring> </property> </widget> - <widget class="QListView" row="1" column="0"> + <widget class="TQListView" row="1" column="0"> <column> <property name="text"> <string></string> @@ -538,7 +538,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -549,7 +549,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="1" column="0"> + <widget class="TQListView" row="1" column="0"> <column> <property name="text"> <string>Name</string> @@ -582,7 +582,7 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>prefixes_label</cstring> </property> @@ -597,7 +597,7 @@ <cstring>prefix_listview</cstring> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -618,14 +618,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>addprefix_button</cstring> </property> @@ -633,7 +633,7 @@ <string>&Add...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>editprefix_button</cstring> </property> @@ -641,7 +641,7 @@ <string>&Edit...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeprefix_button</cstring> </property> @@ -659,7 +659,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -670,7 +670,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -681,7 +681,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>Layout9_2</cstring> </property> @@ -702,14 +702,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>buildmoveup_button</cstring> </property> @@ -717,7 +717,7 @@ <string>Move &Up</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buildmovedown_button</cstring> </property> @@ -735,7 +735,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -744,7 +744,7 @@ </spacer> </vbox> </widget> - <widget class="QListView" row="1" column="0"> + <widget class="TQListView" row="1" column="0"> <column> <property name="text"> <string></string> @@ -763,7 +763,7 @@ <enum>LastColumn</enum> </property> </widget> - <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>buildorder_label</cstring> </property> @@ -781,7 +781,7 @@ </grid> </widget> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -802,14 +802,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>okbutton</cstring> </property> @@ -820,7 +820,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelbutton</cstring> </property> @@ -967,7 +967,7 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">buildorderMoveDownClicked()</slot> <slot access="protected">cflagsClicked()</slot> <slot access="protected">cxxFlagsClicked()</slot> @@ -983,7 +983,7 @@ <slot access="protected">removePrefixClicked()</slot> <slot access="private">addPrefixClicked()</slot> <slot access="private">editPrefixClicked()</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/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp index 39cd35f2..14e5ee96 100644 --- a/buildtools/autotools/targetoptionsdlg.cpp +++ b/buildtools/autotools/targetoptionsdlg.cpp @@ -34,10 +34,10 @@ #include "urlutil.h" TargetOptionsDialog::TargetOptionsDialog(AutoProjectWidget *widget, TargetItem *item, - TQWidget *parent, const char *name) - : TargetOptionsDialogBase(parent, name, true) + TQWidget *tqparent, const char *name) + : TargetOptionsDialogBase(tqparent, name, true) { - setCaption( i18n("Target Options for '%1'").arg(item->name) ); + setCaption( i18n("Target Options for '%1'").tqarg(item->name) ); setIcon( SmallIcon("configure") ); target = item; @@ -79,26 +79,26 @@ TargetOptionsDialog::~TargetOptionsDialog() void TargetOptionsDialog::readConfig() { TQString flagsstr = target->ldflags; - flagsstr.replace(TQRegExp("$(KDE_PLUGIN)"), "-avoid-version -module -no-undefined $(KDE_RPATH)"); + flagsstr.tqreplace(TQRegExp("$(KDE_PLUGIN)"), "-avoid-version -module -no-undefined $(KDE_RPATH)"); TQStringList l1 = TQStringList::split(TQRegExp("[ \t]"), flagsstr); TQStringList::Iterator l1it; - l1it = l1.find("-all-static"); + l1it = l1.tqfind("-all-static"); if (l1it != l1.end()) { allstatic_box->setChecked(true); l1.remove(l1it); } - l1it = l1.find("-avoid-version"); + l1it = l1.tqfind("-avoid-version"); if (l1it != l1.end()) { avoidversion_box->setChecked(true); l1.remove(l1it); } - l1it = l1.find("-module"); + l1it = l1.tqfind("-module"); if (l1it != l1.end()) { module_box->setChecked(true); l1.remove(l1it); } - l1it = l1.find("-no-undefined"); + l1it = l1.tqfind("-no-undefined"); if (l1it != l1.end()) { noundefined_box->setChecked(true); l1.remove(l1it); @@ -295,7 +295,7 @@ void TargetOptionsDialog::outsideAddClicked() KURLRequesterDlg dialog( "", i18n( "Add Library: Choose the .a/.so file, give -l<libname> or use a variable with $(FOOBAR)" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); dialog.urlRequester() ->setFilter( "*.so|"+i18n("Shared Library (*.so)")+"\n*.a|"+i18n("Static Library (*.a)") ); - dialog.urlRequester() ->setURL( TQString::null ); + dialog.urlRequester() ->setURL( TQString() ); dialog.urlRequester() ->completionObject() ->setDir( m_widget->selectedSubproject()->path ); dialog.urlRequester() ->fileDialog() ->setURL( KURL::fromPathOrURL( m_widget->selectedSubproject()->path ) ); if ( dialog.exec() != TQDialog::Accepted ) @@ -354,4 +354,4 @@ void TargetOptionsDialog::accept() } #include "targetoptionsdlg.moc" -// kate: indent-mode csands; space-indent on; indent-width 4; replace-tabs on; +// kate: indent-mode csands; space-indent on; indent-width 4; tqreplace-tabs on; diff --git a/buildtools/autotools/targetoptionsdlg.h b/buildtools/autotools/targetoptionsdlg.h index 3b938046..7e64ca96 100644 --- a/buildtools/autotools/targetoptionsdlg.h +++ b/buildtools/autotools/targetoptionsdlg.h @@ -21,10 +21,11 @@ class TargetItem; class TargetOptionsDialog : public TargetOptionsDialogBase { Q_OBJECT + TQ_OBJECT public: TargetOptionsDialog( AutoProjectWidget *widget, TargetItem *item, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~TargetOptionsDialog(); private: diff --git a/buildtools/autotools/targetoptionsdlgbase.ui b/buildtools/autotools/targetoptionsdlgbase.ui index 07487ac2..5da3e0b5 100644 --- a/buildtools/autotools/targetoptionsdlgbase.ui +++ b/buildtools/autotools/targetoptionsdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>TargetOptionsDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>target_options_dialog</cstring> </property> @@ -22,11 +22,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget5</cstring> </property> @@ -37,7 +37,7 @@ <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>TextLabel1</cstring> </property> @@ -52,7 +52,7 @@ <cstring>allstatic_box</cstring> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout12</cstring> </property> @@ -63,7 +63,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>allstatic_box</cstring> </property> @@ -71,7 +71,7 @@ <string>&Do not link against shared libraries (-all-static)</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>avoidversion_box</cstring> </property> @@ -79,7 +79,7 @@ <string>Do not &assign version numbers to libraries (-avoid-version)</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>module_box</cstring> </property> @@ -87,7 +87,7 @@ <string>Create a library that can &be dynamically loaded (-module)</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>noundefined_box</cstring> </property> @@ -95,7 +95,7 @@ <string>Library does not depend on external symbols (-no-&undefined)</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -106,7 +106,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>ldflagsother_label</cstring> </property> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -169,7 +169,7 @@ <cstring>dependencies_edit</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>dependencies_label</cstring> </property> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -211,7 +211,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -220,7 +220,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget6</cstring> </property> @@ -231,7 +231,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>insidelib_label</cstring> </property> @@ -256,14 +256,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>7</height> </size> </property> </spacer> - <widget class="QListView" row="4" column="0"> + <widget class="TQListView" row="4" column="0"> <column> <property name="text"> <string></string> @@ -282,7 +282,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>outsidelib_label</cstring> </property> @@ -297,7 +297,7 @@ <cstring>outsidelib_listview</cstring> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>Layout9_3</cstring> </property> @@ -318,14 +318,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>insidemoveup_button</cstring> </property> @@ -333,7 +333,7 @@ <string>Move &Up</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>insidemovedown_button</cstring> </property> @@ -351,7 +351,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -360,7 +360,7 @@ </spacer> </vbox> </widget> - <widget class="QListView" row="1" column="0"> + <widget class="TQListView" row="1" column="0"> <column> <property name="text"> <string></string> @@ -379,7 +379,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget" row="4" column="1"> + <widget class="TQLayoutWidget" row="4" column="1"> <property name="name"> <cstring>Layout10_4</cstring> </property> @@ -400,14 +400,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>outsideadd_button</cstring> </property> @@ -415,7 +415,7 @@ <string>&Add...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsideedit_button</cstring> </property> @@ -423,7 +423,7 @@ <string>&Edit...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsideremove_button</cstring> </property> @@ -431,7 +431,7 @@ <string>&Remove</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsidemoveup_button</cstring> </property> @@ -439,7 +439,7 @@ <string>Mo&ve Up</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsidemovedown_button</cstring> </property> @@ -457,7 +457,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -468,7 +468,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>arguments_page</cstring> </property> @@ -479,7 +479,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>argumentBox</cstring> </property> @@ -495,7 +495,7 @@ <cstring>run_arguments_edit</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>arguments_label_1</cstring> </property> @@ -515,7 +515,7 @@ <cstring>m_cwdEdit</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="2" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -523,7 +523,7 @@ <string>Working Directory:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>arguments_label_2</cstring> </property> @@ -555,7 +555,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>120</height> @@ -565,7 +565,7 @@ </grid> </widget> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -586,14 +586,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>okbutton</cstring> </property> @@ -607,7 +607,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelbutton</cstring> </property> @@ -703,7 +703,7 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">insideMoveDownClicked()</slot> <slot access="protected">insideMoveUpClicked()</slot> <slot access="protected">outsideAddClicked()</slot> @@ -711,9 +711,9 @@ <slot access="protected">outsideMoveDownClicked()</slot> <slot access="protected">outsideMoveUpClicked()</slot> <slot access="protected">outsideRemoveClicked()</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/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&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&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&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 &)</slot> <slot access="protected">envChanged(const QString&)</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 &)</slot> <slot access="protected">envChanged(const QString&)</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> diff --git a/buildtools/lib/base/kdevbuildtool.cpp b/buildtools/lib/base/kdevbuildtool.cpp index 2dfc3d84..aee38261 100644 --- a/buildtools/lib/base/kdevbuildtool.cpp +++ b/buildtools/lib/base/kdevbuildtool.cpp @@ -21,8 +21,8 @@ #include <kdevmakefrontend.h> #include <kdevappfrontend.h> -KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name) - :KDevProject(info, parent, name) +KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, TQObject* tqparent, const char* name) + :KDevProject(info, tqparent, name) { } diff --git a/buildtools/lib/base/kdevbuildtool.h b/buildtools/lib/base/kdevbuildtool.h index ff1abcc0..f1276f4a 100644 --- a/buildtools/lib/base/kdevbuildtool.h +++ b/buildtools/lib/base/kdevbuildtool.h @@ -29,7 +29,7 @@ class KDevAppFrontend; class KDevBuildTool: public KDevProject { public: - KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name); + KDevBuildTool(const KDevPluginInfo* info, TQObject* tqparent, const char* name); /**@return The make frontend.*/ KDevMakeFrontend *makeFrontend(); diff --git a/buildtools/lib/parsers/autotools/autotools.ll b/buildtools/lib/parsers/autotools/autotools.ll index f05f8ff6..d6f2a9bb 100644 --- a/buildtools/lib/parsers/autotools/autotools.ll +++ b/buildtools/lib/parsers/autotools/autotools.ll @@ -98,7 +98,7 @@ rule [\t]+[^\n]* <list>{id_list} { yylval.value = yytext; - yylval.value = yylval.value.mid(0, yylval.value.findRev("\\")); + yylval.value = yylval.value.mid(0, yylval.value.tqfindRev("\\")); unput('\\'); BEGIN(INITIAL); return (ID_LIST); diff --git a/buildtools/lib/parsers/autotools/autotools.yy b/buildtools/lib/parsers/autotools/autotools.yy index d76cc5fe..350fbd77 100644 --- a/buildtools/lib/parsers/autotools/autotools.yy +++ b/buildtools/lib/parsers/autotools/autotools.yy @@ -89,7 +89,7 @@ currently on the top in the stack. When a scope or function scope statement is parsed, the child ProjectAST is created and pushed onto the stack. Therefore all statements which belong to the scope -or function scope are added as childs to their direct parent (scope or function scope). +or function scope are added as childs to their direct tqparent (scope or function scope). */ QValueStack<ProjectAST*> projects; diff --git a/buildtools/lib/parsers/autotools/autotools_lex.cpp b/buildtools/lib/parsers/autotools/autotools_lex.cpp index d5f690b5..e534d74f 100644 --- a/buildtools/lib/parsers/autotools/autotools_lex.cpp +++ b/buildtools/lib/parsers/autotools/autotools_lex.cpp @@ -539,8 +539,8 @@ at the left of the operator in assignments (like "SOURCES" in "SOURCES+=foo.cpp -id_list: those are "value list identifiers" at the right side in assignments (like "foo.cpp goo.cpp" in "SOURCES+=foo.cpp goo.cpp"); -id_args: function arguments recognized as one identifier -(example: ""${QMAKE_FILE} is intended only for Windows!"" -in "!win32-*:!wince-*:error("${QMAKE_FILE} is intended only for Windows!")" statements). +(example: ""${TQMAKE_FILE} is intended only for Windows!"" +in "!win32-*:!wince-*:error("${TQMAKE_FILE} is intended only for Windows!")" statements). . To recognize those identifiers two additional start conditions are used: list and funcargs. @@ -841,7 +841,7 @@ YY_RULE_SETUP #line 99 "autotools.ll" { yylval.value = yytext; - yylval.value = yylval.value.mid(0, yylval.value.findRev("\\")); + yylval.value = yylval.value.mid(0, yylval.value.tqfindRev("\\")); unput('\\'); BEGIN(INITIAL); return (ID_LIST); diff --git a/buildtools/lib/parsers/autotools/autotools_yacc.cpp b/buildtools/lib/parsers/autotools/autotools_yacc.cpp index 93cdb733..e0b92999 100644 --- a/buildtools/lib/parsers/autotools/autotools_yacc.cpp +++ b/buildtools/lib/parsers/autotools/autotools_yacc.cpp @@ -204,7 +204,7 @@ currently on the top in the stack. When a scope or function scope statement is parsed, the child ProjectAST is created and pushed onto the stack. Therefore all statements which belong to the scope -or function scope are added as childs to their direct parent (scope or function scope). +or function scope are added as childs to their direct tqparent (scope or function scope). */ TQValueStack<ProjectAST*> projects; diff --git a/buildtools/lib/parsers/autotools/autotoolsast.cpp b/buildtools/lib/parsers/autotools/autotoolsast.cpp index ddcbddc3..f6ac032f 100644 --- a/buildtools/lib/parsers/autotools/autotoolsast.cpp +++ b/buildtools/lib/parsers/autotools/autotoolsast.cpp @@ -28,7 +28,7 @@ namespace AutoTools { AST::~AST() { - for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList<AST*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) { AST *node = *it; delete node; @@ -37,13 +37,13 @@ AST::~AST() void AST::addChildAST(AST *node) { - m_children.append(node); + m_tqchildren.append(node); } void AST::writeBack(TQString &buffer) { - for (TQValueList<AST*>::const_iterator it = m_children.constBegin(); - it != m_children.constEnd(); ++it) + for (TQValueList<AST*>::const_iterator it = m_tqchildren.constBegin(); + it != m_tqchildren.constEnd(); ++it) { if (*it) (*it)->writeBack(buffer); @@ -60,12 +60,12 @@ TQString AST::indentation() bool AST::hasChildren() const { - return !m_children.isEmpty(); + return !m_tqchildren.isEmpty(); } -TQValueList<AST*> AST::children() const +TQValueList<AST*> AST::tqchildren() const { - return m_children; + return m_tqchildren; } //ProjectAST diff --git a/buildtools/lib/parsers/autotools/autotoolsast.h b/buildtools/lib/parsers/autotools/autotoolsast.h index 768e3e07..e690baa4 100644 --- a/buildtools/lib/parsers/autotools/autotoolsast.h +++ b/buildtools/lib/parsers/autotools/autotoolsast.h @@ -37,7 +37,7 @@ namespace AutoTools * AST node. * This is the base class. Objects of this type are not created by the parser. * - * Each AST node holds the list of its children which are always deleted in the + * Each AST node holds the list of its tqchildren which are always deleted in the * destructor. This way, it's possible call delete for only root AST node and * others will be deleted automatically. * @@ -85,20 +85,20 @@ public: /** @return The indentation string based on node depth.*/ virtual TQString indentation(); - //! \return true if this AST has children + //! \return true if this AST has tqchildren bool hasChildren() const; /** - * Get the children of this ast + * Get the tqchildren of this ast * \return the list of this ast's childre */ - TQValueList<AST*> children() const; + TQValueList<AST*> tqchildren() const; protected: NodeType m_nodeType; - TQValueList<AST*> m_children; + TQValueList<AST*> m_tqchildren; private: int m_depth; diff --git a/buildtools/lib/parsers/autotools/autotoolsdriver.h b/buildtools/lib/parsers/autotools/autotoolsdriver.h index 5f6ac7e7..8e29bec6 100644 --- a/buildtools/lib/parsers/autotools/autotoolsdriver.h +++ b/buildtools/lib/parsers/autotools/autotoolsdriver.h @@ -20,8 +20,8 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef QMAKEQMAKEDRIVER_H -#define QMAKEQMAKEDRIVER_H +#ifndef TQMAKETQMAKEDRIVER_H +#define TQMAKETQMAKEDRIVER_H #include <tqvaluelist.h> #include <kurl.h> @@ -56,12 +56,12 @@ public: static void walkAST(Op &op, const ProjectAST *ast) { // op(ast); - for (TQValueList<QMake::AST*>::const_iterator it = ast->statements.constBegin(); + for (TQValueList<TQMake::AST*>::const_iterator it = ast->statements.constBegin(); it != ast->statements.constEnd(); ++it) { const AST *child = *it; if (child->nodeType() == AST::ProjectAST) - walkAST<Op>(op, static_cast<const QMake::ProjectAST*>(child)); + walkAST<Op>(op, static_cast<const TQMake::ProjectAST*>(child)); else op(child); } diff --git a/buildtools/lib/parsers/autotools/tests/viewer.cpp b/buildtools/lib/parsers/autotools/tests/viewer.cpp index 0dc8e733..66401c2c 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.cpp +++ b/buildtools/lib/parsers/autotools/tests/viewer.cpp @@ -34,8 +34,8 @@ using namespace AutoTools; -Viewer::Viewer(TQWidget *parent, const char *name) - :ViewerBase(parent, name) +Viewer::Viewer(TQWidget *tqparent, const char *name) + :ViewerBase(tqparent, name) { if (TQFile::exists(TQDir::currentDirPath() + "/" + "qtlist")) { @@ -46,7 +46,7 @@ Viewer::Viewer(TQWidget *parent, const char *name) files->insertItem(str.readLine()); } ast->setSorting(-1); - parentProject.push((TQListViewItem*)0); + tqparentProject.push((TQListViewItem*)0); } void Viewer::addAll_clicked() @@ -99,12 +99,12 @@ void Viewer::tabWidget2_selected(const TQString& text) void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter) { TQListViewItem *projectIt; - if (!parentProject.top()) + if (!tqparentProject.top()) projectIt = new TQListViewItem(ast, "Project"); else { if ( projectAST->isConditionalScope() || projectAST->isRule() ) - projectIt = new TQListViewItem(parentProject.top(), globAfter, projectAST->scopedID); + projectIt = new TQListViewItem(tqparentProject.top(), globAfter, projectAST->scopedID); } projectIt->setOpen(true); @@ -128,7 +128,7 @@ void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter) { AutomakeTargetAST* ata = static_cast<AutomakeTargetAST*>(ast); TQListViewItem* item = new TQListViewItem(projectIt, after, - ata->target, TQString::null, ata->deps.join("")); + ata->target, TQString(), ata->deps.join("")); after = item; } break; @@ -145,14 +145,14 @@ void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter) { ConditionAST* ata = static_cast<ConditionAST*>(ast); TQListViewItem* item = new TQListViewItem(projectIt, after, - ata->type, ata->conditionName, TQString::null ); + ata->type, ata->conditionName, TQString() ); after = item; } case AST::ProjectAST: { ProjectAST *projectAST = static_cast<ProjectAST*>(ast); - parentProject.push(projectIt); + tqparentProject.push(projectIt); processAST(projectAST, after); - parentProject.pop(); } + tqparentProject.pop(); } break; } } diff --git a/buildtools/lib/parsers/autotools/tests/viewer.h b/buildtools/lib/parsers/autotools/tests/viewer.h index 5ee63c54..c0653020 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.h +++ b/buildtools/lib/parsers/autotools/tests/viewer.h @@ -30,8 +30,9 @@ class TQListViewItem; class Viewer: public ViewerBase { Q_OBJECT + TQ_OBJECT public: - Viewer(TQWidget *parent = 0, const char *name = 0); + Viewer(TQWidget *tqparent = 0, const char *name = 0); void processAST(AutoTools::ProjectAST *projectAST, TQListViewItem *globAfter = 0); public slots: virtual void tabWidget2_selected(const TQString&); @@ -40,7 +41,7 @@ public slots: virtual void addAll_clicked(); private: AutoTools::ProjectAST *projectAST; - TQValueStack<TQListViewItem *> parentProject; + TQValueStack<TQListViewItem *> tqparentProject; }; #endif diff --git a/buildtools/lib/parsers/autotools/tests/viewer_main.cpp b/buildtools/lib/parsers/autotools/tests/viewer_main.cpp index 380767a9..0fc5157b 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer_main.cpp +++ b/buildtools/lib/parsers/autotools/tests/viewer_main.cpp @@ -28,7 +28,7 @@ int main(int argc, char **argv) app.setMainWidget(&viewer); viewer.show(); viewer.resize(800, 600); - //viewer.setWindowState(viewer.windowState() | Qt::WindowMaximized); + //viewer.setWindowState(viewer.windowState() | TQt::WindowMaximized); return app.exec(); } diff --git a/buildtools/lib/parsers/autotools/tests/viewerbase.ui b/buildtools/lib/parsers/autotools/tests/viewerbase.ui index 7c228299..75ed7559 100644 --- a/buildtools/lib/parsers/autotools/tests/viewerbase.ui +++ b/buildtools/lib/parsers/autotools/tests/viewerbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ViewerBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ViewerBase</cstring> </property> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="1" rowspan="4" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="1" rowspan="4" colspan="1"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>source</cstring> </property> @@ -40,7 +40,7 @@ </sizepolicy> </property> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> @@ -52,7 +52,7 @@ <verstretch>2</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -63,7 +63,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Name</string> @@ -103,7 +103,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -114,7 +114,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit" row="0" column="0"> + <widget class="TQTextEdit" row="0" column="0"> <property name="name"> <cstring>writeBack</cstring> </property> @@ -124,22 +124,22 @@ </widget> </vbox> </widget> - <widget class="QLineEdit" row="0" column="0"> + <widget class="TQLineEdit" row="0" column="0"> <property name="name"> <cstring>allLocation</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>32767</height> </size> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>addAll</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>32767</height> @@ -149,11 +149,11 @@ <string>Add All From Directory</string> </property> </widget> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>choose</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>32767</height> @@ -163,7 +163,7 @@ <string>Choose File to Add...</string> </property> </widget> - <widget class="QListBox" row="3" column="0"> + <widget class="TQListBox" row="3" column="0"> <property name="name"> <cstring>files</cstring> </property> @@ -175,7 +175,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>32767</height> @@ -210,11 +210,11 @@ <slot>tabWidget2_selected(const QString&)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>addAll_clicked()</slot> <slot>choose_clicked()</slot> <slot>files_currentChanged(QListBoxItem*)</slot> <slot>tabWidget2_selected(const QString&)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/buildtools/lib/parsers/qmake/location.hh b/buildtools/lib/parsers/qmake/location.hh index 4da36b8a..41ec2015 100644 --- a/buildtools/lib/parsers/qmake/location.hh +++ b/buildtools/lib/parsers/qmake/location.hh @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that contains +/* As a special exception, you may create a larger work that tqcontains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof @@ -34,7 +34,7 @@ /** ** \file location.hh - ** Define the QMake::location class. + ** Define the TQMake::location class. */ #ifndef BISON_LOCATION_HH @@ -44,7 +44,7 @@ # include <string> # include "position.hh" -namespace QMake +namespace TQMake { /// Abstract a location. diff --git a/buildtools/lib/parsers/qmake/position.hh b/buildtools/lib/parsers/qmake/position.hh index 704f0df4..63fe2d81 100644 --- a/buildtools/lib/parsers/qmake/position.hh +++ b/buildtools/lib/parsers/qmake/position.hh @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that contains +/* As a special exception, you may create a larger work that tqcontains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof @@ -34,7 +34,7 @@ /** ** \file position.hh - ** Define the QMake::position class. + ** Define the TQMake::position class. */ #ifndef BISON_POSITION_HH @@ -43,7 +43,7 @@ # include <iostream> # include <string> -namespace QMake +namespace TQMake { /// Abstract a position. class position diff --git a/buildtools/lib/parsers/qmake/qmake.yy b/buildtools/lib/parsers/qmake/qmake.yy index e11c086d..75d306d0 100644 --- a/buildtools/lib/parsers/qmake/qmake.yy +++ b/buildtools/lib/parsers/qmake/qmake.yy @@ -90,7 +90,7 @@ currently on the top in the stack. When a scope or function scope statement is parsed, the child ProjectAST is created and pushed onto the stack. Therefore all statements which belong to the scope -or function scope are added as childs to their direct parent (scope or function scope). +or function scope are added as childs to their direct tqparent (scope or function scope). */ //QValueStack<ProjectAST*> projects; @@ -359,7 +359,7 @@ function_call : ID_SIMPLE LBRACE function_args RBRACE depth++; //qWarning("%s", $<value>1.ascii()); - if ($<value>1.contains("include")) + if ($<value>1.tqcontains("include")) { IncludeAST *includeAST = new IncludeAST(); includeAST->projectName = $<value>3; diff --git a/buildtools/lib/parsers/qmake/qmake_lex.cpp b/buildtools/lib/parsers/qmake/qmake_lex.cpp index 9fe37664..4d74571c 100644 --- a/buildtools/lib/parsers/qmake/qmake_lex.cpp +++ b/buildtools/lib/parsers/qmake/qmake_lex.cpp @@ -398,7 +398,7 @@ int yyFlexLexer::yylex() return 0; } -#define YY_DECL int QMake::Lexer::yylex() +#define YY_DECL int TQMake::Lexer::yylex() /* %if-c-only Standard (non-C++) definition */ /* %endif */ @@ -630,7 +630,7 @@ static yyconst flex_int16_t yy_rule_linenum[23] = /** @file qmake.ll -QMake Lexer +TQMake Lexer There are 3 types of identifiers recognized by this lexer: -id_simple: examples of such identifiers are qmake variables and scoped variables @@ -638,8 +638,8 @@ at the left of the operator in assignments (like "SOURCES" in "SOURCES+=foo.cpp -id_list: those are "value list identifiers" at the right side in assignments (like "foo.cpp goo.cpp" in "SOURCES+=foo.cpp goo.cpp"); -id_args: function arguments recognized as one identifier -(example: ""${QMAKE_FILE} is intended only for Windows!"" -in "!win32-*:!wince-*:error("${QMAKE_FILE} is intended only for Windows!")" statements). +(example: ""${TQMAKE_FILE} is intended only for Windows!"" +in "!win32-*:!wince-*:error("${TQMAKE_FILE} is intended only for Windows!")" statements). . To recognize those identifiers two additional start conditions are used: list and funcargs. @@ -1011,7 +1011,7 @@ YY_RULE_SETUP { BEGIN(vallist); mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); - return Parser::token::token::QUOTED_VARIABLE_VALUE; + return Parser::token::token::TQUOTED_VARIABLE_VALUE; } YY_BREAK case 9: @@ -2202,14 +2202,14 @@ void yyfree (void * ptr ) #line 203 "qmake.ll" -namespace QMake +namespace TQMake { Lexer::Lexer( std::istream* argin, std::ostream* argout ) : yyFlexLexer(argin, argout), mylval(0), m_lineEnding(None) { } - int Lexer::yylex( QMake::Parser::semantic_type* yylval ) + int Lexer::yylex( TQMake::Parser::semantic_type* yylval ) { mylval = yylval; return yylex(); @@ -2231,7 +2231,7 @@ namespace QMake } } -int QMakelex( QMake::Parser::semantic_type* yylval, QMake::Lexer* lexer) +int TQMakelex( TQMake::Parser::semantic_type* yylval, TQMake::Lexer* lexer) { return lexer->yylex( yylval ); } diff --git a/buildtools/lib/parsers/qmake/qmake_lex.h b/buildtools/lib/parsers/qmake/qmake_lex.h index 242cec2a..514631bf 100644 --- a/buildtools/lib/parsers/qmake/qmake_lex.h +++ b/buildtools/lib/parsers/qmake/qmake_lex.h @@ -1,4 +1,4 @@ -/* KDevelop QMake Support +/* KDevelop TQMake Support * * Copyright 2007 Andreas Pakulat <apaku@gmx.de> * @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. */ -#ifndef QMAKE_LEX_H -#define QMAKE_LEX_H +#ifndef TQMAKE_LEX_H +#define TQMAKE_LEX_H #include "qmake_yacc.hpp" #include <iostream> @@ -27,23 +27,23 @@ #include "FlexLexer.h" #endif -namespace QMake +namespace TQMake { class Lexer : public yyFlexLexer { public: enum LineEnding{ None, Unix, MacOS, Windows }; Lexer( std::istream* argin = 0, std::ostream* argout = 0 ); - int yylex( QMake::Parser::semantic_type* yylval ); + int yylex( TQMake::Parser::semantic_type* yylval ); int yylex(); void setLineEndingFromString( const TQString& ); LineEnding lineending(); private: - QMake::Parser::semantic_type* mylval; + TQMake::Parser::semantic_type* mylval; LineEnding m_lineEnding; }; } #endif -// kate: space-indent on; indent-width 4; tab-width: 4; replace-tabs on; auto-insert-doxygen on +// kate: space-indent on; indent-width 4; tab-width: 4; tqreplace-tabs on; auto-insert-doxygen on diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.cpp b/buildtools/lib/parsers/qmake/qmake_yacc.cpp index 32722979..718cb4f5 100644 --- a/buildtools/lib/parsers/qmake/qmake_yacc.cpp +++ b/buildtools/lib/parsers/qmake/qmake_yacc.cpp @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that contains +/* As a special exception, you may create a larger work that tqcontains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof @@ -33,7 +33,7 @@ version 2.2 of Bison. */ // Take the name prefix into account. -#define yylex QMakelex +#define yylex TQMakelex #include "qmake_yacc.hpp" @@ -41,7 +41,7 @@ /* Line 317 of lalr1.cc. */ -#line 45 "qmake_yacc.cpp" +#line 45 "tqmake_yacc.cpp" #ifndef YY_ # if YYENABLE_NLS @@ -100,7 +100,7 @@ do { \ #define YYABORT goto yyabortlab #define YYERROR goto yyerrorlab -namespace QMake +namespace TQMake { #if YYERROR_VERBOSE @@ -144,7 +144,7 @@ namespace QMake #endif /// Build a parser object. - Parser::Parser (QMake::Lexer* lexer_yyarg, TQValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg) + Parser::Parser (TQMake::Lexer* lexer_yyarg, TQValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg) : yydebug_ (false), yycdebug_ (&std::cerr), lexer (lexer_yyarg), @@ -679,7 +679,7 @@ namespace QMake depth++; //qWarning("%s", $<value>1.ascii()); - if ((yysemantic_stack_[(4) - (1)].value).contains("include")) + if ((yysemantic_stack_[(4) - (1)].value).tqcontains("include")) { IncludeAST *includeAST = new IncludeAST(); includeAST->projectName = (yysemantic_stack_[(4) - (3)].value); @@ -752,7 +752,7 @@ namespace QMake /* Line 675 of lalr1.cc. */ -#line 756 "qmake_yacc.cpp" +#line 756 "tqmake_yacc.cpp" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1_[yyn], &yyval, &yyloc); @@ -1089,7 +1089,7 @@ namespace QMake "$end", "error", "$undefined", "ID_SIMPLE", "EQ", "PLUSEQ", "MINUSEQ", "STAREQ", "TILDEEQ", "LBRACE", "RBRACE", "COLON", "NEWLINE", "COMMENT", "CONT", "COMMENT_CONT", "RCURLY", "LCURLY", "ID_ARGS", - "QUOTED_VARIABLE_VALUE", "VARIABLE_VALUE", "LIST_WS", "ENDOFFILE", + "TQUOTED_VARIABLE_VALUE", "VARIABLE_VALUE", "LIST_WS", "ENDOFFILE", "\"else\"", "$accept", "project", "@1", "statements", "statement", "variable_assignment", "possible_value", "multiline_values", "variable_value", "listws", "operator", "scope", "@2", "function_call", @@ -1227,13 +1227,13 @@ namespace QMake const unsigned int Parser::yyuser_token_number_max_ = 278; const Parser::token_number_type Parser::yyundef_token_ = 2; -} // namespace QMake +} // namespace TQMake #line 421 "qmake.yy" -namespace QMake +namespace TQMake { void Parser::error(const location_type& /*l*/, const std::string& m) { diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.hpp b/buildtools/lib/parsers/qmake/qmake_yacc.hpp index 91583cd3..0b67bb14 100644 --- a/buildtools/lib/parsers/qmake/qmake_yacc.hpp +++ b/buildtools/lib/parsers/qmake/qmake_yacc.hpp @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that contains +/* As a special exception, you may create a larger work that tqcontains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof @@ -41,7 +41,7 @@ #include <iostream> #include "stack.hh" -namespace QMake +namespace TQMake { class position; class location; @@ -74,9 +74,9 @@ namespace QMake /** @file qmake.yy -QMake Parser +TQMake Parser -Simple LALR parser which builds the syntax tree (see @ref QMake::AST). +Simple LALR parser which builds the syntax tree (see @ref TQMake::AST). @todo Recognize comments after statements like: SOURCES = foo #regognize me @@ -91,7 +91,7 @@ SOURCES = foo #regognize me #define YYSTYPE_IS_DECLARED -namespace QMake +namespace TQMake { class Lexer; @@ -129,7 +129,7 @@ struct Result { typedef Result YYSTYPE; } -extern int QMakelex( QMake::Result* yylval, QMake::Lexer* lexer ); +extern int TQMakelex( TQMake::Result* yylval, TQMake::Lexer* lexer ); /** The stack to store ProjectAST pointers when a new child @@ -141,7 +141,7 @@ currently on the top in the stack. When a scope or function scope statement is parsed, the child ProjectAST is created and pushed onto the stack. Therefore all statements which belong to the scope -or function scope are added as childs to their direct parent (scope or function scope). +or function scope are added as childs to their direct tqparent (scope or function scope). */ //TQValueStack<ProjectAST*> projects; @@ -202,7 +202,7 @@ do { \ } while (false) #endif -namespace QMake +namespace TQMake { /// A Bison parser. @@ -238,7 +238,7 @@ namespace QMake RCURLY = 271, LCURLY = 272, ID_ARGS = 273, - QUOTED_VARIABLE_VALUE = 274, + TQUOTED_VARIABLE_VALUE = 274, VARIABLE_VALUE = 275, LIST_WS = 276, ENDOFFILE = 277 @@ -249,7 +249,7 @@ namespace QMake typedef token::yytokentype token_type; /// Build a parser object. - Parser (QMake::Lexer* lexer_yyarg, TQValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg); + Parser (TQMake::Lexer* lexer_yyarg, TQValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg); virtual ~Parser (); /// Parse. @@ -408,7 +408,7 @@ namespace QMake /* User arguments. */ - QMake::Lexer* lexer; + TQMake::Lexer* lexer; TQValueStack<ProjectAST*>& projects; int depth; }; diff --git a/buildtools/lib/parsers/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp index 91e48d2d..c551abef 100644 --- a/buildtools/lib/parsers/qmake/qmakeast.cpp +++ b/buildtools/lib/parsers/qmake/qmakeast.cpp @@ -21,34 +21,34 @@ #include <kdebug.h> -namespace QMake { +namespace TQMake { //AST AST::~AST() { - for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList<AST*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) { AST *node = *it; delete node; } - m_children.clear(); + m_tqchildren.clear(); } void AST::addChildAST(AST *node) { - m_children.append(node); + m_tqchildren.append(node); } void AST::removeChildAST(AST *node) { - m_children.remove(node); + m_tqchildren.remove(node); } void AST::writeBack(TQString &buffer) { - for (TQValueList<AST*>::const_iterator it = m_children.constBegin(); - it != m_children.constEnd(); ++it) + for (TQValueList<AST*>::const_iterator it = m_tqchildren.constBegin(); + it != m_tqchildren.constEnd(); ++it) { if (*it) { @@ -70,7 +70,7 @@ TQString AST::indentation() void ProjectAST::writeBack(TQString &buffer) { bool hasActualStatements = false; - for (TQValueList<QMake::AST*>::const_iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList<TQMake::AST*>::const_iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) { if ((*it)->nodeType() != AST::IncludeAST) { @@ -84,7 +84,7 @@ void ProjectAST::writeBack(TQString &buffer) if( !buffer.endsWith(": ") ) buffer += indentation(); buffer += scopedID; - if( m_children.count() == 1 ) + if( m_tqchildren.count() == 1 ) buffer += " : "; else buffer += " {"; @@ -94,9 +94,9 @@ void ProjectAST::writeBack(TQString &buffer) if( !buffer.endsWith(": ") ) buffer += indentation(); buffer += scopedID + "(" + args + ")"; - if( m_children.count() == 1 && hasActualStatements ) + if( m_tqchildren.count() == 1 && hasActualStatements ) buffer += ": "; - else if( (m_children.count() > 0 && hasActualStatements) ) + else if( (m_tqchildren.count() > 0 && hasActualStatements) ) buffer += "{"; else buffer += ""; @@ -104,10 +104,10 @@ void ProjectAST::writeBack(TQString &buffer) else if( !buffer.endsWith(": ") ) buffer += indentation(); AST::writeBack(buffer); - if (isScope() && m_children.count() > 1 ) + if (isScope() && m_tqchildren.count() > 1 ) buffer += indentation() + "}"; - if (isFunctionScope() && (hasActualStatements) && m_children.count() > 1) + if (isFunctionScope() && (hasActualStatements) && m_tqchildren.count() > 1) buffer += indentation() + "}"; } @@ -165,6 +165,6 @@ void IncludeAST::writeBack(TQString &/*buffer*/) } -// 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/lib/parsers/qmake/qmakeast.h b/buildtools/lib/parsers/qmake/qmakeast.h index 45aedb2e..e2abba70 100644 --- a/buildtools/lib/parsers/qmake/qmakeast.h +++ b/buildtools/lib/parsers/qmake/qmakeast.h @@ -17,8 +17,8 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef QMAKEQMAKEAST_H -#define QMAKEQMAKEAST_H +#ifndef TQMAKETQMAKEAST_H +#define TQMAKETQMAKEAST_H #include <tqstringlist.h> @@ -27,13 +27,13 @@ Abstract Syntax Tree (AST) class declarations. */ -namespace QMake { +namespace TQMake { /** AST node. This is the base class. Objects of this type are not created by the parser. -Each AST node holds the list of its children which are always deleted in the +Each AST node holds the list of its tqchildren which are always deleted in the destructor. This way, it's possible call delete for only root AST node and others will be deleted automatically. @@ -79,7 +79,7 @@ public: virtual TQString indentation(); /**The list of child AST nodes.*/ - TQValueList<AST*> m_children; + TQValueList<AST*> m_tqchildren; protected: NodeType m_nodeType; diff --git a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp index 1f7e6cb6..b9470bd9 100644 --- a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp +++ b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "qmakeastvisitor.h" -namespace QMake { +namespace TQMake { void ASTVisitor::processProject(ProjectAST *project) { @@ -29,31 +29,31 @@ void ASTVisitor::processProject(ProjectAST *project) enterScope(project); else if (project->isFunctionScope()) enterFunctionScope(project); - for (TQValueList<QMake::AST*>::const_iterator it = project->m_children.constBegin(); - it != project->m_children.constEnd(); ++it) + for (TQValueList<TQMake::AST*>::const_iterator it = project->m_tqchildren.constBegin(); + it != project->m_tqchildren.constEnd(); ++it) { AST *ast = *it; if (ast == 0) continue; switch (ast->nodeType()) { case AST::AssignmentAST: - processAssignment(static_cast<QMake::AssignmentAST*>(ast)); + processAssignment(static_cast<TQMake::AssignmentAST*>(ast)); break; case AST::NewLineAST: - processNewLine(static_cast<QMake::NewLineAST*>(ast)); + processNewLine(static_cast<TQMake::NewLineAST*>(ast)); break; case AST::CommentAST: - processComment(static_cast<QMake::CommentAST*>(ast)); + processComment(static_cast<TQMake::CommentAST*>(ast)); break; case AST::ProjectAST: - processProject(static_cast<QMake::ProjectAST*>(ast)); + processProject(static_cast<TQMake::ProjectAST*>(ast)); break; case AST::IncludeAST: - processInclude(static_cast<QMake::IncludeAST*>(ast)); + processInclude(static_cast<TQMake::IncludeAST*>(ast)); break; } } diff --git a/buildtools/lib/parsers/qmake/qmakeastvisitor.h b/buildtools/lib/parsers/qmake/qmakeastvisitor.h index 3db9d14d..6978074c 100644 --- a/buildtools/lib/parsers/qmake/qmakeastvisitor.h +++ b/buildtools/lib/parsers/qmake/qmakeastvisitor.h @@ -17,12 +17,12 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef QMAKEQMAKEASTVISITOR_H -#define QMAKEQMAKEASTVISITOR_H +#ifndef TQMAKETQMAKEASTVISITOR_H +#define TQMAKETQMAKEASTVISITOR_H #include "qmakeast.h" -namespace QMake { +namespace TQMake { class ASTVisitor{ public: diff --git a/buildtools/lib/parsers/qmake/qmakedriver.cpp b/buildtools/lib/parsers/qmake/qmakedriver.cpp index e2d93ef8..09256178 100644 --- a/buildtools/lib/parsers/qmake/qmakedriver.cpp +++ b/buildtools/lib/parsers/qmake/qmakedriver.cpp @@ -30,7 +30,7 @@ #include "qmake_lex.h" #include "qmake_yacc.hpp" -namespace QMake { +namespace TQMake { int Driver::parseFile(const char *fileName, ProjectAST **ast, int debug) { @@ -52,15 +52,15 @@ int Driver::parseFile(const char *fileName, ProjectAST **ast, int debug) (*ast)->setFileName(fileName); switch( l.lineending() ) { - case QMake::Lexer::Windows: - (*ast)->setLineEnding(QMake::ProjectAST::Windows); + case TQMake::Lexer::Windows: + (*ast)->setLineEnding(TQMake::ProjectAST::Windows); break; - case QMake::Lexer::MacOS: - (*ast)->setLineEnding(QMake::ProjectAST::MacOS); + case TQMake::Lexer::MacOS: + (*ast)->setLineEnding(TQMake::ProjectAST::MacOS); break; - case QMake::Lexer::Unix: + case TQMake::Lexer::Unix: default: - (*ast)->setLineEnding(QMake::ProjectAST::Unix); + (*ast)->setLineEnding(TQMake::ProjectAST::Unix); break; } return ret; @@ -96,15 +96,15 @@ int Driver::parseString( const char* string, ProjectAST **ast, int debug ) (*ast)->setFileName(""); switch( l.lineending() ) { - case QMake::Lexer::Windows: - (*ast)->setLineEnding(QMake::ProjectAST::Windows); + case TQMake::Lexer::Windows: + (*ast)->setLineEnding(TQMake::ProjectAST::Windows); break; - case QMake::Lexer::MacOS: - (*ast)->setLineEnding(QMake::ProjectAST::MacOS); + case TQMake::Lexer::MacOS: + (*ast)->setLineEnding(TQMake::ProjectAST::MacOS); break; - case QMake::Lexer::Unix: + case TQMake::Lexer::Unix: default: - (*ast)->setLineEnding(QMake::ProjectAST::Unix); + (*ast)->setLineEnding(TQMake::ProjectAST::Unix); break; } return ret; diff --git a/buildtools/lib/parsers/qmake/qmakedriver.h b/buildtools/lib/parsers/qmake/qmakedriver.h index 918054fa..ee56f388 100644 --- a/buildtools/lib/parsers/qmake/qmakedriver.h +++ b/buildtools/lib/parsers/qmake/qmakedriver.h @@ -17,13 +17,13 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef QMAKEQMAKEDRIVER_H -#define QMAKEQMAKEDRIVER_H +#ifndef TQMAKETQMAKEDRIVER_H +#define TQMAKETQMAKEDRIVER_H class TQString; class KURL; -namespace QMake { +namespace TQMake { /** @file qmakedriver.h diff --git a/buildtools/lib/parsers/qmake/stack.hh b/buildtools/lib/parsers/qmake/stack.hh index b81e4a28..07f71922 100644 --- a/buildtools/lib/parsers/qmake/stack.hh +++ b/buildtools/lib/parsers/qmake/stack.hh @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that contains +/* As a special exception, you may create a larger work that tqcontains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof @@ -37,7 +37,7 @@ #include <deque> -namespace QMake +namespace TQMake { template <class T, class S = std::deque<T> > class stack diff --git a/buildtools/lib/parsers/qmake/tests/runner.cpp b/buildtools/lib/parsers/qmake/tests/runner.cpp index 6f1d5956..5dd417db 100644 --- a/buildtools/lib/parsers/qmake/tests/runner.cpp +++ b/buildtools/lib/parsers/qmake/tests/runner.cpp @@ -21,8 +21,8 @@ #include <cstdlib> #include <iostream> #include <stdio.h> -#include "qmakedriver.h" -#include "qmakeastvisitor.h" +#include "tqmakedriver.h" +#include "tqmakeastvisitor.h" #include <tqstring.h> @@ -34,92 +34,92 @@ static const KCmdLineOptions options[] = { {"silent", "Enable Parser debug output", 0}, {"!debug", "Disable output of the generated AST", 0}, - {"!+files", "QMake project files", 0} + {"!+files", "TQMake project files", 0} }; -class PrintAST : QMake::ASTVisitor +class PrintAST : TQMake::ASTVisitor { public: - PrintAST() : QMake::ASTVisitor() + PrintAST() : TQMake::ASTVisitor() { indent = 0; } - virtual void processProject( QMake::ProjectAST* p ) + virtual void processProject( TQMake::ProjectAST* p ) { - QMake::ASTVisitor::processProject(p); + TQMake::ASTVisitor::processProject(p); } private: - virtual void enterRealProject( QMake::ProjectAST* p ) + virtual void enterRealProject( TQMake::ProjectAST* p ) { kdDebug(9024) << getIndent() << "--------- Entering Project: " << replaceWs(p->fileName()) << "| LineEnding:" << p->lineEnding() << " --------------" << endl; indent += 4; - QMake::ASTVisitor::enterRealProject(p); + TQMake::ASTVisitor::enterRealProject(p); } - virtual void leaveRealProject( QMake::ProjectAST* p ) + virtual void leaveRealProject( TQMake::ProjectAST* p ) { indent -= 4; kdDebug(9024) << getIndent() << "--------- Leaving Project: " << replaceWs(p->fileName()) << " --------------" << endl; - QMake::ASTVisitor::leaveRealProject(p); + TQMake::ASTVisitor::leaveRealProject(p); } - virtual void enterScope( QMake::ProjectAST* p ) + virtual void enterScope( TQMake::ProjectAST* p ) { kdDebug(9024) << getIndent() << "--------- Entering Scope: " << replaceWs(p->scopedID) << " --------------" << endl; indent += 4; - QMake::ASTVisitor::enterScope(p); + TQMake::ASTVisitor::enterScope(p); } - virtual void leaveScope( QMake::ProjectAST* p ) + virtual void leaveScope( TQMake::ProjectAST* p ) { indent -= 4; kdDebug(9024) << getIndent() << "--------- Leaving Scope: " << replaceWs(p->scopedID) << " --------------" << endl; - QMake::ASTVisitor::leaveScope(p); + TQMake::ASTVisitor::leaveScope(p); } - virtual void enterFunctionScope( QMake::ProjectAST* p ) + virtual void enterFunctionScope( TQMake::ProjectAST* p ) { kdDebug(9024) << getIndent() << "--------- Entering FunctionScope: " << replaceWs(p->scopedID) << "(" << replaceWs(p->args) << ")"<< " --------------" << endl; indent += 4; - QMake::ASTVisitor::enterFunctionScope(p); + TQMake::ASTVisitor::enterFunctionScope(p); } - virtual void leaveFunctionScope( QMake::ProjectAST* p ) + virtual void leaveFunctionScope( TQMake::ProjectAST* p ) { indent -= 4; kdDebug(9024) << getIndent() << "--------- Leaving FunctionScope: " << replaceWs(p->scopedID) << "(" << replaceWs(p->args) << ")"<< " --------------" << endl; - QMake::ASTVisitor::leaveFunctionScope(p); + TQMake::ASTVisitor::leaveFunctionScope(p); } TQString replaceWs(TQString s) { - return s.replace("\n", "%nl").replace("\t", "%tab").replace(" ", "%spc"); + return s.tqreplace("\n", "%nl").tqreplace("\t", "%tab").tqreplace(" ", "%spc"); } - virtual void processAssignment( QMake::AssignmentAST* a) + virtual void processAssignment( TQMake::AssignmentAST* a) { kdDebug(9024) << getIndent() << "Assignment(" << replaceWs(a->indent) << "):" << replaceWs(a->scopedID) << " " << replaceWs(a->op) << " " << replaceWs(a->values.join("|")) << endl; - QMake::ASTVisitor::processAssignment(a); + TQMake::ASTVisitor::processAssignment(a); } - virtual void processNewLine( QMake::NewLineAST* n) + virtual void processNewLine( TQMake::NewLineAST* n) { kdDebug(9024) << getIndent() << "Newline " << endl; - QMake::ASTVisitor::processNewLine(n); + TQMake::ASTVisitor::processNewLine(n); } - virtual void processComment( QMake::CommentAST* a) + virtual void processComment( TQMake::CommentAST* a) { kdDebug(9024) << getIndent() << "Comment: " << replaceWs(a->comment) << endl; - QMake::ASTVisitor::processComment(a); + TQMake::ASTVisitor::processComment(a); } - virtual void processInclude( QMake::IncludeAST* a) + virtual void processInclude( TQMake::IncludeAST* a) { kdDebug(9024) << getIndent() << "Include: " << replaceWs(a->projectName) << endl; - QMake::ASTVisitor::processInclude(a); + TQMake::ASTVisitor::processInclude(a); } TQString getIndent() @@ -133,7 +133,7 @@ private: }; int main(int argc, char *argv[]) { - KCmdLineArgs::init( argc, argv, "QMake Parser", "qmake-parser", "Parse QMake project files", "1.0.0"); + KCmdLineArgs::init( argc, argv, "TQMake Parser", "qmake-parser", "Parse TQMake project files", "1.0.0"); KCmdLineArgs::addCmdLineOptions(options); KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); @@ -152,8 +152,8 @@ int main(int argc, char *argv[]) debug = 1; for( int i = 0 ; i < args->count() ; i++ ) { - QMake::ProjectAST *projectAST; - int ret = QMake::Driver::parseFile(args->url(i).path(), &projectAST, debug); + TQMake::ProjectAST *projectAST; + int ret = TQMake::Driver::parseFile(args->url(i).path(), &projectAST, debug); PrintAST pa; if ( ret == 0 ) if ( !silent ) @@ -161,7 +161,7 @@ int main(int argc, char *argv[]) pa.processProject(projectAST); TQString profile; projectAST->writeBack(profile); - kdDebug(9024) << "QMake file written back:\n" << profile << endl; + kdDebug(9024) << "TQMake file written back:\n" << profile << endl; } return ret; } diff --git a/buildtools/lib/parsers/qmake/tests/viewer.cpp b/buildtools/lib/parsers/qmake/tests/viewer.cpp index 4583ab11..6f1e5f25 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer.cpp +++ b/buildtools/lib/parsers/qmake/tests/viewer.cpp @@ -29,14 +29,14 @@ #include <tqlistview.h> #include <tqtabwidget.h> -#include <qmakeast.h> -#include <qmakedriver.h> -#include <qmakeastvisitor.h> +#include <tqmakeast.h> +#include <tqmakedriver.h> +#include <tqmakeastvisitor.h> -using namespace QMake; +using namespace TQMake; -Viewer::Viewer(TQWidget *parent, const char *name) - :ViewerBase(parent, name), projectAST(0) +Viewer::Viewer(TQWidget *tqparent, const char *name) + :ViewerBase(tqparent, name), projectAST(0) { if (TQFile::exists(TQDir::currentDirPath() + "/" + "qtlist")) { @@ -47,7 +47,7 @@ Viewer::Viewer(TQWidget *parent, const char *name) files->insertItem(str.readLine()); } ast->setSorting(-1); -// parentProject.push((TQListViewItem*)0); +// tqparentProject.push((TQListViewItem*)0); } void Viewer::addAll_clicked() @@ -78,7 +78,7 @@ void Viewer::files_currentChanged(TQListBoxItem* item) source->setText(str.read()); f.close(); - int result = QMake::Driver::parseFile(item->text().ascii(), &projectAST, 0); + int result = TQMake::Driver::parseFile(item->text().ascii(), &projectAST, 0); if (projectAST && (result == 0)) { processAST(projectAST); @@ -102,7 +102,7 @@ public: ViewerVisitor(Viewer *v): ASTVisitor() { this->v = v; - parentProject.push((TQListViewItem*)0); + tqparentProject.push((TQListViewItem*)0); } virtual void processProject(ProjectAST *project) @@ -113,39 +113,39 @@ public: virtual void enterRealProject(ProjectAST *project) { TQListViewItem *projectIt; - if (!parentProject.top()) + if (!tqparentProject.top()) { projectIt = new TQListViewItem(v->ast, "Project"); projectIt->setOpen(true); - parentProject.push(projectIt); + tqparentProject.push(projectIt); } ASTVisitor::enterRealProject(project); } virtual void enterScope(ProjectAST *scope) { - TQListViewItem *projectIt = new TQListViewItem(parentProject.top(), scope->scopedID, "scope"); - parentProject.push(projectIt); + TQListViewItem *projectIt = new TQListViewItem(tqparentProject.top(), scope->scopedID, "scope"); + tqparentProject.push(projectIt); ASTVisitor::enterScope(scope); } virtual void leaveScope(ProjectAST *scope) { - parentProject.pop(); + tqparentProject.pop(); } virtual void enterFunctionScope(ProjectAST *fscope) { - TQListViewItem *projectIt = new TQListViewItem(parentProject.top(), + TQListViewItem *projectIt = new TQListViewItem(tqparentProject.top(), fscope->scopedID + "(" + fscope->args + ")", "function scope"); - parentProject.push(projectIt); + tqparentProject.push(projectIt); ASTVisitor::enterFunctionScope(fscope); } virtual void leaveFunctionScope(ProjectAST *fscope) { - parentProject.pop(); + tqparentProject.pop(); } virtual void processAssignment(AssignmentAST *assignment) { - TQListViewItem *item = new TQListViewItem(parentProject.top(), + TQListViewItem *item = new TQListViewItem(tqparentProject.top(), assignment->scopedID, assignment->op, assignment->values.join("|"), "assignment"); item->setMultiLinesEnabled(true); @@ -154,26 +154,26 @@ public: } virtual void processNewLine(NewLineAST *newline) { - new TQListViewItem(parentProject.top(), "<newline>"); + new TQListViewItem(tqparentProject.top(), "<newline>"); ASTVisitor::processNewLine(newline); } virtual void processComment(CommentAST *comment) { - new TQListViewItem(parentProject.top(), "<comment>"); + new TQListViewItem(tqparentProject.top(), "<comment>"); ASTVisitor::processComment(comment); } virtual void processInclude(IncludeAST *include) { - new TQListViewItem(parentProject.top(), "<include>", include->projectName); - QMake::ASTVisitor::processInclude(include); + new TQListViewItem(tqparentProject.top(), "<include>", include->projectName); + TQMake::ASTVisitor::processInclude(include); } Viewer *v; - TQValueStack<TQListViewItem *> parentProject; + TQValueStack<TQListViewItem *> tqparentProject; }; -void Viewer::processAST(QMake::ProjectAST *projectAST, TQListViewItem *globAfter) +void Viewer::processAST(TQMake::ProjectAST *projectAST, TQListViewItem *globAfter) { ViewerVisitor visitor(this); visitor.processProject(projectAST); diff --git a/buildtools/lib/parsers/qmake/tests/viewer.h b/buildtools/lib/parsers/qmake/tests/viewer.h index bba85b1f..28a7613c 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer.h +++ b/buildtools/lib/parsers/qmake/tests/viewer.h @@ -24,7 +24,7 @@ #include "viewerbase.h" -namespace QMake { +namespace TQMake { class ProjectAST; } @@ -32,16 +32,17 @@ class TQListViewItem; class Viewer: public ViewerBase { Q_OBJECT + TQ_OBJECT public: - Viewer(TQWidget *parent = 0, const char *name = 0); - void processAST(QMake::ProjectAST *projectAST, TQListViewItem *globAfter = 0); + Viewer(TQWidget *tqparent = 0, const char *name = 0); + void processAST(TQMake::ProjectAST *projectAST, TQListViewItem *globAfter = 0); public slots: virtual void tabWidget2_selected(const TQString&); virtual void files_currentChanged(TQListBoxItem*); virtual void choose_clicked(); virtual void addAll_clicked(); private: - QMake::ProjectAST *projectAST; + TQMake::ProjectAST *projectAST; friend class ViewerVisitor; }; diff --git a/buildtools/lib/parsers/qmake/tests/viewer_main.cpp b/buildtools/lib/parsers/qmake/tests/viewer_main.cpp index c31ea02c..199b106d 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer_main.cpp +++ b/buildtools/lib/parsers/qmake/tests/viewer_main.cpp @@ -27,7 +27,7 @@ int main(int argc, char **argv) Viewer viewer; app.setMainWidget(&viewer); viewer.show(); - viewer.setWindowState(viewer.windowState() | Qt::WindowMaximized); + viewer.setWindowState(viewer.windowState() | TQt::WindowMaximized); return app.exec(); } diff --git a/buildtools/lib/parsers/qmake/tests/viewerbase.ui b/buildtools/lib/parsers/qmake/tests/viewerbase.ui index 976d4d0f..c37f41bf 100644 --- a/buildtools/lib/parsers/qmake/tests/viewerbase.ui +++ b/buildtools/lib/parsers/qmake/tests/viewerbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ViewerBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ViewerBase</cstring> </property> @@ -19,37 +19,37 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter" row="0" column="0"> + <widget class="TQSplitter" row="0" column="0"> <property name="name"> <cstring>splitter5</cstring> </property> <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>allLocation</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> </size> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addAll</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -59,11 +59,11 @@ <string>Add All From Directory</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>choose</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -73,7 +73,7 @@ <string>Choose File to Add...</string> </property> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>files</cstring> </property> @@ -85,7 +85,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -97,14 +97,14 @@ </widget> </vbox> </widget> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter2</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>source</cstring> </property> @@ -117,7 +117,7 @@ </sizepolicy> </property> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> @@ -129,7 +129,7 @@ <verstretch>2</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -140,7 +140,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Name</string> @@ -191,7 +191,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -202,7 +202,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit" row="0" column="0"> + <widget class="TQTextEdit" row="0" column="0"> <property name="name"> <cstring>writeBack</cstring> </property> @@ -240,11 +240,11 @@ <slot>tabWidget2_selected(const QString&)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>addAll_clicked()</slot> <slot>choose_clicked()</slot> <slot>files_currentChanged( QListBoxItem * )</slot> <slot>tabWidget2_selected( const QString & )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> 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> diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp index c2c32f9e..d0ec682d 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.cpp +++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp @@ -23,8 +23,8 @@ #include "pascalproject_part.h" #include "pascalglobaloptionsdlg.h" -PascalGlobalOptionsDlg::PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget* parent, const char* name, WFlags fl) - :PascalProjectOptionsDlgBase(parent,name,fl), m_part(part) +PascalGlobalOptionsDlg::PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget* tqparent, const char* name, WFlags fl) + :PascalProjectOptionsDlgBase(tqparent,name,fl), m_part(part) { delete config_label; delete config_combo; @@ -47,7 +47,7 @@ PascalGlobalOptionsDlg::PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget if (offers.isEmpty()) options_button->setEnabled(false); - currentCompiler = TQString::null; + currentCompiler = TQString(); /*kdDebug() << ServiceComboBox::defaultCompiler() << endl; kdDebug() << ServiceComboBox::itemForText(ServiceComboBox::defaultCompiler(), service_names) << endl; diff --git a/buildtools/pascal/pascalglobaloptionsdlg.h b/buildtools/pascal/pascalglobaloptionsdlg.h index b0c19e0e..295958fc 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.h +++ b/buildtools/pascal/pascalglobaloptionsdlg.h @@ -22,9 +22,10 @@ class PascalProjectPart; class PascalGlobalOptionsDlg : public PascalProjectOptionsDlgBase { Q_OBJECT + TQ_OBJECT public: - PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~PascalGlobalOptionsDlg(); public slots: diff --git a/buildtools/pascal/pascalproject_optionsdlgbase.ui b/buildtools/pascal/pascalproject_optionsdlgbase.ui index 0f0b2324..a00c026f 100644 --- a/buildtools/pascal/pascalproject_optionsdlgbase.ui +++ b/buildtools/pascal/pascalproject_optionsdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>PascalProjectOptionsDlgBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PascalProjectOptionsDlgBase</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="5"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>configuration_layout</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>config_label</cstring> </property> @@ -49,7 +49,7 @@ <cstring>config_combo</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>config_combo</cstring> </property> @@ -75,14 +75,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>8</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addconfig_button</cstring> </property> @@ -90,7 +90,7 @@ <string>&Add</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeconfig_button</cstring> </property> @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -117,7 +117,7 @@ </spacer> </hbox> </widget> - <widget class="QPushButton" row="6" column="4"> + <widget class="TQPushButton" row="6" column="4"> <property name="name"> <cstring>options_button</cstring> </property> @@ -129,7 +129,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -139,7 +139,7 @@ <string>...</string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>options_label</cstring> </property> @@ -158,7 +158,7 @@ <cstring>compiler_box</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>compiler_label</cstring> </property> @@ -177,22 +177,22 @@ <cstring>compiler_box</cstring> </property> </widget> - <widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="4" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>exec_edit</cstring> </property> </widget> - <widget class="QLineEdit" row="6" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="6" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>options_edit</cstring> </property> </widget> - <widget class="QComboBox" row="2" column="1" rowspan="1" colspan="3"> + <widget class="TQComboBox" row="2" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>compiler_box</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>exec_label</cstring> </property> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -252,7 +252,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -269,7 +269,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -286,14 +286,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>400</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton" row="7" column="3" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="7" column="3" rowspan="1" colspan="2"> <property name="name"> <cstring>defaultopts_button</cstring> </property> @@ -305,7 +305,7 @@ <property name="name"> <cstring>mainSourceUrl</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>26</height> @@ -315,7 +315,7 @@ <enum>WheelFocus</enum> </property> </widget> - <widget class="QLabel" row="9" column="0"> + <widget class="TQLabel" row="9" column="0"> <property name="name"> <cstring>mainSourceLabel</cstring> </property> @@ -344,7 +344,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -453,7 +453,7 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">compiler_box_activated(const QString&)</slot> <slot access="protected">addconfig_button_clicked()</slot> <slot access="protected">configRemoved()</slot> @@ -463,9 +463,9 @@ <slot access="protected">configAdded()</slot> <slot access="protected">setDirty()</slot> <slot access="protected">setDefaultOptions()</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/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index 2ed25fc0..6d26ac60 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -52,8 +52,8 @@ typedef KDevGenericFactory<PascalProjectPart> PascalProjectFactory; static const KDevPluginInfo data("kdevpascalproject"); K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( data ) ) -PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const TQStringList& ) - :KDevBuildTool(&data, parent, name ? name : "PascalProjectPart" ) +PascalProjectPart::PascalProjectPart(TQObject *tqparent, const char *name, const TQStringList& ) + :KDevBuildTool(&data, tqparent, name ? name : "PascalProjectPart" ) { setInstance(PascalProjectFactory::instance()); setXMLFile("kdevpascalproject.rc"); @@ -149,7 +149,7 @@ void PascalProjectPart::openProject(const TQString &dirName, const TQString &pro do { dir.setPath(s.pop()); kdDebug(9033) << "Examining: " << dir.path() << endl; - const QFileInfoList *dirEntries = dir.entryInfoList(); + const TQFileInfoList *dirEntries = dir.entryInfoList(); TQPtrListIterator<TQFileInfo> it(*dirEntries); for (; it.current(); ++it) { TQString fileName = it.current()->fileName(); @@ -256,7 +256,7 @@ TQString PascalProjectPart::mainSource() const void PascalProjectPart::setMainSource(TQString fullPath) { TQString olddir = activeDirectory(); - m_mainSource = fullPath.replace(TQRegExp(TQString(projectDirectory() + TQString("/"))),""); + m_mainSource = fullPath.tqreplace(TQRegExp(TQString(projectDirectory() + TQString("/"))),""); emit activeDirectoryChanged( olddir, activeDirectory() ); } @@ -273,7 +273,7 @@ TQString PascalProjectPart::projectName() const TQString PascalProjectPart::activeDirectory() const { TQFileInfo fi(mainSource()); - return fi.dirPath(true).replace(TQRegExp(projectDirectory()),""); + return fi.dirPath(true).tqreplace(TQRegExp(projectDirectory()),""); } TQString PascalProjectPart::buildDirectory() const @@ -287,7 +287,7 @@ void PascalProjectPart::listOfFiles(TQStringList &result, TQString path) const TQDir d(path); if (!d.exists()) return; - QFileInfoList *entries = const_cast<QFileInfoList*>(d.entryInfoList(TQDir::Dirs | TQDir::Files | TQDir::Hidden)); + TQFileInfoList *entries = const_cast<TQFileInfoList*>(d.entryInfoList(TQDir::Dirs | TQDir::Files | TQDir::Hidden)); for (TQFileInfo *it = entries->first(); it; it = entries->next()) { if ((it->isDir()) && (it->filePath() != path)) @@ -448,7 +448,7 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &na if (!factory) { TQString errorMessage = KLibLoader::self()->lastErrorMessage(); KMessageBox::error(0, i18n("There was an error loading the module %1.\n" - "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage)); + "The diagnostics is:\n%2").tqarg(service->name()).tqarg(errorMessage)); exit(1); } diff --git a/buildtools/pascal/pascalproject_part.h b/buildtools/pascal/pascalproject_part.h index 944250e4..81565cc4 100644 --- a/buildtools/pascal/pascalproject_part.h +++ b/buildtools/pascal/pascalproject_part.h @@ -22,8 +22,9 @@ class KDevCompilerOptions; class PascalProjectPart : public KDevBuildTool { Q_OBJECT + TQ_OBJECT public: - PascalProjectPart(TQObject *parent, const char *name, const TQStringList &); + PascalProjectPart(TQObject *tqparent, const char *name, const TQStringList &); ~PascalProjectPart(); virtual void openProject(const TQString &dirName, const TQString &projectName); diff --git a/buildtools/pascal/pascalproject_widget.h b/buildtools/pascal/pascalproject_widget.h index bfd9c328..e7bd5d1d 100644 --- a/buildtools/pascal/pascalproject_widget.h +++ b/buildtools/pascal/pascalproject_widget.h @@ -10,9 +10,10 @@ class KDevProject; class PascalProjectPart; -class PascalProjectWidget : public QWidget +class PascalProjectWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp index 6bbff084..d1ce1f5f 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.cpp +++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp @@ -26,10 +26,10 @@ #include "pascalproject_part.h" #include "pascalprojectoptionsdlg.h" -PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* parent, const char* name, WFlags fl) - : PascalProjectOptionsDlgBase(parent,name, fl), m_part(part) +PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* tqparent, const char* name, WFlags fl) + : PascalProjectOptionsDlgBase(tqparent,name, fl), m_part(part) { - config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); + config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Pascal'"); @@ -44,7 +44,7 @@ PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, TQWidg dirty = false; TQDomDocument &dom = *(m_part->projectDom()); - currentConfig = TQString::null; + currentConfig = TQString(); configChanged(DomUtil::readEntry(dom, "/kdevpascalproject/general/useconfiguration", "default")); } @@ -96,7 +96,7 @@ void PascalProjectOptionsDlg::saveConfig( TQString config ) ServiceComboBox::currentText(compiler_box, service_names)); DomUtil::writeEntry(dom, prefix + "compileroptions", options_edit->text()); DomUtil::writeEntry(dom, prefix + "compilerexec", exec_edit->text()); - DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().replace(TQRegExp(m_part->projectDirectory() + TQString("/")),"")); + DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().tqreplace(TQRegExp(m_part->projectDirectory() + TQString("/")),"")); } void PascalProjectOptionsDlg::readConfig( TQString config ) @@ -130,8 +130,8 @@ void PascalProjectOptionsDlg::readConfig( TQString config ) void PascalProjectOptionsDlg::configComboTextChanged(const TQString &config) { - bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty(); - bool canRemove = allConfigs.contains(config) && config != "default"; + bool canAdd = !allConfigs.tqcontains(config) && !config.tqcontains("/") && !config.isEmpty(); + bool canRemove = allConfigs.tqcontains(config) && config != "default"; addconfig_button->setEnabled(canAdd); removeconfig_button->setEnabled(canRemove); } @@ -139,7 +139,7 @@ void PascalProjectOptionsDlg::configComboTextChanged(const TQString &config) void PascalProjectOptionsDlg::configChanged(const TQString &config) { - if (config == currentConfig || !allConfigs.contains(config)) + if (config == currentConfig || !allConfigs.tqcontains(config)) return; if (!currentConfig.isNull() && dirty) @@ -180,7 +180,7 @@ void PascalProjectOptionsDlg::configRemoved() config_combo->clear(); config_combo->insertStringList(allConfigs); - currentConfig = TQString::null; + currentConfig = TQString(); configChanged("default"); } diff --git a/buildtools/pascal/pascalprojectoptionsdlg.h b/buildtools/pascal/pascalprojectoptionsdlg.h index 6e483338..9ebcbe45 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.h +++ b/buildtools/pascal/pascalprojectoptionsdlg.h @@ -21,9 +21,10 @@ class KDevCompilerOptions; class PascalProjectOptionsDlg : public PascalProjectOptionsDlgBase { Q_OBJECT + TQ_OBJECT public: - PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~PascalProjectOptionsDlg(); public slots: diff --git a/buildtools/pascal/service.cpp b/buildtools/pascal/service.cpp index ea3846b2..b49274ea 100644 --- a/buildtools/pascal/service.cpp +++ b/buildtools/pascal/service.cpp @@ -34,7 +34,7 @@ void ServiceComboBox::insertStringList(TQComboBox *combo, const TQValueList<KSer TQString ServiceComboBox::currentText(TQComboBox *combo, const TQStringList &names) { if (combo->currentItem() == -1) - return TQString::null; + return TQString(); return names[combo->currentItem()]; } diff --git a/buildtools/qmake/choosesubprojectdlg.cpp b/buildtools/qmake/choosesubprojectdlg.cpp index 63da84f8..516e5daa 100644 --- a/buildtools/qmake/choosesubprojectdlg.cpp +++ b/buildtools/qmake/choosesubprojectdlg.cpp @@ -15,8 +15,8 @@ #include "choosesubprojectdlg.h" #include "scope.h" -ChooseSubprojectDlg::ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* parent, const char* name, bool modal, WFlags fl) - : ChooseSubprojectDlgBase(parent,name, modal,fl), m_widget(widget) +ChooseSubprojectDlg::ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* tqparent, const char* name, bool modal, WFlags fl) + : ChooseSubprojectDlgBase(tqparent,name, modal,fl), m_widget(widget) { connect(subprojects_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(itemSelected(TQListViewItem *))); if( m_widget->m_rootSubproject) @@ -41,23 +41,23 @@ void ChooseSubprojectDlg::accept() ChooseItem *item = dynamic_cast<ChooseItem*>(subprojects_view->currentItem()); if (!item) return; - if ( item->subproject()->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) + if ( item->subproject()->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 ) return; TQDialog::accept(); } -ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListViewItem * parent, TQString text ) - :KListViewItem(parent, text), m_spitem(spitem) +ChooseItem::ChooseItem( TQMakeScopeItem * spitem, TQListViewItem * tqparent, TQString text ) + :KListViewItem(tqparent, text), m_spitem(spitem) { } -ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListView * parent, TQString text ) - :KListViewItem(parent, text), m_spitem(spitem) +ChooseItem::ChooseItem( TQMakeScopeItem * spitem, TQListView * tqparent, TQString text ) + :KListViewItem(tqparent, text), m_spitem(spitem) { } -QMakeScopeItem * ChooseItem::subproject( ) +TQMakeScopeItem * ChooseItem::subproject( ) { return m_spitem; } @@ -69,7 +69,7 @@ void ChooseSubprojectDlg::fillSubprojectsView( ChooseItem *item ) TQListViewItem * sub_spitem = item->subproject()->firstChild(); while( sub_spitem ) { - QMakeScopeItem *spitem = dynamic_cast<QMakeScopeItem *>(sub_spitem); + TQMakeScopeItem *spitem = dynamic_cast<TQMakeScopeItem *>(sub_spitem); if ( spitem && spitem->scope->scopeType() == Scope::ProjectScope ) { ChooseItem *child_item = new ChooseItem(spitem, item, spitem->text(0)); @@ -89,13 +89,13 @@ void ChooseSubprojectDlg::itemSelected( TQListViewItem * it ) ChooseItem *item = dynamic_cast<ChooseItem*>(it); if (!item) return; - if ( item->subproject()->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) + if ( item->subproject()->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 ) buttonOk->setEnabled(false); else buttonOk->setEnabled(true); } -QMakeScopeItem * ChooseSubprojectDlg::selectedSubproject( ) +TQMakeScopeItem * ChooseSubprojectDlg::selectedSubproject( ) { if (subprojects_view->currentItem()) { @@ -110,5 +110,5 @@ QMakeScopeItem * ChooseSubprojectDlg::selectedSubproject( ) #include "choosesubprojectdlg.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/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h index 2101d3cd..9ce31311 100644 --- a/buildtools/qmake/choosesubprojectdlg.h +++ b/buildtools/qmake/choosesubprojectdlg.h @@ -16,31 +16,32 @@ #include "choosesubprojectdlgbase.h" -class QMakeScopeItem; +class TQMakeScopeItem; class TrollProjectWidget; class ChooseItem: public KListViewItem { public: - ChooseItem(QMakeScopeItem *spitem, TQListViewItem *parent, TQString text); - ChooseItem(QMakeScopeItem *spitem, TQListView *parent, TQString text); + ChooseItem(TQMakeScopeItem *spitem, TQListViewItem *tqparent, TQString text); + ChooseItem(TQMakeScopeItem *spitem, TQListView *tqparent, TQString text); - QMakeScopeItem *subproject(); + TQMakeScopeItem *subproject(); private: - QMakeScopeItem *m_spitem; + TQMakeScopeItem *m_spitem; }; class ChooseSubprojectDlg : public ChooseSubprojectDlgBase { Q_OBJECT + TQ_OBJECT public: - ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~ChooseSubprojectDlg(); /*$PUBLIC_FUNCTIONS$*/ - QMakeScopeItem *selectedSubproject(); + TQMakeScopeItem *selectedSubproject(); public slots: /*$PUBLIC_SLOTS$*/ @@ -61,4 +62,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/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui index 12db29e2..fa8051e6 100644 --- a/buildtools/qmake/choosesubprojectdlgbase.ui +++ b/buildtools/qmake/choosesubprojectdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>ChooseSubprojectDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ChooseSubprojectDlgBase</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,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -126,7 +126,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/buildtools/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp index 4f65dd17..a9234b58 100644 --- a/buildtools/qmake/createscopedlg.cpp +++ b/buildtools/qmake/createscopedlg.cpp @@ -26,8 +26,8 @@ #include "scope.h" #include "trollprojectwidget.h" -CreateScopeDlg::CreateScopeDlg( QMakeScopeItem* item, TQWidget* parent, const char* name, bool modal, WFlags fl ) - : CreateScopeDlgBase( parent, name, modal, fl ), m_item( item ) +CreateScopeDlg::CreateScopeDlg( TQMakeScopeItem* item, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) + : CreateScopeDlgBase( tqparent, name, modal, fl ), m_item( item ) { incUrl->setMode( KFile::File | KFile::LocalOnly ); incUrl->setCaption( i18n( "Choose existing .pri file or give a new filename for creation" ) ); @@ -58,7 +58,7 @@ void CreateScopeDlg::accept() TQString file = incUrl->url(); if ( !incUrl->url().endsWith( ".pri" ) ) file += ".pri"; - if( file.find("/") == -1 ) + if( file.tqfind("/") == -1 ) file = m_item->scope->projectDir()+"/"+file; // We need to create the file, because getRelativePath checks for existent paths if( !TQFile::exists(file) ) @@ -75,13 +75,13 @@ void CreateScopeDlg::accept() if ( s ) { if ( !m_item->firstChild() ) - new QMakeScopeItem( m_item, s->scopeName(), s ); + new TQMakeScopeItem( m_item, s->scopeName(), s ); else { TQListViewItem* item = m_item->firstChild(); while( item->nextSibling() ) item = item->nextSibling(); - QMakeScopeItem* newitem = new QMakeScopeItem( m_item, s->scopeName(), s ); + TQMakeScopeItem* newitem = new TQMakeScopeItem( m_item, s->scopeName(), s ); newitem->moveItem( item ); } TQDialog::accept(); @@ -97,4 +97,4 @@ void CreateScopeDlg::accept() #include "createscopedlg.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/qmake/createscopedlg.h b/buildtools/qmake/createscopedlg.h index 675143b1..412a5f2f 100644 --- a/buildtools/qmake/createscopedlg.h +++ b/buildtools/qmake/createscopedlg.h @@ -14,15 +14,16 @@ #include "createscopedlgbase.h" -class QMakeScopeItem; +class TQMakeScopeItem; class TrollProjectWigdet; class CreateScopeDlg : public CreateScopeDlgBase { Q_OBJECT + TQ_OBJECT public: - CreateScopeDlg( QMakeScopeItem* item, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreateScopeDlg( TQMakeScopeItem* item, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~CreateScopeDlg(); /*$PUBLIC_FUNCTIONS$*/ @@ -36,10 +37,10 @@ protected slots: /*$PROTECTED_SLOTS$*/ virtual void accept(); private: - QMakeScopeItem* m_item; + TQMakeScopeItem* m_item; }; #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/qmake/createscopedlgbase.ui b/buildtools/qmake/createscopedlgbase.ui index 244589cd..1c6cde9e 100644 --- a/buildtools/qmake/createscopedlgbase.ui +++ b/buildtools/qmake/createscopedlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CreateScopeDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>CreateScopeDlgBase</cstring> </property> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -68,7 +68,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>95</width> <height>20</height> @@ -77,7 +77,7 @@ </spacer> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -88,11 +88,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QWidgetStack" row="0" column="0"> + <widget class="TQWidgetStack" row="0" column="0"> <property name="name"> <cstring>widgetStack1</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>simplePage</cstring> </property> @@ -111,7 +111,7 @@ <string>Specify the new scope name</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -124,7 +124,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>funcPage</cstring> </property> @@ -140,7 +140,7 @@ <cstring>editFunction</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -154,7 +154,7 @@ <string>Specify the function name</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -175,7 +175,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>incPage</cstring> </property> @@ -203,7 +203,7 @@ <string>Choose the .pri file to include</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -214,7 +214,7 @@ <cstring>incUrl</cstring> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>checkNotInc</cstring> </property> @@ -230,9 +230,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -248,14 +248,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>150</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -269,7 +269,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -316,7 +316,7 @@ <tabstop>incUrl</tabstop> <tabstop>checkNotInc</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/qmake/disablesubprojectdlg.cpp b/buildtools/qmake/disablesubprojectdlg.cpp index c05c70c9..161661d5 100644 --- a/buildtools/qmake/disablesubprojectdlg.cpp +++ b/buildtools/qmake/disablesubprojectdlg.cpp @@ -15,8 +15,8 @@ #include "scope.h" #include "qmakescopeitem.h" -DisableSubprojectDlg::DisableSubprojectDlg( const TQStringList& projects, TQWidget* parent, const char* name, WFlags fl ) - : DisableSubprojectDlgBase( parent, name, fl ) +DisableSubprojectDlg::DisableSubprojectDlg( const TQStringList& projects, TQWidget* tqparent, const char* name, WFlags fl ) + : DisableSubprojectDlgBase( tqparent, name, fl ) { for( TQStringList::const_iterator it = projects.begin(); it != projects.end(); ++it ) { @@ -47,4 +47,4 @@ TQStringList DisableSubprojectDlg::selectedProjects() #include "disablesubprojectdlg.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/qmake/disablesubprojectdlg.h b/buildtools/qmake/disablesubprojectdlg.h index 00602f28..4e8a4a84 100644 --- a/buildtools/qmake/disablesubprojectdlg.h +++ b/buildtools/qmake/disablesubprojectdlg.h @@ -17,9 +17,10 @@ class DisableSubprojectDlg : public DisableSubprojectDlgBase { Q_OBJECT + TQ_OBJECT public: - DisableSubprojectDlg( const TQStringList& projects, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + DisableSubprojectDlg( const TQStringList& projects, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~DisableSubprojectDlg(); /*$PUBLIC_FUNCTIONS$*/ @@ -39,4 +40,4 @@ protected slots: #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/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui index ffcc1d32..edc2856c 100644 --- a/buildtools/qmake/disablesubprojectdlgbase.ui +++ b/buildtools/qmake/disablesubprojectdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DisableSubprojectDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>DisableSubprojectDlgBase</cstring> </property> @@ -38,7 +38,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -117,7 +117,7 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/buildtools/qmake/newwidgetdlg.cpp b/buildtools/qmake/newwidgetdlg.cpp index 44dd7588..56a7c057 100644 --- a/buildtools/qmake/newwidgetdlg.cpp +++ b/buildtools/qmake/newwidgetdlg.cpp @@ -25,8 +25,8 @@ #define WIDGET_CLASS_NAME "class" #define WIDGET_SLOTS "slots" -NewWidgetDlg::NewWidgetDlg(TQStringList &newFileNames,TQWidget* parent, const char* name, bool modal, WFlags fl) -: NewWidgetDlgBase(parent,name,modal,fl), +NewWidgetDlg::NewWidgetDlg(TQStringList &newFileNames,TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: NewWidgetDlgBase(tqparent,name,modal,fl), m_newFileNames(newFileNames) //================================================= { diff --git a/buildtools/qmake/newwidgetdlg.h b/buildtools/qmake/newwidgetdlg.h index 994aead5..4c1843ab 100644 --- a/buildtools/qmake/newwidgetdlg.h +++ b/buildtools/qmake/newwidgetdlg.h @@ -21,7 +21,7 @@ class TQDomDocument; class NewWidgetDlg : public NewWidgetDlgBase { public: - NewWidgetDlg(TQStringList &newFileNames,TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + NewWidgetDlg(TQStringList &newFileNames,TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~NewWidgetDlg(); diff --git a/buildtools/qmake/newwidgetdlgbase.ui b/buildtools/qmake/newwidgetdlgbase.ui index 7c3730ca..404fa7d3 100644 --- a/buildtools/qmake/newwidgetdlgbase.ui +++ b/buildtools/qmake/newwidgetdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>NewWidgetDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>NewWidgetDlgBase</cstring> </property> @@ -35,7 +35,7 @@ <string>&Cancel</string> </property> </widget> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -46,7 +46,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>subclassingCb</cstring> </property> @@ -54,7 +54,7 @@ <string>Subclassing</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1" rowspan="2" colspan="1"> + <widget class="TQLayoutWidget" row="1" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -65,7 +65,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>captionLb</cstring> </property> @@ -78,7 +78,7 @@ <cstring>subclassnameEd</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -95,14 +95,14 @@ <property name="name"> <cstring>ui_classnameEd</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>0</height> </size> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>classnameLb</cstring> </property> @@ -112,7 +112,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>previewLb</cstring> </property> @@ -124,7 +124,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>160</height> @@ -137,7 +137,7 @@ <bool>true</bool> </property> </widget> - <widget class="QListBox" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQListBox" row="0" column="0" rowspan="2" colspan="1"> <item> <property name="text"> <string>New Item</string> @@ -159,7 +159,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>310</width> <height>0</height> @@ -220,10 +220,10 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include> </includes> -<slots> +<Q_SLOTS> <slot>subclassingPressed()</slot> <slot>templateSelChanged()</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/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp index 7c646e62..771a1f5f 100644 --- a/buildtools/qmake/projectconfigurationdlg.cpp +++ b/buildtools/qmake/projectconfigurationdlg.cpp @@ -51,15 +51,15 @@ #include "scope.h" #include "urlutil.h" -InsideCheckListItem::InsideCheckListItem( TQListView *parent, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : - TQCheckListItem( parent, item->relativePath().endsWith("/") ? item->relativePath().right( item->relativePath().length() - 1 ) : item->relativePath(), TQCheckListItem::CheckBox ) +InsideCheckListItem::InsideCheckListItem( TQListView *tqparent, TQMakeScopeItem *item, ProjectConfigurationDlg *config ) : + TQCheckListItem( tqparent, item->relativePath().endsWith("/") ? item->relativePath().right( item->relativePath().length() - 1 ) : item->relativePath(), TQCheckListItem::CheckBox ) { prjItem = item; m_config = config; } -InsideCheckListItem::InsideCheckListItem( TQListView *parent, TQListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : - TQCheckListItem( parent, +InsideCheckListItem::InsideCheckListItem( TQListView *tqparent, TQListViewItem *after, TQMakeScopeItem *item, ProjectConfigurationDlg *config ) : + TQCheckListItem( tqparent, after, item->relativePath(), TQCheckListItem::CheckBox ) { @@ -84,8 +84,8 @@ void InsideCheckListItem::stateChange( bool state ) } } -CustomVarListItem::CustomVarListItem(TQListView* parent, unsigned int id, TQMap<TQString, TQString> var) - : KListViewItem(parent), m_key(id) +CustomVarListItem::CustomVarListItem(TQListView* tqparent, unsigned int id, TQMap<TQString, TQString> var) + : KListViewItem(tqparent), m_key(id) { setText(0, var["var"]); setText(1, var["op"]); @@ -99,18 +99,18 @@ TQString CustomVarListItem::key(int column, bool ascending) const return KListViewItem::key(column, ascending); } -ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* parent, const char* name, bool modal, WFlags fl ) - : ProjectConfigurationDlgBase( parent, name, modal, fl | Qt::WStyle_Tool ), myProjectItem(0) +ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) + : ProjectConfigurationDlgBase( tqparent, name, modal, fl | TQt::WStyle_Tool ), myProjectItem(0) { prjList = _prjList; prjWidget = _prjWidget; // m_projectConfiguration = conf; m_targetLibraryVersion->setValidator( new TQRegExpValidator( - TQRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), this ) ); + TQRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), TQT_TQOBJECT(this) ) ); customVariables->setSortColumn(0); - customVariables->setSortOrder(Qt::Ascending); - mocdir_url->completionObject()->setMode(KURLCompletion::DirCompletion); - mocdir_url->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); + customVariables->setSortOrder(TQt::Ascending); + tqmocdir_url->completionObject()->setMode(KURLCompletion::DirCompletion); + tqmocdir_url->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); objdir_url->completionObject()->setMode(KURLCompletion::DirCompletion); objdir_url->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); rccdir_url->completionObject()->setMode(KURLCompletion::DirCompletion); @@ -123,7 +123,7 @@ ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollPro m_targetPath->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); } -void ProjectConfigurationDlg::updateSubproject( QMakeScopeItem* _item ) +void ProjectConfigurationDlg::updateSubproject( TQMakeScopeItem* _item ) { if ( myProjectItem && myProjectItem->scope ) { @@ -158,21 +158,21 @@ void ProjectConfigurationDlg::updateProjectConfiguration() { if ( radioApplication->isChecked() ) { - if( myProjectItem->scope->variableValues("TEMPLATE").findIndex("app") == -1 ) + if( myProjectItem->scope->variableValues("TEMPLATE").tqfindIndex("app") == -1 ) { addAppDeps(); removeSharedLibDeps(); removeStaticLibDeps(); } myProjectItem->scope->setEqualOp( "TEMPLATE", "app" ); - if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 ) + if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 ) myProjectItem->scope->removeFromPlusOp( "CONFIG", "staticlib" ); - if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) + if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 ) myProjectItem->scope->removeFromPlusOp( "CONFIG", "dll" ); myProjectItem->setPixmap( 0, SmallIcon( "qmake_app" ) ); TQString targetname = prjWidget->getCurrentOutputFilename(); - if( targetname.findRev("/") != -1 ) - targetname = targetname.right( targetname.length() - targetname.findRev("/") - 1 ); + if( targetname.tqfindRev("/") != -1 ) + targetname = targetname.right( targetname.length() - targetname.tqfindRev("/") - 1 ); DomUtil::writeEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/runarguments/"+targetname, m_editRunArguments->text() ); DomUtil::writeEntry( *prjWidget->m_part->projectDom(), @@ -186,7 +186,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() myProjectItem->scope->setEqualOp( "TEMPLATE", "lib" ); if ( staticRadio->isOn() ) { - if( myProjectItem->scope->variableValues("CONFIG").findIndex("dll") != -1 ) + if( myProjectItem->scope->variableValues("CONFIG").tqfindIndex("dll") != -1 ) { addStaticLibDeps(); removeSharedLibDeps(); @@ -203,14 +203,14 @@ void ProjectConfigurationDlg::updateProjectConfiguration() if ( sharedRadio->isOn() ) { kdDebug(9024) << "Activating debug lib:" << myProjectItem->scope->variableValues("CONFIG") << endl; - if( myProjectItem->scope->variableValues("CONFIG").findIndex("dll") == -1 ) + if( myProjectItem->scope->variableValues("CONFIG").tqfindIndex("dll") == -1 ) { addSharedLibDeps(); removeStaticLibDeps(); } myProjectItem->addValue( "CONFIG", "dll" ); myProjectItem->scope->setEqualOp( "VERSION", m_targetLibraryVersion->text() ); - if ( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 ) + if ( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 ) myProjectItem->removeValue( "CONFIG", "staticlib" ); } if ( checkPlugin->isOn() ) @@ -227,15 +227,15 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } else if ( radioSubdirs->isChecked() ) { - if( myProjectItem->scope->variableValues("TEMPLATE").findIndex("subdirs") == -1 ) + if( myProjectItem->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") == -1 ) { removeSharedLibDeps(); removeStaticLibDeps(); removeAppDeps(); } - if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) + if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 ) myProjectItem->scope->removeFromPlusOp( "CONFIG", "dll" ); - if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 ) + if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 ) myProjectItem->scope->removeFromPlusOp( "CONFIG", "staticlib" ); myProjectItem->scope->setEqualOp( "TEMPLATE", "subdirs" ); myProjectItem->setPixmap( 0, SmallIcon( "folder" ) ); @@ -243,8 +243,8 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } // Buildmode - int releaseidx = myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "release" ); - int debugidx = myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "debug" ); + int releaseidx = myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "release" ); + int debugidx = myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "debug" ); if ( radioReleaseMode->isChecked() ) { if( releaseidx != -1 && releaseidx < debugidx ) @@ -327,8 +327,8 @@ void ProjectConfigurationDlg::updateProjectConfiguration() else myProjectItem->removeValue( "CONFIG", "windows" ); - //Qt4 libs - if ( prjWidget->m_part->isQt4Project() ) + //TQt4 libs + if ( prjWidget->m_part->isTQt4Project() ) { if ( checkDebugReleaseMode->isChecked() ) myProjectItem->addValue( "CONFIG", "debug_and_release" ); @@ -414,7 +414,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() TQStringList extraValues = TQStringList::split( " ", editConfigExtra->text() ); for ( TQStringList::iterator it = confValues.begin() ; it != confValues.end() ; ++it ) { - if ( Scope::KnownConfigValues.findIndex( *it ) == -1 && extraValues.findIndex( *it ) == -1 ) + if ( Scope::KnownConfigValues.tqfindIndex( *it ) == -1 && extraValues.tqfindIndex( *it ) == -1 ) { myProjectItem->scope->removeFromPlusOp( "CONFIG", *it ); } @@ -422,7 +422,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() for ( TQStringList::iterator it = extraValues.begin() ; it != extraValues.end() ; ++it ) { - if ( confValues.findIndex( *it ) == -1 ) + if ( confValues.tqfindIndex( *it ) == -1 ) myProjectItem->scope->addToPlusOp( "CONFIG", *it ); } @@ -431,9 +431,9 @@ void ProjectConfigurationDlg::updateProjectConfiguration() // targetpath = URLUtil::getRelativePath( myProjectItem->scope->projectDir(), targetpath ); if( myProjectItem->scope->scopeType() == Scope::FunctionScope || myProjectItem->scope->scopeType() == Scope::SimpleScope ) { - if( myProjectItem->scope->variableValues("TARGET").findIndex( m_targetOutputFile->text() ) == -1 ) + if( myProjectItem->scope->variableValues("TARGET").tqfindIndex( m_targetOutputFile->text() ) == -1 ) myProjectItem->scope->setEqualOp( "TARGET", TQStringList( m_targetOutputFile->text() ) ); - if( myProjectItem->scope->variableValues("DESTDIR").findIndex( targetpath ) == -1 ) + if( myProjectItem->scope->variableValues("DESTDIR").tqfindIndex( targetpath ) == -1 ) myProjectItem->scope->setEqualOp( "DESTDIR", TQStringList( targetpath ) ); }else { @@ -442,8 +442,8 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } myProjectItem->updateValues( "DEFINES", TQStringList::split( " ", m_defines->text() ) ); - myProjectItem->updateValues( "QMAKE_CXXFLAGS_DEBUG", TQStringList::split( " ", m_debugFlags->text() ) ); - myProjectItem->updateValues( "QMAKE_CXXFLAGS_RELEASE", TQStringList::split( " ", m_releaseFlags->text() ) ); + myProjectItem->updateValues( "TQMAKE_CXXFLAGS_DEBUG", TQStringList::split( " ", m_debugFlags->text() ) ); + myProjectItem->updateValues( "TQMAKE_CXXFLAGS_RELEASE", TQStringList::split( " ", m_releaseFlags->text() ) ); //add selected includes TQStringList values; @@ -497,7 +497,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() { TQString tmpLib = insideItem->prjItem->getLibAddObject( myProjectItem->scope->projectDir() ); - if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) + if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 ) { //add path if shared lib is linked TQString tmpPath = insideItem->prjItem->getLibAddPath( @@ -550,14 +550,14 @@ void ProjectConfigurationDlg::updateProjectConfiguration() { if ( insideItem->isOn() ) { - if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 - || ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex("dll") == -1 - && insideItem->prjItem->scope->variableValues( "TEMPLATE" ).findIndex("lib") != -1 ) ) + if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 + || ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex("dll") == -1 + && insideItem->prjItem->scope->variableValues( "TEMPLATE" ).tqfindIndex("lib") != -1 ) ) { values << insideItem->prjItem->getLibAddObject( myProjectItem->scope->projectDir() ); } - else if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) + else if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 ) { values << insideItem->prjItem->getSharedLibAddObject( myProjectItem->scope->projectDir() ); @@ -576,7 +576,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() values.clear(); //change build order lvItem = buildorder_listview->firstChild(); - if ( lvItem && lvItem->itemBelow() && myProjectItem->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) + if ( lvItem && lvItem->itemBelow() && myProjectItem->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 ) { while ( lvItem ) @@ -603,7 +603,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() // intermediate locations myProjectItem->scope->setEqualOp( "OBJECTS_DIR", TQStringList( objdir_url->url() ) ); myProjectItem->scope->setEqualOp( "UI_DIR", TQStringList( uidir_url->url() ) ); - myProjectItem->scope->setEqualOp( "MOC_DIR", TQStringList( mocdir_url->url() ) ); + myProjectItem->scope->setEqualOp( "TQMOC_DIR", TQStringList( tqmocdir_url->url() ) ); myProjectItem->scope->setEqualOp( "RCC_DIR", TQStringList( rccdir_url->url() ) ); //CORBA @@ -648,14 +648,14 @@ void ProjectConfigurationDlg::updateControls() TQStringList templateValues = myProjectItem->scope->variableValues( "TEMPLATE" ); //if( !myProjectItem->isScope ) //{ - if ( templateValues.findIndex( "lib" ) != -1 ) + if ( templateValues.tqfindIndex( "lib" ) != -1 ) { groupLibraries->setEnabled( true ); radioLibrary->setChecked( true ); staticRadio->setChecked( true ); //default - if ( configValues.findIndex( "staticlib" ) != -1 ) + if ( configValues.tqfindIndex( "staticlib" ) != -1 ) { staticRadio->setChecked( true ); checkPlugin->setEnabled( false ); @@ -663,11 +663,11 @@ void ProjectConfigurationDlg::updateControls() } else staticRadio->setChecked( false ); - if ( configValues.findIndex( "dll" ) != -1 ) + if ( configValues.tqfindIndex( "dll" ) != -1 ) { sharedRadio->setChecked( true ); checkPlugin->setEnabled( true ); - if( prjWidget->m_part->isQt4Project() ) + if( prjWidget->m_part->isTQt4Project() ) checkDesigner->setEnabled( true ); m_targetLibraryVersion->setText( myProjectItem->scope->variableValues( "VERSION" ).front() ); } @@ -684,33 +684,33 @@ void ProjectConfigurationDlg::updateControls() checkDesigner->setEnabled( false ); } - if ( configValues.findIndex( "plugin" ) != -1 ) + if ( configValues.tqfindIndex( "plugin" ) != -1 ) checkPlugin->setChecked( true ); else checkPlugin->setChecked( false ); - if ( configValues.findIndex( "designer" ) != -1 ) + if ( configValues.tqfindIndex( "designer" ) != -1 ) checkDesigner->setChecked( true ); else checkDesigner->setChecked( false ); - if ( configValues.findIndex( "compile_libtool" ) != -1 ) + if ( configValues.tqfindIndex( "compile_libtool" ) != -1 ) checkLibtool->setChecked( true ); else checkLibtool->setChecked( false ); } - else if ( templateValues.findIndex( "subdirs" ) != -1 ) + else if ( templateValues.tqfindIndex( "subdirs" ) != -1 ) { radioSubdirs->setChecked( true ); }else { //Default is app mode radioApplication->setChecked( true ); - if ( configValues.findIndex( "console" ) != -1 ) + if ( configValues.tqfindIndex( "console" ) != -1 ) { checkConsole->setChecked( true ); } TQString targetname = prjWidget->getCurrentOutputFilename(); - if( targetname.findRev("/") != -1 ) - targetname = targetname.right( targetname.length() - targetname.findRev("/") - 1 ); + if( targetname.tqfindRev("/") != -1 ) + targetname = targetname.right( targetname.length() - targetname.tqfindRev("/") - 1 ); m_editRunArguments->setText( DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/runarguments/"+targetname, "" ) ); TQString dir = DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/cwd/"+targetname, "" ); @@ -731,15 +731,15 @@ void ProjectConfigurationDlg::updateControls() TQString destdir = myProjectItem->m_widget->getCurrentDestDir(); if( !destdir.startsWith( "/" ) ) destdir = myProjectItem->m_widget->projectDirectory()+"/"+destdir; - m_CWDEdit->setURL( destdir.left( destdir.findRev("/") ) ); - m_CWDEdit->fileDialog()->setURL( KURL::fromPathOrURL( destdir.left( destdir.findRev("/") ) ) ); + m_CWDEdit->setURL( destdir.left( destdir.tqfindRev("/") ) ); + m_CWDEdit->fileDialog()->setURL( KURL::fromPathOrURL( destdir.left( destdir.tqfindRev("/") ) ) ); } m_editDebugArguments->setText( DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/debugarguments/"+targetname, "" ) ); } // Buildmode - int debugidx = configValues.findIndex( "debug" ); - int releaseidx = configValues.findIndex( "release" ); + int debugidx = configValues.tqfindIndex( "debug" ); + int releaseidx = configValues.tqfindIndex( "release" ); if ( debugidx != -1 && debugidx > releaseidx ) { radioDebugMode->setChecked( true ); @@ -748,138 +748,138 @@ void ProjectConfigurationDlg::updateControls() { radioReleaseMode->setChecked( true ); } - if ( configValues.findIndex( "debug_and_release" ) != -1 ) + if ( configValues.tqfindIndex( "debug_and_release" ) != -1 ) { checkDebugReleaseMode->setChecked( true ); } // Requirements - if ( configValues.findIndex( "qt" ) != -1 ) + if ( configValues.tqfindIndex( "qt" ) != -1 ) checkQt->setChecked( true ); else checkQt->setChecked( false ); - if ( configValues.findIndex( "opengl" ) != -1 ) + if ( configValues.tqfindIndex( "opengl" ) != -1 ) checkOpenGL->setChecked( true ); else checkOpenGL->setChecked( false ); - if ( configValues.findIndex( "thread" ) != -1 ) + if ( configValues.tqfindIndex( "thread" ) != -1 ) checkThread->setChecked( true ); else checkThread->setChecked( false ); - if ( configValues.findIndex( "x11" ) != -1 ) + if ( configValues.tqfindIndex( "x11" ) != -1 ) checkX11->setChecked( true ); else checkX11->setChecked( false ); - if ( configValues.findIndex( "ordered" ) != -1 ) + if ( configValues.tqfindIndex( "ordered" ) != -1 ) checkOrdered->setChecked( true ); else checkOrdered->setChecked( false ); - if ( configValues.findIndex( "exceptions" ) != -1 ) + if ( configValues.tqfindIndex( "exceptions" ) != -1 ) exceptionCheck->setChecked( true ); else exceptionCheck->setChecked( false ); - if ( configValues.findIndex( "stl" ) != -1 ) + if ( configValues.tqfindIndex( "stl" ) != -1 ) stlCheck->setChecked( true ); else stlCheck->setChecked( false ); - if ( configValues.findIndex( "rtti" ) != -1 ) + if ( configValues.tqfindIndex( "rtti" ) != -1 ) rttiCheck->setChecked( true ); else rttiCheck->setChecked( false ); - if ( configValues.findIndex( "precompile_header" ) != -1 ) + if ( configValues.tqfindIndex( "precompile_header" ) != -1 ) checkPCH->setChecked( true ); else checkPCH->setChecked( false ); // Warnings - if ( configValues.findIndex( "warn_on" ) != -1 ) + if ( configValues.tqfindIndex( "warn_on" ) != -1 ) { checkWarning->setChecked( true ); } - if ( configValues.findIndex( "warn_off" ) != -1 ) + if ( configValues.tqfindIndex( "warn_off" ) != -1 ) { checkWarning->setChecked( false ); } - if ( configValues.findIndex( "windows" ) != -1 ) + if ( configValues.tqfindIndex( "windows" ) != -1 ) checkWindows->setChecked( true ); else checkWindows->setChecked( false ); - //Qt4 libs - if ( prjWidget->m_part->isQt4Project() ) + //TQt4 libs + if ( prjWidget->m_part->isTQt4Project() ) { - if ( configValues.findIndex( "assistant" ) != -1 ) + if ( configValues.tqfindIndex( "assistant" ) != -1 ) checkAssistant->setChecked( true ); else checkAssistant->setChecked( false ); - if ( configValues.findIndex( "qtestlib" ) != -1 ) + if ( configValues.tqfindIndex( "qtestlib" ) != -1 ) checkTestlib->setChecked( true ); else checkTestlib->setChecked( false ); - if ( configValues.findIndex( "uitools" ) != -1 ) + if ( configValues.tqfindIndex( "uitools" ) != -1 ) checkUiTools->setChecked( true ); else checkUiTools->setChecked( false ); - if ( configValues.findIndex( "dbus" ) != -1 ) + if ( configValues.tqfindIndex( "dbus" ) != -1 ) checkQDBus->setChecked( true ); else checkQDBus->setChecked( false ); - if ( configValues.findIndex( "build_all" ) != -1 ) + if ( configValues.tqfindIndex( "build_all" ) != -1 ) checkBuildAll->setChecked( true ); else checkBuildAll->setChecked( false ); - if ( configValues.findIndex( "help" ) != -1 ) + if ( configValues.tqfindIndex( "help" ) != -1 ) checkQtHelp->setChecked( true ); else checkQtHelp->setChecked( false ); TQStringList qtLibs = myProjectItem->scope->variableValues( "QT" ); - if ( qtLibs.findIndex( "core" ) != -1 ) + if ( qtLibs.tqfindIndex( "core" ) != -1 ) checkQt4Core->setChecked( true ); else checkQt4Core->setChecked( false ); - if ( qtLibs.findIndex( "gui" ) != -1 ) + if ( qtLibs.tqfindIndex( "gui" ) != -1 ) checkQt4Gui->setChecked( true ); else checkQt4Gui->setChecked( false ); - if ( qtLibs.findIndex( "sql" ) != -1 ) + if ( qtLibs.tqfindIndex( "sql" ) != -1 ) checkQt4SQL->setChecked( true ); else checkQt4SQL->setChecked( false ); - if ( qtLibs.findIndex( "xml" ) != -1 ) + if ( qtLibs.tqfindIndex( "xml" ) != -1 ) checkQt4XML->setChecked( true ); else checkQt4XML->setChecked( false ); - if ( qtLibs.findIndex( "network" ) != -1 ) + if ( qtLibs.tqfindIndex( "network" ) != -1 ) checkQt4Network->setChecked( true ); else checkQt4Network->setChecked( false ); - if ( qtLibs.findIndex( "svg" ) != -1 ) + if ( qtLibs.tqfindIndex( "svg" ) != -1 ) checkQt4SVG->setChecked( true ); else checkQt4SVG->setChecked( false ); - if ( qtLibs.findIndex( "opengl" ) != -1 ) + if ( qtLibs.tqfindIndex( "opengl" ) != -1 ) checkQt4OpenGL->setChecked( true ); else checkQt4OpenGL->setChecked( false ); - if ( qtLibs.findIndex( "qt3support" ) != -1 ) + if ( qtLibs.tqfindIndex( "qt3support" ) != -1 ) checkQt3Support->setChecked( true ); else checkQt3Support->setChecked( false ); - if ( qtLibs.findIndex( "script" ) != -1 ) + if ( qtLibs.tqfindIndex( "script" ) != -1 ) checkQtScript->setChecked( true ); else checkQtScript->setChecked( false ); - if ( qtLibs.findIndex( "phonon" ) != -1 ) + if ( qtLibs.tqfindIndex( "phonon" ) != -1 ) checkPhonon->setChecked( true ); else checkPhonon->setChecked( false ); - if ( qtLibs.findIndex( "webkit" ) != -1 ) + if ( qtLibs.tqfindIndex( "webkit" ) != -1 ) checkQtWebKit->setChecked( true ); else checkQtWebKit->setChecked( false ); - if ( qtLibs.findIndex( "xmlpatterns" ) != -1 ) + if ( qtLibs.tqfindIndex( "xmlpatterns" ) != -1 ) checkQtXmlPatterns->setChecked( true ); else checkQtXmlPatterns->setChecked( false ); @@ -895,7 +895,7 @@ void ProjectConfigurationDlg::updateControls() TQStringList extraValues; for ( TQStringList::const_iterator it = configValues.begin() ; it != configValues.end() ; ++it ) { - if ( Scope::KnownConfigValues.findIndex( *it ) == -1 ) + if ( Scope::KnownConfigValues.tqfindIndex( *it ) == -1 ) { extraValues << *it; } @@ -914,7 +914,7 @@ void ProjectConfigurationDlg::updateControls() } makefile_url->setURL( dir ); - if ( myProjectItem->scope->variableValues( "INSTALLS" ).findIndex( "target" ) != -1 ) + if ( myProjectItem->scope->variableValues( "INSTALLS" ).tqfindIndex( "target" ) != -1 ) { checkInstallTarget->setChecked( true ); m_InstallTargetPath->setEnabled( true ); @@ -941,8 +941,8 @@ void ProjectConfigurationDlg::updateControls() m_targetPath->setURL( dir ); m_defines->setText( myProjectItem->scope->variableValues( "DEFINES" ).join( " " ) ); - m_debugFlags->setText( myProjectItem->scope->variableValues( "QMAKE_CXXFLAGS_DEBUG" ).join( " " ) ); - m_releaseFlags->setText( myProjectItem->scope->variableValues( "QMAKE_CXXFLAGS_RELEASE" ).join( " " ) ); + m_debugFlags->setText( myProjectItem->scope->variableValues( "TQMAKE_CXXFLAGS_DEBUG" ).join( " " ) ); + m_releaseFlags->setText( myProjectItem->scope->variableValues( "TQMAKE_CXXFLAGS_RELEASE" ).join( " " ) ); updateIncludeControl(); updateLibControls(); @@ -971,17 +971,17 @@ void ProjectConfigurationDlg::updateControls() uidir_url->fileDialog()->setURL( KURL( dir ) ); } uidir_url->setURL( dir ); - dir = myProjectItem->scope->variableValues( "MOC_DIR" ).front(); + dir = myProjectItem->scope->variableValues( "TQMOC_DIR" ).front(); if( TQFileInfo(dir).isRelative() ) { - mocdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); - mocdir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); + tqmocdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); + tqmocdir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); }else { - mocdir_url->completionObject()->setDir( dir ); - mocdir_url->fileDialog()->setURL( KURL( dir ) ); + tqmocdir_url->completionObject()->setDir( dir ); + tqmocdir_url->fileDialog()->setURL( KURL( dir ) ); } - mocdir_url->setURL( dir ); + tqmocdir_url->setURL( dir ); dir = myProjectItem->scope->variableValues( "RC_DIR" ).front(); if( TQFileInfo(dir).isRelative() ) { @@ -1023,10 +1023,10 @@ void ProjectConfigurationDlg::updateControls() groupTemplateChanged(0); } -TQPtrList<QMakeScopeItem> ProjectConfigurationDlg::getAllProjects() +TQPtrList<TQMakeScopeItem> ProjectConfigurationDlg::getAllProjects() { - TQPtrList <QMakeScopeItem> tmpPrjList; - QMakeScopeItem *item = static_cast<QMakeScopeItem*>( prjList->firstChild() ); + TQPtrList <TQMakeScopeItem> tmpPrjList; + TQMakeScopeItem *item = static_cast<TQMakeScopeItem*>( prjList->firstChild() ); while ( item ) { if ( item->scope->scopeType() == Scope::ProjectScope ) @@ -1035,15 +1035,15 @@ TQPtrList<QMakeScopeItem> ProjectConfigurationDlg::getAllProjects() tmpPrjList.append( item ); getAllSubProjects( item, &tmpPrjList ); } - item = static_cast<QMakeScopeItem*>( item->nextSibling() ); + item = static_cast<TQMakeScopeItem*>( item->nextSibling() ); } return ( tmpPrjList ); } -void ProjectConfigurationDlg::getAllSubProjects( QMakeScopeItem *item, TQPtrList <QMakeScopeItem> *itemList ) +void ProjectConfigurationDlg::getAllSubProjects( TQMakeScopeItem *item, TQPtrList <TQMakeScopeItem> *itemList ) { - QMakeScopeItem * subItem = static_cast<QMakeScopeItem*>( item->firstChild() ); + TQMakeScopeItem * subItem = static_cast<TQMakeScopeItem*>( item->firstChild() ); while ( subItem ) { if ( subItem->scope->scopeType() == Scope::ProjectScope ) @@ -1052,7 +1052,7 @@ void ProjectConfigurationDlg::getAllSubProjects( QMakeScopeItem *item, TQPtrList itemList->append( subItem ); getAllSubProjects( subItem, itemList ); } - subItem = static_cast<QMakeScopeItem*>( subItem->nextSibling() ); + subItem = static_cast<TQMakeScopeItem*>( subItem->nextSibling() ); } } @@ -1066,12 +1066,12 @@ void ProjectConfigurationDlg::updateIncludeControl() TQStringList incList = myProjectItem->scope->variableValues( "INCLUDEPATH" ); TQStringList intIncList = incList; TQMap<TQString, InsideCheckListItem*> items; - TQPtrList <QMakeScopeItem> itemList = getAllProjects(); - QMakeScopeItem *item = itemList.first(); + TQPtrList <TQMakeScopeItem> itemList = getAllProjects(); + TQMakeScopeItem *item = itemList.first(); while ( item ) { - if ( item->scope->variableValues( "TEMPLATE" ).findIndex( "lib" ) != -1 || - item->scope->variableValues( "TEMPLATE" ).findIndex( "app" ) != -1 ) + if ( item->scope->variableValues( "TEMPLATE" ).tqfindIndex( "lib" ) != -1 || + item->scope->variableValues( "TEMPLATE" ).tqfindIndex( "app" ) != -1 ) { TQString tmpInc = item->getIncAddPath( myProjectItem->scope->projectDir() ); tmpInc = TQDir::cleanDirPath( tmpInc ); @@ -1079,7 +1079,7 @@ void ProjectConfigurationDlg::updateIncludeControl() insideinc_listview->lastItem(), item, this ); items[tmpInc] = newItem; - if ( incList.findIndex( tmpInc ) != -1 ) + if ( incList.tqfindIndex( tmpInc ) != -1 ) { incList.remove( tmpInc ); newItem->setOn( true ); @@ -1112,7 +1112,7 @@ void ProjectConfigurationDlg::updateIncludeControl() void ProjectConfigurationDlg::updateLibControls() { - TQPtrList <QMakeScopeItem> itemList = getAllProjects(); + TQPtrList <TQMakeScopeItem> itemList = getAllProjects(); insidelib_listview->setSorting( -1, false ); outsidelib_listview->setSorting( -1, false ); @@ -1125,10 +1125,10 @@ void ProjectConfigurationDlg::updateLibControls() TQStringList libList = myProjectItem->scope->variableValues( "LIBS" ); TQStringList intLibList = libList; TQMap<TQString, InsideCheckListItem*> items; - QMakeScopeItem* item = itemList.first(); + TQMakeScopeItem* item = itemList.first(); while ( item ) { - if ( item->scope->variableValues( "TEMPLATE" ).findIndex( "lib" ) != -1 ) + if ( item->scope->variableValues( "TEMPLATE" ).tqfindIndex( "lib" ) != -1 ) { if ( item != myProjectItem ) { @@ -1141,11 +1141,11 @@ void ProjectConfigurationDlg::updateLibControls() items[tmpLib] = newItem; TQString tmpLibDir = item->getLibAddPath( myProjectItem->scope->projectDir() ); kdDebug(9024) << "lib:" << tmpLib << " dir:" << tmpLibDir << "|" << libList << endl; - if ( libList.findIndex( "-L" + tmpLibDir ) != -1 ) + if ( libList.tqfindIndex( "-L" + tmpLibDir ) != -1 ) { libList.remove( "-L" + tmpLibDir ); } - if ( libList.findIndex( tmpLib ) != -1 ) + if ( libList.tqfindIndex( tmpLib ) != -1 ) { libList.remove( tmpLib ); newItem->setOn( true ); @@ -1185,7 +1185,7 @@ void ProjectConfigurationDlg::updateLibControls() void ProjectConfigurationDlg::updateDependenciesControl( ) { - TQPtrList <QMakeScopeItem> itemList = getAllProjects(); + TQPtrList <TQMakeScopeItem> itemList = getAllProjects(); intDeps_view->setSorting( -1, false ); extDeps_view->setSorting( -1, false ); @@ -1195,24 +1195,24 @@ void ProjectConfigurationDlg::updateDependenciesControl( ) TQStringList depsList = myProjectItem->scope->variableValues( "TARGETDEPS" ); TQStringList intDepList = depsList; TQMap<TQString,InsideCheckListItem*> items; - QMakeScopeItem *item = itemList.first(); + TQMakeScopeItem *item = itemList.first(); while ( item ) { TQStringList templateval = item->scope->variableValues( "TEMPLATE" ); - if ( templateval.findIndex( "lib" ) != -1 - || templateval.findIndex( "app" ) != -1 ) + if ( templateval.tqfindIndex( "lib" ) != -1 + || templateval.tqfindIndex( "app" ) != -1 ) { TQString tmpLib; TQStringList values = item->scope->variableValues( "CONFIG" ); - if ( templateval.findIndex( "lib" ) != -1 && values.findIndex( "dll" ) != -1 ) + if ( templateval.tqfindIndex( "lib" ) != -1 && values.tqfindIndex( "dll" ) != -1 ) tmpLib = item->getSharedLibAddObject( myProjectItem->scope->projectDir() ); - else if ( templateval.findIndex( "lib" ) != -1 ) + else if ( templateval.tqfindIndex( "lib" ) != -1 ) tmpLib = item->getLibAddObject( myProjectItem->scope->projectDir() ); else tmpLib = item->getApplicationObject( myProjectItem->scope->projectDir() ); InsideCheckListItem * newItem = new InsideCheckListItem( intDeps_view, intDeps_view->lastItem(), item, this ); items[tmpLib] = newItem; - if ( depsList.findIndex( tmpLib ) != -1 ) + if ( depsList.tqfindIndex( tmpLib ) != -1 ) { depsList.remove( tmpLib ); newItem->setOn( true ); @@ -1248,16 +1248,16 @@ void ProjectConfigurationDlg::updateDependenciesControl( ) void ProjectConfigurationDlg::updateBuildOrderControl() { //sort build order only if subdirs - if ( myProjectItem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) != -1 ) + if ( myProjectItem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) != -1 ) { - TQPtrList <QMakeScopeItem> itemList; + TQPtrList <TQMakeScopeItem> itemList; - QMakeScopeItem *item = static_cast<QMakeScopeItem*>( myProjectItem->firstChild() ); + TQMakeScopeItem *item = static_cast<TQMakeScopeItem*>( myProjectItem->firstChild() ); while ( item ) { itemList.append( item ); - item = static_cast<QMakeScopeItem*>( item->nextSibling() ); + item = static_cast<TQMakeScopeItem*>( item->nextSibling() ); } incaddTab->setEnabled( false ); @@ -1379,7 +1379,7 @@ void ProjectConfigurationDlg::outsideIncAddClicked() { KURLRequesterDlg dialog( "", i18n( "Add include directory:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - dialog.urlRequester() ->setURL( TQString::null ); + dialog.urlRequester() ->setURL( TQString() ); dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) ); if ( dialog.exec() != TQDialog::Accepted ) @@ -1463,7 +1463,7 @@ void ProjectConfigurationDlg::outsideLibAddClicked() KURLRequesterDlg dialog( "", i18n( "Add Library: Either choose the .a/.so file or give -l<libname>" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); dialog.urlRequester() ->setFilter( "*.so|"+i18n("Shared Library (*.so)")+"\n*.a|"+i18n("Static Library (*.a)") ); - dialog.urlRequester() ->setURL( TQString::null ); + dialog.urlRequester() ->setURL( TQString() ); dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) ); if ( dialog.exec() != TQDialog::Accepted ) @@ -1546,7 +1546,7 @@ void ProjectConfigurationDlg::outsideLibDirAddClicked() { KURLRequesterDlg dialog( "", i18n( "Add library directory:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - dialog.urlRequester() ->setURL( TQString::null ); + dialog.urlRequester() ->setURL( TQString() ); dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) ); if ( dialog.exec() != TQDialog::Accepted ) @@ -1686,7 +1686,7 @@ void ProjectConfigurationDlg::extAdd_button_clicked( ) { KURLRequesterDlg dialog( "", i18n( "Add target:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::LocalOnly ); - dialog.urlRequester() ->setURL( TQString::null ); + dialog.urlRequester() ->setURL( TQString() ); dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) ); if ( dialog.exec() != TQDialog::Accepted ) @@ -1882,7 +1882,7 @@ void ProjectConfigurationDlg::groupLibrariesChanged( int ) checkPlugin->setEnabled( true ); checkDesigner->setEnabled( checkPlugin->isChecked() ); } - else if ( checkPlugin->isChecked() && prjWidget->m_part->isQt4Project() ) + else if ( checkPlugin->isChecked() && prjWidget->m_part->isTQt4Project() ) { checkDesigner->setEnabled( true ); } @@ -1978,7 +1978,7 @@ void ProjectConfigurationDlg::groupTemplateChanged( int ) void ProjectConfigurationDlg::groupRequirementsChanged( int ) { - if ( checkQt->isChecked() && prjWidget->m_part->isQt4Project() ) + if ( checkQt->isChecked() && prjWidget->m_part->isTQt4Project() ) { groupQt4Libs->setEnabled( true ); } @@ -2036,17 +2036,17 @@ void ProjectConfigurationDlg::removeSharedLibDeps() TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { - QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); + TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("LIBS").findIndex(infos["shared_lib"]) != -1 ) + if( prjItem->scope->variableValues("LIBS").tqfindIndex(infos["shared_lib"]) != -1 ) prjItem->scope->removeFromPlusOp("LIBS", infos["shared_lib"]); - if( prjItem->scope->variableValues("LIBS").findIndex(infos["shared_libdir"]) != -1 ) + if( prjItem->scope->variableValues("LIBS").tqfindIndex(infos["shared_libdir"]) != -1 ) prjItem->scope->removeFromPlusOp("LIBS", infos["shared_libdir"]); - if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["shared_depend"]) != -1 ) { prjItem->scope->removeFromPlusOp("TARGETDEPS", infos["shared_depend"]); @@ -2060,14 +2060,14 @@ void ProjectConfigurationDlg::addStaticLibDeps() TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { - QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); + TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 - || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["app_depend"]) != -1 + || prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["shared_depend"]) != -1 ) { prjItem->scope->addToPlusOp("LIBS", infos["static_lib"]); prjItem->scope->addToPlusOp("TARGETDEPS", infos["static_depend"]); @@ -2081,16 +2081,16 @@ void ProjectConfigurationDlg::removeStaticLibDeps() TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { - QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); + TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("LIBS").findIndex(infos["static_lib"]) != -1 ) + if( prjItem->scope->variableValues("LIBS").tqfindIndex(infos["static_lib"]) != -1 ) prjItem->scope->removeFromPlusOp("LIBS", infos["static_lib"]); - if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["static_depend"]) != -1 ) { prjItem->scope->removeFromPlusOp("TARGETDEPS", infos["static_depend"]); prjItem->scope->saveToFile(); @@ -2103,13 +2103,13 @@ void ProjectConfigurationDlg::addSharedLibDeps() TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { - QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); + TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 - || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["app_depend"]) != -1 + || prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["static_depend"]) != -1 ) { prjItem->scope->addToPlusOp("LIBS", infos["shared_lib"]); prjItem->scope->addToPlusOp("LIBS", infos["shared_libdir"]); @@ -2124,13 +2124,13 @@ void ProjectConfigurationDlg::removeAppDeps() TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { - QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); + TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["app_depend"]) != -1 ) { prjItem->scope->removeFromPlusOp("TARGETDEPS", infos["app_depend"]); prjItem->scope->saveToFile(); @@ -2143,14 +2143,14 @@ void ProjectConfigurationDlg::addAppDeps() TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { - QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); + TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 - || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["shared_depend"]) != -1 + || prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["static_depend"]) != -1 ) { prjItem->scope->addToPlusOp("TARGETDEPS", infos["app_depend"]); @@ -2171,4 +2171,4 @@ void ProjectConfigurationDlg::customVarChanged() activateApply( 0 ); } -// 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/qmake/projectconfigurationdlg.h b/buildtools/qmake/projectconfigurationdlg.h index 313882c4..29c41b07 100644 --- a/buildtools/qmake/projectconfigurationdlg.h +++ b/buildtools/qmake/projectconfigurationdlg.h @@ -25,19 +25,19 @@ #include <klistview.h> #include <tqmap.h> -class QMakeScopeItem; +class TQMakeScopeItem; class KListViewItem; class qProjectItem; class ProjectConfigurationDlg; class TrollProjectWidget; -class InsideCheckListItem : public QCheckListItem +class InsideCheckListItem : public TQCheckListItem { public: - InsideCheckListItem( TQListView *parent, QMakeScopeItem *item, ProjectConfigurationDlg *config ); + InsideCheckListItem( TQListView *tqparent, TQMakeScopeItem *item, ProjectConfigurationDlg *config ); - InsideCheckListItem( TQListView *parent, TQListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ); - QMakeScopeItem *prjItem; + InsideCheckListItem( TQListView *tqparent, TQListViewItem *after, TQMakeScopeItem *item, ProjectConfigurationDlg *config ); + TQMakeScopeItem *prjItem; ProjectConfigurationDlg *m_config; protected: @@ -56,11 +56,11 @@ class CustomVarListItem : public KListViewItem class ProjectConfigurationDlg : public ProjectConfigurationDlgBase { public: - ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~ProjectConfigurationDlg(); void updateControls(); - void updateSubproject( QMakeScopeItem* _item ); - QMakeScopeItem* currentProjectItem() { return myProjectItem; } + void updateSubproject( TQMakeScopeItem* _item ); + TQMakeScopeItem* currentProjectItem() { return myProjectItem; } public slots: // virtual void radioLibrarytoggled(bool); @@ -126,10 +126,10 @@ public slots: protected: TQListView *prjList; - QMakeScopeItem *myProjectItem; - TQPtrList <QMakeScopeItem> getAllProjects(); + TQMakeScopeItem *myProjectItem; + TQPtrList <TQMakeScopeItem> getAllProjects(); TrollProjectWidget* prjWidget; - void getAllSubProjects( QMakeScopeItem *item, TQPtrList<QMakeScopeItem> *itemList ); + void getAllSubProjects( TQMakeScopeItem *item, TQPtrList<TQMakeScopeItem> *itemList ); private: void removeSharedLibDeps(); @@ -142,4 +142,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/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui index d447210d..0ce31c82 100644 --- a/buildtools/qmake/projectconfigurationdlgbase.ui +++ b/buildtools/qmake/projectconfigurationdlgbase.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ProjectConfigurationDlgBase</class> <author>Jakob Simon-Gaarde</author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ProjectConfigurationDlgBase</cstring> </property> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>260</width> <height>16</height> @@ -72,7 +72,7 @@ <string>&Apply</string> </property> </widget> - <widget class="QTabWidget" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQTabWidget" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>TabBuild</cstring> </property> @@ -82,7 +82,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>buildTab</cstring> </property> @@ -93,7 +93,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>groupTemplate</cstring> </property> @@ -104,7 +104,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>radioLibrary</cstring> </property> @@ -115,7 +115,7 @@ <string>Create a library</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>radioSubdirs</cstring> </property> @@ -126,7 +126,7 @@ <string>This project holds subdirectories</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>checkOrdered</cstring> </property> @@ -150,14 +150,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>101</width> <height>20</height> </size> </property> </spacer> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>radioApplication</cstring> </property> @@ -173,7 +173,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>targetGroupbox</cstring> </property> @@ -184,7 +184,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_2</cstring> </property> @@ -195,7 +195,7 @@ <cstring>m_targetPath</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -218,7 +218,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>targetInstGroupbox</cstring> </property> @@ -234,7 +234,7 @@ <cstring>m_InstallTargetPath</cstring> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>checkInstallTarget</cstring> </property> @@ -242,7 +242,7 @@ <string>I&nstall</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -255,7 +255,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -273,7 +273,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>argumentsGroupBox</cstring> </property> @@ -287,7 +287,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_6</cstring> </property> @@ -305,7 +305,7 @@ <cstring>m_editDebugArguments</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -313,7 +313,7 @@ <string>Debug Arguments:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2_2_2</cstring> </property> @@ -338,7 +338,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>120</height> @@ -347,7 +347,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>configTab</cstring> </property> @@ -358,7 +358,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>groupBuildMode</cstring> </property> @@ -375,15 +375,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout147</cstring> + <cstring>tqlayout147</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioDebugMode</cstring> </property> @@ -394,7 +394,7 @@ <string>Set project to be built in debug mode</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioReleaseMode</cstring> </property> @@ -405,7 +405,7 @@ <string>Set project to be built in release mode</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkDebugReleaseMode</cstring> </property> @@ -424,15 +424,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout30</cstring> + <cstring>tqlayout30</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkWarning</cstring> </property> @@ -443,7 +443,7 @@ <string>Show compiler warnings</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkBuildAll</cstring> </property> @@ -461,7 +461,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>groupRequirements</cstring> </property> @@ -472,7 +472,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>checkOpenGL</cstring> </property> @@ -483,7 +483,7 @@ <string>Requires the OpenGL (or Mesa) headers/libraries</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>stlCheck</cstring> </property> @@ -491,7 +491,7 @@ <string>STL</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>checkThread</cstring> </property> @@ -502,7 +502,7 @@ <string>Requires support for multi-threaded application or library.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>checkQt</cstring> </property> @@ -513,7 +513,7 @@ <string>Requires the Qt header files/library</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>checkX11</cstring> </property> @@ -524,7 +524,7 @@ <string>Support required for X11 application or library</string> </property> </widget> - <widget class="QCheckBox" row="2" column="2"> + <widget class="TQCheckBox" row="2" column="2"> <property name="name"> <cstring>checkPCH</cstring> </property> @@ -532,7 +532,7 @@ <string>Precompiled headers</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>rttiCheck</cstring> </property> @@ -540,7 +540,7 @@ <string>RTTI</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>checkWindows</cstring> </property> @@ -548,7 +548,7 @@ <string>Windows</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel1_4</cstring> </property> @@ -556,7 +556,7 @@ <string>Custom Configuration</string> </property> </widget> - <widget class="QCheckBox" row="0" column="2"> + <widget class="TQCheckBox" row="0" column="2"> <property name="name"> <cstring>exceptionCheck</cstring> </property> @@ -569,7 +569,7 @@ <cstring>editConfigExtra</cstring> </property> </widget> - <widget class="QCheckBox" row="1" column="2"> + <widget class="TQCheckBox" row="1" column="2"> <property name="name"> <cstring>checkConsole</cstring> </property> @@ -588,7 +588,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>groupQt4Libs</cstring> </property> @@ -602,7 +602,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>checkQt4Gui</cstring> </property> @@ -613,7 +613,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>checkQt4XML</cstring> </property> @@ -621,7 +621,7 @@ <string>XML</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>checkQt4Network</cstring> </property> @@ -629,7 +629,7 @@ <string>Network</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>checkQt4Core</cstring> </property> @@ -640,7 +640,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>checkQt4OpenGL</cstring> </property> @@ -648,7 +648,7 @@ <string>OpenGL</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>checkUiTools</cstring> </property> @@ -656,7 +656,7 @@ <string>QtUiTools</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>checkQt4SQL</cstring> </property> @@ -664,7 +664,7 @@ <string>SQL</string> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>checkQt4SVG</cstring> </property> @@ -672,7 +672,7 @@ <string>SVG</string> </property> </widget> - <widget class="QCheckBox" row="0" column="2"> + <widget class="TQCheckBox" row="0" column="2"> <property name="name"> <cstring>checkTestlib</cstring> </property> @@ -680,7 +680,7 @@ <string>QtTest</string> </property> </widget> - <widget class="QCheckBox" row="1" column="2"> + <widget class="TQCheckBox" row="1" column="2"> <property name="name"> <cstring>checkQt3Support</cstring> </property> @@ -688,7 +688,7 @@ <string>Qt3 Support</string> </property> </widget> - <widget class="QCheckBox" row="2" column="2"> + <widget class="TQCheckBox" row="2" column="2"> <property name="name"> <cstring>checkQDBus</cstring> </property> @@ -696,7 +696,7 @@ <string>QDBus (Qt4.2)</string> </property> </widget> - <widget class="QCheckBox" row="3" column="2"> + <widget class="TQCheckBox" row="3" column="2"> <property name="name"> <cstring>checkAssistant</cstring> </property> @@ -704,7 +704,7 @@ <string>QtAssistant</string> </property> </widget> - <widget class="QCheckBox" row="0" column="3"> + <widget class="TQCheckBox" row="0" column="3"> <property name="name"> <cstring>checkQtScript</cstring> </property> @@ -712,7 +712,7 @@ <string>QtScript (Qt4.3)</string> </property> </widget> - <widget class="QCheckBox" row="1" column="3"> + <widget class="TQCheckBox" row="1" column="3"> <property name="name"> <cstring>checkQtWebKit</cstring> </property> @@ -720,7 +720,7 @@ <string>QtWebKit (Qt4.4)</string> </property> </widget> - <widget class="QCheckBox" row="2" column="3"> + <widget class="TQCheckBox" row="2" column="3"> <property name="name"> <cstring>checkQtXmlPatterns</cstring> </property> @@ -728,7 +728,7 @@ <string>QtXmlPatterns (Qt4.4)</string> </property> </widget> - <widget class="QCheckBox" row="3" column="3"> + <widget class="TQCheckBox" row="3" column="3"> <property name="name"> <cstring>checkPhonon</cstring> </property> @@ -736,7 +736,7 @@ <string>Phonon (Qt4.4)</string> </property> </widget> - <widget class="QCheckBox" row="0" column="4"> + <widget class="TQCheckBox" row="0" column="4"> <property name="name"> <cstring>checkQtHelp</cstring> </property> @@ -746,7 +746,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>groupLibraries</cstring> </property> @@ -760,15 +760,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout69</cstring> + <cstring>tqlayout69</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>staticRadio</cstring> </property> @@ -779,7 +779,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkPlugin</cstring> </property> @@ -790,7 +790,7 @@ <string>Plugin</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkLibtool</cstring> </property> @@ -816,22 +816,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout68</cstring> + <cstring>tqlayout68</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>sharedRadio</cstring> </property> @@ -839,7 +839,7 @@ <string>Build as shared library</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkDesigner</cstring> </property> @@ -853,15 +853,15 @@ <string></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout67</cstring> + <cstring>tqlayout67</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -893,7 +893,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -902,7 +902,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>incaddTab</cstring> </property> @@ -913,7 +913,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -950,7 +950,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -959,7 +959,7 @@ </spacer> </vbox> </widget> - <widget class="QListView" row="3" column="0"> + <widget class="TQListView" row="3" column="0"> <column> <property name="text"> <string>Directories Outside Project</string> @@ -978,7 +978,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QListView" row="1" column="0"> + <widget class="TQListView" row="1" column="0"> <column> <property name="text"> <string>Directories Inside Project</string> @@ -997,9 +997,9 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> @@ -1055,7 +1055,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>70</height> @@ -1066,7 +1066,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>libAddTab</cstring> </property> @@ -1077,15 +1077,15 @@ <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>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>External Library Dirs</string> @@ -1104,9 +1104,9 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> @@ -1162,7 +1162,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>70</height> @@ -1173,15 +1173,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>External Libraries</string> @@ -1200,9 +1200,9 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> @@ -1258,7 +1258,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>64</height> @@ -1269,15 +1269,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Link Convenience Libraries Inside Project</string> @@ -1296,7 +1296,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9_3</cstring> </property> @@ -1330,7 +1330,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1343,7 +1343,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>depTab</cstring> </property> @@ -1354,15 +1354,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout26</cstring> + <cstring>tqlayout26</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Targets in Project</string> @@ -1381,7 +1381,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9_3_2</cstring> </property> @@ -1418,7 +1418,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1429,15 +1429,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout27</cstring> + <cstring>tqlayout27</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Miscellaneous Targets</string> @@ -1456,9 +1456,9 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9_2</cstring> + <cstring>tqlayout9_2</cstring> </property> <vbox> <property name="name"> @@ -1514,7 +1514,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>64</height> @@ -1525,15 +1525,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout28_2</cstring> + <cstring>tqlayout28_2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Order in Which Sub Projects Are Built</string> @@ -1552,7 +1552,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9_2</cstring> </property> @@ -1589,7 +1589,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1602,7 +1602,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>buildOptsTab</cstring> </property> @@ -1613,7 +1613,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -1632,23 +1632,23 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout26</cstring> + <cstring>tqlayout26</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout23</cstring> + <cstring>tqlayout23</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -1659,7 +1659,7 @@ <cstring>m_debugFlags</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_2_2</cstring> </property> @@ -1670,7 +1670,7 @@ <cstring>m_releaseFlags</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -1680,9 +1680,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <vbox> <property name="name"> @@ -1709,7 +1709,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox8</cstring> </property> @@ -1720,26 +1720,26 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout84</cstring> + <cstring>tqlayout84</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> - <cstring>mocdir_label</cstring> + <cstring>tqmocdir_label</cstring> </property> <property name="text"> - <string>MOC files:</string> + <string>TQMOC files:</string> </property> <property name="buddy" stdset="0"> - <cstring>mocdir_url</cstring> + <cstring>tqmocdir_url</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>uidir_label</cstring> </property> @@ -1750,7 +1750,7 @@ <cstring>uidir_url</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>objdir_label</cstring> </property> @@ -1761,7 +1761,7 @@ <cstring>objdir_url</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>rccdir_label</cstring> </property> @@ -1774,9 +1774,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout85</cstring> + <cstring>tqlayout85</cstring> </property> <vbox> <property name="name"> @@ -1784,7 +1784,7 @@ </property> <widget class="KURLRequester"> <property name="name"> - <cstring>mocdir_url</cstring> + <cstring>tqmocdir_url</cstring> </property> </widget> <widget class="KURLRequester"> @@ -1809,7 +1809,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>idlGroup</cstring> </property> @@ -1823,7 +1823,7 @@ <property name="margin"> <number>11</number> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2_3</cstring> </property> @@ -1844,7 +1844,7 @@ <cstring>idlCmdEdit</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_2_2</cstring> </property> @@ -1867,7 +1867,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -1876,7 +1876,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>custVarsTab</cstring> </property> @@ -1887,9 +1887,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <hbox> <property name="name"> @@ -1950,17 +1950,17 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout23</cstring> + <cstring>tqlayout23</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout22</cstring> + <cstring>tqlayout22</cstring> </property> <vbox> <property name="name"> @@ -2010,7 +2010,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>106</height> @@ -2021,15 +2021,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout33</cstring> + <cstring>tqlayout33</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -2060,15 +2060,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout32</cstring> + <cstring>tqlayout32</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5</cstring> </property> @@ -2130,7 +2130,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>250</width> <height>20</height> @@ -2139,15 +2139,15 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout34</cstring> + <cstring>tqlayout34</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -2162,7 +2162,7 @@ <property name="text"> <string>Value:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -2242,13 +2242,13 @@ <slot>activateApply(const QString&)</slot> </connection> <connection> - <sender>mocdir_url</sender> + <sender>tqmocdir_url</sender> <signal>textChanged(const QString&)</signal> <receiver>ProjectConfigurationDlgBase</receiver> <slot>activateApply(const QString&)</slot> </connection> <connection> - <sender>mocdir_url</sender> + <sender>tqmocdir_url</sender> <signal>urlSelected(const QString&)</signal> <receiver>ProjectConfigurationDlgBase</receiver> <slot>activateApply(const QString&)</slot> @@ -2333,39 +2333,39 @@ </connection> <connection> <sender>insideinc_listview</sender> - <signal>clicked(QListViewItem*)</signal> + <signal>clicked(TQListViewItem*)</signal> <receiver>ProjectConfigurationDlgBase</receiver> - <slot>activateApply(QListViewItem*)</slot> + <slot>activateApply(TQListViewItem*)</slot> </connection> <connection> <sender>insideinc_listview</sender> - <signal>spacePressed(QListViewItem*)</signal> + <signal>spacePressed(TQListViewItem*)</signal> <receiver>ProjectConfigurationDlgBase</receiver> - <slot>activateApply(QListViewItem*)</slot> + <slot>activateApply(TQListViewItem*)</slot> </connection> <connection> <sender>insidelib_listview</sender> - <signal>clicked(QListViewItem*)</signal> + <signal>clicked(TQListViewItem*)</signal> <receiver>ProjectConfigurationDlgBase</receiver> - <slot>activateApply(QListViewItem*)</slot> + <slot>activateApply(TQListViewItem*)</slot> </connection> <connection> <sender>insidelib_listview</sender> - <signal>spacePressed(QListViewItem*)</signal> + <signal>spacePressed(TQListViewItem*)</signal> <receiver>ProjectConfigurationDlgBase</receiver> - <slot>activateApply(QListViewItem*)</slot> + <slot>activateApply(TQListViewItem*)</slot> </connection> <connection> <sender>intDeps_view</sender> - <signal>clicked(QListViewItem*)</signal> + <signal>clicked(TQListViewItem*)</signal> <receiver>ProjectConfigurationDlgBase</receiver> - <slot>activateApply(QListViewItem*)</slot> + <slot>activateApply(TQListViewItem*)</slot> </connection> <connection> <sender>intDeps_view</sender> - <signal>spacePressed(QListViewItem*)</signal> + <signal>spacePressed(TQListViewItem*)</signal> <receiver>ProjectConfigurationDlgBase</receiver> - <slot>activateApply(QListViewItem*)</slot> + <slot>activateApply(TQListViewItem*)</slot> </connection> <connection> <sender>varAdd_button</sender> @@ -2768,7 +2768,7 @@ <tabstop>m_debugFlags</tabstop> <tabstop>m_releaseFlags</tabstop> <tabstop>m_defines</tabstop> - <tabstop>mocdir_url</tabstop> + <tabstop>tqmocdir_url</tabstop> <tabstop>uidir_url</tabstop> <tabstop>objdir_url</tabstop> <tabstop>rccdir_url</tabstop> @@ -2791,7 +2791,7 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include> </includes> -<slots> +<Q_SLOTS> <slot>updateProjectConfiguration()</slot> <slot>buildorderMoveUpClicked()</slot> <slot>buildorderMoveDownClicked()</slot> @@ -2833,11 +2833,11 @@ <slot>apply()</slot> <slot>activateApply( int )</slot> <slot>activateApply( const QString & )</slot> - <slot>activateApply( QListViewItem * )</slot> + <slot>activateApply( TQListViewItem * )</slot> <slot>customVarChanged()</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>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/buildtools/qmake/qmakedefaultopts.cpp b/buildtools/qmake/qmakedefaultopts.cpp index fa7711c9..304bd1e1 100644 --- a/buildtools/qmake/qmakedefaultopts.cpp +++ b/buildtools/qmake/qmakedefaultopts.cpp @@ -18,12 +18,12 @@ #include <blockingkprocess.h> -QMakeDefaultOpts::QMakeDefaultOpts() +TQMakeDefaultOpts::TQMakeDefaultOpts() { } -void QMakeDefaultOpts::readVariables( const TQString& qmake, const TQString& projdir ) +void TQMakeDefaultOpts::readVariables( const TQString& qmake, const TQString& projdir ) { KTempFile makefile (projdir+"/", ".mf"); KTempFile qmakefile(projdir+"/", ".pro"); @@ -71,21 +71,21 @@ void QMakeDefaultOpts::readVariables( const TQString& qmake, const TQString& pro } } -QMakeDefaultOpts::~QMakeDefaultOpts() +TQMakeDefaultOpts::~TQMakeDefaultOpts() { } -const TQStringList QMakeDefaultOpts::variableValues( const TQString& var ) const +const TQStringList TQMakeDefaultOpts::variableValues( const TQString& var ) const { // TQStringList result; - if ( m_variables.contains(var) ) + if ( m_variables.tqcontains(var) ) return m_variables[var]; return TQStringList(); } -const TQStringList& QMakeDefaultOpts::variables() const +const TQStringList& TQMakeDefaultOpts::variables() const { return m_keys; } -// 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/qmake/qmakedefaultopts.h b/buildtools/qmake/qmakedefaultopts.h index f95d5608..121e0cd0 100644 --- a/buildtools/qmake/qmakedefaultopts.h +++ b/buildtools/qmake/qmakedefaultopts.h @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#ifndef QMAKEDEFAULTOPTS_H -#define QMAKEDEFAULTOPTS_H +#ifndef TQMAKEDEFAULTOPTS_H +#define TQMAKEDEFAULTOPTS_H #include <tqmap.h> #include <tqstringlist.h> @@ -19,12 +19,12 @@ // class KTempFile; // class BlockingKProcess; -class QMakeDefaultOpts +class TQMakeDefaultOpts { public: - QMakeDefaultOpts( ); + TQMakeDefaultOpts( ); - ~QMakeDefaultOpts(); + ~TQMakeDefaultOpts(); void readVariables( const TQString& qtdir, const TQString& projdir ); @@ -46,4 +46,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/qmake/qmakeoptionswidget.cpp b/buildtools/qmake/qmakeoptionswidget.cpp index c2f4cfdd..920d2efd 100644 --- a/buildtools/qmake/qmakeoptionswidget.cpp +++ b/buildtools/qmake/qmakeoptionswidget.cpp @@ -20,8 +20,8 @@ #include <kdebug.h> QMakeOptionsWidget::QMakeOptionsWidget( const TQString& projectdir, TQDomDocument &dom, const TQString &configGroup, - TQWidget *parent, const char *name ) - : QMakeOptionsWidgetBase( parent, name ), + TQWidget *tqparent, const char *name ) + : QMakeOptionsWidgetBase( tqparent, name ), m_dom( dom ), m_configGroup( configGroup ), m_projectDir( projectdir ) { groupBehaviour->setButton( DomUtil::readIntEntry( dom, configGroup+"/qmake/savebehaviour", 2) ); @@ -60,4 +60,4 @@ void QMakeOptionsWidget::accept() #include "qmakeoptionswidget.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/qmake/qmakeoptionswidget.h b/buildtools/qmake/qmakeoptionswidget.h index ee50fde6..159547f8 100644 --- a/buildtools/qmake/qmakeoptionswidget.h +++ b/buildtools/qmake/qmakeoptionswidget.h @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#ifndef QMAKEOPTIONSWIDGET_H -#define QMAKEOPTIONSWIDGET_H +#ifndef TQMAKEOPTIONSWIDGET_H +#define TQMAKEOPTIONSWIDGET_H #include "qmakeoptionswidgetbase.h" @@ -19,9 +19,10 @@ class QMakeOptionsWidget : public QMakeOptionsWidgetBase { Q_OBJECT + TQ_OBJECT public: QMakeOptionsWidget( const TQString& projectdir, TQDomDocument &dom, const TQString &configGroup, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~QMakeOptionsWidget(); public slots: @@ -34,6 +35,6 @@ 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/qmake/qmakeoptionswidgetbase.ui b/buildtools/qmake/qmakeoptionswidgetbase.ui index 0ad833d1..0f3d52d1 100644 --- a/buildtools/qmake/qmakeoptionswidgetbase.ui +++ b/buildtools/qmake/qmakeoptionswidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>QMakeOptionsWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>QMakeOptionsWidgetBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -29,15 +29,15 @@ - For changes on this page to take effect the project needs to be reloaded.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -59,7 +59,7 @@ Leave this empty to automatically search for a .pro file in the project director </widget> </hbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>groupBehaviour</cstring> </property> @@ -73,18 +73,18 @@ Leave this empty to automatically search for a .pro file in the project director <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> <property name="text"> <string>The following settings determine what the project configuration dialog should do when another subproject is selected while the dialog is still open.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioAlwaysSave</cstring> </property> @@ -98,7 +98,7 @@ Leave this empty to automatically search for a .pro file in the project director <string>Always save the project configuration when selecting a another sub project.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioNeverSave</cstring> </property> @@ -112,7 +112,7 @@ Leave this empty to automatically search for a .pro file in the project director <string>Never save the project configuration when selecting a another sub project.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioAsk</cstring> </property> @@ -131,7 +131,7 @@ Leave this empty to automatically search for a .pro file in the project director </widget> </vbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkReplacePaths</cstring> </property> @@ -153,7 +153,7 @@ Leave this empty to automatically search for a .pro file in the project director <string>This replaces the relative paths of added files with existing custom variables if the value assigned to it is the same as the path.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>showVariablesInTree</cstring> </property> @@ -161,7 +161,7 @@ Leave this empty to automatically search for a .pro file in the project director <string>Show variables in filenames in the QMake projectmanager view.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkFilenamesOnly</cstring> </property> @@ -169,7 +169,7 @@ Leave this empty to automatically search for a .pro file in the project director <string>Display only filenames in the QMake Manager (Project reload is needed after changing this setting)</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkDisableDefaultOpts</cstring> </property> @@ -178,7 +178,7 @@ Leave this empty to automatically search for a .pro file in the project director This disables the reading of any .qmake.cache files or mkspecs.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkShowParseErrors</cstring> </property> @@ -199,7 +199,7 @@ This disables the reading of any .qmake.cache files or mkspecs.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> @@ -208,7 +208,7 @@ This disables the reading of any .qmake.cache files or mkspecs.</string> </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp index 73edf730..157b0894 100644 --- a/buildtools/qmake/qmakescopeitem.cpp +++ b/buildtools/qmake/qmakescopeitem.cpp @@ -2,7 +2,7 @@ * Copyright (C) 2006 by Andreas Pakulat * * apaku@gmx.de * * * -* Part of this file is taken from Qt Designer. * +* Part of this file is taken from TQt Designer. * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -28,13 +28,13 @@ * Class qProjectItem */ -qProjectItem::qProjectItem( Type type, TQListView *parent, const TQString &text ) - : TQListViewItem( parent, text ), typ( type ) +qProjectItem::qProjectItem( Type type, TQListView *tqparent, const TQString &text ) + : TQListViewItem( tqparent, text ), typ( type ) {} -qProjectItem::qProjectItem( Type type, qProjectItem *parent, const TQString &text ) - : TQListViewItem( parent, text ), typ( type ) +qProjectItem::qProjectItem( Type type, qProjectItem *tqparent, const TQString &text ) + : TQListViewItem( tqparent, text ), typ( type ) {} @@ -43,7 +43,7 @@ qProjectItem::qProjectItem( Type type, qProjectItem *parent, const TQString &tex * Class GroupItem */ -GroupItem::GroupItem( TQListView *lv, GroupType type, const TQString &text, QMakeScopeItem* spitem ) +GroupItem::GroupItem( TQListView *lv, GroupType type, const TQString &text, TQMakeScopeItem* spitem ) : qProjectItem( Group, lv, text ) { this->owner = spitem; @@ -302,24 +302,24 @@ FileItem::FileItem( TQListView *lv, const TQString &text ) /* - * Class QMakeScopeItem + * Class TQMakeScopeItem */ -QMakeScopeItem::QMakeScopeItem( TQListView *parent, const TQString &text, Scope* s, TrollProjectWidget* widget ) - : qProjectItem( Subproject, parent, text ), scope( s ), m_widget( widget ) +TQMakeScopeItem::TQMakeScopeItem( TQListView *tqparent, const TQString &text, Scope* s, TrollProjectWidget* widget ) + : qProjectItem( Subproject, tqparent, text ), scope( s ), m_widget( widget ) { - // configuration.m_template = QTMP_APPLICATION; + // configuration.m_template = TQTMP_APPLICATION; init(); } -QMakeScopeItem::QMakeScopeItem( QMakeScopeItem *parent, const TQString &text, Scope* s ) - : qProjectItem( Subproject, parent, text ), scope( s ), m_widget( parent->m_widget ) +TQMakeScopeItem::TQMakeScopeItem( TQMakeScopeItem *tqparent, const TQString &text, Scope* s ) + : qProjectItem( Subproject, tqparent, text ), scope( s ), m_widget( tqparent->m_widget ) { init(); } -QMakeScopeItem::~QMakeScopeItem() +TQMakeScopeItem::~TQMakeScopeItem() { TQMap<GroupItem::GroupType, GroupItem*>::iterator it; for ( it = groups.begin() ; it != groups.end() ; ++it ) @@ -331,35 +331,35 @@ QMakeScopeItem::~QMakeScopeItem() } -TQString QMakeScopeItem::relativePath() +TQString TQMakeScopeItem::relativePath() { - if( !scope || !scope->parent() ) + if( !scope || !scope->tqparent() ) return ""; if( scope->scopeType() == Scope::ProjectScope ) { - if( scope->parent() && scope->parent()->variableValues("SUBDIRS").contains( URLUtil::relativePathToFile( scope->parent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ) ) ) + if( scope->tqparent() && scope->tqparent()->variableValues("SUBDIRS").tqcontains( URLUtil::relativePathToFile( scope->tqparent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ) ) ) { - return URLUtil::relativePathToFile( scope->parent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ); + return URLUtil::relativePathToFile( scope->tqparent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ); }else { return URLUtil::getRelativePath( m_widget->projectDirectory(), scope->projectDir() ); } }else - return static_cast<QMakeScopeItem*>( parent() ) ->relativePath(); -// if( !scope->parent() ) + return static_cast<TQMakeScopeItem*>( tqparent() ) ->relativePath(); +// if( !scope->tqparent() ) // return ""; -// else if ( !scope->parent()->parent() || scope->scopeType() != Scope::ProjectScope ) +// else if ( !scope->tqparent()->tqparent() || scope->scopeType() != Scope::ProjectScope ) // return scope->scopeName(); // else if ( scope->scopeType() == Scope::ProjectScope ) -// return ( static_cast<QMakeScopeItem*>( parent() ) ->relativePath() +// return ( static_cast<TQMakeScopeItem*>( tqparent() ) ->relativePath() // + TQString( TQChar( TQDir::separator() ) ) + scope->scopeName() ); // else -// return ( static_cast<QMakeScopeItem*>( parent() ) ->relativePath() ); +// return ( static_cast<TQMakeScopeItem*>( tqparent() ) ->relativePath() ); } -TQString QMakeScopeItem::getSharedLibAddObject( TQString basePath ) +TQString TQMakeScopeItem::getSharedLibAddObject( TQString basePath ) { - if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) + if ( scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 ) { TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); if ( !scope->variableValues( "DESTDIR" ).front().isEmpty() ) @@ -392,7 +392,7 @@ TQString QMakeScopeItem::getSharedLibAddObject( TQString basePath ) return ""; } -TQString QMakeScopeItem::getApplicationObject( TQString basePath ) +TQString TQMakeScopeItem::getApplicationObject( TQString basePath ) { TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() ); @@ -419,9 +419,9 @@ TQString QMakeScopeItem::getApplicationObject( TQString basePath ) return tmpPath + TQString( TQChar( TQDir::separator() ) ) + target; } -TQString QMakeScopeItem::getLibAddObject( TQString basePath ) +TQString TQMakeScopeItem::getLibAddObject( TQString basePath ) { - if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) + if ( scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 ) { TQString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() ); if ( !target.isEmpty() ) @@ -433,8 +433,8 @@ TQString QMakeScopeItem::getLibAddObject( TQString basePath ) return ( "-l" + scope->projectName() ); } } - else if ( scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 - || scope->variableValues("TEMPLATE").findIndex("lib") != -1 ) + else if ( scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 + || scope->variableValues("TEMPLATE").tqfindIndex("lib") != -1 ) { TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() ); @@ -469,11 +469,11 @@ TQString QMakeScopeItem::getLibAddObject( TQString basePath ) return ( "" ); } -TQString QMakeScopeItem::getLibAddPath( TQString basePath ) +TQString TQMakeScopeItem::getLibAddPath( TQString basePath ) { //PATH only add if shared lib - if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) == -1 ) return ( "" ); + if ( scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) == -1 ) return ( "" ); TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() ); @@ -495,7 +495,7 @@ TQString QMakeScopeItem::getLibAddPath( TQString basePath ) } -TQString QMakeScopeItem::getIncAddPath( TQString basePath ) +TQString TQMakeScopeItem::getIncAddPath( TQString basePath ) { TQString tmpPath = URLUtil::getRelativePath( basePath, scope->projectDir() ); tmpPath = TQDir::cleanDirPath( tmpPath ); @@ -503,7 +503,7 @@ TQString QMakeScopeItem::getIncAddPath( TQString basePath ) return ( tmpPath ); } -void QMakeScopeItem::buildSubTree() +void TQMakeScopeItem::buildSubTree() { TQValueList<Scope*>::const_iterator it; @@ -514,14 +514,14 @@ void QMakeScopeItem::buildSubTree() for ( it = scopes.begin(); it != scopes.end(); ++it ) { if( (*it)->scopeType() != Scope::InvalidScope ) - new QMakeScopeItem( this, ( *it )->scopeName(), ( *it ) ); + new TQMakeScopeItem( this, ( *it )->scopeName(), ( *it ) ); else - kdDebug( 9024 ) << "No QMakeScopeItem created" << endl; + kdDebug( 9024 ) << "No TQMakeScopeItem created" << endl; } } -void QMakeScopeItem::init() +void TQMakeScopeItem::init() { if ( scope->scopeType() == Scope::SimpleScope ) { @@ -540,17 +540,17 @@ void QMakeScopeItem::init() TQStringList tmp = scope->variableValues( "TEMPLATE" ); if( scope->isEnabled() ) { - if ( tmp.findIndex( "subdirs" ) != -1 ) + if ( tmp.tqfindIndex( "subdirs" ) != -1 ) setPixmap( 0, SmallIcon( "folder" ) ); - else if ( tmp.findIndex( "lib" ) != -1 ) + else if ( tmp.tqfindIndex( "lib" ) != -1 ) setPixmap( 0, SmallIcon( "qmake_lib" ) ); else setPixmap( 0, SmallIcon( "qmake_app" ) ); }else { - if ( tmp.findIndex( "subdirs" ) != -1 ) + if ( tmp.tqfindIndex( "subdirs" ) != -1 ) setPixmap( 0, SmallIcon( "folder_grey" ) ); - else if ( tmp.findIndex( "lib" ) != -1 ) + else if ( tmp.tqfindIndex( "lib" ) != -1 ) setPixmap( 0, SmallIcon( "qmake_lib_disabled" ) ); else setPixmap( 0, SmallIcon( "qmake_app_disabled" ) ); @@ -565,19 +565,19 @@ void QMakeScopeItem::init() } } -GroupItem* QMakeScopeItem::createGroupItem( GroupItem::GroupType type, const TQString& label, QMakeScopeItem* scopeitem ) +GroupItem* TQMakeScopeItem::createGroupItem( GroupItem::GroupType type, const TQString& label, TQMakeScopeItem* scopeitem ) { GroupItem * item = new GroupItem( scopeitem->listView(), type, label, scopeitem ); scopeitem->listView() ->takeItem( item ); return item; } -FileItem* QMakeScopeItem::createFileItem( const TQString& name ) +FileItem* TQMakeScopeItem::createFileItem( const TQString& name ) { TQString display = name; if( m_widget->showFilenamesOnly() ) { - int dirSepPos = name.findRev( TQChar( TQDir::separator() ) ); + int dirSepPos = name.tqfindRev( TQChar( TQDir::separator() ) ); if ( dirSepPos != - 1 ) display = name.mid( dirSepPos + 1 ); } @@ -593,9 +593,9 @@ FileItem* QMakeScopeItem::createFileItem( const TQString& name ) return fitem; } -void QMakeScopeItem::buildGroups() +void TQMakeScopeItem::buildGroups() { - if( scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) + if( scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 ) return; TQStringList values; @@ -648,7 +648,7 @@ void QMakeScopeItem::buildGroups() item->files.append( createFileItem( *it ) ); } - if ( scope->isQt4Project() ) + if ( scope->isTQt4Project() ) { values = scope->variableValues( "RESOURCES" ); item = createGroupItem( GroupItem::Resources, "RESOURCES", this ); @@ -720,7 +720,7 @@ void QMakeScopeItem::buildGroups() } -void QMakeScopeItem::removeValues( const TQString& var, const TQStringList& values ) +void TQMakeScopeItem::removeValues( const TQString& var, const TQStringList& values ) { for( TQStringList::const_iterator it = values.begin() ; it != values.end(); ++it ) { @@ -728,7 +728,7 @@ void QMakeScopeItem::removeValues( const TQString& var, const TQStringList& valu } } -void QMakeScopeItem::addValues( const TQString& var, const TQStringList& values ) +void TQMakeScopeItem::addValues( const TQString& var, const TQStringList& values ) { for( TQStringList::const_iterator it = values.begin() ; it != values.end(); ++it ) { @@ -736,14 +736,14 @@ void QMakeScopeItem::addValues( const TQString& var, const TQStringList& values } } -void QMakeScopeItem::removeValue( const TQString& var, const TQString& value ) +void TQMakeScopeItem::removeValue( const TQString& var, const TQString& value ) { - if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).findIndex( value ) != -1 ) + if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).tqfindIndex( value ) != -1 ) { - if( scope->variableValuesForOp( var, "+=" ).findIndex(value) != -1 ) + if( scope->variableValuesForOp( var, "+=" ).tqfindIndex(value) != -1 ) { scope->removeFromPlusOp( var, TQStringList( value ) ); - if( scope->variableValues( var ).findIndex( value ) != -1 ) + if( scope->variableValues( var ).tqfindIndex( value ) != -1 ) { scope->addToMinusOp( var, TQStringList( value ) ); } @@ -755,11 +755,11 @@ void QMakeScopeItem::removeValue( const TQString& var, const TQString& value ) } } -void QMakeScopeItem::addValue( const TQString& var, const TQString& value ) +void TQMakeScopeItem::addValue( const TQString& var, const TQString& value ) { - if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).findIndex( value ) == -1 ) + if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).tqfindIndex( value ) == -1 ) { - if( scope->variableValuesForOp( var, "-=" ).findIndex(value) != -1 ) + if( scope->variableValuesForOp( var, "-=" ).tqfindIndex(value) != -1 ) scope->removeFromMinusOp( var, TQStringList( value ) ); else scope->addToPlusOp( var, TQStringList( value ) ); @@ -769,15 +769,15 @@ void QMakeScopeItem::addValue( const TQString& var, const TQString& value ) } } -void QMakeScopeItem::updateValues( const TQString& var, const TQStringList& values ) +void TQMakeScopeItem::updateValues( const TQString& var, const TQStringList& values ) { TQStringList curValues = scope->variableValues( var, (scope->scopeType() != Scope::IncludeScope) ); TQStringList scopeValues = scope->variableValuesForOp( var, "+=" ); for( TQStringList::const_iterator it = curValues.begin(); it != curValues.end(); ++it ) { - if ( values.findIndex( *it ) == -1 ) + if ( values.tqfindIndex( *it ) == -1 ) { - if( scopeValues.findIndex( *it ) != -1 ) + if( scopeValues.tqfindIndex( *it ) != -1 ) { scope->removeFromPlusOp( var, TQStringList( *it ) ); scopeValues.remove( *it ); @@ -787,7 +787,7 @@ void QMakeScopeItem::updateValues( const TQString& var, const TQStringList& valu } for( TQStringList::const_iterator it = values.begin(); it != values.end(); ++it ) { - if ( scopeValues.findIndex( *it ) != -1 ) + if ( scopeValues.tqfindIndex( *it ) != -1 ) { scopeValues.remove(*it); } @@ -802,18 +802,18 @@ void QMakeScopeItem::updateValues( const TQString& var, const TQStringList& valu // kdDebug(9024) << "---------------------------------------" << endl; } -QMakeScopeItem* QMakeScopeItem::projectFileItem() +TQMakeScopeItem* TQMakeScopeItem::projectFileItem() { if( scope->scopeType() != Scope::ProjectScope ) { - QMakeScopeItem* parentitem = dynamic_cast<QMakeScopeItem*>(parent()); - if( parentitem ) - return parentitem->projectFileItem(); + TQMakeScopeItem* tqparentitem = dynamic_cast<TQMakeScopeItem*>(tqparent()); + if( tqparentitem ) + return tqparentitem->projectFileItem(); } return this; } -void QMakeScopeItem::reloadProject() +void TQMakeScopeItem::reloadProject() { kdDebug(9024) << "Reloading Project" << endl; TQListViewItem* item = firstChild(); @@ -837,19 +837,19 @@ void QMakeScopeItem::reloadProject() init(); } -void QMakeScopeItem::disableSubprojects( const TQStringList& dirs ) +void TQMakeScopeItem::disableSubprojects( const TQStringList& dirs ) { TQStringList::const_iterator it = dirs.begin(); for( ; it != dirs.end() ; ++it) { - if( scope->variableValues("SUBDIRS").findIndex(*it) != -1 ) + if( scope->variableValues("SUBDIRS").tqfindIndex(*it) != -1 ) { Scope* s = scope->disableSubproject(*it); if( !s ) return; else { - QMakeScopeItem* newitem = new QMakeScopeItem( this, s->scopeName(), s ); + TQMakeScopeItem* newitem = new TQMakeScopeItem( this, s->scopeName(), s ); TQListViewItem* lastitem = firstChild(); while( lastitem && lastitem->nextSibling() ) lastitem = lastitem->nextSibling(); @@ -861,9 +861,9 @@ void QMakeScopeItem::disableSubprojects( const TQStringList& dirs ) } -int QMakeScopeItem::compare( TQListViewItem* i, int , bool ) const +int TQMakeScopeItem::compare( TQListViewItem* i, int , bool ) const { - QMakeScopeItem* other = dynamic_cast<QMakeScopeItem*>(i); + TQMakeScopeItem* other = dynamic_cast<TQMakeScopeItem*>(i); if( !i ) return -1; if( other->scope->getNum() < scope->getNum() ) @@ -874,7 +874,7 @@ int QMakeScopeItem::compare( TQListViewItem* i, int , bool ) const return 0; } -TQMap<TQString, TQString> QMakeScopeItem::getLibInfos( TQString basePath ) +TQMap<TQString, TQString> TQMakeScopeItem::getLibInfos( TQString basePath ) { TQMap<TQString, TQString> result; @@ -925,4 +925,4 @@ TQMap<TQString, TQString> QMakeScopeItem::getLibInfos( TQString basePath ) return result; } -// 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/qmake/qmakescopeitem.h b/buildtools/qmake/qmakescopeitem.h index 7c02a33a..be42af8f 100644 --- a/buildtools/qmake/qmakescopeitem.h +++ b/buildtools/qmake/qmakescopeitem.h @@ -9,27 +9,27 @@ * * ***************************************************************************/ -#ifndef _QMAKESCOPEITEM_H_ -#define _QMAKESCOPEITEM_H_ +#ifndef _TQMAKESCOPEITEM_H_ +#define _TQMAKESCOPEITEM_H_ #include <tqlistview.h> #include <tqstring.h> class Scope; -class QMakeScopeItem; +class TQMakeScopeItem; class FileItem; class TrollProjectWidget; /** * Base class for all items appearing in ProjectOverview and ProjectDetails. */ -class qProjectItem : public QListViewItem +class qProjectItem : public TQListViewItem { public: enum Type { Subproject, Group, File }; - qProjectItem( Type type, TQListView *parent, const TQString &text ); - qProjectItem( Type type, qProjectItem *parent, const TQString &text ); + qProjectItem( Type type, TQListView *tqparent, const TQString &text ); + qProjectItem( Type type, qProjectItem *tqparent, const TQString &text ); TQString scopeString; Type type() @@ -50,7 +50,7 @@ public: static GroupType groupTypeForExtension( const TQString &ext ); static void groupTypeMeanings( GroupItem::GroupType type, TQString& title, TQString& ext ); - GroupItem( TQListView *lv, GroupType type, const TQString &text, QMakeScopeItem* spitem ); + GroupItem( TQListView *lv, GroupType type, const TQString &text, TQMakeScopeItem* spitem ); void removeFileFromScope( const TQString& filename); void addFileToScope( const TQString& filename); @@ -65,7 +65,7 @@ public: // TQStringList str_files_exclude; // end qmake INSTALLS support GroupType groupType; - QMakeScopeItem* owner; + TQMakeScopeItem* owner; protected: void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align ); @@ -85,11 +85,11 @@ public: /** * Stores one Scope */ -class QMakeScopeItem : public qProjectItem +class TQMakeScopeItem : public qProjectItem { public: - QMakeScopeItem( TQListView *parent, const TQString &text, Scope *s, TrollProjectWidget* widget ); - QMakeScopeItem( QMakeScopeItem *parent, const TQString &text, Scope* ); + TQMakeScopeItem( TQListView *tqparent, const TQString &text, Scope *s, TrollProjectWidget* widget ); + TQMakeScopeItem( TQMakeScopeItem *tqparent, const TQString &text, Scope* ); void updateValues( const TQString& var, const TQStringList& values ); void addValue( const TQString& var, const TQString& value ); void removeValue( const TQString& var, const TQString& value ); @@ -98,7 +98,7 @@ public: void disableSubprojects( const TQStringList& ); void reloadProject(); int compare( TQListViewItem* i, int col, bool ascending ) const; - ~QMakeScopeItem(); + ~TQMakeScopeItem(); TQMap<GroupItem::GroupType, GroupItem*> groups; @@ -110,10 +110,10 @@ public: TQString getApplicationObject( TQString ); TQString getIncAddPath( TQString downDirs ); FileItem* createFileItem(const TQString& file); - GroupItem* createGroupItem(GroupItem::GroupType type, const TQString& name, QMakeScopeItem* scopeitem); + GroupItem* createGroupItem(GroupItem::GroupType type, const TQString& name, TQMakeScopeItem* scopeitem); TQMap<TQString, TQString> getLibInfos( TQString ); - QMakeScopeItem* projectFileItem(); + TQMakeScopeItem* projectFileItem(); TrollProjectWidget* m_widget; private: @@ -125,4 +125,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/qmake/scope.cpp b/buildtools/qmake/scope.cpp index 3f182ded..e332edd2 100644 --- a/buildtools/qmake/scope.cpp +++ b/buildtools/qmake/scope.cpp @@ -31,7 +31,7 @@ #include "trollprojectpart.h" #include "qmakedefaultopts.h" -const TQStringList Scope::KnownVariables = TQStringList() << "QT" << "CONFIG" << "TEMPLATE" << "SUBDIRS" << "VERSION" << "LIBS" << "target.path" << "INSTALLS" << "MAKEFILE" << "TARGETDEPS" << "INCLUDEPATH" << "TARGET" << "DESTDIR" << "DEFINES" << "QMAKE_CXXFLAGS_DEBUG" << "QMAKE_CXXFLAGS_RELEASE" << "OBJECTS_DIR" << "UI_DIR" << "MOC_DIR" << "IDL_COMPILER" << "IDL_OPTIONS" << "RCC_DIR" << "IDLS" << "RESOURCES" << "IMAGES" << "LEXSOURCES" << "DISTFILES" << "YACCSOURCES" << "TRANSLATIONS" << "HEADERS" << "SOURCES" << "INTERFACES" << "FORMS" ; +const TQStringList Scope::KnownVariables = TQStringList() << "QT" << "CONFIG" << "TEMPLATE" << "SUBDIRS" << "VERSION" << "LIBS" << "target.path" << "INSTALLS" << "MAKEFILE" << "TARGETDEPS" << "INCLUDEPATH" << "TARGET" << "DESTDIR" << "DEFINES" << "TQMAKE_CXXFLAGS_DEBUG" << "TQMAKE_CXXFLAGS_RELEASE" << "OBJECTS_DIR" << "UI_DIR" << "TQMOC_DIR" << "IDL_COMPILER" << "IDL_OPTIONS" << "RCC_DIR" << "IDLS" << "RESOURCES" << "IMAGES" << "LEXSOURCES" << "DISTFILES" << "YACCSOURCES" << "TRANSLATIONS" << "HEADERS" << "SOURCES" << "INTERFACES" << "FORMS" ; const TQStringList Scope::KnownConfigValues = TQStringList() << "debug" << "release" << "debug_and_release" << "warn_on" << "warn_off" << "staticlib" << "dll" << "plugin" << "designer" << "create_pkgconf" << "create_libtool" << "qt" << "console" << "windows" << "x11" << "thread" << "exceptions" << "stl" << "rtti" << "opengl" << "thread" << "ordered" << "precompile_header" << "qtestlib" << "uitools" << "dbus" << "assistant" << "build_all" << "help"; @@ -42,7 +42,7 @@ Scope::Scope( const TQMap<TQString, TQString>& env, const TQString &filename, Tr { if( !TQFileInfo( filename ).exists() ) { - m_root = new QMake::ProjectAST(); + m_root = new TQMake::ProjectAST(); m_root->setFileName( filename ); }else { @@ -80,25 +80,25 @@ Scope::~Scope() } // Simple/Function Scopes -Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, QMake::ProjectAST* scope, - QMakeDefaultOpts* defaultopts, TrollProjectPart* part ) - : m_root( scope ), m_incast( 0 ), m_parent( parent ), m_num(num), m_isEnabled( true ), +Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, TQMake::ProjectAST* scope, + TQMakeDefaultOpts* defaultopts, TrollProjectPart* part ) + : m_root( scope ), m_incast( 0 ), m_parent( tqparent ), m_num(num), m_isEnabled( true ), m_part(part), m_defaultopts(defaultopts), m_environment( env ) { init(); } //Subdirs -Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, const TQString& filename, +Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, const TQString& filename, TrollProjectPart* part, bool isEnabled ) - : m_root( 0 ), m_incast( 0 ), m_parent( parent ), m_num(num), m_isEnabled( isEnabled ), + : m_root( 0 ), m_incast( 0 ), m_parent( tqparent ), m_num(num), m_isEnabled( isEnabled ), m_part(part), m_defaultopts(0), m_environment( env ) { if ( !loadFromFile( filename ) ) { if( !TQFileInfo( filename ).exists() && TQFileInfo( TQFileInfo( filename ).dirPath( true ) ).exists() ) { - m_root = new QMake::ProjectAST(); + m_root = new TQMake::ProjectAST(); m_root->setFileName( filename ); }else { @@ -114,15 +114,15 @@ Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* par } //Include Scope -Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, QMake::IncludeAST* incast, const TQString& path, - const TQString& incfile, QMakeDefaultOpts* defaultopts, TrollProjectPart* part ) - : m_root( 0 ), m_incast( incast ), m_parent( parent ), m_num(num), m_isEnabled( true ), +Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, TQMake::IncludeAST* incast, const TQString& path, + const TQString& incfile, TQMakeDefaultOpts* defaultopts, TrollProjectPart* part ) + : m_root( 0 ), m_incast( incast ), m_parent( tqparent ), m_num(num), m_isEnabled( true ), m_part(part), m_defaultopts(defaultopts), m_environment( env ) { TQString absfilename; TQString tmp = incfile.stripWhiteSpace(); - if( tmp.contains(")" ) ) - tmp = tmp.mid(0, tmp.find(")") ); + if( tmp.tqcontains(")" ) ) + tmp = tmp.mid(0, tmp.tqfind(")") ); if( tmp.startsWith( "\"" ) ) tmp = tmp.mid( 1, tmp.length()-2 ); @@ -136,7 +136,7 @@ Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* par { if( !TQFileInfo( absfilename ).exists() && TQFileInfo( TQFileInfo( absfilename ).dirPath( true ) ).exists() ) { - m_root = new QMake::ProjectAST(); + m_root = new TQMake::ProjectAST(); m_root->setFileName( absfilename ); }else { @@ -152,13 +152,13 @@ Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* par bool Scope::loadFromFile( const TQString& filename ) { - if ( !TQFileInfo(filename).exists() || QMake::Driver::parseFile( filename, &m_root, 0 ) != 0 ) + if ( !TQFileInfo(filename).exists() || TQMake::Driver::parseFile( filename, &m_root, 0 ) != 0 ) { kdDebug( 9024 ) << "Couldn't parse project: " << filename << endl; if( DomUtil::readBoolEntry( *m_part->projectDom(), "/kdevtrollproject/qmake/showParseErrors", true ) ) { - KMessageBox::error( 0, i18n( "Could not parse project file: %1" ).arg( filename ), + KMessageBox::error( 0, i18n( "Could not parse project file: %1" ).tqarg( filename ), i18n( "Could not parse project file" ) ); } m_root = 0; @@ -198,7 +198,7 @@ void Scope::saveToFile() const file.close(); }else { - KMessageBox::error( 0, i18n( "Could not write project file: %1" ).arg( filename ), + KMessageBox::error( 0, i18n( "Could not write project file: %1" ).tqarg( filename ), i18n( "Could not write project file" ) ); } #ifdef DEBUG @@ -291,13 +291,13 @@ TQStringList Scope::variableValuesForOp( const TQString& variable , const TQStri if( !m_root ) return result; - TQValueList<QMake::AST*>::const_iterator it; - for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it ) + TQValueList<TQMake::AST*>::const_iterator it; + for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it ) { - QMake::AST* ast = *it; - if ( ast->nodeType() == QMake::AST::AssignmentAST ) + TQMake::AST* ast = *it; + if ( ast->nodeType() == TQMake::AST::AssignmentAST ) { - QMake::AssignmentAST * assign = static_cast<QMake::AssignmentAST*>( ast ); + TQMake::AssignmentAST * assign = static_cast<TQMake::AssignmentAST*>( ast ); if ( assign->scopedID == variable && assign->op == op ) { result += assign->values; @@ -315,7 +315,7 @@ TQStringList Scope::variableValues( const TQString& variable, bool checkIncParen if ( !m_root ) return result; - if( m_varCache.contains( variable ) && fetchFromParent && ( checkIncParent || scopeType() != Scope::IncludeScope ) ) + if( m_varCache.tqcontains( variable ) && fetchFromParent && ( checkIncParent || scopeType() != Scope::IncludeScope ) ) { return m_varCache[variable]; } @@ -329,15 +329,15 @@ TQStringList Scope::variableValues( const TQString& variable, bool checkIncParen return result; } -void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& result, bool checkIncParent, QMake::AST* stopHere, bool fetchFromParent, bool setDefault, bool evaluateSubScopes ) const +void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& result, bool checkIncParent, TQMake::AST* stopHere, bool fetchFromParent, bool setDefault, bool evaluateSubScopes ) const { if( !m_root ) return; /* For variables that we don't know and which are not QT/CONFIG find the default value */ if( setDefault && m_defaultopts - && m_defaultopts->variables().findIndex(variable) != -1 - && ( variable == "TEMPLATE" || variable == "QT" || KnownVariables.findIndex(variable) == -1 || variable == "CONFIG" ) ) + && m_defaultopts->variables().tqfindIndex(variable) != -1 + && ( variable == "TEMPLATE" || variable == "QT" || KnownVariables.tqfindIndex(variable) == -1 || variable == "CONFIG" ) ) { result = m_defaultopts->variableValues(variable); } @@ -351,15 +351,15 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re m_parent->calcValuesFromStatements( variable, result, true, this->m_incast, fetchFromParent, setDefault, evaluateSubScopes ); } - TQValueList<QMake::AST*>::const_iterator it; - for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it ) + TQValueList<TQMake::AST*>::const_iterator it; + for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it ) { if ( stopHere && *it == stopHere ) return ; - QMake::AST* ast = *it; - if ( ast->nodeType() == QMake::AST::AssignmentAST ) + TQMake::AST* ast = *it; + if ( ast->nodeType() == TQMake::AST::AssignmentAST ) { - QMake::AssignmentAST * assign = static_cast<QMake::AssignmentAST*>( ast ); + TQMake::AssignmentAST * assign = static_cast<TQMake::AssignmentAST*>( ast ); if ( assign->scopedID == variable ) { if ( assign->op == "=" ) @@ -370,7 +370,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re { for ( TQStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit ) { - if ( result.findIndex( *sit ) == -1 ) + if ( result.tqfindIndex( *sit ) == -1 ) result.append( *sit ); } } @@ -378,21 +378,21 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re { for ( TQStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit ) { - if ( result.findIndex( *sit ) != -1 ) + if ( result.tqfindIndex( *sit ) != -1 ) result.remove( *sit ); } } } }else if( evaluateSubScopes ) { - if( ast->nodeType() == QMake::AST::IncludeAST ) + if( ast->nodeType() == TQMake::AST::IncludeAST ) { - QMake::IncludeAST* iast = static_cast<QMake::IncludeAST*>(ast); + TQMake::IncludeAST* iast = static_cast<TQMake::IncludeAST*>(ast); TQValueList<unsigned int> l = m_scopes.keys(); for( unsigned int i = 0; i < l.count(); ++i ) { int num = l[ i ]; - if( m_scopes.contains( num ) ) + if( m_scopes.tqcontains( num ) ) { Scope* s = m_scopes[num]; if( s && s->scopeType() == IncludeScope && s->m_incast == iast ) @@ -403,16 +403,16 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re } } - else if( ast->nodeType() == QMake::AST::ProjectAST ) + else if( ast->nodeType() == TQMake::AST::ProjectAST ) { - QMake::ProjectAST* past = static_cast<QMake::ProjectAST*>(ast); + TQMake::ProjectAST* past = static_cast<TQMake::ProjectAST*>(ast); if( past->isFunctionScope() || past->isScope() ) { TQValueList<unsigned int> l = m_scopes.keys(); for( unsigned int i = 0; i < l.count(); ++i ) { int num = l[ i ]; - if( m_scopes.contains( num ) ) + if( m_scopes.tqcontains( num ) ) { Scope* s = m_scopes[num]; if( s && s->m_root == past && s->m_root->scopedID == past->scopedID ) @@ -486,13 +486,13 @@ Scope* Scope::createFunctionScope( const TQString& funcName, const TQString& arg if ( !m_root ) return 0; - QMake::ProjectAST* ast = new QMake::ProjectAST( QMake::ProjectAST::FunctionScope ); + TQMake::ProjectAST* ast = new TQMake::ProjectAST( TQMake::ProjectAST::FunctionScope ); ast->scopedID = funcName; ast->args = args; ast->setDepth( m_root->depth() ); - ast->addChildAST( new QMake::NewLineAST() ); + ast->addChildAST( new TQMake::NewLineAST() ); m_root->addChildAST( ast ); - m_root->addChildAST( new QMake::NewLineAST() ); + m_root->addChildAST( new TQMake::NewLineAST() ); Scope* funcScope = new Scope( m_environment, getNextScopeNum(), this, ast, m_defaultopts, m_part ); if( funcScope->scopeType() != Scope::InvalidScope ) { @@ -508,14 +508,14 @@ Scope* Scope::createSimpleScope( const TQString& scopename ) if ( !m_root ) return 0; - QMake::ProjectAST* ast = new QMake::ProjectAST( QMake::ProjectAST::Scope ); + TQMake::ProjectAST* ast = new TQMake::ProjectAST( TQMake::ProjectAST::Scope ); ast->scopedID = scopename; - ast->addChildAST( new QMake::NewLineAST() ); + ast->addChildAST( new TQMake::NewLineAST() ); ast->setDepth( m_root->depth() ); m_root->addChildAST( ast ); - m_root->addChildAST( new QMake::NewLineAST() ); + m_root->addChildAST( new TQMake::NewLineAST() ); /* We can't unconditionally add the scope name to CONFIG, scope might be win32 which may only be in CONFIG under windows. - if ( m_part->isQt4Project() ) + if ( m_part->isTQt4Project() ) addToPlusOp( "CONFIG", TQStringList( scopename ) ); */ Scope* simpleScope = new Scope( m_environment, getNextScopeNum(), this, ast, m_defaultopts, m_part ); @@ -547,7 +547,7 @@ Scope* Scope::createIncludeScope( const TQString& includeFile, bool negate ) if( funcScope == 0 ) return 0; - QMake::IncludeAST* ast = new QMake::IncludeAST(); + TQMake::IncludeAST* ast = new TQMake::IncludeAST(); ast->setDepth( m_root->depth() ); ast->projectName = includeFile; Scope* incScope = new Scope( m_environment, funcScope->getNextScopeNum(), funcScope, ast, projectDir(), resolveVariables( ast->projectName ), m_defaultopts, m_part ); @@ -571,17 +571,17 @@ Scope* Scope::createSubProject( const TQString& projname ) if( !m_root ) return 0; - if( variableValuesForOp( "SUBDIRS", "-=").findIndex( projname ) != -1 ) + if( variableValuesForOp( "SUBDIRS", "-=").tqfindIndex( projname ) != -1 ) removeFromMinusOp( "SUBDIRS", projname ); TQString realprojname = resolveVariables(projname); - if( variableValuesForOp( "SUBDIRS", "-=").findIndex( realprojname ) != -1 ) + if( variableValuesForOp( "SUBDIRS", "-=").tqfindIndex( realprojname ) != -1 ) removeFromMinusOp( "SUBDIRS", realprojname ); TQDir curdir( projectDir() ); - if ( variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 ) + if ( variableValues("TEMPLATE").tqfindIndex( "subdirs" ) != -1 ) { TQString filename; if( !realprojname.endsWith(".pro") ) @@ -592,7 +592,7 @@ Scope* Scope::createSubProject( const TQString& projname ) curdir.cd( realprojname ); TQStringList entries = curdir.entryList("*.pro", TQDir::Files); - if ( !entries.isEmpty() && entries.findIndex( curdir.dirName()+".pro" ) == -1 ) + if ( !entries.isEmpty() && entries.tqfindIndex( curdir.dirName()+".pro" ) == -1 ) filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+entries.first(); else filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+curdir.dirName()+".pro"; @@ -622,13 +622,13 @@ Scope* Scope::createSubProject( const TQString& projname ) bool Scope::deleteFunctionScope( unsigned int num ) { - if ( !m_root || !m_scopes.contains( num ) ) + if ( !m_root || !m_scopes.tqcontains( num ) ) return false; Scope* funcScope = m_scopes[ num ]; if ( funcScope ) { - QMake::AST* ast = m_root->m_children[ m_root->m_children.findIndex( funcScope->m_root ) ]; + TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.tqfindIndex( funcScope->m_root ) ]; if( !ast ) return false; m_scopes.remove( num ); @@ -642,13 +642,13 @@ bool Scope::deleteFunctionScope( unsigned int num ) bool Scope::deleteSimpleScope( unsigned int num ) { - if ( !m_root || !m_scopes.contains( num ) ) + if ( !m_root || !m_scopes.tqcontains( num ) ) return false; Scope* simpleScope = m_scopes[ num ]; if ( simpleScope ) { - QMake::AST* ast = m_root->m_children[ m_root->m_children.findIndex( simpleScope->m_root ) ]; + TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.tqfindIndex( simpleScope->m_root ) ]; if( !ast ) return false; m_scopes.remove( num ); @@ -663,13 +663,13 @@ bool Scope::deleteSimpleScope( unsigned int num ) bool Scope::deleteIncludeScope( unsigned int num ) { - if ( !m_root || !m_scopes.contains( num ) ) + if ( !m_root || !m_scopes.tqcontains( num ) ) return false; Scope * incScope = m_scopes[ num ]; if( !incScope ) return false; - QMake::AST* ast = incScope->m_incast; + TQMake::AST* ast = incScope->m_incast; if( !ast ) return false; m_scopes.remove( num ); @@ -682,14 +682,14 @@ bool Scope::deleteIncludeScope( unsigned int num ) bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir ) { - if ( !m_root || !m_scopes.contains( num ) ) + if ( !m_root || !m_scopes.tqcontains( num ) ) return false; - TQValueList<QMake::AST*>::iterator it = findExistingVariable( "TEMPLATE" ); - if ( it != m_root->m_children.end() ) + TQValueList<TQMake::AST*>::iterator it = findExistingVariable( "TEMPLATE" ); + if ( it != m_root->m_tqchildren.end() ) { - QMake::AssignmentAST * tempast = static_cast<QMake::AssignmentAST*>( *it ); - if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_children.end() ) + TQMake::AssignmentAST * tempast = static_cast<TQMake::AssignmentAST*>( *it ); + if ( tempast->values.tqfindIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_tqchildren.end() ) { Scope* project = m_scopes[ num ]; if( !project ) @@ -722,12 +722,12 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir ) kdDebug(9024) << "removed subproject?:" << d.remove( dir ) << endl; } } - TQValueList<QMake::AST*>::iterator foundit = findExistingVariable( "SUBDIRS" ); - if ( foundit != m_root->m_children.end() ) + TQValueList<TQMake::AST*>::iterator foundit = findExistingVariable( "SUBDIRS" ); + if ( foundit != m_root->m_tqchildren.end() ) { - QMake::AssignmentAST * ast = static_cast<QMake::AssignmentAST*>( *foundit ); + TQMake::AssignmentAST * ast = static_cast<TQMake::AssignmentAST*>( *foundit ); updateValues( ast->values, TQStringList( projdir ), true, ast->indent ); - if( m_varCache.contains( "SUBDIRS" ) ) + if( m_varCache.tqcontains( "SUBDIRS" ) ) m_varCache.erase( "SUBDIRS" ); }else return false; @@ -746,7 +746,7 @@ void Scope::updateValues( TQStringList& origValues, const TQStringList& newValue for ( TQStringList::const_iterator it = newValues.begin(); it != newValues.end() ; ++it ) { - if ( origValues.findIndex( *it ) == -1 && !remove ) + if ( origValues.tqfindIndex( *it ) == -1 && !remove ) { while ( !origValues.isEmpty() && origValues.last() == getLineEndingString() ) origValues.pop_back(); @@ -769,17 +769,17 @@ void Scope::updateValues( TQStringList& origValues, const TQStringList& newValue origValues.append(" "); TQString newval = *it; TQRegExp re("([^$])\\$([^$\\(\\)\\{\\} /]*)( |\\)|/)"); - newval.replace(re, "\\1$(\\2)\\3"); - if( (newval).contains(" ") || (newval).contains("\t") || (newval).contains( getLineEndingString() ) || (newval).contains("#") ) + newval.tqreplace(re, "\\1$(\\2)\\3"); + if( (newval).tqcontains(" ") || (newval).tqcontains("\t") || (newval).tqcontains( getLineEndingString() ) || (newval).tqcontains("#") ) origValues.append( "\""+newval+"\"" ); else origValues.append( newval ); origValues.append( getLineEndingString() ); - } else if ( origValues.findIndex( *it ) != -1 && remove ) + } else if ( origValues.tqfindIndex( *it ) != -1 && remove ) { - TQStringList::iterator posit = origValues.find( *it ); + TQStringList::iterator posit = origValues.tqfind( *it ); posit = origValues.remove( posit ); - while( posit != origValues.end() && ( (*posit).find( TQRegExp("\\\\[\\s]*"+getLineEndingString() ) ) != -1 + while( posit != origValues.end() && ( (*posit).tqfind( TQRegExp("\\\\[\\s]*"+getLineEndingString() ) ) != -1 || (*posit).stripWhiteSpace() == "" ) ) { posit = origValues.remove( posit ); @@ -790,9 +790,9 @@ void Scope::updateValues( TQStringList& origValues, const TQStringList& newValue || origValues.last() == getLineEndingString() || origValues.last().stripWhiteSpace() == "" ) && !origValues.isEmpty() ) origValues.pop_back(); - if( !origValues.isEmpty() && origValues.last().find( TQRegExp("\\\\[ \t]*#") ) != -1 ) - origValues[origValues.count()-1] = origValues[origValues.count()-1].mid(origValues[origValues.count()-1].find( "#") ); - if( !origValues.isEmpty() && origValues.last().find( getLineEndingString() ) == -1 ) + if( !origValues.isEmpty() && origValues.last().tqfind( TQRegExp("\\\\[ \t]*#") ) != -1 ) + origValues[origValues.count()-1] = origValues[origValues.count()-1].mid(origValues[origValues.count()-1].tqfind( "#") ); + if( !origValues.isEmpty() && origValues.last().tqfind( getLineEndingString() ) == -1 ) origValues.append(getLineEndingString()); } @@ -801,14 +801,14 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const if ( !m_root || listIsEmpty( values ) ) return ; - if( m_varCache.contains( variable ) ) + if( m_varCache.tqcontains( variable ) ) m_varCache.erase( variable ); - for ( int i = m_root->m_children.count() - 1; i >= 0; --i ) + for ( int i = m_root->m_tqchildren.count() - 1; i >= 0; --i ) { - if ( m_root->m_children[ i ] ->nodeType() == QMake::AST::AssignmentAST ) + if ( m_root->m_tqchildren[ i ] ->nodeType() == TQMake::AST::AssignmentAST ) { - QMake::AssignmentAST * assignment = static_cast<QMake::AssignmentAST*>( m_root->m_children[ i ] ); + TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( m_root->m_tqchildren[ i ] ); if ( assignment->scopedID == variable && Scope::isCompatible( assignment->op, op ) ) { updateValues( assignment->values, values, removeFromOp, assignment->indent ); @@ -823,7 +823,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const { for ( TQStringList::const_iterator it = values.begin() ; it != values.end() ; ++it ) { - if ( op == "+=" && !removeFromOp && assignment->values.findIndex( *it ) != -1 ) + if ( op == "+=" && !removeFromOp && assignment->values.tqfindIndex( *it ) != -1 ) { if ( assignment->op == "=" ) { @@ -841,7 +841,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const } } } - else if ( op == "-=" && !removeFromOp && assignment->values.findIndex( *it ) != -1 ) + else if ( op == "-=" && !removeFromOp && assignment->values.tqfindIndex( *it ) != -1 ) { updateValues( assignment->values, TQStringList( *it ), true, assignment->indent ); if ( listIsEmpty( assignment->values ) ) @@ -858,7 +858,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const m_root->removeChildAST( assignment ); delete assignment; } - else if ( assignment->op == "+=" && assignment->values.findIndex( *it ) != -1 ) + else if ( assignment->op == "+=" && assignment->values.tqfindIndex( *it ) != -1 ) { updateValues( assignment->values, TQStringList( *it ), true, assignment->indent ); if ( listIsEmpty( assignment->values ) ) @@ -876,7 +876,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const if ( !removeFromOp ) { - QMake::AssignmentAST * ast = new QMake::AssignmentAST(); + TQMake::AssignmentAST * ast = new TQMake::AssignmentAST(); ast->scopedID = variable; ast->op = op; updateValues( ast->values, values ); @@ -885,31 +885,31 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const else ast->setDepth( m_root->depth()+1 ); m_root->addChildAST( ast ); - if ( values.findIndex( getLineEndingString() ) == -1 ) + if ( values.tqfindIndex( getLineEndingString() ) == -1 ) { ast->values.append( getLineEndingString() ); } } } -TQValueList<QMake::AST*>::iterator Scope::findExistingVariable( const TQString& variable ) +TQValueList<TQMake::AST*>::iterator Scope::findExistingVariable( const TQString& variable ) { - TQValueList<QMake::AST*>::iterator it; + TQValueList<TQMake::AST*>::iterator it; TQStringList ops; ops << "=" << "+="; - for ( it = m_root->m_children.begin(); it != m_root->m_children.end() ; ++it ) + for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end() ; ++it ) { - if ( ( *it ) ->nodeType() == QMake::AST::AssignmentAST ) + if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST ) { - QMake::AssignmentAST * assignment = static_cast<QMake::AssignmentAST*>( *it ); - if ( assignment->scopedID == variable && ops.findIndex( assignment->op ) != -1 ) + TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( *it ); + if ( assignment->scopedID == variable && ops.tqfindIndex( assignment->op ) != -1 ) { return it; } } } - return m_root->m_children.end(); + return m_root->m_tqchildren.end(); } void Scope::init() @@ -920,17 +920,17 @@ void Scope::init() kdDebug(9024) << "Initializing Scope: " << scopeName() << this << endl; m_maxCustomVarNum = 1; - TQValueList<QMake::AST*>::const_iterator it; - for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it ) + TQValueList<TQMake::AST*>::const_iterator it; + for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it ) { - if ( ( *it ) ->nodeType() == QMake::AST::ProjectAST ) + if ( ( *it ) ->nodeType() == TQMake::AST::ProjectAST ) { - QMake::ProjectAST * p = static_cast<QMake::ProjectAST*>( *it ); + TQMake::ProjectAST * p = static_cast<TQMake::ProjectAST*>( *it ); m_scopes.insert( getNextScopeNum(), new Scope( m_environment, getNextScopeNum(), this, p, m_defaultopts, m_part ) ); } - else if ( ( *it ) ->nodeType() == QMake::AST::IncludeAST ) + else if ( ( *it ) ->nodeType() == TQMake::AST::IncludeAST ) { - QMake::IncludeAST * i = static_cast<QMake::IncludeAST*>( *it ); + TQMake::IncludeAST * i = static_cast<TQMake::IncludeAST*>( *it ); TQString filename = i->projectName; if( i->projectName.stripWhiteSpace().startsWith("$") ) { @@ -938,11 +938,11 @@ void Scope::init() } m_scopes.insert( getNextScopeNum(), new Scope( m_environment, getNextScopeNum(), this, i, projectDir(), filename, m_defaultopts, m_part ) ); } - else if ( ( *it ) ->nodeType() == QMake::AST::AssignmentAST ) + else if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST ) { - QMake::AssignmentAST * m = static_cast<QMake::AssignmentAST*>( *it ); + TQMake::AssignmentAST * m = static_cast<TQMake::AssignmentAST*>( *it ); // Check wether TEMPLATE==subdirs here too! - if ( m->scopedID == "SUBDIRS" && variableValues("TEMPLATE").findIndex("subdirs") != -1 ) + if ( m->scopedID == "SUBDIRS" && variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 ) { for ( TQStringList::const_iterator sit = m->values.begin() ; sit != m->values.end(); ++sit ) { @@ -977,7 +977,7 @@ void Scope::init() }else continue; } - if ( subproject.entryList().isEmpty() || subproject.entryList().findIndex( str + ".pro" ) != -1 ) + if ( subproject.entryList().isEmpty() || subproject.entryList().tqfindIndex( str + ".pro" ) != -1 ) projectfile = (str) + ".pro"; else projectfile = subproject.entryList().first(); @@ -992,16 +992,16 @@ void Scope::init() else { if ( !( - KnownVariables.findIndex( m->scopedID ) != -1 + KnownVariables.tqfindIndex( m->scopedID ) != -1 && ( m->op == "=" || m->op == "+=" || m->op == "-=") ) && !( - ( m->scopedID.contains( ".files" ) || m->scopedID.contains( ".path" ) ) - && variableValues("INSTALLS").findIndex(m->scopedID.left( m->scopedID.findRev(".") != -1 ) ) + ( m->scopedID.tqcontains( ".files" ) || m->scopedID.tqcontains( ".path" ) ) + && variableValues("INSTALLS").tqfindIndex(m->scopedID.left( m->scopedID.tqfindRev(".") != -1 ) ) ) && !( - ( m->scopedID.contains( ".subdir" ) ) - && variableValues("SUBDIRS").findIndex(m->scopedID.left( m->scopedID.findRev(".") != -1 ) ) + ( m->scopedID.tqcontains( ".subdir" ) ) + && variableValues("SUBDIRS").tqfindIndex(m->scopedID.left( m->scopedID.tqfindRev(".") != -1 ) ) ) ) { @@ -1040,7 +1040,7 @@ const TQMap<unsigned int, TQMap<TQString, TQString> > Scope::customVariables() c if( !m_root ) return result; - TQMap<unsigned int, QMake::AssignmentAST*>::const_iterator it = m_customVariables.begin(); + TQMap<unsigned int, TQMake::AssignmentAST*>::const_iterator it = m_customVariables.begin(); for ( ; it != m_customVariables.end(); ++it ) { TQMap<TQString,TQString> temp; @@ -1056,11 +1056,11 @@ void Scope::updateCustomVariable( unsigned int id, const TQString& name, const T { if( !m_root ) return; - if ( id > 0 && m_customVariables.contains( id ) ) + if ( id > 0 && m_customVariables.tqcontains( id ) ) { m_customVariables[ id ] ->values.clear(); updateValues( m_customVariables[ id ] ->values, newvalues.stripWhiteSpace() ); - if( m_varCache.contains( m_customVariables[ id ]->scopedID ) ) + if( m_varCache.tqcontains( m_customVariables[ id ]->scopedID ) ) m_varCache.erase( m_customVariables[ id ]->scopedID ); m_customVariables[ id ] ->op = newop; m_customVariables[ id ] ->scopedID = name; @@ -1069,7 +1069,7 @@ void Scope::updateCustomVariable( unsigned int id, const TQString& name, const T unsigned int Scope::addCustomVariable( const TQString& var, const TQString& op, const TQString& values ) { - QMake::AssignmentAST* newast = new QMake::AssignmentAST(); + TQMake::AssignmentAST* newast = new TQMake::AssignmentAST(); newast->scopedID = var; newast->op = op; newast->values.append(values.stripWhiteSpace()); @@ -1084,11 +1084,11 @@ unsigned int Scope::addCustomVariable( const TQString& var, const TQString& op, void Scope::removeCustomVariable( unsigned int id ) { - if( m_customVariables.contains(id) ) + if( m_customVariables.tqcontains(id) ) { - QMake::AssignmentAST* m = m_customVariables[id]; + TQMake::AssignmentAST* m = m_customVariables[id]; m_customVariables.remove(id); - m_root->m_children.remove( m ); + m_root->m_tqchildren.remove( m ); } } @@ -1097,12 +1097,12 @@ bool Scope::isVariableReset( const TQString& var ) bool result = false; if( !m_root ) return result; - TQValueList<QMake::AST*>::const_iterator it = m_root->m_children.begin(); - for ( ; it != m_root->m_children.end(); ++it ) + TQValueList<TQMake::AST*>::const_iterator it = m_root->m_tqchildren.begin(); + for ( ; it != m_root->m_tqchildren.end(); ++it ) { - if ( ( *it ) ->nodeType() == QMake::AST::AssignmentAST ) + if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST ) { - QMake::AssignmentAST * ast = static_cast<QMake::AssignmentAST*>( *it ); + TQMake::AssignmentAST * ast = static_cast<TQMake::AssignmentAST*>( *it ); if ( ast->scopedID == var && ast->op == "=" ) { result = true; @@ -1118,18 +1118,18 @@ void Scope::removeVariable( const TQString& var, const TQString& op ) if ( !m_root ) return ; - QMake::AssignmentAST* ast = 0; + TQMake::AssignmentAST* ast = 0; - TQValueList<QMake::AST*>::iterator it = m_root->m_children.begin(); - for ( ; it != m_root->m_children.end(); ++it ) + TQValueList<TQMake::AST*>::iterator it = m_root->m_tqchildren.begin(); + for ( ; it != m_root->m_tqchildren.end(); ++it ) { - if ( ( *it ) ->nodeType() == QMake::AST::AssignmentAST ) + if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST ) { - ast = static_cast<QMake::AssignmentAST*>( *it ); + ast = static_cast<TQMake::AssignmentAST*>( *it ); if ( ast->scopedID == var && ast->op == op ) { - m_root->m_children.remove( ast ); - it = m_root->m_children.begin(); + m_root->m_tqchildren.remove( ast ); + it = m_root->m_tqchildren.begin(); } } } @@ -1182,9 +1182,9 @@ TQStringList Scope::cleanStringList(const TQStringList& list) const return result; } -bool Scope::isQt4Project() const +bool Scope::isTQt4Project() const { - return m_part->isQt4Project(); + return m_part->isTQt4Project(); } void Scope::reloadProject() @@ -1209,7 +1209,7 @@ void Scope::reloadProject() delete m_root; if ( !loadFromFile( filename ) && !TQFileInfo( filename ).exists() ) { - m_root = new QMake::ProjectAST(); + m_root = new TQMake::ProjectAST(); m_root->setFileName( filename ); } init(); @@ -1220,20 +1220,20 @@ Scope* Scope::disableSubproject( const TQString& dir) if( !m_root || ( m_root->isProject() && !m_incast ) ) return 0; - if( scopeType() != Scope::IncludeScope && variableValuesForOp( "SUBDIRS", "+=").findIndex( dir ) != -1 ) + if( scopeType() != Scope::IncludeScope && variableValuesForOp( "SUBDIRS", "+=").tqfindIndex( dir ) != -1 ) removeFromPlusOp( "SUBDIRS", dir ); else if( scopeType() != Scope::IncludeScope ) removeFromPlusOp( "SUBDIRS", dir ); TQDir curdir( projectDir() ); - if ( variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 ) + if ( variableValues("TEMPLATE").tqfindIndex( "subdirs" ) != -1 ) { curdir.cd(dir); TQString filename; TQStringList entries = curdir.entryList("*.pro", TQDir::Files); - if ( !entries.isEmpty() && entries.findIndex( curdir.dirName()+".pro" ) != -1 ) + if ( !entries.isEmpty() && entries.tqfindIndex( curdir.dirName()+".pro" ) != -1 ) filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+entries.first(); else filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+curdir.dirName()+".pro"; @@ -1255,12 +1255,12 @@ TQString Scope::resolveVariables( const TQString& value ) const } -TQString Scope::resolveVariables( const TQString& value, QMake::AST* stopHere ) const +TQString Scope::resolveVariables( const TQString& value, TQMake::AST* stopHere ) const { return resolveVariables(TQStringList(value), stopHere).front(); } -TQStringList Scope::variableValues( const TQString& variable, QMake::AST* stopHere, bool fetchFromParent ) const +TQStringList Scope::variableValues( const TQString& variable, TQMake::AST* stopHere, bool fetchFromParent ) const { TQStringList result; @@ -1272,7 +1272,7 @@ TQStringList Scope::variableValues( const TQString& variable, QMake::AST* stopHe return result; } -TQStringList Scope::resolveVariables( const TQStringList& values, QMake::AST* stopHere ) const +TQStringList Scope::resolveVariables( const TQStringList& values, TQMake::AST* stopHere ) const { TQStringList result = values; TQMap<TQString, TQStringList> variables; @@ -1285,7 +1285,7 @@ TQStringList Scope::resolveVariables( const TQStringList& values, QMake::AST* st pos = re.search( (*it), pos ); if( pos > -1 ) { - if( !variables.contains( re.cap(1) ) ) + if( !variables.tqcontains( re.cap(1) ) ) { variables[re.cap(1)] = resolveVariables( variableValues( re.cap(1), stopHere ) ); if( variables[re.cap(1)].isEmpty() && re.cap(1) == "TARGET" ) @@ -1303,7 +1303,7 @@ TQStringList Scope::resolveVariables( const TQStringList& values, QMake::AST* st pos = re.search( (*it), pos ); if( pos > -1 ) { - if( !variables.contains( re.cap(1) ) ) + if( !variables.tqcontains( re.cap(1) ) ) { variables[re.cap(1)] = resolveVariables( variableValues( re.cap(1), stopHere ) ); if( variables[re.cap(1)].isEmpty() && re.cap(1) == "TARGET" ) @@ -1322,8 +1322,8 @@ TQStringList Scope::resolveVariables( const TQStringList& values, QMake::AST* st pos = re.search( (*it), pos ); if( pos > -1 ) { - if( !envvars.contains( re.cap(1) ) ) - if( m_environment.contains( re.cap(1) ) != -1 ) + if( !envvars.tqcontains( re.cap(1) ) ) + if( m_environment.tqcontains( re.cap(1) ) != -1 ) envvars[re.cap(1)] = m_environment[ re.cap(1) ]; else if ( ::getenv( re.cap(1).local8Bit() ) != 0 ) envvars[re.cap(1)] = TQString::fromLocal8Bit( ::getenv( re.cap(1).local8Bit() ) ); @@ -1332,14 +1332,14 @@ TQStringList Scope::resolveVariables( const TQStringList& values, QMake::AST* st } for( TQMap<TQString, TQString>::const_iterator it2 = envvars.begin(); it2 != envvars.end(); ++it2 ) { - (*it).replace("$$("+it2.key()+")", it2.data() ); + (*it).tqreplace("$$("+it2.key()+")", it2.data() ); } for( TQMap<TQString, TQStringList>::const_iterator it2 = variables.begin(); it2 != variables.end(); ++it2 ) { for( TQStringList::const_iterator it3 = it2.data().begin(); it3 != it2.data().end(); ++it3 ) { - (*it).replace("$$"+it2.key(), *it3 ); - (*it).replace("$${"+it2.key()+"}", *it3 ); + (*it).tqreplace("$$"+it2.key(), *it3 ); + (*it).tqreplace("$${"+it2.key()+"}", *it3 ); } } } @@ -1353,7 +1353,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res TQString file; TQStringList values; TQString header = ""; - if( variableValues("TEMPLATE",false ).findIndex("subdirs") == -1 ) + if( variableValues("TEMPLATE",false ).tqfindIndex("subdirs") == -1 ) { values = variableValues( "INSTALLS" ,false, false ); TQStringList::const_iterator it; @@ -1368,7 +1368,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res { file = myRelPath + TQString(TQChar(TQDir::separator())) + *filesit; file = resolveVariables( file ); - if( file.contains("*") ) + if( file.tqcontains("*") ) { TQFileInfo fi( projectDirectory + TQString( TQChar( TQDir::separator() ) ) + file ); TQDir absDir = fi.dir( true ); @@ -1408,7 +1408,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res { file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - if( file.contains("*") ) + if( file.tqcontains("*") ) { TQFileInfo fi( projectDirectory + TQString( TQChar( TQDir::separator() ) ) + file ); TQDir absDir = fi.dir( true ); @@ -1426,7 +1426,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res } } - if ( isQt4Project() ) + if ( isTQt4Project() ) { values = variableValues( "RESOURCES" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) @@ -1481,7 +1481,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res file = resolveVariables( file ); res.insert( TQDir::cleanDirPath( file ) ); - if( !m_part->isQt4Project()) + if( !m_part->isTQt4Project()) { header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".h"; if( TQFileInfo(header).exists() ) @@ -1493,7 +1493,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res else { header = projectDir()+TQString(TQChar(TQDir::separator())) + "ui_" +*it; - header.replace(TQRegExp("\\.ui$"),".h"); + header.tqreplace(TQRegExp("\\.ui$"),".h"); if( TQFileInfo(header).exists() ) res.insert( TQDir::cleanDirPath( header ) ); } @@ -1541,7 +1541,7 @@ TQString Scope::findCustomVarForPath( const TQString& path ) if( !m_root ) return result; - TQMap<unsigned int, QMake::AssignmentAST*>::const_iterator it = m_customVariables.begin(); + TQMap<unsigned int, TQMake::AssignmentAST*>::const_iterator it = m_customVariables.begin(); for( ; it != m_customVariables.end(); ++it ) { kdDebug(9024) << "Checking " << path << " against " << cleanStringList(it.data()->values) << endl; @@ -1552,7 +1552,7 @@ TQString Scope::findCustomVarForPath( const TQString& path ) } if( scopeType() != ProjectScope ) { - return parent()->findCustomVarForPath( path ); + return tqparent()->findCustomVarForPath( path ); } return result; } @@ -1561,7 +1561,7 @@ void Scope::loadDefaultOpts() { if( !m_defaultopts && m_root ) { - m_defaultopts = new QMakeDefaultOpts(); + m_defaultopts = new TQMakeDefaultOpts(); if( DomUtil::readBoolEntry( *m_part->projectDom(), "/kdevtrollproject/qmake/disableDefaultOpts", true ) ) { m_defaultopts->readVariables( m_part->qmakePath(), TQFileInfo( m_root->fileName() ).dirPath( true ) ); @@ -1576,13 +1576,13 @@ TQString Scope::getLineEndingString() const { switch( m_root->lineEnding() ) { - case QMake::ProjectAST::Windows: + case TQMake::ProjectAST::Windows: return TQString("\r\n"); break; - case QMake::ProjectAST::MacOS: + case TQMake::ProjectAST::MacOS: return TQString("\r"); break; - case QMake::ProjectAST::Unix: + case TQMake::ProjectAST::Unix: return TQString("\n"); break; } @@ -1595,13 +1595,13 @@ TQString Scope::getLineEndingString() const TQString Scope::replaceWs(TQString s) { - return s.replace( getLineEndingString(), "%nl").replace("\t", "%tab").replace(" ", "%spc"); + return s.tqreplace( getLineEndingString(), "%nl").tqreplace("\t", "%tab").tqreplace(" ", "%spc"); } bool Scope::containsContinue(const TQString& s ) const { - return( s.find( TQRegExp( "\\\\\\s*"+getLineEndingString() ) ) != -1 - || s.find( TQRegExp( "\\\\\\s*#" ) ) != -1 ); + return( s.tqfind( TQRegExp( "\\\\\\s*"+getLineEndingString() ) ) != -1 + || s.tqfind( TQRegExp( "\\\\\\s*#" ) ) != -1 ); } bool Scope::isComment( const TQString& s) const @@ -1616,86 +1616,86 @@ void Scope::printTree() p.processProject(m_root); } -Scope::PrintAST::PrintAST() : QMake::ASTVisitor() +Scope::PrintAST::PrintAST() : TQMake::ASTVisitor() { indent = 0; } -void Scope::PrintAST::processProject( QMake::ProjectAST* p ) +void Scope::PrintAST::processProject( TQMake::ProjectAST* p ) { - QMake::ASTVisitor::processProject(p); + TQMake::ASTVisitor::processProject(p); } -void Scope::PrintAST::enterRealProject( QMake::ProjectAST* p ) +void Scope::PrintAST::enterRealProject( TQMake::ProjectAST* p ) { kdDebug(9024) << getIndent() << "--------- Entering Project: " << replaceWs(p->fileName()) << " --------------" << endl; indent += 4; - QMake::ASTVisitor::enterRealProject(p); + TQMake::ASTVisitor::enterRealProject(p); } -void Scope::PrintAST::leaveRealProject( QMake::ProjectAST* p ) +void Scope::PrintAST::leaveRealProject( TQMake::ProjectAST* p ) { indent -= 4; kdDebug(9024) << getIndent() << "--------- Leaving Project: " << replaceWs(p->fileName()) << " --------------" << endl; - QMake::ASTVisitor::leaveRealProject(p); + TQMake::ASTVisitor::leaveRealProject(p); } -void Scope::PrintAST::enterScope( QMake::ProjectAST* p ) +void Scope::PrintAST::enterScope( TQMake::ProjectAST* p ) { kdDebug(9024) << getIndent() << "--------- Entering Scope: " << replaceWs(p->scopedID) << " --------------" << endl; indent += 4; - QMake::ASTVisitor::enterScope(p); + TQMake::ASTVisitor::enterScope(p); } -void Scope::PrintAST::leaveScope( QMake::ProjectAST* p ) +void Scope::PrintAST::leaveScope( TQMake::ProjectAST* p ) { indent -= 4; kdDebug(9024) << getIndent() << "--------- Leaving Scope: " << replaceWs(p->scopedID) << " --------------" << endl; - QMake::ASTVisitor::leaveScope(p); + TQMake::ASTVisitor::leaveScope(p); } -void Scope::PrintAST::enterFunctionScope( QMake::ProjectAST* p ) +void Scope::PrintAST::enterFunctionScope( TQMake::ProjectAST* p ) { kdDebug(9024) << getIndent() << "--------- Entering FunctionScope: " << replaceWs(p->scopedID) << "(" << replaceWs(p->args) << ")"<< " --------------" << endl; indent += 4; - QMake::ASTVisitor::enterFunctionScope(p); + TQMake::ASTVisitor::enterFunctionScope(p); } -void Scope::PrintAST::leaveFunctionScope( QMake::ProjectAST* p ) +void Scope::PrintAST::leaveFunctionScope( TQMake::ProjectAST* p ) { indent -= 4; kdDebug(9024) << getIndent() << "--------- Leaving FunctionScope: " << replaceWs(p->scopedID) << "(" << replaceWs(p->args) << ")"<< " --------------" << endl; - QMake::ASTVisitor::leaveFunctionScope(p); + TQMake::ASTVisitor::leaveFunctionScope(p); } TQString Scope::PrintAST::replaceWs(TQString s) { - return s.replace("\n", "%nl").replace("\t", "%tab").replace(" ", "%spc"); + return s.tqreplace("\n", "%nl").tqreplace("\t", "%tab").tqreplace(" ", "%spc"); } -void Scope::PrintAST::processAssignment( QMake::AssignmentAST* a) +void Scope::PrintAST::processAssignment( TQMake::AssignmentAST* a) { kdDebug(9024) << getIndent() << "Assignment: " << replaceWs(a->scopedID) << " " << replaceWs(a->op) << " " << replaceWs(a->values.join("|"))<< endl; - QMake::ASTVisitor::processAssignment(a); + TQMake::ASTVisitor::processAssignment(a); } -void Scope::PrintAST::processNewLine( QMake::NewLineAST* n) +void Scope::PrintAST::processNewLine( TQMake::NewLineAST* n) { kdDebug(9024) << getIndent() << "Newline " << endl; - QMake::ASTVisitor::processNewLine(n); + TQMake::ASTVisitor::processNewLine(n); } -void Scope::PrintAST::processComment( QMake::CommentAST* a) +void Scope::PrintAST::processComment( TQMake::CommentAST* a) { kdDebug(9024) << getIndent() << "Comment: " << replaceWs(a->comment) << endl; - QMake::ASTVisitor::processComment(a); + TQMake::ASTVisitor::processComment(a); } -void Scope::PrintAST::processInclude( QMake::IncludeAST* a) +void Scope::PrintAST::processInclude( TQMake::IncludeAST* a) { kdDebug(9024) << getIndent() << "Include: " << replaceWs(a->projectName) << endl; - QMake::ASTVisitor::processInclude(a); + TQMake::ASTVisitor::processInclude(a); } TQString Scope::PrintAST::getIndent() @@ -1707,4 +1707,4 @@ TQString Scope::PrintAST::getIndent() } #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/qmake/scope.h b/buildtools/qmake/scope.h index 5cc609ce..a01adaad 100644 --- a/buildtools/qmake/scope.h +++ b/buildtools/qmake/scope.h @@ -64,7 +64,7 @@ public: TQStringList variableValuesForOp( const TQString& variable, const TQString& op ) const; // Fetch the variable values by running over the statements and adding/removing/setting - // as the encountered op's say, begin with the parent projects variableValues list + // as the encountered op's say, begin with the tqparent projects variableValues list TQStringList variableValues( const TQString& variable, bool checkIncParent = true, bool fetchFromParent = true, bool evaluateSubScopes = false ); // Remove a variable+Op combination from the scope, if existant @@ -86,8 +86,8 @@ public: // Returns the absolute path of the dir containing the .pro file TQString projectDir() const; - // get the parent Scope - Scope* parent() const { return m_parent; } + // get the tqparent Scope + Scope* tqparent() const { return m_parent; } // Fetching sub-scopes const TQValueList<Scope*> scopesInOrder() const { return m_scopes.values(); } @@ -105,7 +105,7 @@ public: * creates a new function scope at the end of this (Sub-)AST * and a new include scope inside the new function scope. * It returns the Scope wrapping the include-AST, the function scope AST - * can be accessed easily using the parent() method. + * can be accessed easily using the tqparent() method. */ Scope* createIncludeScope( const TQString& includeFile, bool negate = false ); @@ -125,8 +125,8 @@ public: /* deletes the subproject (including the subdir if deleteSubdir is true) */ bool deleteSubProject( unsigned int, bool deleteSubdir ); - /* find out wether the project is Qt4 or Qt3 */ - bool isQt4Project() const ; + /* find out wether the project is TQt4 or TQt3 */ + bool isTQt4Project() const ; /* Provide a Map of Custom variables */ const TQMap<unsigned int, TQMap<TQString, TQString> > customVariables() const; @@ -195,29 +195,29 @@ private: /* * Finds an existing variable, returns the end() of the statemenst if it is not found */ - TQValueList<QMake::AST*>::iterator findExistingVariable( const TQString& variable ); + TQValueList<TQMake::AST*>::iterator findExistingVariable( const TQString& variable ); // Private constructors for easier subscope creation /* * just initializes the lists from the scope */ - Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, QMake::ProjectAST* root, QMakeDefaultOpts*, TrollProjectPart* part ); + Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, TQMake::ProjectAST* root, TQMakeDefaultOpts*, TrollProjectPart* part ); /* * reads the given filename and parses it. If it doesn't exist creates an empty * ProjectAST with the given filename */ - Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, const TQString& filename, TrollProjectPart* part, bool isEnabled = true ); + Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, const TQString& filename, TrollProjectPart* part, bool isEnabled = true ); /* * Creates a scope for an include statement, parses the file and initializes the Scope * Create an empty ProjectAST if the file cannot be found or parsed. */ - Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, QMake::IncludeAST* incast, const TQString& path, const TQString& incfile, QMakeDefaultOpts*, TrollProjectPart* part ); + Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, TQMake::IncludeAST* incast, const TQString& path, const TQString& incfile, TQMakeDefaultOpts*, TrollProjectPart* part ); // runs through the statements until stopHere is found (or the end is reached, if stopHere is 0), // using the given list as startvalue // Changes the list using the +=, -=, = operations accordingly - void calcValuesFromStatements( const TQString& variable, TQStringList& result, bool, QMake::AST* stopHere = 0, bool fetchFromParent = true, bool setDefault = true, bool evaluateSubScopes = false ) const; + void calcValuesFromStatements( const TQString& variable, TQStringList& result, bool, TQMake::AST* stopHere = 0, bool fetchFromParent = true, bool setDefault = true, bool evaluateSubScopes = false ) const; // Check wether the two operators are compatible static bool isCompatible( const TQString& op1, const TQString& op2); @@ -228,15 +228,15 @@ private: // Load and Save project files, these only work on ProjectScope's bool loadFromFile( const TQString& filename ); - TQString funcScopeKey( QMake::ProjectAST* funcast ) const { return funcast->scopedID + "(" + funcast->args + ")"; } + TQString funcScopeKey( TQMake::ProjectAST* funcast ) const { return funcast->scopedID + "(" + funcast->args + ")"; } unsigned int getNextScopeNum() { if( m_scopes.isEmpty() ) return 0; else return (m_scopes.keys().last()+1); } TQStringList lookupVariable( const TQString& var ); - TQStringList resolveVariables( const TQStringList&, QMake::AST* = 0 ) const; - TQStringList variableValues( const TQString& variable, QMake::AST*, bool fetchFromParent = true ) const; - TQString resolveVariables( const TQString& , QMake::AST* ) const; + TQStringList resolveVariables( const TQStringList&, TQMake::AST* = 0 ) const; + TQStringList variableValues( const TQString& variable, TQMake::AST*, bool fetchFromParent = true ) const; + TQString resolveVariables( const TQString& , TQMake::AST* ) const; // This function determines the currently used String for fileending, it can be \n, \r or \r\n TQString getLineEndingString() const; @@ -246,9 +246,9 @@ private: void loadDefaultOpts(); - QMake::ProjectAST* m_root; - QMake::IncludeAST* m_incast; - TQMap<unsigned int, QMake::AssignmentAST*> m_customVariables; + TQMake::ProjectAST* m_root; + TQMake::IncludeAST* m_incast; + TQMap<unsigned int, TQMake::AssignmentAST*> m_customVariables; TQMap<unsigned int, Scope*> m_scopes; Scope* m_parent; unsigned int m_maxCustomVarNum; @@ -256,40 +256,40 @@ private: TQString replaceWs(TQString); - // The "position" inside the parent scope that this scope starts at + // The "position" inside the tqparent scope that this scope starts at unsigned int m_num; bool m_isEnabled; TrollProjectPart* m_part; - QMakeDefaultOpts* m_defaultopts; + TQMakeDefaultOpts* m_defaultopts; TQMap<TQString, TQStringList> m_varCache; TQMap<TQString,TQString> m_environment; #ifdef DEBUG - class PrintAST : QMake::ASTVisitor + class PrintAST : TQMake::ASTVisitor { public: PrintAST(); - virtual void processProject( QMake::ProjectAST* p ); - virtual void enterRealProject( QMake::ProjectAST* p ); + virtual void processProject( TQMake::ProjectAST* p ); + virtual void enterRealProject( TQMake::ProjectAST* p ); - virtual void leaveRealProject( QMake::ProjectAST* p ); + virtual void leaveRealProject( TQMake::ProjectAST* p ); - virtual void enterScope( QMake::ProjectAST* p ); + virtual void enterScope( TQMake::ProjectAST* p ); - virtual void leaveScope( QMake::ProjectAST* p ); + virtual void leaveScope( TQMake::ProjectAST* p ); - virtual void enterFunctionScope( QMake::ProjectAST* p ); + virtual void enterFunctionScope( TQMake::ProjectAST* p ); - virtual void leaveFunctionScope( QMake::ProjectAST* p ); + virtual void leaveFunctionScope( TQMake::ProjectAST* p ); - virtual void processAssignment( QMake::AssignmentAST* a); + virtual void processAssignment( TQMake::AssignmentAST* a); - virtual void processNewLine( QMake::NewLineAST* n); + virtual void processNewLine( TQMake::NewLineAST* n); - virtual void processComment( QMake::CommentAST* a); + virtual void processComment( TQMake::CommentAST* a); - virtual void processInclude( QMake::IncludeAST* a); + virtual void processInclude( TQMake::IncludeAST* a); TQString replaceWs(TQString); @@ -304,5 +304,5 @@ 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/qmake/trolllistview.cpp b/buildtools/qmake/trolllistview.cpp index 3bf99a0e..adca9d44 100644 --- a/buildtools/qmake/trolllistview.cpp +++ b/buildtools/qmake/trolllistview.cpp @@ -20,9 +20,9 @@ #include "trolllistview.h" -TrollListView::TrollListView(TrollProjectWidget *widget, TQWidget *parent, +TrollListView::TrollListView(TrollProjectWidget *widget, TQWidget *tqparent, TrollProjectWidget::TrollProjectView view, const char *name) - :KListView(parent, name), m_widget(widget), m_view(view) + :KListView(tqparent, name), m_widget(widget), m_view(view) { } diff --git a/buildtools/qmake/trolllistview.h b/buildtools/qmake/trolllistview.h index 5fd79b30..9d843cb7 100644 --- a/buildtools/qmake/trolllistview.h +++ b/buildtools/qmake/trolllistview.h @@ -27,8 +27,9 @@ class TrollListView : public KListView { Q_OBJECT + TQ_OBJECT public: - TrollListView(TrollProjectWidget *widget, TQWidget *parent, TrollProjectWidget::TrollProjectView view, const char *name = 0); + TrollListView(TrollProjectWidget *widget, TQWidget *tqparent, TrollProjectWidget::TrollProjectView view, const char *name = 0); ~TrollListView(); protected: virtual void focusOutEvent(TQFocusEvent *e); diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index d59c5b4b..54d31735 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -60,8 +60,8 @@ typedef KDevGenericFactory<TrollProjectPart> TrollProjectFactory; static const KDevPluginInfo data("kdevtrollproject"); K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) ) -TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args ) - : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart") +TrollProjectPart::TrollProjectPart(TQObject *tqparent, const char *name, const TQStringList& args ) + : KDevBuildTool(&data, tqparent, name ? name : "TrollProjectPart") { setInstance(TrollProjectFactory::instance()); @@ -79,20 +79,20 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS m_widget = new TrollProjectWidget(this); m_widget->setIcon(SmallIcon("qmakerun")); - m_widget->setCaption(i18n("QMake Manager")); - TQWhatsThis::add(m_widget, i18n("<b>QMake manager</b><p>" - "The QMake manager project tree consists of two parts. The 'overview' " + m_widget->setCaption(i18n("TQMake Manager")); + TQWhatsThis::add(m_widget, i18n("<b>TQMake manager</b><p>" + "The TQMake manager project tree consists of two parts. The 'overview' " "in the upper half shows the subprojects, each one having a " ".pro file. The 'details' view in the lower half shows the " "list of files for the active subproject selected in the overview.")); - mainWindow()->embedSelectViewRight(m_widget, i18n("QMake Manager"), i18n("QMake manager")); + mainWindow()->embedSelectViewRight(m_widget, i18n("TQMake Manager"), i18n("TQMake manager")); KAction *action; const TQIconSet icon(SmallIcon("compfile")); action = new KAction( i18n("Compile &File"), "compfile", 0, - m_widget, TQT_SLOT(slotBuildOpenFile()), + TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildOpenFile()), actionCollection(),"build_compilefile" ); action->setToolTip(i18n("Compile file")); action->setWhatsThis(i18n("<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>" @@ -101,7 +101,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS action = new KAction( i18n("&Build Project"), "make_kdevelop", Key_F8, - m_widget, TQT_SLOT(slotBuildProject()), + TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildProject()), actionCollection(), "build_build_project" ); action->setToolTip(i18n("Build project")); action->setWhatsThis(i18n("<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>" @@ -109,7 +109,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("&Rebuild Project"),"rebuild" , 0, - m_widget, TQT_SLOT(slotRebuildProject()), + TQT_TQOBJECT(m_widget), TQT_SLOT(slotRebuildProject()), actionCollection(),"build_rebuild_project" ); action->setToolTip(i18n("Rebuild project")); action->setWhatsThis(i18n("<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from the project directory.<br>" @@ -117,7 +117,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("&Install Project"),"install" , 0, - m_widget, TQT_SLOT(slotInstallProject()), + TQT_TQOBJECT(m_widget), TQT_SLOT(slotInstallProject()), actionCollection(),"build_install_project" ); action->setToolTip(i18n("Install project")); action->setWhatsThis(i18n("<b>Install project</b><p>Runs <b>make install</b> from the project directory.<br>" @@ -125,7 +125,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("&Clean Project"), 0, - m_widget, TQT_SLOT(slotCleanProject()), + TQT_TQOBJECT(m_widget), TQT_SLOT(slotCleanProject()), actionCollection(), "build_clean_project" ); action->setToolTip(i18n("Clean project")); action->setWhatsThis(i18n("<b>Clean project</b><p>Runs <b>make clean</b> command from the project directory.<br>" @@ -133,7 +133,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("&Dist-Clean Project"), 0, - m_widget, TQT_SLOT(slotDistCleanProject()), + TQT_TQOBJECT(m_widget), TQT_SLOT(slotDistCleanProject()), actionCollection(), "build_distclean_project" ); action->setToolTip(i18n("Dist-Clean project")); action->setWhatsThis(i18n("<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the " @@ -147,47 +147,47 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS action->setWhatsThis(i18n("<b>Execute program</b><p>Executes the currently selected subproject if it is an application or the program specified in project settings, <b>Run Options</b> tab.")); action = new KAction( i18n("&Build Subproject"), "make_kdevelop", Key_F7, - m_widget, TQT_SLOT(slotBuildTarget()), + TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildTarget()), actionCollection(), "build_build_target" ); action->setToolTip(i18n("Build subproject")); action->setWhatsThis(i18n("<b>Build subproject</b><p>Runs <b>make</b> from the current subproject directory. " - "Current subproject is a subproject selected in <b>QMake manager</b> 'overview' window.<br>" + "Current subproject is a subproject selected in <b>TQMake manager</b> 'overview' window.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("&Rebuild Subproject"), "rebuild", 0, - m_widget, TQT_SLOT(slotRebuildTarget()), + TQT_TQOBJECT(m_widget), TQT_SLOT(slotRebuildTarget()), actionCollection(),"build_rebuild_target" ); action->setToolTip(i18n("Rebuild subproject")); action->setWhatsThis(i18n("<b>Rebuild subproject</b><p>Runs <b>make clean</b> and then <b>make</b> from the current subproject directory. " - "Current subproject is a subproject selected in <b>QMake manager</b> 'overview' window.<br>" + "Current subproject is a subproject selected in <b>TQMake manager</b> 'overview' window.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("&Install Subproject"), "install", 0, - m_widget, TQT_SLOT(slotInstallTarget()), + TQT_TQOBJECT(m_widget), TQT_SLOT(slotInstallTarget()), actionCollection(),"build_install_target" ); action->setToolTip(i18n("Install subproject")); action->setWhatsThis(i18n("<b>Install subproject</b><p>Runs <b>make install</b> from the current subproject directory. " - "The current subproject is the subproject selected in the <b>QMake manager</b> 'overview' window.<br>" + "The current subproject is the subproject selected in the <b>TQMake manager</b> 'overview' window.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("&Clean Subproject"), 0, - m_widget, TQT_SLOT(slotCleanTarget()), + TQT_TQOBJECT(m_widget), TQT_SLOT(slotCleanTarget()), actionCollection(), "build_clean_target" ); action->setToolTip(i18n("Clean subproject")); action->setWhatsThis(i18n("<b>Clean subproject</b><p>Runs <b>make clean</b> from the current subproject directory. " - "The current subproject is the subproject selected in the <b>QMake manager</b> 'overview' window.<br>" + "The current subproject is the subproject selected in the <b>TQMake manager</b> 'overview' window.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab.")); action = new KAction( i18n("&Dist-Clean Subproject"), 0, - m_widget, TQT_SLOT(slotDistCleanTarget()), + TQT_TQOBJECT(m_widget), TQT_SLOT(slotDistCleanTarget()), actionCollection(), "build_distclean_target" ); action->setToolTip(i18n("Dist-Clean subproject")); action->setWhatsThis(i18n("<b>Dist-Clean subproject</b><p>Runs <b>make distclean</b> from the current" - " subproject directory. The current subproject is the subproject selected in the <b>QMake manager</b> 'overview' window.<br>" + " subproject directory. The current subproject is the subproject selected in the <b>TQMake manager</b> 'overview' window.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab.")); @@ -205,15 +205,15 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS connect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), this, TQT_SLOT(slotCommandFinished(const TQString&)) ); - TQString m_defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); + TQString m_defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); TQString m_qmakePath = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", ""); TQString qtversion = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/version", "3"); - if( m_defaultQtDir.isEmpty() || !isValidQtDir( m_defaultQtDir ) ) + if( m_defaultTQtDir.isEmpty() || !isValidTQtDir( m_defaultTQtDir ) ) { - m_defaultQtDir = findQtDir(); - kdDebug(9024) << "Setting default dir to: " << m_defaultQtDir << endl; - DomUtil::writeEntry(*projectDom(), "/kdevcppsupport/qt/root", m_defaultQtDir ); + m_defaultTQtDir = findTQtDir(); + kdDebug(9024) << "Setting default dir to: " << m_defaultTQtDir << endl; + DomUtil::writeEntry(*projectDom(), "/kdevcppsupport/qt/root", m_defaultTQtDir ); } if( m_qmakePath.isEmpty() || !isExecutable( m_qmakePath ) ) { @@ -244,10 +244,10 @@ TQString TrollProjectPart::makeEnvironment() TQString environstr; DomUtil::PairList::ConstIterator it; - bool hasQtDir = false; + bool hasTQtDir = false; for (it = envvars.begin(); it != envvars.end(); ++it) { - if( (*it).first == "QTDIR" ) - hasQtDir = true; + if( (*it).first == "TQTDIR" ) + hasTQtDir = true; environstr += (*it).first; environstr += "="; @@ -255,9 +255,9 @@ TQString TrollProjectPart::makeEnvironment() environstr += " "; } - if( !hasQtDir && !isQt4Project() && !DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) + if( !hasTQtDir && !isTQt4Project() && !DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) { - environstr += TQString( "QTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$QTDIR/bin:$PATH " ); + environstr += TQString( "TQTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$TQTDIR/bin:$PATH " ); } KConfigGroup grp( kapp->config(), "MakeOutputView" ); @@ -276,7 +276,7 @@ void TrollProjectPart::projectConfigWidget(KDialogBase *dlg) vbox = dlg->addVBoxPage(i18n("Make Options"), i18n("Make Options"), BarIcon( "make", KIcon::SizeMedium )); MakeOptionsWidget *w4 = new MakeOptionsWidget(*projectDom(), "/kdevtrollproject", vbox); - vbox = dlg->addVBoxPage(i18n("QMake Manager"), i18n("QMake Manager"), BarIcon( "make", KIcon::SizeMedium )); + vbox = dlg->addVBoxPage(i18n("TQMake Manager"), i18n("TQMake Manager"), BarIcon( "make", KIcon::SizeMedium )); QMakeOptionsWidget *qm = new QMakeOptionsWidget( projectDirectory(), *projectDom(), "/kdevtrollproject", vbox); @@ -290,32 +290,32 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj { mainWindow()->statusBar()->message( i18n("Loading Project...") ); - TQString defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); - if( !isQt4Project() && ( defaultQtDir.isEmpty() || !isValidQtDir( defaultQtDir ) ) ) + TQString defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); + if( !isTQt4Project() && ( defaultTQtDir.isEmpty() || !isValidTQtDir( defaultTQtDir ) ) ) { bool doask = true; while( doask ) { - KURLRequesterDlg dlg( i18n("Choose Qt3 directory"), - i18n("Choose the Qt3 directory to use. This directory needs to have an include directory containing tqt.h.") + KURLRequesterDlg dlg( i18n("Choose TQt3 directory"), + i18n("Choose the TQt3 directory to use. This directory needs to have an include directory containing tqt.h.") , m_widget, 0); dlg.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - dlg.urlRequester() ->setURL( TQString::null ); + dlg.urlRequester() ->setURL( TQString() ); dlg.urlRequester() ->completionObject() ->setDir( "/" ); if ( dlg.exec() == TQDialog::Accepted && !dlg.urlRequester() ->url().isEmpty() ) { TQString qtdir = dlg.urlRequester()->url(); - if( !isValidQtDir( qtdir ) ) + if( !isValidTQtDir( qtdir ) ) { if( KMessageBox::warningYesNo( m_widget, - i18n("The directory you gave is not a proper Qt directory, the " + i18n("The directory you gave is not a proper TQt directory, the " "project might not work properly without one.\nPlease make " "sure you give a directory that contains a bin with the " - "qmake binary in it and for Qt3 project also contains an " + "qmake binary in it and for TQt3 project also contains an " "include directory with tqt.h in it.\nDo you want to try " - "setting a Qt directory again?"), - i18n("Wrong Qt directory given")) + "setting a TQt directory again?"), + i18n("Wrong TQt directory given")) == KMessageBox::Yes ) doask = true; @@ -323,17 +323,17 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj doask = false; }else { - defaultQtDir = qtdir; + defaultTQtDir = qtdir; doask = false; } }else { if( KMessageBox::warningYesNo( m_widget, - i18n("You did not specify a Qt directory, and the project might not " - "work properly without one.\nDo you want to try setting a Qt" + i18n("You did not specify a TQt directory, and the project might not " + "work properly without one.\nDo you want to try setting a TQt" " directory again?"), - i18n("No Qt directory given")) + i18n("No TQt directory given")) == KMessageBox::Yes ) doask = true; @@ -348,10 +348,10 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj bool doask = true; while( doask ) { - KURLRequesterDlg dlg( i18n("Choose QMake executable"), - i18n("Choose the QMake binary to use. QMake is used to generate Makefiles from the project files."), m_widget, 0); + KURLRequesterDlg dlg( i18n("Choose TQMake executable"), + i18n("Choose the TQMake binary to use. TQMake is used to generate Makefiles from the project files."), m_widget, 0); dlg.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - dlg.urlRequester() ->setURL( TQString::null ); + dlg.urlRequester() ->setURL( TQString() ); dlg.urlRequester() ->completionObject() ->setDir( "/" ); if ( dlg.exec() == TQDialog::Accepted && !dlg.urlRequester() ->url().isEmpty() ) @@ -363,8 +363,8 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj i18n("The binary you gave is not executable, the " "project might not work properly.\nPlease make " "sure you give a qmake binary that is executable.\nDo you want to try " - "setting the QMake binary again?"), - i18n("Wrong QMake binary given")) + "setting the TQMake binary again?"), + i18n("Wrong TQMake binary given")) == KMessageBox::Yes ) doask = true; @@ -379,10 +379,10 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj }else { if( KMessageBox::warningYesNo( m_widget, - i18n("You did not specify a QMake binary, and the project might not " - "work properly without one.\nDo you want to try setting a QMake" + i18n("You did not specify a TQMake binary, and the project might not " + "work properly without one.\nDo you want to try setting a TQMake" " binary again?"), - i18n("No QMake binary given")) + i18n("No TQMake binary given")) == KMessageBox::Yes ) doask = true; @@ -391,7 +391,7 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj } } } - DomUtil::writeEntry( *projectDom(), "/kdevcppsupport/qt/root", defaultQtDir ); + DomUtil::writeEntry( *projectDom(), "/kdevcppsupport/qt/root", defaultTQtDir ); DomUtil::writeEntry( *projectDom(), "/kdevcppsupport/qt/qmake", qmakePath ); m_projectName = projectName; @@ -479,8 +479,8 @@ TQString TrollProjectPart::runDirectory() const }else { TQString name = m_widget->getCurrentOutputFilename(); - if( name.findRev("/") != -1 ) - name = name.right( name.length()-name.findRev("/")-1 ); + if( name.tqfindRev("/") != -1 ) + name = name.right( name.length()-name.tqfindRev("/")-1 ); cwd = DomUtil::readEntry( dom, "/kdevtrollproject/run/cwd/" + name ); } if( cwd.isEmpty() ) @@ -490,7 +490,7 @@ TQString TrollProjectPart::runDirectory() const { destpath = m_widget->subprojectDirectory() + TQString( TQChar( TQDir::separator() ) ) + destpath; } - destpath = destpath.left( destpath.findRev("/") ); + destpath = destpath.left( destpath.tqfindRev("/") ); cwd = destpath; } @@ -535,17 +535,17 @@ TQString TrollProjectPart::mainProgram() const KMessageBox::error( m_widget, "There's no selected subproject!\n" "Unable to determine the main program", "No selected subproject found" ); kdDebug ( 9020 ) << k_funcinfo << "Error! : There's no active target! -> Unable to determine the main program in TrollProjectPart::mainProgram()" << endl; - return TQString::null; + return TQString(); } - if ( m_widget->currentSubproject()->scope->variableValues("TEMPLATE").findIndex("app") == -1 ) + if ( m_widget->currentSubproject()->scope->variableValues("TEMPLATE").tqfindIndex("app") == -1 ) { KMessageBox::error( m_widget, "Selected Subproject \""+m_widget->currentSubproject()->scope->projectName()+"\"isn't binary ( " + m_widget->currentSubproject()->scope->variableValues("TEMPLATE").join(" ") + " ) !\n" "Unable to determine the main program. If you want this\n" "to be the selected subproject, set a main program under\n" "Project -> Project Options -> Run Options", "Selected subproject is not a library" ); kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << m_widget->currentSubproject()->scope->variableValues("TEMPLATE").join(" ") << ") ! -> Unable to determine the main program in TrollProjectPart::mainProgram()" << endl; - return TQString::null; + return TQString(); } TQString destpath = m_widget->getCurrentTarget(); @@ -647,10 +647,10 @@ void TrollProjectPart::startMakeCommand(const TQString &dir, const TQString &tar TQFileInfo fi(dir + "/Makefile"); if (!fi.exists()) { - int r = KMessageBox::questionYesNo(m_widget, i18n("There is no Makefile in this directory. Run qmake first?"), TQString::null, i18n("Run qmake"), i18n("Do Not Run")); + int r = KMessageBox::questionYesNo(m_widget, i18n("There is no Makefile in this directory. Run qmake first?"), TQString(), i18n("Run qmake"), i18n("Do Not Run")); if (r == KMessageBox::No) return; - startQMakeCommand(dir); + startTQMakeCommand(dir); } TQDomDocument &dom = *projectDom(); @@ -692,7 +692,7 @@ void TrollProjectPart::startMakeCommand(const TQString &dir, const TQString &tar } */ -void TrollProjectPart::startQMakeCommand(const TQString &dir, bool recursive) +void TrollProjectPart::startTQMakeCommand(const TQString &dir, bool recursive) { TQFileInfo fi(dir); TQString cmdline; @@ -705,24 +705,24 @@ void TrollProjectPart::startQMakeCommand(const TQString &dir, bool recursive) cmdline = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", "")+" "; } - if(isQt4Project() && recursive) + if(isTQt4Project() && recursive) { cmdline += " -recursive "; } - //TQString cmdline = TQString::fromLatin1( isTMakeProject() ? "tmake " : "qmake " ); + //TQString cmdline = TQString::tqfromLatin1( isTMakeProject() ? "tmake " : "qmake " ); // cmdline += fi.baseName() + ".pro"; TQDir d(dir); TQStringList l = d.entryList("*.pro"); - if( l.isEmpty() || ( l.count() && l.findIndex( projectName() + ".pro" ) != -1 ) ) + if( l.isEmpty() || ( l.count() && l.tqfindIndex( projectName() + ".pro" ) != -1 ) ) cmdline += projectName()+".pro"; - else if( l.isEmpty() || (l.count() && l.findIndex( fi.baseName() + ".pro" ) != -1 ) ) + else if( l.isEmpty() || (l.count() && l.tqfindIndex( fi.baseName() + ".pro" ) != -1 ) ) cmdline += fi.baseName() + ".pro"; else cmdline += l[0]; -// cmdline += TQString::fromLatin1( " -o Makefile" ); +// cmdline += TQString::tqfromLatin1( " -o Makefile" ); TQString dircmd = "cd "; dircmd += KProcess::quote(dir); @@ -744,7 +744,7 @@ void TrollProjectPart::slotCommandFinished( const TQString& command ) // if( m_buildCommand != command ) // return; // -// m_buildCommand = TQString::null; +// m_buildCommand = TQString(); m_timestamp.clear(); TQStringList fileList = allFiles(); @@ -778,7 +778,7 @@ bool TrollProjectPart::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 ){ return true; @@ -790,37 +790,37 @@ bool TrollProjectPart::isDirty() KDevProject::Options TrollProjectPart::options( ) const { - return UsesQMakeBuildSystem; + return UsesTQMakeBuildSystem; } -bool TrollProjectPart::isValidQtDir( const TQString& path ) const +bool TrollProjectPart::isValidTQtDir( const TQString& path ) const { TQFileInfo inc( path + TQString( TQChar( TQDir::separator() ) )+ "include"+TQString( TQChar( TQDir::separator() ) )+ "tqt.h" ); - return ( isQt4Project() || ( !isQt4Project() && inc.exists() ) ); + return ( isTQt4Project() || ( !isTQt4Project() && inc.exists() ) ); } void TrollProjectPart::buildBinDirs( TQStringList & dirs ) const { - if( !isQt4Project() ) + if( !isTQt4Project() ) { - TQString m_defaultQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); - if( !m_defaultQtDir.isEmpty() ) - dirs << (m_defaultQtDir + TQString( TQChar( TQDir::separator() ) ) + "bin" ); - dirs << ( ::getenv("QTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin" ); + TQString m_defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); + if( !m_defaultTQtDir.isEmpty() ) + dirs << (m_defaultTQtDir + TQString( TQChar( TQDir::separator() ) ) + "bin" ); + dirs << ( ::getenv("TQTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin" ); } TQStringList paths = TQStringList::split(":",::getenv("PATH")); dirs += paths; TQString binpath = TQDir::rootDirPath() + "bin"; - if( dirs.findIndex( binpath ) != -1 ) + if( dirs.tqfindIndex( binpath ) != -1 ) dirs << binpath; binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "bin"; - if( dirs.findIndex( binpath ) != -1 ) + if( dirs.tqfindIndex( binpath ) != -1 ) dirs << binpath; binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "local" + TQString( TQChar( TQDir::separator() ) ) + "bin"; - if( dirs.findIndex( binpath ) != -1 ) + if( dirs.tqfindIndex( binpath ) != -1 ) dirs << binpath; } @@ -847,21 +847,21 @@ bool TrollProjectPart::isExecutable( const TQString& path ) const return( fi.exists() && fi.isExecutable() ); } -TQString TrollProjectPart::findQtDir() +TQString TrollProjectPart::findTQtDir() { TQStringList qtdirs; - if( !isQt4Project() ) - qtdirs.push_back( ::getenv("QTDIR") ); - qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); - qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); - qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); + if( !isTQt4Project() ) + qtdirs.push_back( ::getenv("TQTDIR") ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr" ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt" ); for( TQStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it ) { TQString qtdir = *it; - if( !qtdir.isEmpty() && isValidQtDir(qtdir) ) + if( !qtdir.isEmpty() && isValidTQtDir(qtdir) ) { return qtdir; } @@ -874,8 +874,8 @@ TQStringList recursiveProFind( const TQString &currDir, const TQString &baseDir { TQStringList fileList; - if( !currDir.contains( TQString( TQChar ( TQDir::separator() ) ) +".." ) - && !currDir.contains( TQString( TQChar( TQDir::separator() ) )+".") ) + if( !currDir.tqcontains( TQString( TQChar ( TQDir::separator() ) ) +".." ) + && !currDir.tqcontains( TQString( TQChar( TQDir::separator() ) )+".") ) { TQDir dir(currDir); TQStringList dirList = dir.entryList(TQDir::Dirs ); @@ -909,7 +909,7 @@ TQStringList TrollProjectPart::distFiles() const return sourceList + files; } -bool TrollProjectPart::isQt4Project() const +bool TrollProjectPart::isTQt4Project() const { return ( DomUtil::readIntEntry( *projectDom(), "kdevcppsupport/qt/version", 3 ) == 4 ); } @@ -926,6 +926,6 @@ void TrollProjectPart::slotBuild() #include "trollprojectpart.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/qmake/trollprojectpart.h b/buildtools/qmake/trollprojectpart.h index 945fb10a..baeddc90 100644 --- a/buildtools/qmake/trollprojectpart.h +++ b/buildtools/qmake/trollprojectpart.h @@ -26,18 +26,19 @@ class KDialogBase; class TrollProjectWidget; class KDirWatch; -class QMakeDefaultOpts; +class TQMakeDefaultOpts; class TrollProjectPart : public KDevBuildTool { Q_OBJECT + TQ_OBJECT public: - TrollProjectPart( TQObject *parent, const char *name, const TQStringList &args ); + TrollProjectPart( TQObject *tqparent, const char *name, const TQStringList &args ); ~TrollProjectPart(); bool isTMakeProject() const { return m_tmakeProject; } - bool isQt4Project() const; + bool isTQt4Project() const; bool isDirty(); KDirWatch* dirWatch(); virtual Options options() const; @@ -74,15 +75,15 @@ private slots: private: // void startMakeCommand(const TQString &dir, const TQString &target); - void startQMakeCommand(const TQString &dir, bool recursive = false ); + void startTQMakeCommand(const TQString &dir, bool recursive = false ); // void execute(const TQString &directory, const TQString &command); void queueCmd(const TQString &dir, const TQString &cmd); TQString makeEnvironment(); - TQString findQtDir(); + TQString findTQtDir(); TQString findExecutable( const TQString& path ) const; void buildBinDirs( TQStringList& ) const; - bool isValidQtDir( const TQString& path ) const; + bool isValidTQtDir( const TQString& path ) const; bool isExecutable( const TQString& path ) const; TQGuardedPtr<TrollProjectWidget> m_widget; @@ -98,7 +99,7 @@ private: friend class TrollProjectWidget; friend class ProjectRunOptionsDlg; - friend class QMakeDefaultOpts; + friend class TQMakeDefaultOpts; }; #endif diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 087367bd..b6ec8f5e 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -12,7 +12,7 @@ * Copyright (C) 2006 by Andreas Pakulat * * apaku@gmx.de * * * -* Part of this file is taken from Qt Designer. * +* Part of this file is taken from TQt Designer. * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -84,7 +84,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) m_rootScope ( 0 ), m_part ( part ), m_configDlg( 0 ), m_filesCached(false) { - TQSplitter * splitter = new TQSplitter( Vertical, this ); + TQSplitter * splitter = new TQSplitter(Qt::Vertical, this ); ////////////////// // PROJECT VIEW // @@ -93,7 +93,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) overviewContainer = new TQVBox( splitter, "Projects" ); overviewContainer->setMargin ( 2 ); overviewContainer->setSpacing ( 2 ); - // overviewContainer->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); + // overviewContainer->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); // splitter->setResizeMode(overviewContainer, TQSplitter::FollowSizeHint); projectTools = new TQHBox( overviewContainer, "Project buttons" ); @@ -102,7 +102,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // Add subdir addSubdirButton = new TQToolButton ( projectTools, "Add subproject button" ); addSubdirButton->setPixmap ( SmallIcon ( "folder_new" ) ); - addSubdirButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addSubdirButton->sizePolicy().hasHeightForWidth() ) ); + addSubdirButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addSubdirButton->sizePolicy().hasHeightForWidth() ) ); addSubdirButton->setEnabled ( true ); TQToolTip::add( addSubdirButton, i18n( "Add subproject" ) ); TQWhatsThis::add( addSubdirButton, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. " @@ -111,15 +111,15 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // Create scope createScopeButton = new TQToolButton ( projectTools, "Create scope button" ); createScopeButton->setPixmap ( SmallIcon ( "qmake_scopenew" ) ); - createScopeButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, createScopeButton->sizePolicy().hasHeightForWidth() ) ); + createScopeButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, createScopeButton->sizePolicy().hasHeightForWidth() ) ); createScopeButton->setEnabled ( true ); TQToolTip::add( createScopeButton, i18n( "Create scope" ) ); - TQWhatsThis::add( createScopeButton, i18n( "<b>Create scope</b><p>Creates QMake scope in the project file in case the subproject is selected or creates nested scope in case the scope is selected." ) ); + TQWhatsThis::add( createScopeButton, i18n( "<b>Create scope</b><p>Creates TQMake scope in the project file in case the subproject is selected or creates nested scope in case the scope is selected." ) ); // build buildProjectButton = new TQToolButton ( projectTools, "Make button" ); buildProjectButton->setPixmap ( SmallIcon ( "make_kdevelop" ) ); - buildProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildProjectButton->sizePolicy().hasHeightForWidth() ) ); + buildProjectButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildProjectButton->sizePolicy().hasHeightForWidth() ) ); buildProjectButton->setEnabled ( true ); TQToolTip::add( buildProjectButton, i18n( "Build project" ) ); TQWhatsThis::add( buildProjectButton, i18n( "<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>" @@ -128,7 +128,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // rebuild rebuildProjectButton = new TQToolButton ( projectTools, "Rebuild button" ); rebuildProjectButton->setPixmap ( SmallIcon ( "rebuild" ) ); - rebuildProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildProjectButton->sizePolicy().hasHeightForWidth() ) ); + rebuildProjectButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildProjectButton->sizePolicy().hasHeightForWidth() ) ); rebuildProjectButton->setEnabled ( true ); TQToolTip::add( rebuildProjectButton, i18n( "Rebuild project" ) ); TQWhatsThis::add( rebuildProjectButton, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from the project directory.<br>" @@ -138,7 +138,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // run executeProjectButton = new TQToolButton ( projectTools, "Run button" ); executeProjectButton->setPixmap ( SmallIcon ( "exec" ) ); - executeProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeProjectButton->sizePolicy().hasHeightForWidth() ) ); + executeProjectButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeProjectButton->sizePolicy().hasHeightForWidth() ) ); executeProjectButton->setEnabled ( true ); TQToolTip::add( executeProjectButton, i18n( "Execute main program" ) ); TQWhatsThis::add( executeProjectButton, i18n( "<b>Execute main program</b><p>Executes the main program specified in project settings, <b>Run Options</b> tab." ) ); @@ -148,10 +148,10 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // Project configuration projectconfButton = new TQToolButton ( projectTools, "Project configuration button" ); projectconfButton->setPixmap ( SmallIcon ( "configure" ) ); - projectconfButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, projectconfButton->sizePolicy().hasHeightForWidth() ) ); + projectconfButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, projectconfButton->sizePolicy().hasHeightForWidth() ) ); projectconfButton->setEnabled ( true ); TQToolTip::add( projectconfButton, i18n( "Subproject settings" ) ); - TQWhatsThis::add( projectconfButton, i18n( "<b>Subproject settings</b><p>Opens <b>QMake Subproject Configuration</b> dialog for the currently selected subproject. " + TQWhatsThis::add( projectconfButton, i18n( "<b>Subproject settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog for the currently selected subproject. " "It provides settings for:<br>subproject type and configuration,<br>include and library paths,<br>lists of dependencies and " "external libraries,<br>build order,<br>intermediate files locations,<br>compiler options." ) ); @@ -172,7 +172,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // overview->setResizeMode( TQListView::LastColumn ); overview->setSorting( -1 ); overview->header() ->hide(); - overview->addColumn( TQString::null ); + overview->addColumn( TQString() ); // Project tree connections connect( overview, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), @@ -189,7 +189,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) detailContainer = new TQVBox( splitter, "Details" ); detailContainer->setMargin ( 2 ); detailContainer->setSpacing ( 2 ); - // detailContainer->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + // detailContainer->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); // Details Toolbar fileTools = new TQHBox( detailContainer, "Detail buttons" ); @@ -199,7 +199,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // Add new file button newfileButton = new TQToolButton ( fileTools, "Create new file" ); newfileButton->setPixmap ( SmallIcon ( "filenew" ) ); - newfileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, newfileButton->sizePolicy().hasHeightForWidth() ) ); + newfileButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, newfileButton->sizePolicy().hasHeightForWidth() ) ); newfileButton->setEnabled ( true ); TQToolTip::add( newfileButton, i18n( "Create new file" ) ); TQWhatsThis::add( newfileButton, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) ); @@ -207,7 +207,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // Add existing files button addfilesButton = new TQToolButton ( fileTools, "Add existing files" ); addfilesButton->setPixmap ( SmallIcon ( "fileimport" ) ); - addfilesButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addfilesButton->sizePolicy().hasHeightForWidth() ) ); + addfilesButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addfilesButton->sizePolicy().hasHeightForWidth() ) ); addfilesButton->setEnabled ( true ); TQToolTip::add( addfilesButton, i18n( "Add existing files" ) ); TQWhatsThis::add( addfilesButton, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is " @@ -217,7 +217,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // remove file button removefileButton = new TQToolButton ( fileTools, "Remove file" ); removefileButton->setPixmap ( SmallIcon ( "button_cancel" ) ); - removefileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, removefileButton->sizePolicy().hasHeightForWidth() ) ); + removefileButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, removefileButton->sizePolicy().hasHeightForWidth() ) ); removefileButton->setEnabled ( true ); TQToolTip::add( removefileButton, i18n( "Remove file" ) ); TQWhatsThis::add( removefileButton, i18n( "<b>Remove file</b><p>Removes file from a current group. Does not remove file from disk." ) ); @@ -225,7 +225,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // build selected file buildFileButton = new TQToolButton ( fileTools, "Make file button" ); buildFileButton->setPixmap ( SmallIcon ( "compfile" ) ); - buildFileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildFileButton->sizePolicy().hasHeightForWidth() ) ); + buildFileButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildFileButton->sizePolicy().hasHeightForWidth() ) ); buildFileButton->setEnabled ( true ); TQToolTip::add( buildFileButton, i18n( "Compile file" ) ); TQWhatsThis::add( buildFileButton, i18n( "<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>" @@ -235,28 +235,28 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // build buildTargetButton = new TQToolButton ( fileTools, "Make sp button" ); buildTargetButton->setPixmap ( SmallIcon ( "make_kdevelop" ) ); - buildTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildTargetButton->sizePolicy().hasHeightForWidth() ) ); + buildTargetButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildTargetButton->sizePolicy().hasHeightForWidth() ) ); buildTargetButton->setEnabled ( true ); TQToolTip::add( buildTargetButton, i18n( "Build subproject" ) ); TQWhatsThis::add( buildTargetButton, i18n( "<b>Build subproject</b><p>Runs <b>make</b> from the current subproject directory. " - "Current subproject is a subproject selected in <b>QMake manager</b> 'overview' window.<br>" + "Current subproject is a subproject selected in <b>TQMake manager</b> 'overview' window.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab." ) ); // rebuild rebuildTargetButton = new TQToolButton ( fileTools, "Rebuild sp button" ); rebuildTargetButton->setPixmap ( SmallIcon ( "rebuild" ) ); - rebuildTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildTargetButton->sizePolicy().hasHeightForWidth() ) ); + rebuildTargetButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildTargetButton->sizePolicy().hasHeightForWidth() ) ); rebuildTargetButton->setEnabled ( true ); TQToolTip::add( rebuildTargetButton, i18n( "Rebuild subproject" ) ); TQWhatsThis::add( rebuildTargetButton, i18n( "<b>Rebuild subproject</b><p>Runs <b>make clean</b> and then <b>make</b> from the current subproject directory. " - "Current subproject is a subproject selected in <b>QMake manager</b> 'overview' window.<br>" + "Current subproject is a subproject selected in <b>TQMake manager</b> 'overview' window.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab." ) ); // run executeTargetButton = new TQToolButton ( fileTools, "Run sp button" ); executeTargetButton->setPixmap ( SmallIcon ( "exec" ) ); - executeTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeTargetButton->sizePolicy().hasHeightForWidth() ) ); + executeTargetButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeTargetButton->sizePolicy().hasHeightForWidth() ) ); executeTargetButton->setEnabled ( true ); TQToolTip::add( executeTargetButton, i18n( "Execute subproject" ) ); TQWhatsThis::add( executeTargetButton, i18n( "<b>Execute subproject</b><p>Executes the target program for the currently selected subproject. " @@ -271,7 +271,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // Configure file button excludeFileFromScopeButton = new TQToolButton ( fileTools, "Exclude file" ); excludeFileFromScopeButton->setPixmap ( SmallIcon ( "configure_file" ) ); - excludeFileFromScopeButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, excludeFileFromScopeButton->sizePolicy().hasHeightForWidth() ) ); + excludeFileFromScopeButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, excludeFileFromScopeButton->sizePolicy().hasHeightForWidth() ) ); excludeFileFromScopeButton->setEnabled ( true ); TQToolTip::add( excludeFileFromScopeButton , i18n( "Exclude file" ) ); TQWhatsThis::add( excludeFileFromScopeButton , i18n( "<b>Exclude file</b><p>Exclude the selected file from this scope." ) ); @@ -282,7 +282,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) details->setResizeMode( TQListView::LastColumn ); details->setSorting( -1 ); details->header() ->hide(); - details->addColumn( TQString::null ); + details->addColumn( TQString() ); // Detail button connections connect ( addfilesButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddFiles () ) ); connect ( newfileButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotNewFile () ) ); @@ -339,9 +339,9 @@ void TrollProjectWidget::openProject( const TQString &dirName ) TQStringList l = dir.entryList( "*.pro" ); TQString profile; - if( l.count() && l.findIndex( m_part->projectName() + ".pro") != -1 ) + if( l.count() && l.tqfindIndex( m_part->projectName() + ".pro") != -1 ) profile = m_part->projectName()+".pro"; - else if( l.isEmpty() || ( l.count() && l.findIndex( fi.baseName() + ".pro") != -1 ) ) + else if( l.isEmpty() || ( l.count() && l.tqfindIndex( fi.baseName() + ".pro") != -1 ) ) profile = fi.baseName()+".pro"; else profile = l[0]; @@ -358,11 +358,11 @@ void TrollProjectWidget::openProject( const TQString &dirName ) if( m_rootScope->scopeType() != Scope::InvalidScope ) { - m_rootSubproject = new QMakeScopeItem( overview, m_rootScope->scopeName(), m_rootScope, this ); + m_rootSubproject = new TQMakeScopeItem( overview, m_rootScope->scopeName(), m_rootScope, this ); m_rootSubproject->setOpen( true ); - if ( m_rootSubproject->firstChild() && m_rootSubproject->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 ) + if ( m_rootSubproject->firstChild() && m_rootSubproject->scope->variableValues( "TEMPLATE" ).tqfindIndex("subdirs") != -1 ) { overview->setSelected( m_rootSubproject->firstChild(), true ); } @@ -380,7 +380,7 @@ void TrollProjectWidget::openProject( const TQString &dirName ) } -void TrollProjectWidget::createQMakeScopeItems() +void TrollProjectWidget::createTQMakeScopeItems() { } @@ -407,7 +407,7 @@ TQStringList TrollProjectWidget::allFiles() TQString TrollProjectWidget::projectDirectory() { if ( !m_rootScope ) - return TQString::null; //confused + return TQString(); //confused return m_rootScope->projectDir(); } @@ -416,7 +416,7 @@ TQString TrollProjectWidget::projectDirectory() TQString TrollProjectWidget::subprojectDirectory() { if ( !m_shownSubproject ) - return TQString::null; + return TQString(); return m_shownSubproject->scope->projectDir(); } @@ -433,11 +433,11 @@ void TrollProjectWidget::setupContext() TQStringList tmpl = m_shownSubproject->scope->variableValues( "TEMPLATE" ); - if ( tmpl.findIndex( "lib" ) != -1 ) + if ( tmpl.tqfindIndex( "lib" ) != -1 ) { runable = false; } - else if ( tmpl.findIndex( "subdirs" ) != -1 ) + else if ( tmpl.tqfindIndex( "subdirs" ) != -1 ) { hasSubdirs = true; runable = false; @@ -480,7 +480,7 @@ void TrollProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item ) return ; } cleanDetailView( m_shownSubproject ); - m_shownSubproject = static_cast<QMakeScopeItem*>( item ); + m_shownSubproject = static_cast<TQMakeScopeItem*>( item ); setupContext(); buildProjectDetailTree( m_shownSubproject, details ); @@ -519,7 +519,7 @@ TQString TrollProjectWidget::getCurrentOutputFilename() if ( m_shownSubproject->scope->variableValues( "TARGET", true, true, true ).isEmpty() ) { TQString exe = m_shownSubproject->scope->resolveVariables(m_shownSubproject->scope->fileName()); - return exe.replace( TQRegExp( "\\.pro$" ), "" ); + return exe.tqreplace( TQRegExp( "\\.pro$" ), "" ); } else { @@ -527,9 +527,9 @@ TQString TrollProjectWidget::getCurrentOutputFilename() } } -void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item ) +void TrollProjectWidget::cleanDetailView( TQMakeScopeItem *item ) { - // If no children in detailview + // If no tqchildren in detailview // it is a subdir template if ( item && details->childCount() ) { @@ -545,7 +545,7 @@ void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item ) // { // // After AddTargetDialog, it can happen that an // // item is not yet in the list view, so better check... -// if ( it1.data() ->parent() ) +// if ( it1.data() ->tqparent() ) // while ( it1.data() ->firstChild() ) // it1.data() ->takeItem( it1.data() ->firstChild() ); // details->takeItem( it1.data() ); @@ -553,11 +553,11 @@ void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item ) } } -void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl ) +void TrollProjectWidget::buildProjectDetailTree( TQMakeScopeItem *item, KListView *listviewControl ) { - // Insert all GroupItems and all of their children into the view - if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 ) + // Insert all GroupItems and all of their tqchildren into the view + if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).tqfindIndex("subdirs") != -1 ) return ; TQMapIterator<GroupItem::GroupType, GroupItem*> it2 = item->groups.begin(); @@ -628,7 +628,7 @@ void TrollProjectWidget::slotDetailsExecuted( TQListViewItem *item ) TQString filePath; if( m_shownSubproject->scope->scopeType() == Scope::IncludeScope ) { - filePath = m_shownSubproject->scope->parent()->projectDir(); + filePath = m_shownSubproject->scope->tqparent()->projectDir(); }else { filePath = m_shownSubproject->scope->projectDir(); @@ -669,7 +669,7 @@ void TrollProjectWidget::slotExecuteTarget() // Only run application projects - if ( !m_shownSubproject->scope->variableValues( "TEMPLATE" ).isEmpty() && m_shownSubproject->scope->variableValues( "TEMPLATE" ).findIndex( "app" ) == -1 ) + if ( !m_shownSubproject->scope->variableValues( "TEMPLATE" ).isEmpty() && m_shownSubproject->scope->variableValues( "TEMPLATE" ).tqfindIndex( "app" ) == -1 ) return ; //only run once @@ -689,7 +689,7 @@ void TrollProjectWidget::slotExecuteTarget() TQString program = KProcess::quote( "." + TQString( TQChar( TQDir::separator() ) ) + getCurrentOutputFilename() ); // Build environment variables to prepend to the executable path - TQString runEnvVars = TQString::null; + TQString runEnvVars = TQString(); DomUtil::PairList list = DomUtil::readPairListEntry( *( m_part->projectDom() ), "/kdevtrollproject/run/envvars", "envvar", "name", "value" ); @@ -820,7 +820,7 @@ void TrollProjectWidget::slotRebuildTarget() m_part->queueCmd( dir, dircmd + rebuildcmd ); } -void TrollProjectWidget::slotCreateScope( QMakeScopeItem *spitem ) +void TrollProjectWidget::slotCreateScope( TQMakeScopeItem *spitem ) { if ( spitem == 0 && m_shownSubproject == 0 ) return ; @@ -835,7 +835,7 @@ void TrollProjectWidget::slotCreateScope( QMakeScopeItem *spitem ) return ; } -void TrollProjectWidget::slotAddSubproject( QMakeScopeItem *spitem ) +void TrollProjectWidget::slotAddSubproject( TQMakeScopeItem *spitem ) { if ( spitem == 0 && m_shownSubproject == 0 ) return ; @@ -850,7 +850,7 @@ void TrollProjectWidget::slotAddSubproject( QMakeScopeItem *spitem ) KURLRequesterDlg dialog( i18n( "Add Subproject" ), i18n( "Please enter a name for the subproject: " ), this, 0 ); KURLRequester* req = dialog.urlRequester(); req->setMode( KFile::Directory | KFile::File | KFile::LocalOnly ); - req->setFilter( "*.pro|QMake Project Files (*.pro)" ); + req->setFilter( "*.pro|TQMake Project Files (*.pro)" ); req->setURL( TQString() ); req->fileDialog()->setURL( KURL::fromPathOrURL( projectdir ) ); req->completionObject() ->setDir( projectdir ); @@ -898,12 +898,12 @@ void TrollProjectWidget::slotAddSubproject( QMakeScopeItem *spitem ) } } -void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const TQString& subdirname ) +void TrollProjectWidget::addSubprojectToItem( TQMakeScopeItem* spitem, const TQString& subdirname ) { TQListViewItem* item = spitem->firstChild(); while( item ) { - QMakeScopeItem* sitem = static_cast<QMakeScopeItem*>(item); + TQMakeScopeItem* sitem = static_cast<TQMakeScopeItem*>(item); if( sitem->scope->scopeName() == subdirname ) { if( sitem->scope->isEnabled() ) @@ -913,7 +913,7 @@ void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const TQSt { spitem->scope->removeFromMinusOp( "SUBDIRS", subdirname ); delete item; - if( spitem->scope->variableValues( "SUBDIRS" ).findIndex( subdirname ) != -1 ) + if( spitem->scope->variableValues( "SUBDIRS" ).tqfindIndex( subdirname ) != -1 ) return; } } @@ -923,7 +923,7 @@ void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const TQSt Scope* subproject = spitem->scope->createSubProject( subdirname ); if( subproject ) { - new QMakeScopeItem( spitem, subproject->scopeName(), subproject ); + new TQMakeScopeItem( spitem, subproject->scopeName(), subproject ); // TQListViewItem* lastitem = spitem->firstChild(); // while( lastitem->nextSibling() != 0 ) // lastitem = lastitem->nextSibling(); @@ -938,11 +938,11 @@ void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const TQSt spitem->sortChildItems( 0, true ); } -void TrollProjectWidget::slotRemoveSubproject( QMakeScopeItem *spitem ) +void TrollProjectWidget::slotRemoveSubproject( TQMakeScopeItem *spitem ) { if ( spitem == 0 && m_shownSubproject == 0 ) return ; - else if ( ( spitem = dynamic_cast<QMakeScopeItem *>( m_shownSubproject->parent() ) ) != NULL ) + else if ( ( spitem = dynamic_cast<TQMakeScopeItem *>( m_shownSubproject->tqparent() ) ) != NULL ) { m_filesCached = false; @@ -971,10 +971,10 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i if ( !item ) return ; - QMakeScopeItem *spitem = static_cast<QMakeScopeItem*>( item ); + TQMakeScopeItem *spitem = static_cast<TQMakeScopeItem*>( item ); KPopupMenu popup( this ); - popup.insertTitle( i18n( "Subproject %1" ).arg( item->text( 0 ) ) ); + popup.insertTitle( i18n( "Subproject %1" ).tqarg( item->text( 0 ) ) ); int idBuild = -2; int idRebuild = -2; @@ -991,75 +991,75 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i int idAddScope = -2; - if ( spitem->scope->scopeType() == Scope::ProjectScope && ( !spitem->scope->parent() || spitem->scope->parent()->scopeType() == Scope::ProjectScope ) ) + if ( spitem->scope->scopeType() == Scope::ProjectScope && ( !spitem->scope->tqparent() || spitem->scope->tqparent()->scopeType() == Scope::ProjectScope ) ) { idBuild = popup.insertItem( SmallIcon( "make_kdevelop" ), i18n( "Build" ) ); - popup.setWhatsThis( idBuild, i18n( "<b>Build</b><p>Runs <b>make</b> from the selected subproject directory.<br>" + popup.tqsetWhatsThis( idBuild, i18n( "<b>Build</b><p>Runs <b>make</b> from the selected subproject directory.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab." ) ); idInstall = popup.insertItem( i18n( "Install" ) ); - popup.setWhatsThis( idBuild, i18n( "<b>Install</b><p>Runs <b>make install</b> from the selected subproject directory.<br>" + popup.tqsetWhatsThis( idBuild, i18n( "<b>Install</b><p>Runs <b>make install</b> from the selected subproject directory.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab." ) ); idClean = popup.insertItem( i18n( "Clean" ) ); - popup.setWhatsThis( idBuild, i18n( "<b>Clean project</b><p>Runs <b>make clean</b> command from the project " + popup.tqsetWhatsThis( idBuild, i18n( "<b>Clean project</b><p>Runs <b>make clean</b> command from the project " "directory.<br> Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab." ) ); idDistClean = popup.insertItem( i18n( "Dist-Clean" ) ); - popup.setWhatsThis( idBuild, i18n( "<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the project " + popup.tqsetWhatsThis( idBuild, i18n( "<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the project " "directory.<br> Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab." ) ); idRebuild = popup.insertItem( SmallIcon( "rebuild" ), i18n( "Rebuild" ) ); - popup.setWhatsThis( idRebuild, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from " + popup.tqsetWhatsThis( idRebuild, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from " "the project directory.<br>Environment variables and make arguments can be " "specified in the project settings dialog, <b>Make Options</b> tab." ) ); idQmake = popup.insertItem( SmallIcon( "qmakerun" ), i18n( "Run qmake" ) ); - popup.setWhatsThis( idQmake, i18n( "<b>Run qmake</b><p>Runs <b>qmake</b> from the selected subproject directory. This creates or regenerates Makefile." ) ); + popup.tqsetWhatsThis( idQmake, i18n( "<b>Run qmake</b><p>Runs <b>qmake</b> from the selected subproject directory. This creates or regenerates Makefile." ) ); idQmakeRecursive = popup.insertItem( SmallIcon( "qmakerun" ), i18n( "Run qmake recursively" ) ); - popup.setWhatsThis( idQmakeRecursive, i18n( "<b>Run qmake recursively</b><p>Runs <b>qmake</b> from the selected " + popup.tqsetWhatsThis( idQmakeRecursive, i18n( "<b>Run qmake recursively</b><p>Runs <b>qmake</b> from the selected " "subproject directory and recurses into all subproject directories. " "This creates or regenerates Makefile." ) ); popup.insertSeparator(); idAddSubproject = popup.insertItem( SmallIcon( "folder_new" ), i18n( "Add Subproject..." ) ); - popup.setWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. " + popup.tqsetWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. " "This action is allowed only if a type of the subproject is 'subdirectories'. The type of the subproject can be " "defined in <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) ); - if ( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 ) + if ( spitem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 ) popup.setItemEnabled( idAddSubproject, false ); idRemoveSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Remove Subproject..." ) ); - popup.setWhatsThis( idRemoveSubproject, i18n( "<b>Remove subproject</b><p>Removes currently selected subproject. Does not delete any file from disk. Deleted subproject can be later added by calling 'Add Subproject' action." ) ); - if ( spitem->parent() == NULL ) + popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Remove subproject</b><p>Removes currently selected subproject. Does not delete any file from disk. Deleted subproject can be later added by calling 'Add Subproject' action." ) ); + if ( spitem->tqparent() == NULL ) popup.setItemEnabled( idRemoveSubproject, false ); idAddScope = popup.insertItem( SmallIcon( "qmake_scopenew" ), i18n( "Create Scope..." ) ); - popup.setWhatsThis( idAddScope, i18n( "<b>Create scope</b><p>Creates QMake scope in the project file of the currently selected subproject." ) ); + popup.tqsetWhatsThis( idAddScope, i18n( "<b>Create scope</b><p>Creates TQMake scope in the project file of the currently selected subproject." ) ); popup.insertSeparator(); idProjectConfiguration = popup.insertItem( SmallIcon( "configure" ), i18n( "Subproject Settings" ) ); - popup.setWhatsThis( idProjectConfiguration, i18n( "<b>Subproject settings</b><p>Opens <b>QMake Subproject Configuration</b> dialog. " + popup.tqsetWhatsThis( idProjectConfiguration, i18n( "<b>Subproject settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. " "It provides settings for:<br>subproject type and configuration,<br>include and library paths,<br>lists of dependencies and " "external libraries,<br>build order,<br>intermediate files locations,<br>compiler options." ) ); } else { idAddScope = popup.insertItem( SmallIcon( "qmake_scopenew" ), i18n( "Create Scope..." ) ); - popup.setWhatsThis( idAddScope, i18n( "<b>Create Scope</b><p>Creates QMake scope in the currently selected scope." ) ); + popup.tqsetWhatsThis( idAddScope, i18n( "<b>Create Scope</b><p>Creates TQMake scope in the currently selected scope." ) ); idRemoveScope = popup.insertItem( SmallIcon( "editdelete" ), i18n( "Remove Scope" ) ); - popup.setWhatsThis( idRemoveScope, i18n( "<b>Remove Scope</b><p>Removes currently selected scope." ) ); + popup.tqsetWhatsThis( idRemoveScope, i18n( "<b>Remove Scope</b><p>Removes currently selected scope." ) ); popup.insertSeparator(); idAddSubproject = popup.insertItem( SmallIcon( "folder_new" ), i18n( "Add Subproject..." ) ); - popup.setWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to the currently selected scope. " + popup.tqsetWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to the currently selected scope. " "This action is allowed only if the type of the subproject is 'subdirectories'. The type of the subproject can be " "defined in the <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) ); - if ( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 ) + if ( spitem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 ) popup.setItemEnabled( idAddSubproject, false ); idDisableSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Disable Subproject..." ) ); - popup.setWhatsThis( idRemoveSubproject, i18n( "<b>Disable subproject</b><p>Disables the currently selected subproject when this scope is active. Does not delete the directory from disk. The deleted subproject can be later added by using the 'Add Subproject' action." ) ); - if( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 && spitem->scope->parent()->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 ) + popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Disable subproject</b><p>Disables the currently selected subproject when this scope is active. Does not delete the directory from disk. The deleted subproject can be later added by using the 'Add Subproject' action." ) ); + if( spitem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 && spitem->scope->tqparent()->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 ) popup.setItemEnabled( idDisableSubproject, false ); popup.insertSeparator(); idProjectConfiguration = popup.insertItem( SmallIcon( "configure" ), i18n( "Scope Settings" ) ); - popup.setWhatsThis( idProjectConfiguration, i18n( "<b>Scope settings</b><p>Opens <b>QMake Subproject Configuration</b> dialog. " + popup.tqsetWhatsThis( idProjectConfiguration, i18n( "<b>Scope settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. " "It provides settings for:<br>subproject type and configuration,<br>include and library paths,<br>lists of dependencies and " "external libraries,<br>build order,<br>intermediate files locations,<br>compiler options." ) ); } @@ -1090,12 +1090,12 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i else if ( r == idBuild ) { slotBuildTarget(); - // m_part->startMakeCommand(projectDirectory() + relpath, TQString::fromLatin1("")); + // m_part->startMakeCommand(projectDirectory() + relpath, TQString::tqfromLatin1("")); } else if ( r == idInstall ) { slotInstallTarget(); - // m_part->startMakeCommand(projectDirectory() + relpath, TQString::fromLatin1("")); + // m_part->startMakeCommand(projectDirectory() + relpath, TQString::tqfromLatin1("")); } else if ( r == idRebuild ) { @@ -1112,11 +1112,11 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i else if ( r == idQmake ) { - m_part->startQMakeCommand( projectDirectory() + TQString(TQChar(TQDir::separator())) + relpath ); + m_part->startTQMakeCommand( projectDirectory() + TQString(TQChar(TQDir::separator())) + relpath ); } else if ( r == idQmakeRecursive ) { - runQMakeRecursive( spitem ); + runTQMakeRecursive( spitem ); } else if ( r == idProjectConfiguration ) @@ -1144,7 +1144,7 @@ void TrollProjectWidget::addFileToCurrentSubProject( GroupItem::GroupType gtype, GroupItem *gitem = 0; - if ( m_shownSubproject->groups.contains( gtype ) ) + if ( m_shownSubproject->groups.tqcontains( gtype ) ) gitem = m_shownSubproject->groups[ gtype ]; if ( !gitem ) @@ -1170,12 +1170,12 @@ void TrollProjectWidget::addFiles( TQStringList &files, bool relativeToProjectRo TQString fileName = *it; kdDebug(9024) << "Adding file:" << fileName << " " << relativeToProjectRoot << endl; - if ( m_shownSubproject->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) != -1 && !fileName.endsWith(".pro") ) + if ( m_shownSubproject->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) != -1 && !fileName.endsWith(".pro") ) { ChooseSubprojectDlg dlg( this, false ); if ( dlg.exec() == TQDialog::Accepted ) { - if ( dlg.selectedSubproject() && dlg.selectedSubproject()->scope->variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 ) + if ( dlg.selectedSubproject() && dlg.selectedSubproject()->scope->variableValues("TEMPLATE").tqfindIndex( "subdirs" ) != -1 ) { fileName = URLUtil::getRelativePath( dlg.selectedSubproject()->scope->projectDir() , TQDir::cleanDirPath( @@ -1213,7 +1213,7 @@ void TrollProjectWidget::addFiles( TQStringList &files, bool relativeToProjectRo kdDebug(9024) << "calc filename:" << noPathFileName << endl; // GroupItem *gitem = 0; // GroupItem::GroupType gtype = GroupItem::groupTypeForExtension( ext ); -// if ( m_shownSubproject->groups.contains( gtype ) ) +// if ( m_shownSubproject->groups.tqcontains( gtype ) ) // gitem = m_shownSubproject->groups[ gtype ]; @@ -1301,13 +1301,13 @@ void TrollProjectWidget::slotAddFiles() case AddFilesDialog::Link: { // Link selected files to current subproject folder - KProcess *proc = new KProcess( this ); + KProcess *proc = new KProcess( TQT_TQOBJECT(this) ); *proc << "ln"; *proc << "-s"; *proc << files[ i ]; *proc << cleanSubprojectDir; proc->start(KProcess::Block); - TQString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 ); + TQString filename = files[ i ].right( files[ i ].length() - files[ i ].tqfindRev( '/' ) - 1 ); // and add them to the filelist TQFile testExist( cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename ); if ( testExist.exists() ) @@ -1331,14 +1331,14 @@ void TrollProjectWidget::slotAddFiles() } } -GroupItem* TrollProjectWidget::getInstallRoot( QMakeScopeItem* item ) +GroupItem* TrollProjectWidget::getInstallRoot( TQMakeScopeItem* item ) { - if ( item->groups.contains( GroupItem::InstallRoot ) ) + if ( item->groups.tqcontains( GroupItem::InstallRoot ) ) return item->groups[ GroupItem::InstallRoot ]; return 0; } -GroupItem* TrollProjectWidget::getInstallObject( QMakeScopeItem* item, const TQString& objectname ) +GroupItem* TrollProjectWidget::getInstallObject( TQMakeScopeItem* item, const TQString& objectname ) { GroupItem * instroot = getInstallRoot( item ); if ( !instroot ) @@ -1363,7 +1363,7 @@ void TrollProjectWidget::slotNewFile() if( !gitem ) { - gitem = dynamic_cast<GroupItem*>( details->currentItem()->parent() ); + gitem = dynamic_cast<GroupItem*>( details->currentItem()->tqparent() ); } if ( gitem ) @@ -1376,7 +1376,7 @@ void TrollProjectWidget::slotNewFile() i18n( "Insert New Filepattern" ), i18n( "Please enter a filepattern relative the current " "subproject (example docs/*.html):" ), - TQString::null, &ok, this ); + TQString(), &ok, this ); if ( ok && !filepattern.isEmpty() ) { addFileToCurrentSubProject( gitem, filepattern ); @@ -1391,7 +1391,7 @@ void TrollProjectWidget::slotNewFile() TQString install_obj = KInputDialog::getText( i18n( "Insert New Install Object" ), i18n( "Please enter a name for the new object:" ), - TQString::null, &ok, this ); + TQString(), &ok, this ); if ( ok && !install_obj.isEmpty() ) { gitem->addInstallObject( install_obj ); @@ -1416,7 +1416,7 @@ void TrollProjectWidget::slotNewFile() fcext = "h"; break; case GroupItem::Forms: - if ( !m_part->isQt4Project() ) + if ( !m_part->isTQt4Project() ) fcext = "ui-widget"; else fcext = "ui-widget-qt4"; @@ -1434,7 +1434,7 @@ void TrollProjectWidget::slotNewFile() fcext = "qrc"; break; default: - fcext = TQString::null; + fcext = TQString(); } } KDevCreateFile::CreatedFile crFile = @@ -1469,7 +1469,7 @@ void TrollProjectWidget::slotExcludeFileFromScopeButton() return ; FileItem *fitem = static_cast<FileItem*>( pvitem ); - GroupItem *gitem = static_cast<GroupItem*>( fitem->parent() ); + GroupItem *gitem = static_cast<GroupItem*>( fitem->tqparent() ); gitem->removeFileFromScope( fitem->text( 0 ) ); } @@ -1544,41 +1544,41 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it if ( titem->groupType == GroupItem::InstallRoot ) { idInsInstallObject = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Install Object..." ) ); - popup.setWhatsThis( idInsInstallObject, i18n( "<b>Add install object</b><p>Creates QMake install object. " + popup.tqsetWhatsThis( idInsInstallObject, i18n( "<b>Add install object</b><p>Creates TQMake install object. " "It is possible to define a list of files to install and installation locations for each object. Warning! " "Install objects without path specified will not be saved to a project file." ) ); } else if ( titem->groupType == GroupItem::InstallObject ) { idSetInstObjPath = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Install Path..." ) ); - popup.setWhatsThis( idSetInstObjPath, i18n( "<b>Install path</b><p>Allows to choose the installation path for the current install object." ) ); + popup.tqsetWhatsThis( idSetInstObjPath, i18n( "<b>Install path</b><p>Allows to choose the installation path for the current install object." ) ); idInsNewFilepatternItem = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Pattern of Files to Install..." ) ); - popup.setWhatsThis( idInsNewFilepatternItem, i18n( "<b>Add pattern of files to install</b><p>Defines the pattern to match files which will be installed. " + popup.tqsetWhatsThis( idInsNewFilepatternItem, i18n( "<b>Add pattern of files to install</b><p>Defines the pattern to match files which will be installed. " "It is possible to use wildcards and relative paths like <i>docs/*</i>." ) ); idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove Install Object" ) ); - popup.setWhatsThis( idRemoveFile, i18n( "<b>Remove install object</b><p>Removes the install object the current group." ) ); + popup.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove install object</b><p>Removes the install object the current group." ) ); } else if ( titem->groupType == GroupItem::Translations ) { idInsNewFile = popup.insertItem( SmallIconSet( "filenew" ), i18n( "Create New File..." ) ); - popup.setWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new translation file and adds it to a currently selected TRANSLATIONS group." ) ); + popup.tqsetWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new translation file and adds it to a currently selected TRANSLATIONS group." ) ); idInsExistingFile = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Existing Files..." ) ); - popup.setWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing translation (*.ts) files to a currently selected TRANSLATIONS group. It is " + popup.tqsetWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing translation (*.ts) files to a currently selected TRANSLATIONS group. It is " "possible to copy files to a current subproject directory, create symbolic links or " "add them with the relative path." ) ); idLUpdate = popup.insertItem( SmallIconSet( "konsole" ), i18n( "Update Translation Files" ) ); - popup.setWhatsThis( idLUpdate, i18n( "<b>Update Translation Files</b><p>Runs <b>lupdate</b> command from the current subproject directory. It collects translatable " + popup.tqsetWhatsThis( idLUpdate, i18n( "<b>Update Translation Files</b><p>Runs <b>lupdate</b> command from the current subproject directory. It collects translatable " "messages and saves them into translation files." ) ); idLRelease = popup.insertItem( SmallIconSet( "konsole" ), i18n( "Release Binary Translations" ) ); - popup.setWhatsThis( idLRelease, i18n( "<b>Release Binary Translations</b><p>Runs <b>lrelease</b> command from the current subproject directory. It creates binary " + popup.tqsetWhatsThis( idLRelease, i18n( "<b>Release Binary Translations</b><p>Runs <b>lrelease</b> command from the current subproject directory. It creates binary " "translation files that are ready to be loaded at program execution." ) ); } else // File group containing files { idInsNewFile = popup.insertItem( SmallIconSet( "filenew" ), i18n( "Create New File..." ) ); - popup.setWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) ); + popup.tqsetWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) ); idInsExistingFile = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Existing Files..." ) ); - popup.setWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is " + popup.tqsetWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is " "possible to copy files to a current subproject directory, create symbolic links or " "add them with the relative path." ) ); } @@ -1604,7 +1604,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it i18n( "Add Pattern of Files to Install" ), i18n( "Enter a pattern relative to the current " "subproject (example docs/*.html):" ), - TQString::null, &ok, this ); + TQString(), &ok, this ); if ( ok && !filepattern.isEmpty() ) { addFileToCurrentSubProject( titem, filepattern ); @@ -1645,13 +1645,13 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it case AddFilesDialog::Link: { // Link selected files to current subproject folder - KProcess *proc = new KProcess( this ); + KProcess *proc = new KProcess( TQT_TQOBJECT(this) ); *proc << "ln"; *proc << "-s"; *proc << files[ i ]; *proc << cleanSubprojectPath; proc->start(KProcess::Block); - TQString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 ); + TQString filename = files[ i ].right( files[ i ].length() - files[ i ].tqfindRev( '/' ) - 1 ); // and add them to the filelist TQFile testExist( cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename ); if ( testExist.exists() ) @@ -1694,7 +1694,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it fcext = "h"; break; case GroupItem::Forms: - if ( !m_part->isQt4Project() ) + if ( !m_part->isTQt4Project() ) fcext = "ui-widget"; else fcext = "ui-widget-qt4"; @@ -1712,7 +1712,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it fcext = "qrc"; break; default: - fcext = TQString::null; + fcext = TQString(); } KDevCreateFile::CreatedFile crFile = createFileSupport->createNewFile( fcext, cleanSubprojectPath ); @@ -1724,7 +1724,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it TQString install_obj = KInputDialog::getText( i18n( "Add Install Object" ), i18n( "Enter a name for the new object:" ), - TQString::null, &ok, this ); + TQString(), &ok, this ); if ( ok && !install_obj.isEmpty() ) { titem->addInstallObject( install_obj ); @@ -1744,7 +1744,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it m_part->appFrontend() ->startAppCommand( m_shownSubproject->scope->projectDir(), cmd, false ); }else if( r == idRemoveFile ) { - static_cast<GroupItem*>(titem->parent())->removeInstallObject( titem ); + static_cast<GroupItem*>(titem->tqparent())->removeInstallObject( titem ); slotOverviewSelectionChanged( m_shownSubproject ); } } @@ -1753,13 +1753,13 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it removefileButton->setEnabled( true ); FileItem *fitem = static_cast<FileItem*>( pvitem ); - GroupItem* gitem = static_cast<GroupItem*>( item->parent() ); + GroupItem* gitem = static_cast<GroupItem*>( item->tqparent() ); KPopupMenu popup( this ); if ( !( gitem->groupType == GroupItem::InstallObject ) ) - popup.insertTitle( i18n( "File: %1" ).arg( fitem->text( 0 ) ) ); + popup.insertTitle( i18n( "File: %1" ).tqarg( fitem->text( 0 ) ) ); else - popup.insertTitle( i18n( "Pattern: %1" ).arg( fitem->text( 0 ) ) ); + popup.insertTitle( i18n( "Pattern: %1" ).tqarg( fitem->text( 0 ) ) ); int idRemoveFile = -2; int idSubclassWidget = -2; @@ -1773,37 +1773,37 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it if ( !fitem->uiFileLink.isEmpty() ) { idUpdateWidgetclass = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "Edit ui-Subclass..." ) ); - popup.setWhatsThis( idUpdateWidgetclass, i18n( "<b>Edit ui-subclass</b><p>Launches <b>Subclassing</b> wizard " + popup.tqsetWhatsThis( idUpdateWidgetclass, i18n( "<b>Edit ui-subclass</b><p>Launches <b>Subclassing</b> wizard " "and prompts to implement missing in childclass slots and functions." ) ); } - if ( fitem->text( 0 ).contains( ".ui" ) ) + if ( fitem->text( 0 ).tqcontains( ".ui" ) ) { idSubclassWidget = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "Subclassing Wizard..." ) ); - popup.setWhatsThis( idSubclassWidget, i18n( "<b>Subclass widget</b><p>Launches <b>Subclassing</b> wizard. " + popup.tqsetWhatsThis( idSubclassWidget, i18n( "<b>Subclass widget</b><p>Launches <b>Subclassing</b> wizard. " "It allows to create a subclass from the class defined in .ui file. " "There is also possibility to implement slots and functions defined in the base class." ) ); - if ( !m_part->isQt4Project() ) + if ( !m_part->isTQt4Project() ) { idViewUIH = popup.insertItem( SmallIconSet( "qmake_ui_h" ), i18n( "Open ui.h File" ) ); - popup.setWhatsThis( idViewUIH, i18n( "<b>Open ui.h file</b><p>Opens .ui.h file associated with the selected .ui." ) ); + popup.tqsetWhatsThis( idViewUIH, i18n( "<b>Open ui.h file</b><p>Opens .ui.h file associated with the selected .ui." ) ); } idUISubclasses = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "List of Subclasses..." ) ); - popup.setWhatsThis( idUISubclasses, i18n( "<b>List of subclasses</b><p>Shows subclasses list editor. " + popup.tqsetWhatsThis( idUISubclasses, i18n( "<b>List of subclasses</b><p>Shows subclasses list editor. " "There is possibility to add or remove subclasses from the list." ) ); } if ( !( gitem->groupType == GroupItem::InstallObject ) ) { idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove File" ) ); - popup.setWhatsThis( idRemoveFile, i18n( "<b>Remove file</b><p>Removes file from a current group. For sources, this also removes the subclassing information." ) ); + popup.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove file</b><p>Removes file from a current group. For sources, this also removes the subclassing information." ) ); idFileProperties = popup.insertItem( SmallIconSet( "configure_file" ), i18n( "Exclude File" ) ); - popup.setWhatsThis( idFileProperties, i18n( "<b>Exclude File</b><p>Excludes the file from this Scope. Does not touch subclassing information" ) ); + popup.tqsetWhatsThis( idFileProperties, i18n( "<b>Exclude File</b><p>Excludes the file from this Scope. Does not touch subclassing information" ) ); } else { idEditInstallPattern = popup.insertItem( SmallIconSet( "configure_file" ), i18n( "Edit Pattern" ) ); - popup.setWhatsThis( idEditInstallPattern, i18n( "<b>Edit pattern</b><p>Allows to edit install files pattern." ) ); + popup.tqsetWhatsThis( idEditInstallPattern, i18n( "<b>Edit pattern</b><p>Allows to edit install files pattern." ) ); idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove Pattern" ) ); - popup.setWhatsThis( idRemoveFile, i18n( "<b>Remove pattern</b><p>Removes install files pattern from the current install object." ) ); + popup.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove pattern</b><p>Removes install files pattern from the current install object." ) ); } if ( !( gitem->groupType == GroupItem::InstallObject ) ) { @@ -1815,7 +1815,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it if ( gitem->groupType == GroupItem::Sources ) { idBuildFile = popup.insertItem( SmallIconSet( "make_kdevelop" ), i18n( "Build File" ) ); - popup.setWhatsThis( idBuildFile, i18n( "<b>Build File</b><p>Builds the object file for this source file." ) ); + popup.tqsetWhatsThis( idBuildFile, i18n( "<b>Build File</b><p>Builds the object file for this source file." ) ); } int r = popup.exec( p ); @@ -1827,9 +1827,9 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it } else if ( r == idViewUIH ) { - kdDebug(9024) << "Opening:" << fitem->text(0) << ";" << fitem->text(0).replace(".ui","") << endl; + kdDebug(9024) << "Opening:" << fitem->text(0) << ";" << fitem->text(0).tqreplace(".ui","") << endl; m_part->partController() ->editDocument( KURL( m_shownSubproject->scope->projectDir() + TQChar( TQDir::separator() ) + - fitem->localFilePath.replace(".ui","") + ".h" ) ); + fitem->localFilePath.tqreplace(".ui","") + ".h" ) ); } else if ( r == idSubclassWidget ) @@ -1850,7 +1850,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it list << DomUtil::Pair( srcfile_relpath, uifile_relpath ); DomUtil::writePairListEntry( dom, "/kdevtrollproject/subclassing", "subclass", "sourcefile", "uifile", list ); - // newFileNames[i] = newFileNames[i].replace(TQRegExp(projectDirectory()+"/"),""); + // newFileNames[i] = newFileNames[i].tqreplace(TQRegExp(projectDirectory()+"/"),""); qWarning( "new file: %s", newFileNames[ i ].latin1() ); } m_subclasslist = DomUtil::readPairListEntry( dom, "/kdevtrollproject/subclassing" , @@ -1862,11 +1862,11 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it else if ( r == idUpdateWidgetclass ) { TQString noext = fitem->text( 0 ); - if ( noext.findRev( '.' ) > -1 ) - noext = noext.left( noext.findRev( '.' ) ); + if ( noext.tqfindRev( '.' ) > -1 ) + noext = noext.left( noext.tqfindRev( '.' ) ); TQStringList dummy; TQString uifile = fitem->uiFileLink; - if ( uifile.findRev( TQString( TQChar( TQDir::separator() ) ) ) > -1 ) + if ( uifile.tqfindRev( TQString( TQChar( TQDir::separator() ) ) ) > -1 ) { TQStringList uisplit = TQStringList::split( TQString( TQChar( TQDir::separator() ) ), uifile ); uifile = uisplit[ uisplit.count() - 1 ]; @@ -1898,7 +1898,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it } else if ( r == idEditInstallPattern ) { - GroupItem * titem = static_cast<GroupItem*>( item->parent() ); + GroupItem * titem = static_cast<GroupItem*>( item->tqparent() ); bool ok = FALSE; TQString filepattern = KInputDialog::getText( @@ -1921,9 +1921,9 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it } -void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem ) +void TrollProjectWidget::removeFile( TQMakeScopeItem *spitem, FileItem *fitem ) { - GroupItem * gitem = static_cast<GroupItem*>( fitem->parent() ); + GroupItem * gitem = static_cast<GroupItem*>( fitem->tqparent() ); m_filesCached = false; m_allFilesCache.clear(); @@ -1932,12 +1932,12 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem ) if ( KMessageBox::warningYesNo( this, "<qt>" + i18n( "Do you want to delete the file <strong>%1</strong> from the project and your disk?" ) - .arg( fitem->text( 0 ) ) + + .tqarg( fitem->text( 0 ) ) + "</qt>", i18n( "Remove File" ), KStdGuiItem::remove(), KStdGuiItem::no(), - "deleteFileFromQMakeProject" ) == KMessageBox::No ) + "deleteFileFromTQMakeProject" ) == KMessageBox::No ) { return; }else @@ -2028,9 +2028,9 @@ void TrollProjectWidget::slotBuildOpenFile() m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); // m_part->startMakeCommand(buildDir, target); - TQPtrList<QMakeScopeItem> list = findSubprojectForFile( fi ); + TQPtrList<TQMakeScopeItem> list = findSubprojectForFile( fi ); - QMakeScopeItem *spitem; + TQMakeScopeItem *spitem; for ( spitem = list.first(); spitem; spitem = list.next() ) { TQString buildcmd = constructMakeCommandLine( spitem->scope ); @@ -2050,7 +2050,7 @@ void TrollProjectWidget::slotExecuteProject() if ( program.isEmpty() ) { KMessageBox::sorry( this, i18n( "Please specify the executable name in the " - "project options dialog or select an application subproject in the QMake Manager." ), i18n( "No Executable Found" ) ); + "project options dialog or select an application subproject in the TQMake Manager." ), i18n( "No Executable Found" ) ); return ; } @@ -2072,7 +2072,7 @@ void TrollProjectWidget::slotExecuteProject() // Build environment variables to prepend to the executable path - TQString runEnvVars = TQString::null; + TQString runEnvVars = TQString(); DomUtil::PairList list = DomUtil::readPairListEntry( *( m_part->projectDom() ), "/kdevtrollproject/run/envvars", "envvar", "name", "value" ); @@ -2112,7 +2112,7 @@ void TrollProjectWidget::slotDistCleanTarget() runClean(m_shownSubproject, "distclean"); } -void TrollProjectWidget::runClean( QMakeScopeItem* item, const TQString& cleantargetname ) +void TrollProjectWidget::runClean( TQMakeScopeItem* item, const TQString& cleantargetname ) { // no subproject selected m_part->partController() ->saveAllFiles(); @@ -2165,7 +2165,7 @@ TQString TrollProjectWidget::constructMakeCommandLine( Scope* s ) } -void TrollProjectWidget::createMakefileIfMissing( const TQString &dir, QMakeScopeItem *item ) +void TrollProjectWidget::createMakefileIfMissing( const TQString &dir, TQMakeScopeItem *item ) { TQFileInfo fi; TQFileInfo fi2; @@ -2183,25 +2183,25 @@ void TrollProjectWidget::createMakefileIfMissing( const TQString &dir, QMakeScop } if ( !fi.exists() && !fi2.exists() ) { - int r = KMessageBox::questionYesNo( this, i18n( "There is no Makefile in this directory. Run qmake first?" ), TQString::null, i18n( "Run qmake" ), i18n( "Do Not Run" ) ); + int r = KMessageBox::questionYesNo( this, i18n( "There is no Makefile in this directory. Run qmake first?" ), TQString(), i18n( "Run qmake" ), i18n( "Do Not Run" ) ); if ( r == KMessageBox::No ) return ; - m_part->startQMakeCommand( dir ); + m_part->startTQMakeCommand( dir ); } } -QMakeScopeItem* TrollProjectWidget::findSubprojectForPath( const TQString& relPath ) +TQMakeScopeItem* TrollProjectWidget::findSubprojectForPath( const TQString& relPath ) { if( !m_rootSubproject ) return 0; TQStringList dirs = TQStringList::split("/", relPath); - QMakeScopeItem* pitem = static_cast<QMakeScopeItem*>(m_rootSubproject); + TQMakeScopeItem* pitem = static_cast<TQMakeScopeItem*>(m_rootSubproject); for( TQStringList::iterator it = dirs.begin(); it != dirs.end(); ++it) { TQListViewItem* item = pitem->firstChild(); while( item ) { - QMakeScopeItem* sitem = static_cast<QMakeScopeItem*>(item); + TQMakeScopeItem* sitem = static_cast<TQMakeScopeItem*>(item); if( TQFileInfo( sitem->scope->projectDir() ).fileName() == *it ) { pitem = sitem; @@ -2212,14 +2212,14 @@ QMakeScopeItem* TrollProjectWidget::findSubprojectForPath( const TQString& relPa return pitem; } -TQPtrList<QMakeScopeItem> TrollProjectWidget::findSubprojectForFile( TQFileInfo fi ) +TQPtrList<TQMakeScopeItem> TrollProjectWidget::findSubprojectForFile( TQFileInfo fi ) { - TQPtrList<QMakeScopeItem> list; + TQPtrList<TQMakeScopeItem> list; findSubprojectForFile( list, m_rootSubproject, fi.absFilePath() ); return list; } -void TrollProjectWidget::findSubprojectForFile( TQPtrList<QMakeScopeItem> &list, QMakeScopeItem * item, TQString absFilePath ) +void TrollProjectWidget::findSubprojectForFile( TQPtrList<TQMakeScopeItem> &list, TQMakeScopeItem * item, TQString absFilePath ) { if( !item ) return; @@ -2245,7 +2245,7 @@ void TrollProjectWidget::findSubprojectForFile( TQPtrList<QMakeScopeItem> &list, TQListViewItem * child = item->firstChild(); while ( child ) { - QMakeScopeItem * spitem = dynamic_cast<QMakeScopeItem*>( child ); + TQMakeScopeItem * spitem = dynamic_cast<TQMakeScopeItem*>( child ); if ( spitem ) { @@ -2256,7 +2256,7 @@ void TrollProjectWidget::findSubprojectForFile( TQPtrList<QMakeScopeItem> &list, } } -void TrollProjectWidget::slotRemoveScope( QMakeScopeItem * spitem ) +void TrollProjectWidget::slotRemoveScope( TQMakeScopeItem * spitem ) { if ( spitem == 0 && m_shownSubproject == 0 ) return ; @@ -2265,7 +2265,7 @@ void TrollProjectWidget::slotRemoveScope( QMakeScopeItem * spitem ) m_filesCached = false; m_allFilesCache.clear(); - QMakeScopeItem* pitem = dynamic_cast<QMakeScopeItem *>( spitem->parent() ); + TQMakeScopeItem* pitem = dynamic_cast<TQMakeScopeItem *>( spitem->tqparent() ); if ( pitem != 0 ) { switch ( spitem->scope->scopeType() ) @@ -2287,7 +2287,7 @@ void TrollProjectWidget::slotRemoveScope( QMakeScopeItem * spitem ) // pitem->scopes.remove( spitem ); delete spitem; spitem = pitem; - pitem = dynamic_cast<QMakeScopeItem *>( pitem->parent() ); + pitem = dynamic_cast<TQMakeScopeItem *>( pitem->tqparent() ); // pitem->scopes.remove(spitem); break; case Scope::SimpleScope: @@ -2311,13 +2311,13 @@ void TrollProjectWidget::slotRemoveScope( QMakeScopeItem * spitem ) } } -QMakeScopeItem * TrollProjectWidget::findSubprojectForScope( QMakeScopeItem * scope ) +TQMakeScopeItem * TrollProjectWidget::findSubprojectForScope( TQMakeScopeItem * scope ) { - if ( ( scope == 0 ) || ( scope->parent() == 0 ) ) + if ( ( scope == 0 ) || ( scope->tqparent() == 0 ) ) return 0; if ( scope->scope->scopeType() == Scope::ProjectScope ) return scope; - return findSubprojectForScope( dynamic_cast<QMakeScopeItem *>( scope->parent() ) ); + return findSubprojectForScope( dynamic_cast<TQMakeScopeItem *>( scope->tqparent() ) ); } void TrollProjectWidget::focusInEvent( TQFocusEvent * /*e*/ ) @@ -2338,22 +2338,22 @@ void TrollProjectWidget::setLastFocusedView( TrollProjectView view ) m_lastFocusedView = view; } -void TrollProjectWidget::runQMakeRecursive( QMakeScopeItem* proj ) +void TrollProjectWidget::runTQMakeRecursive( TQMakeScopeItem* proj ) { - if( m_part->isQt4Project() ) + if( m_part->isTQt4Project() ) { - m_part->startQMakeCommand( proj->scope->projectDir(), true ); + m_part->startTQMakeCommand( proj->scope->projectDir(), true ); }else { if ( proj->scope->scopeType() == Scope::ProjectScope ) { - m_part->startQMakeCommand( proj->scope->projectDir() ); + m_part->startTQMakeCommand( proj->scope->projectDir() ); } - QMakeScopeItem* item = static_cast<QMakeScopeItem*>( proj->firstChild() ); + TQMakeScopeItem* item = static_cast<TQMakeScopeItem*>( proj->firstChild() ); while ( item ) { - runQMakeRecursive( item ); - item = static_cast<QMakeScopeItem*>( item->nextSibling() ); + runTQMakeRecursive( item ); + item = static_cast<TQMakeScopeItem*>( item->nextSibling() ); } } } @@ -2371,7 +2371,7 @@ void TrollProjectWidget::slotBuildSelectedFile() buildFile( m_shownSubproject, fitem ); } -void TrollProjectWidget::buildFile( QMakeScopeItem* spitem, FileItem* fitem ) +void TrollProjectWidget::buildFile( TQMakeScopeItem* spitem, FileItem* fitem ) { TQFileInfo fi( spitem->scope->projectDir() + TQChar( TQDir::separator() ) + spitem->scope->resolveVariables( fitem->localFilePath ) ); TQString sourceDir = fi.dirPath(); @@ -2421,12 +2421,12 @@ bool TrollProjectWidget::isTMakeProject() return m_part->isTMakeProject(); } -void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem ) +void TrollProjectWidget::slotDisableSubproject( TQMakeScopeItem* spitem ) { m_filesCached = false; m_allFilesCache.clear(); - if( spitem->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) + if( spitem->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 ) { TQStringList subdirs = spitem->scope->variableValues( "SUBDIRS" ); DisableSubprojectDlg dlg( subdirs ); @@ -2436,7 +2436,7 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem ) TQListViewItem* item = spitem->firstChild(); while( item ) { - if( values.findIndex( item->text(0) ) != -1 ) + if( values.tqfindIndex( item->text(0) ) != -1 ) delete item; item = item->nextSibling(); } @@ -2447,11 +2447,11 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem ) } }else { - QMakeScopeItem* parent = static_cast<QMakeScopeItem*>(spitem->parent()); - parent->disableSubprojects( TQStringList( spitem->scope->scopeName() ) ); + TQMakeScopeItem* tqparent = static_cast<TQMakeScopeItem*>(spitem->tqparent()); + tqparent->disableSubprojects( TQStringList( spitem->scope->scopeName() ) ); delete spitem; - parent->scope->saveToFile(); - m_shownSubproject = parent; + tqparent->scope->saveToFile(); + m_shownSubproject = tqparent; slotOverviewSelectionChanged( m_shownSubproject ); } } @@ -2459,14 +2459,14 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem ) void TrollProjectWidget::slotProjectDirty(const TQString& path) { kdDebug(9024) << "File is dirty:" << path << " using method " << endl; - if( KMessageBox::warningYesNo(this, i18n("The project file \"%1\" has changed on disk\n(Or you have \"%2\" opened in the editor, which also triggers a reload when you change something in the QMake Manager).\n\nDo you want to reload it?").arg(path).arg(path), i18n("Project File Changed"), i18n("Reload"), i18n("Do Not Reload"), "trollproject_reload_project_file" ) != KMessageBox::No ) + if( KMessageBox::warningYesNo(this, i18n("The project file \"%1\" has changed on disk\n(Or you have \"%2\" opened in the editor, which also triggers a reload when you change something in the TQMake Manager).\n\nDo you want to reload it?").tqarg(path).tqarg(path), i18n("Project File Changed"), i18n("Reload"), i18n("Do Not Reload"), "trollproject_reload_project_file" ) != KMessageBox::No ) { m_part->dirWatch()->stopScan(); TQListViewItemIterator it(m_rootSubproject); - TQValueList<QMakeScopeItem*> itemstoreload; + TQValueList<TQMakeScopeItem*> itemstoreload; while( it.current() ) { - QMakeScopeItem* projectitem = static_cast<QMakeScopeItem*>( it.current() ); + TQMakeScopeItem* projectitem = static_cast<TQMakeScopeItem*>( it.current() ); if( projectitem->scope->scopeType() == Scope::ProjectScope || projectitem->scope->scopeType() == Scope::IncludeScope ) { @@ -2479,7 +2479,7 @@ void TrollProjectWidget::slotProjectDirty(const TQString& path) it++; } - TQValueList<QMakeScopeItem*>::const_iterator reloadit = itemstoreload.begin(); + TQValueList<TQMakeScopeItem*>::const_iterator reloadit = itemstoreload.begin(); for( ; reloadit != itemstoreload.end() ; ++reloadit ) { (*reloadit)->reloadProject(); @@ -2501,7 +2501,7 @@ void TrollProjectWidget::slotProjectDirty(const TQString& path) } -QMakeScopeItem* TrollProjectWidget::currentSubproject() +TQMakeScopeItem* TrollProjectWidget::currentSubproject() { return m_shownSubproject; } @@ -2525,17 +2525,17 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const TQString environstr; DomUtil::PairList::ConstIterator it; - bool hasQtDir = false; + bool hasTQtDir = false; for (it = envvars.begin(); it != envvars.end(); ++it) { - if( (*it).first == "QTDIR" ) - hasQtDir = true; + if( (*it).first == "TQTDIR" ) + hasTQtDir = true; map[(*it).first] = (*it).second; } - if( !hasQtDir && !m_part->isQt4Project() && !DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) + if( !hasTQtDir && !m_part->isTQt4Project() && !DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) { - map["QTDIR="] = DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", ""); + map["TQTDIR="] = DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", ""); map["PATH"] = map["PATH"].prepend( DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "") +"/bin" ); } return map; @@ -2543,5 +2543,5 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const #include "trollprojectwidget.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/qmake/trollprojectwidget.h b/buildtools/qmake/trollprojectwidget.h index 7983f4d7..9c5fac62 100644 --- a/buildtools/qmake/trollprojectwidget.h +++ b/buildtools/qmake/trollprojectwidget.h @@ -41,9 +41,10 @@ class TrollProjectPart; class KListView; class ProjectConfigurationDlg; -class TrollProjectWidget : public QVBox +class TrollProjectWidget : public TQVBox { Q_OBJECT + TQ_OBJECT public: TrollProjectWidget( TrollProjectPart *part ); @@ -93,7 +94,7 @@ public: enum TrollProjectView { SubprojectView, DetailsView }; void setLastFocusedView( TrollProjectView view ); enum SaveType { AlwaysSave, NeverSave, Ask }; - QMakeScopeItem* currentSubproject(); + TQMakeScopeItem* currentSubproject(); bool showFilenamesOnly() const; bool showVariablesInTree() const; @@ -131,43 +132,43 @@ private slots: void slotDetailsExecuted( TQListViewItem *item ); void slotDetailsContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ); void slotExcludeFileFromScopeButton(); - void slotAddSubproject( QMakeScopeItem *spitem = 0 ); - void slotRemoveSubproject( QMakeScopeItem *spitem = 0 ); - void slotCreateScope( QMakeScopeItem *spitem = 0 ); - void slotRemoveScope( QMakeScopeItem *spitem = 0 ); - void slotDisableSubproject( QMakeScopeItem* spitem = 0 ); + void slotAddSubproject( TQMakeScopeItem *spitem = 0 ); + void slotRemoveSubproject( TQMakeScopeItem *spitem = 0 ); + void slotCreateScope( TQMakeScopeItem *spitem = 0 ); + void slotRemoveScope( TQMakeScopeItem *spitem = 0 ); + void slotDisableSubproject( TQMakeScopeItem* spitem = 0 ); void slotProjectDirty( const TQString& ); - void createQMakeScopeItems(); + void createTQMakeScopeItems(); private: - void cleanDetailView( QMakeScopeItem *item ); - void runClean( QMakeScopeItem*, const TQString& ); - void buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl ); - void removeFile( QMakeScopeItem *spitem, FileItem *fitem ); - void addSubprojectToItem( QMakeScopeItem*, const TQString& ); + void cleanDetailView( TQMakeScopeItem *item ); + void runClean( TQMakeScopeItem*, const TQString& ); + void buildProjectDetailTree( TQMakeScopeItem *item, KListView *listviewControl ); + void removeFile( TQMakeScopeItem *spitem, FileItem *fitem ); + void addSubprojectToItem( TQMakeScopeItem*, const TQString& ); void setupContext(); - // void parseScope(QMakeScopeItem *item,TQString scopeString, Scope *scope); - GroupItem* getInstallRoot( QMakeScopeItem *item ); - GroupItem* getInstallObject( QMakeScopeItem *item, const TQString& objectname ); + // void parseScope(TQMakeScopeItem *item,TQString scopeString, Scope *scope); + GroupItem* getInstallRoot( TQMakeScopeItem *item ); + GroupItem* getInstallObject( TQMakeScopeItem *item, const TQString& objectname ); TQString constructMakeCommandLine( Scope* s = 0 ); - void createMakefileIfMissing( const TQString &dir, QMakeScopeItem *item ); + void createMakefileIfMissing( const TQString &dir, TQMakeScopeItem *item ); - void runQMakeRecursive( QMakeScopeItem* proj); - void buildFile( QMakeScopeItem* spitem, FileItem* fitem); + void runTQMakeRecursive( TQMakeScopeItem* proj); + void buildFile( TQMakeScopeItem* spitem, FileItem* fitem); /*fileName: full base file name like TQFileInfo::baseName ( true )*/ - TQPtrList<QMakeScopeItem> findSubprojectForFile( TQFileInfo fi ); - void findSubprojectForFile( TQPtrList<QMakeScopeItem> &list, QMakeScopeItem * item, TQString absFilePath ); - QMakeScopeItem* findSubprojectForPath( const TQString& ); + TQPtrList<TQMakeScopeItem> findSubprojectForFile( TQFileInfo fi ); + void findSubprojectForFile( TQPtrList<TQMakeScopeItem> &list, TQMakeScopeItem * item, TQString absFilePath ); + TQMakeScopeItem* findSubprojectForPath( const TQString& ); // TQString makeEnvironment(); TrollProjectWidget::SaveType dialogSaveBehaviour() const; - QMakeScopeItem *findSubprojectForScope( QMakeScopeItem *scope ); + TQMakeScopeItem *findSubprojectForScope( TQMakeScopeItem *scope ); - void reloadProjectFromFile( QMakeScopeItem* item ); + void reloadProjectFromFile( TQMakeScopeItem* item ); TQMap<TQString,TQString> qmakeEnvironment() const; TQVBox *overviewContainer; @@ -196,8 +197,8 @@ private: TQToolButton *excludeFileFromScopeButton; DomUtil::PairList m_subclasslist; - QMakeScopeItem *m_shownSubproject; - QMakeScopeItem *m_rootSubproject; + TQMakeScopeItem *m_shownSubproject; + TQMakeScopeItem *m_rootSubproject; Scope* m_rootScope; TrollProjectPart *m_part; ProjectConfigurationDlg* m_configDlg; @@ -215,4 +216,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/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp index 3bfeeee7..41683113 100644 --- a/buildtools/script/scriptnewfiledlg.cpp +++ b/buildtools/script/scriptnewfiledlg.cpp @@ -30,8 +30,8 @@ ScriptNewFileDialog::ScriptNewFileDialog(ScriptProjectPart *part, - TQWidget *parent, const char *name) - : TQDialog(parent, name, true) + TQWidget *tqparent, const char *name) + : TQDialog(tqparent, name, true) { setCaption(i18n("New File")); @@ -56,14 +56,14 @@ ScriptNewFileDialog::ScriptNewFileDialog(ScriptProjectPart *part, ok_button->setDefault(true); connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); - buttonbox->layout(); + buttonbox->tqlayout(); - TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4); - layout->addWidget(filename_label); - layout->addWidget(filename_edit); - layout->addWidget(usetemplate_box); - layout->addWidget(frame, 0); - layout->addWidget(buttonbox, 0); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4); + tqlayout->addWidget(filename_label); + tqlayout->addWidget(filename_edit); + tqlayout->addWidget(usetemplate_box); + tqlayout->addWidget(frame, 0); + tqlayout->addWidget(buttonbox, 0); m_part = part; } @@ -76,7 +76,7 @@ ScriptNewFileDialog::~ScriptNewFileDialog() void ScriptNewFileDialog::accept() { TQString fileName = filename_edit->text(); - if (fileName.find('/') != -1) { + if (fileName.tqfind('/') != -1) { KMessageBox::sorry(this, i18n("Please enter the file name without '/' and so on.")); return; } diff --git a/buildtools/script/scriptnewfiledlg.h b/buildtools/script/scriptnewfiledlg.h index 72f433c9..ca60ebd5 100644 --- a/buildtools/script/scriptnewfiledlg.h +++ b/buildtools/script/scriptnewfiledlg.h @@ -19,12 +19,13 @@ class KLineEdit; class ScriptProjectPart; -class ScriptNewFileDialog : public QDialog +class ScriptNewFileDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - ScriptNewFileDialog( ScriptProjectPart *part, TQWidget *parent=0, const char *name=0 ); + ScriptNewFileDialog( ScriptProjectPart *part, TQWidget *tqparent=0, const char *name=0 ); ~ScriptNewFileDialog(); protected: diff --git a/buildtools/script/scriptoptionswidget.cpp b/buildtools/script/scriptoptionswidget.cpp index d80cd501..5b0e8cf8 100644 --- a/buildtools/script/scriptoptionswidget.cpp +++ b/buildtools/script/scriptoptionswidget.cpp @@ -20,8 +20,8 @@ ScriptOptionsWidget::ScriptOptionsWidget(KDevPlugin *part, - TQWidget *parent, const char *name) - : ScriptOptionsWidgetBase(parent, name) + TQWidget *tqparent, const char *name) + : ScriptOptionsWidgetBase(tqparent, name) { m_part = part; diff --git a/buildtools/script/scriptoptionswidget.h b/buildtools/script/scriptoptionswidget.h index 3dc03058..a93d63d1 100644 --- a/buildtools/script/scriptoptionswidget.h +++ b/buildtools/script/scriptoptionswidget.h @@ -20,9 +20,10 @@ class KDevPlugin; class ScriptOptionsWidget : public ScriptOptionsWidgetBase { Q_OBJECT + TQ_OBJECT public: - ScriptOptionsWidget( KDevPlugin *part, TQWidget *parent=0, const char *name=0 ); + ScriptOptionsWidget( KDevPlugin *part, TQWidget *tqparent=0, const char *name=0 ); ~ScriptOptionsWidget(); public slots: diff --git a/buildtools/script/scriptoptionswidgetbase.ui b/buildtools/script/scriptoptionswidgetbase.ui index 3a8f7b99..a73c8683 100644 --- a/buildtools/script/scriptoptionswidgetbase.ui +++ b/buildtools/script/scriptoptionswidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>ScriptOptionsWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>script_project_options</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>includepatterns_label</cstring> </property> @@ -30,7 +30,7 @@ <cstring>includepatterns_edit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -51,7 +51,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -75,14 +75,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>excludepatterns_label</cstring> </property> @@ -93,7 +93,7 @@ <cstring>excludepatterns_edit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2_2</cstring> </property> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</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,6 +150,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/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp index 2bc19135..e28ef2e4 100644 --- a/buildtools/script/scriptprojectpart.cpp +++ b/buildtools/script/scriptprojectpart.cpp @@ -40,8 +40,8 @@ typedef KDevGenericFactory<ScriptProjectPart> ScriptProjectFactory; static const KDevPluginInfo data("kdevscriptproject"); K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) ) -ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &) - : KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart") +ScriptProjectPart::ScriptProjectPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevBuildTool(&data, tqparent, name ? name : "ScriptProjectPart") { setInstance(ScriptProjectFactory::instance()); @@ -119,7 +119,7 @@ void ScriptProjectPart::openProject(const TQString &dirName, const TQString &pro do { dir.setPath(s.pop()); kdDebug(9015) << "Examining: " << dir.path() << endl; - const QFileInfoList *dirEntries = dir.entryInfoList(); + const TQFileInfoList *dirEntries = dir.entryInfoList(); if ( dirEntries ) { TQPtrListIterator<TQFileInfo> it(*dirEntries); @@ -340,7 +340,7 @@ void ScriptProjectPart::rescan() do { dir.setPath(s.pop()); kdDebug(9015) << "Examining: " << dir.path() << endl; - const QFileInfoList *dirEntries = dir.entryInfoList(); + const TQFileInfoList *dirEntries = dir.entryInfoList(); if ( dirEntries ) { TQPtrListIterator<TQFileInfo> it(*dirEntries); @@ -370,7 +370,7 @@ void ScriptProjectPart::rescan() } } while (!s.isEmpty()); -/* const QFileInfoList *dirEntries = TQDir(path).entryInfoList(); +/* const TQFileInfoList *dirEntries = TQDir(path).entryInfoList(); if ( dirEntries ) { kdDebug() << "1" << endl; diff --git a/buildtools/script/scriptprojectpart.h b/buildtools/script/scriptprojectpart.h index b3a748ed..2029c09b 100644 --- a/buildtools/script/scriptprojectpart.h +++ b/buildtools/script/scriptprojectpart.h @@ -25,9 +25,10 @@ class ScriptProjectWidget; class ScriptProjectPart : public KDevBuildTool { Q_OBJECT + TQ_OBJECT public: - ScriptProjectPart( TQObject *parent, const char *name, const TQStringList &args ); + ScriptProjectPart( TQObject *tqparent, const char *name, const TQStringList &args ); ~ScriptProjectPart(); TQStringList distFiles() const; |