diff options
Diffstat (limited to 'buildtools/qmake')
30 files changed, 1094 insertions, 1087 deletions
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 |