diff options
Diffstat (limited to 'buildtools/qmake')
26 files changed, 111 insertions, 614 deletions
diff --git a/buildtools/qmake/choosesubprojectdlg.cpp b/buildtools/qmake/choosesubprojectdlg.cpp index 815a6ef7..f61caaf6 100644 --- a/buildtools/qmake/choosesubprojectdlg.cpp +++ b/buildtools/qmake/choosesubprojectdlg.cpp @@ -18,7 +18,7 @@ ChooseSubprojectDlg::ChooseSubprojectDlg(TrollProjectWidget *widget, TQWidget* parent, const char* name, bool modal, WFlags fl) : ChooseSubprojectDlgBase(parent,name, modal,fl), m_widget(widget) { - connect(subprojects_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(itemSelected(TQListViewItem *))); + connect(subprojects_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(itemSelected(TQListViewItem *))); if( m_widget->m_rootSubproject) { ChooseItem *it = new ChooseItem(m_widget->m_rootSubproject, subprojects_view, m_widget->m_rootSubproject->text(0)); @@ -109,6 +109,3 @@ QMakeScopeItem * ChooseSubprojectDlg::selectedSubproject( ) #include "choosesubprojectdlg.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - diff --git a/buildtools/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h index e59ed6b9..4cf4ea4e 100644 --- a/buildtools/qmake/choosesubprojectdlg.h +++ b/buildtools/qmake/choosesubprojectdlg.h @@ -33,11 +33,11 @@ private: 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* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~ChooseSubprojectDlg(); /*$PUBLIC_FUNCTIONS$*/ @@ -61,5 +61,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui index 854966b3..cd595be1 100644 --- a/buildtools/qmake/choosesubprojectdlgbase.ui +++ b/buildtools/qmake/choosesubprojectdlgbase.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -77,9 +74,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/buildtools/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp index dfb8683a..abdd9e5b 100644 --- a/buildtools/qmake/createscopedlg.cpp +++ b/buildtools/qmake/createscopedlg.cpp @@ -96,5 +96,3 @@ void CreateScopeDlg::accept() } #include "createscopedlg.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/createscopedlg.h b/buildtools/qmake/createscopedlg.h index 6596c021..26535c72 100644 --- a/buildtools/qmake/createscopedlg.h +++ b/buildtools/qmake/createscopedlg.h @@ -19,11 +19,11 @@ 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( QMakeScopeItem* item, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~CreateScopeDlg(); /*$PUBLIC_FUNCTIONS$*/ @@ -41,6 +41,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - diff --git a/buildtools/qmake/disablesubprojectdlg.cpp b/buildtools/qmake/disablesubprojectdlg.cpp index 9a5fbb1d..37aa79ea 100644 --- a/buildtools/qmake/disablesubprojectdlg.cpp +++ b/buildtools/qmake/disablesubprojectdlg.cpp @@ -45,6 +45,3 @@ TQStringList DisableSubprojectDlg::selectedProjects() } #include "disablesubprojectdlg.moc" - - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/disablesubprojectdlg.h b/buildtools/qmake/disablesubprojectdlg.h index 5ca64451..aa876866 100644 --- a/buildtools/qmake/disablesubprojectdlg.h +++ b/buildtools/qmake/disablesubprojectdlg.h @@ -16,7 +16,7 @@ class DisableSubprojectDlg : public DisableSubprojectDlgBase { - Q_OBJECT + TQ_OBJECT public: @@ -38,6 +38,3 @@ protected slots: }; #endif - - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui index 2adc1544..1d522c84 100644 --- a/buildtools/qmake/disablesubprojectdlgbase.ui +++ b/buildtools/qmake/disablesubprojectdlgbase.ui @@ -90,9 +90,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/buildtools/qmake/newwidgetdlg.h b/buildtools/qmake/newwidgetdlg.h index 994aead5..d2d92254 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* parent = 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 84d552b2..fde51b13 100644 --- a/buildtools/qmake/newwidgetdlgbase.ui +++ b/buildtools/qmake/newwidgetdlgbase.ui @@ -216,10 +216,10 @@ <tabstop>okayButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>subclassingPressed()</slot> <slot>templateSelChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp index e2ebe9a2..95189fff 100644 --- a/buildtools/qmake/projectconfigurationdlg.cpp +++ b/buildtools/qmake/projectconfigurationdlg.cpp @@ -106,7 +106,7 @@ ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollPro prjWidget = _prjWidget; // m_projectConfiguration = conf; m_targetLibraryVersion->setValidator( new TQRegExpValidator( - TQRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), TQT_TQOBJECT(this) ) ); + TQRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), this ) ); customVariables->setSortColumn(0); customVariables->setSortOrder(TQt::Ascending); mocdir_url->completionObject()->setMode(KURLCompletion::DirCompletion); @@ -327,89 +327,6 @@ void ProjectConfigurationDlg::updateProjectConfiguration() else myProjectItem->removeValue( "CONFIG", "windows" ); - //TQt4 libs - if ( prjWidget->m_part->isTQt4Project() ) - { - if ( checkDebugReleaseMode->isChecked() ) - myProjectItem->addValue( "CONFIG", "debug_and_release" ); - else - myProjectItem->removeValue( "CONFIG", "debug_and_release" ); - - if ( checkTestlib->isChecked() ) - myProjectItem->addValue( "CONFIG", "qtestlib" ); - else - myProjectItem->removeValue( "CONFIG", "qtestlib" ); - if ( checkAssistant->isChecked() ) - myProjectItem->addValue( "CONFIG", "assistant" ); - else - myProjectItem->removeValue( "CONFIG", "assistant" ); - if ( checkUiTools->isChecked() ) - myProjectItem->addValue( "CONFIG", "uitools" ); - else - myProjectItem->removeValue( "CONFIG", "uitools" ); - if ( checkQDBus->isChecked() ) - myProjectItem->addValue( "CONFIG", "dbus" ); - else - myProjectItem->removeValue( "CONFIG", "dbus" ); - if ( checkBuildAll->isChecked() ) - myProjectItem->addValue( "CONFIG", "build_all" ); - else - myProjectItem->removeValue( "CONFIG", "build_all" ); - if ( checkQtHelp->isChecked() ) - myProjectItem->addValue( "CONFIG", "help" ); - else - myProjectItem->removeValue( "CONFIG", "help" ); - - if ( checkQt4Core->isChecked() ) - myProjectItem->addValue( "QT", "core" ); - else - myProjectItem->removeValue( "QT", "core" ); - if ( checkQt4Gui->isChecked() ) - myProjectItem->addValue( "QT", "gui" ); - else - myProjectItem->removeValue( "QT", "gui" ); - if ( checkQt4SQL->isChecked() ) - myProjectItem->addValue( "QT", "sql" ); - else - myProjectItem->removeValue( "QT", "sql" ); - if ( checkQt4SVG->isChecked() ) - myProjectItem->addValue( "QT", "svg" ); - else - myProjectItem->removeValue( "QT", "svg" ); - if ( checkQt4XML->isChecked() ) - myProjectItem->addValue( "QT", "xml" ); - else - myProjectItem->removeValue( "QT", "xml" ); - if ( checkQt4Network->isChecked() ) - myProjectItem->addValue( "QT", "network" ); - else - myProjectItem->removeValue( "QT", "network" ); - if ( checkQt3Support->isChecked() ) - myProjectItem->addValue( "QT", "qt3support" ); - else - myProjectItem->removeValue( "QT", "qt3support" ); - if ( checkQt4OpenGL->isChecked() ) - myProjectItem->addValue( "QT", "opengl" ); - else - myProjectItem->removeValue( "QT", "opengl" ); - if ( checkQtScript->isChecked() ) - myProjectItem->addValue( "QT", "script" ); - else - myProjectItem->removeValue( "QT", "script" ); - if ( checkQtWebKit->isChecked() ) - myProjectItem->addValue( "QT", "webkit" ); - else - myProjectItem->removeValue( "QT", "webkit" ); - if ( checkQtXmlPatterns->isChecked() ) - myProjectItem->addValue( "QT", "xmlpatterns" ); - else - myProjectItem->removeValue( "QT", "xmlpatterns" ); - if ( checkPhonon->isChecked() ) - myProjectItem->addValue( "QT", "phonon" ); - else - myProjectItem->removeValue( "QT", "phonon" ); - } - TQStringList confValues = myProjectItem->scope->variableValues( "CONFIG" ); TQStringList extraValues = TQStringList::split( " ", editConfigExtra->text() ); for ( TQStringList::iterator it = confValues.begin() ; it != confValues.end() ; ++it ) @@ -470,7 +387,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() myProjectItem->updateValues( "INCLUDEPATH", values ); //target.install - if ( checkInstallTarget->isChecked() == true ) + if ( checkInstallTarget->isChecked() ) { myProjectItem->addValue( "INSTALLS", "target" ); myProjectItem->scope->setEqualOp( "target.path", TQStringList( m_InstallTargetPath->text() ) ); @@ -667,8 +584,6 @@ void ProjectConfigurationDlg::updateControls() { sharedRadio->setChecked( true ); checkPlugin->setEnabled( true ); - if( prjWidget->m_part->isTQt4Project() ) - checkDesigner->setEnabled( true ); m_targetLibraryVersion->setText( myProjectItem->scope->variableValues( "VERSION" ).front() ); } else @@ -805,92 +720,6 @@ void ProjectConfigurationDlg::updateControls() else checkWindows->setChecked( false ); - //TQt4 libs - if ( prjWidget->m_part->isTQt4Project() ) - { - - if ( configValues.findIndex( "assistant" ) != -1 ) - checkAssistant->setChecked( true ); - else - checkAssistant->setChecked( false ); - if ( configValues.findIndex( "qtestlib" ) != -1 ) - checkTestlib->setChecked( true ); - else - checkTestlib->setChecked( false ); - if ( configValues.findIndex( "uitools" ) != -1 ) - checkUiTools->setChecked( true ); - else - checkUiTools->setChecked( false ); - if ( configValues.findIndex( "dbus" ) != -1 ) - checkQDBus->setChecked( true ); - else - checkQDBus->setChecked( false ); - if ( configValues.findIndex( "build_all" ) != -1 ) - checkBuildAll->setChecked( true ); - else - checkBuildAll->setChecked( false ); - if ( configValues.findIndex( "help" ) != -1 ) - checkQtHelp->setChecked( true ); - else - checkQtHelp->setChecked( false ); - - TQStringList qtLibs = myProjectItem->scope->variableValues( "QT" ); - if ( qtLibs.findIndex( "core" ) != -1 ) - checkQt4Core->setChecked( true ); - else - checkQt4Core->setChecked( false ); - if ( qtLibs.findIndex( "gui" ) != -1 ) - checkQt4Gui->setChecked( true ); - else - checkQt4Gui->setChecked( false ); - if ( qtLibs.findIndex( "sql" ) != -1 ) - checkQt4SQL->setChecked( true ); - else - checkQt4SQL->setChecked( false ); - if ( qtLibs.findIndex( "xml" ) != -1 ) - checkQt4XML->setChecked( true ); - else - checkQt4XML->setChecked( false ); - if ( qtLibs.findIndex( "network" ) != -1 ) - checkQt4Network->setChecked( true ); - else - checkQt4Network->setChecked( false ); - if ( qtLibs.findIndex( "svg" ) != -1 ) - checkQt4SVG->setChecked( true ); - else - checkQt4SVG->setChecked( false ); - if ( qtLibs.findIndex( "opengl" ) != -1 ) - checkQt4OpenGL->setChecked( true ); - else - checkQt4OpenGL->setChecked( false ); - if ( qtLibs.findIndex( "qt3support" ) != -1 ) - checkQt3Support->setChecked( true ); - else - checkQt3Support->setChecked( false ); - if ( qtLibs.findIndex( "script" ) != -1 ) - checkQtScript->setChecked( true ); - else - checkQtScript->setChecked( false ); - if ( qtLibs.findIndex( "phonon" ) != -1 ) - checkPhonon->setChecked( true ); - else - checkPhonon->setChecked( false ); - if ( qtLibs.findIndex( "webkit" ) != -1 ) - checkQtWebKit->setChecked( true ); - else - checkQtWebKit->setChecked( false ); - if ( qtLibs.findIndex( "xmlpatterns" ) != -1 ) - checkQtXmlPatterns->setChecked( true ); - else - checkQtXmlPatterns->setChecked( false ); - - checkDebugReleaseMode->setEnabled( true ); - checkBuildAll->setEnabled( true ); - groupQt4Libs->setEnabled( checkQt->isChecked() ); - rccdir_url->setEnabled( true ); - rccdir_label->setEnabled( true ); - } - //fill the custom config edit TQStringList extraValues; for ( TQStringList::const_iterator it = configValues.begin() ; it != configValues.end() ; ++it ) @@ -1882,10 +1711,6 @@ void ProjectConfigurationDlg::groupLibrariesChanged( int ) checkPlugin->setEnabled( true ); checkDesigner->setEnabled( checkPlugin->isChecked() ); } - else if ( checkPlugin->isChecked() && prjWidget->m_part->isTQt4Project() ) - { - checkDesigner->setEnabled( true ); - } else { checkDesigner->setEnabled( false ); @@ -1978,14 +1803,6 @@ void ProjectConfigurationDlg::groupTemplateChanged( int ) void ProjectConfigurationDlg::groupRequirementsChanged( int ) { - if ( checkQt->isChecked() && prjWidget->m_part->isTQt4Project() ) - { - groupQt4Libs->setEnabled( true ); - } - else - { - groupQt4Libs->setEnabled( false ); - } activateApply( 0 ); } @@ -2170,5 +1987,3 @@ void ProjectConfigurationDlg::customVarChanged() } activateApply( 0 ); } - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/projectconfigurationdlg.h b/buildtools/qmake/projectconfigurationdlg.h index 7452e9e6..bcf38005 100644 --- a/buildtools/qmake/projectconfigurationdlg.h +++ b/buildtools/qmake/projectconfigurationdlg.h @@ -56,7 +56,7 @@ class CustomVarListItem : public TDEListViewItem 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* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~ProjectConfigurationDlg(); void updateControls(); void updateSubproject( QMakeScopeItem* _item ); @@ -141,5 +141,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui index 686240fe..d809814d 100644 --- a/buildtools/qmake/projectconfigurationdlgbase.ui +++ b/buildtools/qmake/projectconfigurationdlgbase.ui @@ -415,9 +415,6 @@ <property name="text"> <string>Debug && Release</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Set project to be built in debug_and_release mode</string> </property> @@ -579,9 +576,6 @@ <property name="text"> <string>Console</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Check to build a win32 console app</string> </property> @@ -590,164 +584,6 @@ </widget> <widget class="TQButtonGroup"> <property name="name"> - <cstring>groupQt4Libs</cstring> - </property> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="title"> - <string>Qt4 Libraries</string> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="TQCheckBox" row="1" column="0"> - <property name="name"> - <cstring>checkQt4Gui</cstring> - </property> - <property name="text"> - <string>Gui</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - <widget class="TQCheckBox" row="2" column="0"> - <property name="name"> - <cstring>checkQt4XML</cstring> - </property> - <property name="text"> - <string>XML</string> - </property> - </widget> - <widget class="TQCheckBox" row="3" column="0"> - <property name="name"> - <cstring>checkQt4Network</cstring> - </property> - <property name="text"> - <string>Network</string> - </property> - </widget> - <widget class="TQCheckBox" row="0" column="0"> - <property name="name"> - <cstring>checkQt4Core</cstring> - </property> - <property name="text"> - <string>Core</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - <widget class="TQCheckBox" row="0" column="1"> - <property name="name"> - <cstring>checkQt4OpenGL</cstring> - </property> - <property name="text"> - <string>OpenGL</string> - </property> - </widget> - <widget class="TQCheckBox" row="1" column="1"> - <property name="name"> - <cstring>checkUiTools</cstring> - </property> - <property name="text"> - <string>QtUiTools</string> - </property> - </widget> - <widget class="TQCheckBox" row="2" column="1"> - <property name="name"> - <cstring>checkQt4SQL</cstring> - </property> - <property name="text"> - <string>SQL</string> - </property> - </widget> - <widget class="TQCheckBox" row="3" column="1"> - <property name="name"> - <cstring>checkQt4SVG</cstring> - </property> - <property name="text"> - <string>SVG</string> - </property> - </widget> - <widget class="TQCheckBox" row="0" column="2"> - <property name="name"> - <cstring>checkTestlib</cstring> - </property> - <property name="text"> - <string>QtTest</string> - </property> - </widget> - <widget class="TQCheckBox" row="1" column="2"> - <property name="name"> - <cstring>checkQt3Support</cstring> - </property> - <property name="text"> - <string>Qt3 Support</string> - </property> - </widget> - <widget class="TQCheckBox" row="2" column="2"> - <property name="name"> - <cstring>checkQDBus</cstring> - </property> - <property name="text"> - <string>QDBus (Qt4.2)</string> - </property> - </widget> - <widget class="TQCheckBox" row="3" column="2"> - <property name="name"> - <cstring>checkAssistant</cstring> - </property> - <property name="text"> - <string>QtAssistant</string> - </property> - </widget> - <widget class="TQCheckBox" row="0" column="3"> - <property name="name"> - <cstring>checkQtScript</cstring> - </property> - <property name="text"> - <string>QtScript (Qt4.3)</string> - </property> - </widget> - <widget class="TQCheckBox" row="1" column="3"> - <property name="name"> - <cstring>checkQtWebKit</cstring> - </property> - <property name="text"> - <string>QtWebKit (Qt4.4)</string> - </property> - </widget> - <widget class="TQCheckBox" row="2" column="3"> - <property name="name"> - <cstring>checkQtXmlPatterns</cstring> - </property> - <property name="text"> - <string>QtXmlPatterns (Qt4.4)</string> - </property> - </widget> - <widget class="TQCheckBox" row="3" column="3"> - <property name="name"> - <cstring>checkPhonon</cstring> - </property> - <property name="text"> - <string>Phonon (Qt4.4)</string> - </property> - </widget> - <widget class="TQCheckBox" row="0" column="4"> - <property name="name"> - <cstring>checkQtHelp</cstring> - </property> - <property name="text"> - <string>QtHelp (Qt4.4)</string> - </property> - </widget> - </grid> - </widget> - <widget class="TQButtonGroup"> - <property name="name"> <cstring>groupLibraries</cstring> </property> <property name="title"> @@ -849,9 +685,6 @@ <property name="text"> <string>Designer Plugin</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> @@ -2326,12 +2159,6 @@ <slot>activateApply(int)</slot> </connection> <connection> - <sender>groupQt4Libs</sender> - <signal>clicked(int)</signal> - <receiver>ProjectConfigurationDlgBase</receiver> - <slot>activateApply(int)</slot> - </connection> - <connection> <sender>insideinc_listview</sender> <signal>clicked(TQListViewItem*)</signal> <receiver>ProjectConfigurationDlgBase</receiver> @@ -2706,23 +2533,6 @@ <tabstop>checkConsole</tabstop> <tabstop>checkPCH</tabstop> <tabstop>editConfigExtra</tabstop> - <tabstop>checkQt4Core</tabstop> - <tabstop>checkQt4Gui</tabstop> - <tabstop>checkQt4XML</tabstop> - <tabstop>checkQt4Network</tabstop> - <tabstop>checkQt4OpenGL</tabstop> - <tabstop>checkUiTools</tabstop> - <tabstop>checkQt4SQL</tabstop> - <tabstop>checkQt4SVG</tabstop> - <tabstop>checkTestlib</tabstop> - <tabstop>checkQt3Support</tabstop> - <tabstop>checkQDBus</tabstop> - <tabstop>checkAssistant</tabstop> - <tabstop>checkQtScript</tabstop> - <tabstop>checkQtWebKit</tabstop> - <tabstop>checkQtXmlPatterns</tabstop> - <tabstop>checkPhonon</tabstop> - <tabstop>checkQtHelp</tabstop> <tabstop>staticRadio</tabstop> <tabstop>checkPlugin</tabstop> <tabstop>checkLibtool</tabstop> @@ -2786,7 +2596,7 @@ <tabstop>buttonApply</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>updateProjectConfiguration()</slot> <slot>buildorderMoveUpClicked()</slot> <slot>buildorderMoveDownClicked()</slot> @@ -2830,7 +2640,7 @@ <slot>activateApply( const TQString & )</slot> <slot>activateApply( TQListViewItem * )</slot> <slot>customVarChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/qmake/qmakedefaultopts.cpp b/buildtools/qmake/qmakedefaultopts.cpp index 8c34c34b..f33c277a 100644 --- a/buildtools/qmake/qmakedefaultopts.cpp +++ b/buildtools/qmake/qmakedefaultopts.cpp @@ -14,9 +14,9 @@ #include <kdebug.h> #include <tdetempfile.h> #include <tqregexp.h> -#include <kprocess.h> +#include <tdeprocess.h> -#include <blockingkprocess.h> +#include <blockingtdeprocess.h> TQMakeDefaultOpts::TQMakeDefaultOpts() { @@ -87,5 +87,3 @@ const TQStringList& TQMakeDefaultOpts::variables() const { return m_keys; } - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakedefaultopts.h b/buildtools/qmake/qmakedefaultopts.h index 1b38d80c..575f832f 100644 --- a/buildtools/qmake/qmakedefaultopts.h +++ b/buildtools/qmake/qmakedefaultopts.h @@ -44,6 +44,3 @@ private: }; #endif - - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakeoptionswidget.cpp b/buildtools/qmake/qmakeoptionswidget.cpp index c2f4cfdd..3aafb3a0 100644 --- a/buildtools/qmake/qmakeoptionswidget.cpp +++ b/buildtools/qmake/qmakeoptionswidget.cpp @@ -59,5 +59,3 @@ void QMakeOptionsWidget::accept() } #include "qmakeoptionswidget.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakeoptionswidget.h b/buildtools/qmake/qmakeoptionswidget.h index be1cc534..c64d9efb 100644 --- a/buildtools/qmake/qmakeoptionswidget.h +++ b/buildtools/qmake/qmakeoptionswidget.h @@ -18,7 +18,7 @@ class QMakeOptionsWidget : public QMakeOptionsWidgetBase { - Q_OBJECT + TQ_OBJECT public: QMakeOptionsWidget( const TQString& projectdir, TQDomDocument &dom, const TQString &configGroup, @@ -34,7 +34,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - - diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp index 496adad8..ec0cd2af 100644 --- a/buildtools/qmake/qmakescopeitem.cpp +++ b/buildtools/qmake/qmakescopeitem.cpp @@ -649,16 +649,6 @@ void QMakeScopeItem::buildGroups() item->files.append( createFileItem( *it ) ); } - if ( scope->isTQt4Project() ) - { - values = scope->variableValues( "RESOURCES" ); - item = createGroupItem( GroupItem::Resources, "RESOURCES", this ); - groups.insert( item->groupType, item ); - for ( it = values.begin(); it != values.end(); ++it ) - { - item->files.append( createFileItem( *it ) ); - } - } values = scope->variableValues( "IMAGES" ); item = createGroupItem( GroupItem::Images, "IMAGES", this ); groups.insert( item->groupType, item ); @@ -925,5 +915,3 @@ TQMap<TQString, TQString> QMakeScopeItem::getLibInfos( TQString basePath ) kdDebug(9024) << "Running getLibInfo for" << scope->projectName() << "|" << map << endl; return result; } - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakescopeitem.h b/buildtools/qmake/qmakescopeitem.h index 2e275511..09b3bd06 100644 --- a/buildtools/qmake/qmakescopeitem.h +++ b/buildtools/qmake/qmakescopeitem.h @@ -124,5 +124,3 @@ private: #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp index 6cf86bf8..4e2b079a 100644 --- a/buildtools/qmake/scope.cpp +++ b/buildtools/qmake/scope.cpp @@ -514,10 +514,7 @@ Scope* Scope::createSimpleScope( const TQString& scopename ) ast->setDepth( m_root->depth() ); m_root->addChildAST( ast ); 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->isTQt4Project() ) - addToPlusOp( "CONFIG", TQStringList( scopename ) ); - */ + // We can't unconditionally add the scope name to CONFIG, scope might be win32 which may only be in CONFIG under windows. Scope* simpleScope = new Scope( m_environment, getNextScopeNum(), this, ast, m_defaultopts, m_part ); if( simpleScope->scopeType() != Scope::InvalidScope ) @@ -1182,11 +1179,6 @@ TQStringList Scope::cleanStringList(const TQStringList& list) const return result; } -bool Scope::isTQt4Project() const -{ - return m_part->isTQt4Project(); -} - void Scope::reloadProject() { if ( !m_root || !m_root->isProject() ) @@ -1426,16 +1418,6 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res } } - if ( isTQt4Project() ) - { - values = variableValues( "RESOURCES" ,false, false ); - for ( it = values.begin(); it != values.end(); ++it ) - { - file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; - file = resolveVariables( file ); - res.insert( TQDir::cleanDirPath( file ) ); - } - } values = variableValues( "IMAGES" ,false, false ); for ( it = values.begin(); it != values.end(); ++it ) { @@ -1481,22 +1463,12 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res file = resolveVariables( file ); res.insert( TQDir::cleanDirPath( file ) ); - if( !m_part->isTQt4Project()) - { - header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".h"; - if( TQFileInfo(header).exists() ) - res.insert( TQDir::cleanDirPath( header ) ); - header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".cpp"; - if( TQFileInfo(header).exists() ) - res.insert( TQDir::cleanDirPath( header ) ); - } - else - { - header = projectDir()+TQString(TQChar(TQDir::separator())) + "ui_" +*it; - header.replace(TQRegExp("\\.ui$"),".h"); - if( TQFileInfo(header).exists() ) - res.insert( TQDir::cleanDirPath( header ) ); - } + header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".h"; + if( TQFileInfo(header).exists() ) + res.insert( TQDir::cleanDirPath( header ) ); + header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".cpp"; + if( TQFileInfo(header).exists() ) + res.insert( TQDir::cleanDirPath( header ) ); } } @@ -1706,5 +1678,3 @@ TQString Scope::PrintAST::getIndent() return ind; } #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/scope.h b/buildtools/qmake/scope.h index 98519bdf..f50d4d99 100644 --- a/buildtools/qmake/scope.h +++ b/buildtools/qmake/scope.h @@ -125,9 +125,6 @@ public: /* deletes the subproject (including the subdir if deleteSubdir is true) */ bool deleteSubProject( unsigned int, bool deleteSubdir ); - /* 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; @@ -303,6 +300,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - diff --git a/buildtools/qmake/trolllistview.h b/buildtools/qmake/trolllistview.h index 8c2c021f..13c0565d 100644 --- a/buildtools/qmake/trolllistview.h +++ b/buildtools/qmake/trolllistview.h @@ -26,7 +26,7 @@ class TrollListView : public TDEListView { -Q_OBJECT +TQ_OBJECT public: TrollListView(TrollProjectWidget *widget, TQWidget *parent, TrollProjectWidget::TrollProjectView view, const char *name = 0); diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 6d92d03b..58aa9d17 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -30,7 +30,7 @@ #include <kdevgenericfactory.h> #include <tdeaction.h> #include <tdeparts/part.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kurlrequesterdlg.h> @@ -57,11 +57,11 @@ #include <urlutil.h> typedef KDevGenericFactory<TrollProjectPart> TrollProjectFactory; -static const KDevPluginInfo data("kdevtrollproject"); -K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) ) +static const KDevPluginInfo pluginData("kdevtrollproject"); +K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( pluginData ) ) TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args ) - : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart") + : KDevBuildTool(&pluginData, parent, name ? name : "TrollProjectPart") { setInstance(TrollProjectFactory::instance()); @@ -92,7 +92,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS const TQIconSet icon(SmallIcon("compfile")); action = new TDEAction( i18n("Compile &File"), "compfile", 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildOpenFile()), + m_widget, TQ_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 TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildProject()), + m_widget, TQ_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 TDEAction( i18n("&Rebuild Project"),"rebuild" , 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotRebuildProject()), + m_widget, TQ_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 TDEAction( i18n("&Install Project"),"install" , 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotInstallProject()), + m_widget, TQ_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 TDEAction( i18n("&Clean Project"), 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotCleanProject()), + m_widget, TQ_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 TDEAction( i18n("&Dist-Clean Project"), 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotDistCleanProject()), + m_widget, TQ_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 " @@ -141,13 +141,13 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("Execute Main Program"), "application-x-executable", SHIFT+Key_F9, - this, TQT_SLOT(slotBuildAndExecuteProject()), + this, TQ_SLOT(slotBuildAndExecuteProject()), actionCollection(), "build_execute_project" ); action->setToolTip(i18n("Execute main program")); 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 TDEAction( i18n("&Build Subproject"), "make_tdevelop", Key_F7, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildTarget()), + m_widget, TQ_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. " @@ -156,7 +156,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Rebuild Subproject"), "rebuild", 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotRebuildTarget()), + m_widget, TQ_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. " @@ -165,7 +165,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Install Subproject"), "install", 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotInstallTarget()), + m_widget, TQ_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. " @@ -174,7 +174,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Clean Subproject"), 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotCleanTarget()), + m_widget, TQ_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. " @@ -183,7 +183,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("&Dist-Clean Subproject"), 0, - TQT_TQOBJECT(m_widget), TQT_SLOT(slotDistCleanTarget()), + m_widget, TQ_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" @@ -192,18 +192,18 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, <b>Make Options</b> tab.")); action = new TDEAction( i18n("Execute Subproject"), "application-x-executable", 0, - this, TQT_SLOT(slotBuildAndExecuteTarget()), + this, TQ_SLOT(slotBuildAndExecuteTarget()), actionCollection(), "build_execute_target" ); action->setToolTip(i18n("Execute subproject")); action->setWhatsThis(i18n("<b>Execute subproject</b><p>Executes the target program for the currently selected subproject. " "This action is allowed only if a type of the subproject is 'application'. The type of the subproject can be " "defined in <b>Subproject Settings</b> dialog (open it from the subproject context menu).")); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( makeFrontend(), TQT_SIGNAL(commandFinished(const TQString&)), - this, TQT_SLOT(slotCommandFinished(const TQString&)) ); + connect( makeFrontend(), TQ_SIGNAL(commandFinished(const TQString&)), + this, TQ_SLOT(slotCommandFinished(const TQString&)) ); TQString m_defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); TQString m_qmakePath = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", ""); @@ -255,12 +255,12 @@ TQString TrollProjectPart::makeEnvironment() environstr += " "; } - if( !hasTQtDir && !isTQt4Project() && !DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) + if( !hasTQtDir && !DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) { environstr += TQString( "TQTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$TQTDIR/bin:$PATH " ); } - TDEConfigGroup grp( kapp->config(), "MakeOutputView" ); + TDEConfigGroup grp( tdeApp->config(), "MakeOutputView" ); if( grp.readBoolEntry( "ForceCLocale", true ) ) environstr += "LC_MESSAGES="+EnvVarTools::quote("C")+" "+" "+"LC_CTYPE="+EnvVarTools::quote("C")+" "; @@ -280,9 +280,9 @@ void TrollProjectPart::projectConfigWidget(KDialogBase *dlg) QMakeOptionsWidget *qm = new QMakeOptionsWidget( projectDirectory(), *projectDom(), "/kdevtrollproject", vbox); - connect( dlg, TQT_SIGNAL(okClicked()), w4, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(okClicked()), qm, TQT_SLOT(accept()) ); - connect( dlg, TQT_SIGNAL(okClicked()), optdlg, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w4, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), qm, TQ_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), optdlg, TQ_SLOT(accept()) ); } @@ -291,7 +291,7 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj mainWindow()->statusBar()->message( i18n("Loading Project...") ); TQString defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); - if( !isTQt4Project() && ( defaultTQtDir.isEmpty() || !isValidTQtDir( defaultTQtDir ) ) ) + if( defaultTQtDir.isEmpty() || !isValidTQtDir( defaultTQtDir ) ) { bool doask = true; while( doask ) @@ -705,11 +705,6 @@ void TrollProjectPart::startTQMakeCommand(const TQString &dir, bool recursive) cmdline = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/qmake", "")+" "; } - if(isTQt4Project() && recursive) - { - cmdline += " -recursive "; - } - //TQString cmdline = TQString::fromLatin1( isTMakeProject() ? "tmake " : "qmake " ); // cmdline += fi.baseName() + ".pro"; TQDir d(dir); @@ -798,18 +793,15 @@ bool TrollProjectPart::isValidTQtDir( const TQString& path ) const TQFileInfo inc( path + TQString( TQChar( TQDir::separator() ) )+ "include"+TQString( TQChar( TQDir::separator() ) )+ "tqt.h" ); - return ( isTQt4Project() || ( !isTQt4Project() && inc.exists() ) ); + return ( inc.exists() ); } void TrollProjectPart::buildBinDirs( TQStringList & dirs ) const { - if( !isTQt4Project() ) - { - 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" ); - } + 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"; @@ -850,8 +842,7 @@ bool TrollProjectPart::isExecutable( const TQString& path ) const TQString TrollProjectPart::findTQtDir() { TQStringList qtdirs; - if( !isTQt4Project() ) - qtdirs.push_back( ::getenv("TQTDIR") ); + qtdirs.push_back( ::getenv("TQTDIR") ); 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") ) ); @@ -909,11 +900,6 @@ TQStringList TrollProjectPart::distFiles() const return sourceList + files; } -bool TrollProjectPart::isTQt4Project() const -{ - return ( DomUtil::readIntEntry( *projectDom(), "kdevcppsupport/qt/version", 3 ) == 4 ); -} - KDirWatch* TrollProjectPart::dirWatch() { return m_dirWatch; @@ -925,7 +911,3 @@ void TrollProjectPart::slotBuild() } #include "trollprojectpart.moc" - -//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - - diff --git a/buildtools/qmake/trollprojectpart.h b/buildtools/qmake/trollprojectpart.h index e36ef202..1516c477 100644 --- a/buildtools/qmake/trollprojectpart.h +++ b/buildtools/qmake/trollprojectpart.h @@ -30,7 +30,7 @@ class TQMakeDefaultOpts; class TrollProjectPart : public KDevBuildTool { - Q_OBJECT + TQ_OBJECT public: @@ -38,7 +38,6 @@ public: ~TrollProjectPart(); bool isTMakeProject() const { return m_tmakeProject; } - bool isTQt4Project() const; bool isDirty(); KDirWatch* dirWatch(); virtual Options options() const; diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 79077bac..bc5c850c 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -32,7 +32,7 @@ #include <tqptrstack.h> #include <tqtextstream.h> #include <tqcombobox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqtimer.h> #include <tqdir.h> #include <tqregexp.h> @@ -51,7 +51,6 @@ #include <iostream> #include <tdeparts/part.h> #include <tdeaction.h> -#include <kprocess.h> #include <kinputdialog.h> #include <tdeversion.h> #include <kdirwatch.h> @@ -84,7 +83,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) m_rootScope ( 0 ), m_part ( part ), m_configDlg( 0 ), m_filesCached(false) { - TQSplitter * splitter = new TQSplitter(Qt::Vertical, this ); + TQSplitter * splitter = new TQSplitter(TQt::Vertical, this ); ////////////////// // PROJECT VIEW // @@ -156,16 +155,16 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) "external libraries,<br>build order,<br>intermediate files locations,<br>compiler options." ) ); // Project button connections - connect ( addSubdirButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddSubproject () ) ); - connect ( createScopeButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotCreateScope () ) ); + connect ( addSubdirButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotAddSubproject () ) ); + connect ( createScopeButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotCreateScope () ) ); - connect ( buildProjectButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotBuildProject () ) ); - connect ( rebuildProjectButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRebuildProject () ) ); - connect ( executeProjectButton, TQT_SIGNAL ( clicked () ), m_part, TQT_SLOT ( slotBuildAndExecuteProject () ) ); + connect ( buildProjectButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotBuildProject () ) ); + connect ( rebuildProjectButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRebuildProject () ) ); + connect ( executeProjectButton, TQ_SIGNAL ( clicked () ), m_part, TQ_SLOT ( slotBuildAndExecuteProject () ) ); - connect ( projectconfButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotConfigureProject () ) ); + connect ( projectconfButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotConfigureProject () ) ); // Project tree overview = new TrollListView( this, overviewContainer, SubprojectView, "project overview widget" ); @@ -175,10 +174,10 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) overview->addColumn( TQString() ); // Project tree connections - connect( overview, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); - connect( overview, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotOverviewContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( overview, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); + connect( overview, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( slotOverviewContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); ///////////////// @@ -284,30 +283,30 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) details->header() ->hide(); details->addColumn( TQString() ); // Detail button connections - connect ( addfilesButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotAddFiles () ) ); - connect ( newfileButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotNewFile () ) ); - connect ( removefileButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRemoveFile () ) ); - connect ( buildFileButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotBuildSelectedFile () ) ); - connect ( excludeFileFromScopeButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotExcludeFileFromScopeButton() ) ); + connect ( addfilesButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotAddFiles () ) ); + connect ( newfileButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotNewFile () ) ); + connect ( removefileButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRemoveFile () ) ); + connect ( buildFileButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotBuildSelectedFile () ) ); + connect ( excludeFileFromScopeButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotExcludeFileFromScopeButton() ) ); // Detail tree connections - connect( details, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotDetailsSelectionChanged( TQListViewItem* ) ) ); - connect( details, TQT_SIGNAL( executed( TQListViewItem* ) ), - this, TQT_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); - connect( details, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotDetailsContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); - - connect ( buildTargetButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotBuildTarget () ) ); - connect ( rebuildTargetButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRebuildTarget () ) ); - connect ( executeTargetButton, TQT_SIGNAL ( clicked () ), m_part, TQT_SLOT ( slotBuildAndExecuteTarget () ) ); + connect( details, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotDetailsSelectionChanged( TQListViewItem* ) ) ); + connect( details, TQ_SIGNAL( executed( TQListViewItem* ) ), + this, TQ_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); + connect( details, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( slotDetailsContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); + + connect ( buildTargetButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotBuildTarget () ) ); + connect ( rebuildTargetButton, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotRebuildTarget () ) ); + connect ( executeTargetButton, TQ_SIGNAL ( clicked () ), m_part, TQ_SLOT ( slotBuildAndExecuteTarget () ) ); buildTargetButton->setEnabled( false ); rebuildTargetButton->setEnabled( false ); executeTargetButton->setEnabled( false ); m_configDlg = new ProjectConfigurationDlg( overview, this, this ); - connect( m_part->dirWatch(), TQT_SIGNAL( dirty(const TQString&) ), this, TQT_SLOT( slotProjectDirty(const TQString&) ) ); + connect( m_part->dirWatch(), TQ_SIGNAL( dirty(const TQString&) ), this, TQ_SLOT( slotProjectDirty(const TQString&) ) ); } @@ -680,7 +679,7 @@ void TrollProjectWidget::slotExecuteTarget() m_part->appFrontend()->stopApplication(); while(m_part->appFrontend()->isRunning()) { - TDEApplication::kApplication()->processEvents(); + tdeApp->processEvents(); usleep(100); } } @@ -715,7 +714,7 @@ void TrollProjectWidget::slotExecuteTarget() void TrollProjectWidget::slotBuildProject() { - if ( m_part->partController() ->saveAllFiles() == false ) + if ( !m_part->partController() ->saveAllFiles() ) return ; //user cancelled TQString dir = projectDirectory(); @@ -733,7 +732,7 @@ void TrollProjectWidget::slotBuildProject() void TrollProjectWidget::slotInstallProject() { - if ( m_part->partController() ->saveAllFiles() == false ) + if ( !m_part->partController() ->saveAllFiles() ) return ; //user cancelled TQString dir = projectDirectory(); @@ -1301,7 +1300,7 @@ void TrollProjectWidget::slotAddFiles() case AddFilesDialog::Link: { // Link selected files to current subproject folder - TDEProcess *proc = new TDEProcess( TQT_TQOBJECT(this) ); + TDEProcess *proc = new TDEProcess( this ); *proc << "ln"; *proc << "-s"; *proc << files[ i ]; @@ -1371,7 +1370,7 @@ void TrollProjectWidget::slotNewFile() if ( gitem->groupType == GroupItem::InstallObject ) { // TQString relpath = m_shownSubproject->path.mid(projectDirectory().length()); - bool ok = FALSE; + bool ok = false; TQString filepattern = KInputDialog::getText( i18n( "Insert New Filepattern" ), i18n( "Please enter a filepattern relative the current " @@ -1387,7 +1386,7 @@ void TrollProjectWidget::slotNewFile() if ( gitem->groupType == GroupItem::InstallRoot ) { // TQString relpath = m_shownSubproject->path.mid(projectDirectory().length()); - bool ok = FALSE; + bool ok = false; TQString install_obj = KInputDialog::getText( i18n( "Insert New Install Object" ), i18n( "Please enter a name for the new object:" ), @@ -1416,10 +1415,7 @@ void TrollProjectWidget::slotNewFile() fcext = "h"; break; case GroupItem::Forms: - if ( !m_part->isTQt4Project() ) - fcext = "ui-widget"; - else - fcext = "ui-widget-qt4"; + fcext = "ui-widget"; break; case GroupItem::Translations: fcext = "ts"; @@ -1599,7 +1595,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * } else if ( r == idInsNewFilepatternItem ) { - bool ok = FALSE; + bool ok = false; TQString filepattern = KInputDialog::getText( i18n( "Add Pattern of Files to Install" ), i18n( "Enter a pattern relative to the current " @@ -1645,7 +1641,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * case AddFilesDialog::Link: { // Link selected files to current subproject folder - TDEProcess *proc = new TDEProcess( TQT_TQOBJECT(this) ); + TDEProcess *proc = new TDEProcess( this ); *proc << "ln"; *proc << "-s"; *proc << files[ i ]; @@ -1694,10 +1690,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * fcext = "h"; break; case GroupItem::Forms: - if ( !m_part->isTQt4Project() ) - fcext = "ui-widget"; - else - fcext = "ui-widget-qt4"; + fcext = "ui-widget"; break; case GroupItem::Translations: fcext = "ts"; @@ -1720,7 +1713,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * } else if ( r == idInsInstallObject ) { - bool ok = FALSE; + bool ok = false; TQString install_obj = KInputDialog::getText( i18n( "Add Install Object" ), i18n( "Enter a name for the new object:" ), @@ -1782,11 +1775,8 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * popup.setWhatsThis( 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->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." ) ); - } + 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." ) ); idUISubclasses = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "List of Subclasses..." ) ); popup.setWhatsThis( idUISubclasses, i18n( "<b>List of subclasses</b><p>Shows subclasses list editor. " "There is possibility to add or remove subclasses from the list." ) ); @@ -1900,7 +1890,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * { GroupItem * titem = static_cast<GroupItem*>( item->parent() ); - bool ok = FALSE; + bool ok = false; TQString filepattern = KInputDialog::getText( i18n( "Edit Pattern" ), i18n( "Enter a pattern relative to the current " @@ -2062,7 +2052,7 @@ void TrollProjectWidget::slotExecuteProject() m_part->appFrontend()->stopApplication(); while(m_part->appFrontend()->isRunning()) { - TDEApplication::kApplication()->processEvents(); + tdeApp->processEvents(); usleep(100); } } @@ -2340,21 +2330,15 @@ void TrollProjectWidget::setLastFocusedView( TrollProjectView view ) void TrollProjectWidget::runTQMakeRecursive( QMakeScopeItem* proj ) { - if( m_part->isTQt4Project() ) + if ( proj->scope->scopeType() == Scope::ProjectScope ) { - m_part->startTQMakeCommand( proj->scope->projectDir(), true ); - }else + m_part->startTQMakeCommand( proj->scope->projectDir() ); + } + QMakeScopeItem* item = static_cast<QMakeScopeItem*>( proj->firstChild() ); + while ( item ) { - if ( proj->scope->scopeType() == Scope::ProjectScope ) - { - m_part->startTQMakeCommand( proj->scope->projectDir() ); - } - QMakeScopeItem* item = static_cast<QMakeScopeItem*>( proj->firstChild() ); - while ( item ) - { - runTQMakeRecursive( item ); - item = static_cast<QMakeScopeItem*>( item->nextSibling() ); - } + runTQMakeRecursive( item ); + item = static_cast<QMakeScopeItem*>( item->nextSibling() ); } } @@ -2533,7 +2517,7 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const map[(*it).first] = (*it).second; } - if( !hasTQtDir && !m_part->isTQt4Project() && !DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) + if( !hasTQtDir && !DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) { map["TQTDIR="] = DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", ""); map["PATH"] = map["PATH"].prepend( DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "") +"/bin" ); @@ -2542,6 +2526,3 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const } #include "trollprojectwidget.moc" - -//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - diff --git a/buildtools/qmake/trollprojectwidget.h b/buildtools/qmake/trollprojectwidget.h index dac889c9..7821d075 100644 --- a/buildtools/qmake/trollprojectwidget.h +++ b/buildtools/qmake/trollprojectwidget.h @@ -43,7 +43,7 @@ class ProjectConfigurationDlg; class TrollProjectWidget : public TQVBox { - Q_OBJECT + TQ_OBJECT public: @@ -215,5 +215,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on |