diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
| commit | 48d4a26399959121f33d2bc3bfe51c7827b654fc (patch) | |
| tree | 5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /buildtools/autotools | |
| parent | 7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff) | |
| download | tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip | |
TQt4 port kdevelop
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'buildtools/autotools')
72 files changed, 894 insertions, 869 deletions
diff --git a/buildtools/autotools/addapplicationdlg.cpp b/buildtools/autotools/addapplicationdlg.cpp index f0cd3693..d70dc2d5 100644 --- a/buildtools/autotools/addapplicationdlg.cpp +++ b/buildtools/autotools/addapplicationdlg.cpp @@ -33,8 +33,8 @@ AddApplicationDialog::AddApplicationDialog(AutoProjectWidget *widget, SubprojectItem *spitem, - TQWidget *parent, const char *name) - : AddApplicationDialogBase(parent, name, true) + TQWidget *tqparent, const char *name) + : AddApplicationDialogBase(tqparent, name, true) { filename_edit->setText(".desktop"); filename_edit->home(false); diff --git a/buildtools/autotools/addapplicationdlg.h b/buildtools/autotools/addapplicationdlg.h index 4ab74ef2..05314582 100644 --- a/buildtools/autotools/addapplicationdlg.h +++ b/buildtools/autotools/addapplicationdlg.h @@ -22,10 +22,11 @@ class TargetItem; class AddApplicationDialog : public AddApplicationDialogBase { Q_OBJECT + TQ_OBJECT public: AddApplicationDialog( AutoProjectWidget *widget, SubprojectItem *spitem, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~AddApplicationDialog(); protected: diff --git a/buildtools/autotools/addapplicationdlgbase.ui b/buildtools/autotools/addapplicationdlgbase.ui index 5e6def81..3380dc4c 100644 --- a/buildtools/autotools/addapplicationdlgbase.ui +++ b/buildtools/autotools/addapplicationdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AddApplicationDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>add_application_dialog</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox7</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>terminal_box</cstring> </property> @@ -51,7 +51,7 @@ <cstring>filename_edit</cstring> </property> </widget> - <widget class="QLayoutWidget" row="1" column="3"> + <widget class="TQLayoutWidget" row="1" column="3"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -62,11 +62,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>icon_button</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>24</width> <height>24</height> @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -98,7 +98,7 @@ </spacer> </hbox> </widget> - <widget class="QComboBox" row="0" column="3"> + <widget class="TQComboBox" row="0" column="3"> <property name="name"> <cstring>executable_combo</cstring> </property> @@ -111,7 +111,7 @@ <cstring>name_edit</cstring> </property> </widget> - <widget class="QComboBox" row="2" column="3"> + <widget class="TQComboBox" row="2" column="3"> <item> <property name="text"> <string>Application</string> @@ -181,7 +181,7 @@ <cstring>section_combo</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>name_label_2</cstring> </property> @@ -192,14 +192,14 @@ <property name="text"> <string>E&xecutable:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>executable_combo</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>icon_label</cstring> </property> @@ -210,14 +210,14 @@ <property name="text"> <string>&Icon:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>icon_button</cstring> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>section_label</cstring> </property> @@ -228,14 +228,14 @@ <property name="text"> <string>&Section:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>section_combo</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>filename_label</cstring> </property> @@ -246,14 +246,14 @@ <property name="text"> <string>&File name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>filename_edit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>name_label</cstring> </property> @@ -264,14 +264,14 @@ <property name="text"> <string>&Name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>name_edit</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>comment_label</cstring> </property> @@ -282,7 +282,7 @@ <property name="text"> <string>Co&mment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -301,14 +301,14 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox6</cstring> </property> @@ -319,7 +319,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -330,7 +330,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string></string> @@ -349,7 +349,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -370,14 +370,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>add_button</cstring> </property> @@ -385,7 +385,7 @@ <string><-</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>remove_button</cstring> </property> @@ -403,7 +403,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -412,7 +412,7 @@ </spacer> </vbox> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string></string> @@ -435,7 +435,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -456,14 +456,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>okbutton</cstring> </property> @@ -477,7 +477,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelbutton</cstring> </property> @@ -542,11 +542,11 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">addTypeClicked()</slot> <slot access="protected">iconClicked()</slot> <slot access="protected">removeTypeClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp index 912edc52..19d400fb 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.cpp +++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp @@ -34,8 +34,8 @@ #include "addexistingdirectoriesdlg.h" -AddExistingDirectoriesDialog::AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TQWidget* parent, const char* name, bool modal, WFlags fl ) - : AddExistingDlgBase ( parent, name, modal, fl ) +AddExistingDirectoriesDialog::AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) + : AddExistingDlgBase ( tqparent, name, modal, fl ) { setIcon ( SmallIcon ( "fileimport.png" ) ); @@ -186,7 +186,7 @@ void AddExistingDirectoriesDialog::slotOk() TQString name = *it; // Adjust SUBDIRS variable in containing Makefile.am - if (m_spitem->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) + if (m_spitem->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1) { TQFile subdirsfile( m_spitem->path + "/subdirs" ); if ( subdirsfile.open( IO_WriteOnly | IO_Append ) ) @@ -196,7 +196,7 @@ void AddExistingDirectoriesDialog::slotOk() subdirsfile.close(); } } - else if (m_spitem->variables["SUBDIRS"].find("$(AUTODIRS)") != -1) + else if (m_spitem->variables["SUBDIRS"].tqfind("$(AUTODIRS)") != -1) { } else @@ -229,7 +229,7 @@ void AddExistingDirectoriesDialog::slotOk() m_widget->getSubprojectView()->parse( newitem ); } else { if (!f.open(IO_WriteOnly)) { -// KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name)); +// KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").tqarg(name)); continue; } TQTextStream stream(&f); @@ -243,7 +243,7 @@ void AddExistingDirectoriesDialog::slotOk() if ( !m_part->isKDE() ) { TQString projroot = m_part->projectDirectory() + "/"; TQString subdirectory = dir.path(); - TQString relpath = subdirectory.replace(0, projroot.length(),""); + TQString relpath = subdirectory.tqreplace(0, projroot.length(),""); TQString configureFile = m_part->getAutoConfFile(projroot); @@ -270,7 +270,7 @@ void AddExistingDirectoriesDialog::slotAddSelected() TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url()); if (relPath[relPath.length()-1] == '/') relPath = relPath.left(relPath.length()-1); - if ( (relPath.isEmpty()) || (! m_widget->allSubprojects().contains( relPath )) ) + if ( (relPath.isEmpty()) || (! m_widget->allSubprojects().tqcontains( relPath )) ) { m_importList.append ( ( *it ) ); } @@ -288,7 +288,7 @@ void AddExistingDirectoriesDialog::slotAddAll() TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url()); if (relPath[relPath.length()-1] == '/') relPath = relPath.left(relPath.length()-1); - if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().contains( relPath )) ) + if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().tqcontains( relPath )) ) { m_importList.append ( ( *it ) ); } @@ -363,7 +363,7 @@ void AddExistingDirectoriesDialog::slotDropped ( TQDropEvent* ev ) TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), *it); if (relPath[relPath.length()-1] == '/') relPath = relPath.left(relPath.length()-1); - if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().contains( relPath )) ) + if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().tqcontains( relPath )) ) { type = KMimeType::findByURL ( ( *it ) ); diff --git a/buildtools/autotools/addexistingdirectoriesdlg.h b/buildtools/autotools/addexistingdirectoriesdlg.h index 3b8853ee..1db1f328 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.h +++ b/buildtools/autotools/addexistingdirectoriesdlg.h @@ -36,10 +36,11 @@ class KImportIconView; class AddExistingDirectoriesDialog : public AddExistingDlgBase { Q_OBJECT + TQ_OBJECT public: AddExistingDirectoriesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, - SubprojectItem* spitem, TQWidget* parent = 0, + SubprojectItem* spitem, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddExistingDirectoriesDialog(); diff --git a/buildtools/autotools/addexistingdlgbase.ui b/buildtools/autotools/addexistingdlgbase.ui index cf73ee21..e70d5479 100644 --- a/buildtools/autotools/addexistingdlgbase.ui +++ b/buildtools/autotools/addexistingdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>AddExistingDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>AddExistingDlgBase</cstring> </property> @@ -27,9 +27,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -45,14 +45,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>317</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>okButton</cstring> </property> @@ -63,7 +63,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelButton</cstring> </property> @@ -81,7 +81,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>infoGroupBox</cstring> </property> @@ -93,7 +93,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -112,7 +112,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>infoLayout1</cstring> </property> @@ -123,7 +123,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>directoryStaticLabel</cstring> </property> @@ -143,7 +143,7 @@ <string>Directory:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>targetStaticLabel</cstring> </property> @@ -165,7 +165,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>infoLayout2</cstring> </property> @@ -192,7 +192,7 @@ <string>[DIRECTORY]</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>targetLabel</cstring> </property> @@ -204,7 +204,7 @@ </widget> </hbox> </widget> - <widget class="QSplitter" row="1" column="0"> + <widget class="TQSplitter" row="1" column="0"> <property name="name"> <cstring>splitter2</cstring> </property> @@ -219,17 +219,17 @@ <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -245,14 +245,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>84</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addAllButton</cstring> </property> @@ -263,7 +263,7 @@ <string>Import by creating symbolic links (recommended)</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addSelectedButton</cstring> </property> @@ -284,7 +284,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>84</width> <height>20</height> @@ -293,17 +293,17 @@ </spacer> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>sourceGroupBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>240</width> <height>250</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -323,17 +323,17 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -349,14 +349,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeAllButton</cstring> </property> @@ -367,7 +367,7 @@ <string>Removes all added files.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeSelectedButton</cstring> </property> @@ -388,7 +388,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -397,17 +397,17 @@ </spacer> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>destGroupBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>140</width> <height>100</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -450,8 +450,8 @@ <include location="global" impldecl="in implementation">kprogress.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kprogress.h</includehint> <includehint>ksqueezedtextlabel.h</includehint> diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp index 6d3224df..519acb33 100644 --- a/buildtools/autotools/addexistingfilesdlg.cpp +++ b/buildtools/autotools/addexistingfilesdlg.cpp @@ -49,15 +49,15 @@ #include "addexistingfilesdlg.h" /* - * Constructs a AddExistingFilesDialog which is a child of 'parent', with the + * Constructs a AddExistingFilesDialog which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TargetItem* titem, TQWidget* parent, const char* name, bool modal, WFlags fl ) - : AddExistingDlgBase ( parent, name, modal, fl ) +AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProjectWidget *widget, SubprojectItem* spitem, TargetItem* titem, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) + : AddExistingDlgBase ( tqparent, name, modal, fl ) { m_spitem = spitem; m_titem = titem; @@ -110,7 +110,7 @@ AddExistingFilesDialog::AddExistingFilesDialog ( AutoProjectPart* part, AutoProj */ AddExistingFilesDialog::~AddExistingFilesDialog() { - // no need to delete child widgets, Qt does it all for me + // no need to delete child widgets, TQt does it all for me } @@ -234,7 +234,7 @@ void AddExistingFilesDialog::slotOk() progressBar->show(); progressBar->setFormat ( i18n ( "Importing... %p%" ) ); - qApp->processEvents(); + tqApp->processEvents(); KFileItemListIterator items ( *importView->items() ); diff --git a/buildtools/autotools/addexistingfilesdlg.h b/buildtools/autotools/addexistingfilesdlg.h index aa00a99e..6cf69364 100644 --- a/buildtools/autotools/addexistingfilesdlg.h +++ b/buildtools/autotools/addexistingfilesdlg.h @@ -39,10 +39,11 @@ class KFileItem; class AddExistingFilesDialog : public AddExistingDlgBase { Q_OBJECT + TQ_OBJECT public: AddExistingFilesDialog( AutoProjectPart* part, AutoProjectWidget *widget, - SubprojectItem* spitem, TargetItem* titem, TQWidget* parent = 0, + SubprojectItem* spitem, TargetItem* titem, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddExistingFilesDialog(); diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp index 56df4998..407e5109 100644 --- a/buildtools/autotools/addfiledlg.cpp +++ b/buildtools/autotools/addfiledlg.cpp @@ -40,8 +40,8 @@ AddFileDialog::AddFileDialog(AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *item, - TQWidget *parent, const char *name) - : AddFileDlgBase(parent, name, true) + TQWidget *tqparent, const char *name) + : AddFileDlgBase(tqparent, name, true) { connect ( createButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( accept() ) ); connect ( cancelButton, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( reject() ) ); @@ -68,7 +68,7 @@ AddFileDialog::~AddFileDialog() void AddFileDialog::accept() { TQString name = fileEdit->text(); - if (name.find('/') != -1) { + if (name.tqfind('/') != -1) { KMessageBox::sorry(this, i18n("Please enter the file name without '/' and so on.")); return; } diff --git a/buildtools/autotools/addfiledlg.h b/buildtools/autotools/addfiledlg.h index 867c88cc..e4a6ead4 100644 --- a/buildtools/autotools/addfiledlg.h +++ b/buildtools/autotools/addfiledlg.h @@ -27,11 +27,12 @@ class TargetItem; class AddFileDialog : public AddFileDlgBase { Q_OBJECT + TQ_OBJECT public: AddFileDialog( AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *item, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~AddFileDialog(); protected: diff --git a/buildtools/autotools/addfiledlgbase.ui b/buildtools/autotools/addfiledlgbase.ui index dc8e38b2..2c73254d 100644 --- a/buildtools/autotools/addfiledlgbase.ui +++ b/buildtools/autotools/addfiledlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AddFileDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>AddFileDlgBase</cstring> </property> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -39,7 +39,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>targetBox</cstring> </property> @@ -56,7 +56,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>targetLayout</cstring> </property> @@ -75,7 +75,7 @@ <string>[TARGET DIRECTORY]</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>targetLabel</cstring> </property> @@ -83,7 +83,7 @@ <string>[TARGET NAME]</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>directoryStaticLabel</cstring> </property> @@ -103,7 +103,7 @@ <string>Directory:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>targetStaticLabel</cstring> </property> @@ -127,7 +127,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>fileGroupBox</cstring> </property> @@ -150,14 +150,14 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>templateCheckBox</cstring> </property> @@ -176,7 +176,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>fileStaticLabel</cstring> </property> @@ -188,7 +188,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -217,14 +217,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> <cstring>buttonLayout</cstring> </property> @@ -245,14 +245,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>createButton</cstring> </property> @@ -263,7 +263,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelButton</cstring> </property> @@ -280,8 +280,8 @@ <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>ksqueezedtextlabel.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/autotools/addicondlg.cpp b/buildtools/autotools/addicondlg.cpp index 5531c656..79aaab0e 100644 --- a/buildtools/autotools/addicondlg.cpp +++ b/buildtools/autotools/addicondlg.cpp @@ -39,8 +39,8 @@ const char *size_map[] = { AddIconDialog::AddIconDialog(AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *titem, - TQWidget *parent, const char *name) - : AddIconDialogBase(parent, name, true) + TQWidget *tqparent, const char *name) + : AddIconDialogBase(tqparent, name, true) { type_combo->insertItem(i18n("Application")); type_combo->insertItem(i18n("Action")); @@ -105,7 +105,7 @@ void AddIconDialog::accept() m_target->sources.append(fitem); m_target->insertItem(fitem); - m_part->startMakeCommand(destdir, TQString::fromLatin1("force-reedit")); + m_part->startMakeCommand(destdir, TQString::tqfromLatin1("force-reedit")); m_widget->emitAddedFile(destpath); diff --git a/buildtools/autotools/addicondlg.h b/buildtools/autotools/addicondlg.h index 8ab8437f..94dd8306 100644 --- a/buildtools/autotools/addicondlg.h +++ b/buildtools/autotools/addicondlg.h @@ -23,11 +23,12 @@ class TargetItem; class AddIconDialog : public AddIconDialogBase { Q_OBJECT + TQ_OBJECT public: AddIconDialog( AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *titem, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~AddIconDialog(); diff --git a/buildtools/autotools/addicondlgbase.ui b/buildtools/autotools/addicondlgbase.ui index 7fec5097..ad087c56 100644 --- a/buildtools/autotools/addicondlgbase.ui +++ b/buildtools/autotools/addicondlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AddIconDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>add_icon_dialog</cstring> </property> @@ -23,7 +23,7 @@ <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>type_label</cstring> </property> @@ -34,14 +34,14 @@ <property name="text"> <string>&Type:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>type_combo</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>size_label</cstring> </property> @@ -52,19 +52,19 @@ <property name="text"> <string>&Size:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>size_combo</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>size_combo</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>filename_label</cstring> </property> @@ -75,14 +75,14 @@ <property name="text"> <string>File name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>filename_edit</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>name_label</cstring> </property> @@ -93,7 +93,7 @@ <property name="text"> <string>&Name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -114,7 +114,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -136,14 +136,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>okbutton</cstring> </property> @@ -157,7 +157,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelbutton</cstring> </property> @@ -178,12 +178,12 @@ <string>unknown</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>type_combo</cstring> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>filename_edit</cstring> </property> @@ -212,7 +212,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -260,14 +260,14 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>somethingChanged()</slot> -</slots> +</Q_SLOTS> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/autotools/addprefixdlg.cpp b/buildtools/autotools/addprefixdlg.cpp index c4570d8f..105c1457 100644 --- a/buildtools/autotools/addprefixdlg.cpp +++ b/buildtools/autotools/addprefixdlg.cpp @@ -21,8 +21,8 @@ #include <kdeversion.h> AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& pathEdit, - TQWidget *parent, const char *name) - : TQDialog(parent, name, true) + TQWidget *tqparent, const char *name) + : TQDialog(tqparent, name, true) { setCaption(i18n("Add Prefix")); @@ -39,10 +39,10 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path path_edit->setMinimumWidth(fm.width('X')*35); connect( path_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotPrefixChanged() ) ); - TQVBoxLayout *layout = new TQVBoxLayout(this, 10); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10); TQGridLayout *grid = new TQGridLayout(2, 2); - layout->addLayout(grid); + tqlayout->addLayout(grid); grid->addWidget(name_label, 0, 0); grid->addWidget(name_edit, 0, 1); grid->addWidget(path_label, 1, 0); @@ -50,7 +50,7 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path TQFrame *frame = new TQFrame(this); frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); - layout->addWidget(frame, 0); + tqlayout->addWidget(frame, 0); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); @@ -59,8 +59,8 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path m_pOk->setDefault(true); connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); - buttonbox->layout(); - layout->addWidget(buttonbox, 0); + buttonbox->tqlayout(); + tqlayout->addWidget(buttonbox, 0); slotPrefixChanged(); } diff --git a/buildtools/autotools/addprefixdlg.h b/buildtools/autotools/addprefixdlg.h index 43630ab4..48dc09b4 100644 --- a/buildtools/autotools/addprefixdlg.h +++ b/buildtools/autotools/addprefixdlg.h @@ -16,13 +16,14 @@ #include <klineedit.h> class TQPushButton; -class AddPrefixDialog : public QDialog +class AddPrefixDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: AddPrefixDialog( const TQString& nameEdit = "", const TQString& pathEdit = "", - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~AddPrefixDialog(); TQString name() const diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp index dde34053..a53b2551 100644 --- a/buildtools/autotools/addservicedlg.cpp +++ b/buildtools/autotools/addservicedlg.cpp @@ -32,8 +32,8 @@ AddServiceDialog::AddServiceDialog(AutoProjectWidget *widget, SubprojectItem *spitem, - TQWidget *parent, const char *name) - : AddServiceDialogBase(parent, name, true) + TQWidget *tqparent, const char *name) + : AddServiceDialogBase(tqparent, name, true) { filename_edit->setText(".desktop"); filename_edit->home(false); @@ -77,7 +77,7 @@ void AddServiceDialog::updateProperties() TQStringList stprops = type->propertyDefNames(); TQStringList::ConstIterator stit; for (stit = stprops.begin(); stit != stprops.end(); ++stit) - if (props.find(*stit) == props.end() && (*stit) != "Name" && (*stit) != "Comment" + if (props.tqfind(*stit) == props.end() && (*stit) != "Name" && (*stit) != "Comment" && (*stit) != "Icon") props.append(*stit); } @@ -136,7 +136,7 @@ void AddServiceDialog::propertyExecuted(TQListViewItem *item) TQString prop = item->text(0); TQString value = item->text(1); bool ok; - value = KInputDialog::getText(i18n("Enter Value"), i18n("Property %1:").arg(prop), value, &ok, this); + value = KInputDialog::getText(i18n("Enter Value"), i18n("Property %1:").tqarg(prop), value, &ok, this); if (!ok) return; diff --git a/buildtools/autotools/addservicedlg.h b/buildtools/autotools/addservicedlg.h index 84469e0c..7799a184 100644 --- a/buildtools/autotools/addservicedlg.h +++ b/buildtools/autotools/addservicedlg.h @@ -22,10 +22,11 @@ class TargetItem; class AddServiceDialog : public AddServiceDialogBase { Q_OBJECT + TQ_OBJECT public: AddServiceDialog( AutoProjectWidget *widget, SubprojectItem *spitem, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~AddServiceDialog(); protected: diff --git a/buildtools/autotools/addservicedlgbase.ui b/buildtools/autotools/addservicedlgbase.ui index 050f8066..99370d6e 100644 --- a/buildtools/autotools/addservicedlgbase.ui +++ b/buildtools/autotools/addservicedlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AddServiceDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>add_service_dialog</cstring> </property> @@ -23,7 +23,7 @@ <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -43,7 +43,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>icon_label</cstring> </property> @@ -54,14 +54,14 @@ <property name="text"> <string>&Icon:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>icon_button</cstring> </property> </widget> - <widget class="QLayoutWidget" row="1" column="3"> + <widget class="TQLayoutWidget" row="1" column="3"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -73,11 +73,11 @@ <number>0</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>icon_button</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>24</width> <height>24</height> @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -119,7 +119,7 @@ <cstring>name_edit</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="3"> + <widget class="TQComboBox" row="0" column="3"> <property name="name"> <cstring>library_combo</cstring> </property> @@ -127,7 +127,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>library_label</cstring> </property> @@ -138,14 +138,14 @@ <property name="text"> <string>&Library:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>library_combo</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>filename_label</cstring> </property> @@ -156,14 +156,14 @@ <property name="text"> <string>&File name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>filename_edit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>name_label</cstring> </property> @@ -174,14 +174,14 @@ <property name="text"> <string>&Name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>name_edit</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>comment_label</cstring> </property> @@ -192,7 +192,7 @@ <property name="text"> <string>Co&mment:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -201,7 +201,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -213,7 +213,7 @@ <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -225,7 +225,7 @@ <number>0</number> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string></string> @@ -252,7 +252,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -274,14 +274,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>add_button</cstring> </property> @@ -289,7 +289,7 @@ <string><-</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>remove_button</cstring> </property> @@ -307,7 +307,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -316,7 +316,7 @@ </spacer> </vbox> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string></string> @@ -345,7 +345,7 @@ </widget> </hbox> </widget> - <widget class="QListView" row="1" column="1"> + <widget class="TQListView" row="1" column="1"> <column> <property name="text"> <string>Property</string> @@ -386,7 +386,7 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>properties_label</cstring> </property> @@ -405,7 +405,7 @@ <property name="text"> <string>&Properties:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -414,7 +414,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -436,14 +436,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>okbutton</cstring> </property> @@ -457,7 +457,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelbutton</cstring> </property> @@ -493,15 +493,15 @@ </connection> <connection> <sender>properties_listview</sender> - <signal>doubleClicked(QListViewItem*)</signal> + <signal>doubleClicked(TQListViewItem*)</signal> <receiver>add_service_dialog</receiver> - <slot>propertyExecuted(QListViewItem*)</slot> + <slot>propertyExecuted(TQListViewItem*)</slot> </connection> <connection> <sender>properties_listview</sender> - <signal>returnPressed(QListViewItem*)</signal> + <signal>returnPressed(TQListViewItem*)</signal> <receiver>add_service_dialog</receiver> - <slot>propertyExecuted(QListViewItem*)</slot> + <slot>propertyExecuted(TQListViewItem*)</slot> </connection> <connection> <sender>icon_button</sender> @@ -530,15 +530,15 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot access="protected">iconClicked()</slot> <slot access="protected">addTypeClicked()</slot> - <slot access="protected">propertyExecuted(QListViewItem*)</slot> + <slot access="protected">propertyExecuted(TQListViewItem*)</slot> <slot access="protected">removeTypeClicked()</slot> -</slots> +</Q_SLOTS> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp index 9aeef695..bb0e5527 100644 --- a/buildtools/autotools/addsubprojectdlg.cpp +++ b/buildtools/autotools/addsubprojectdlg.cpp @@ -32,8 +32,8 @@ AddSubprojectDialog::AddSubprojectDialog(AutoProjectPart *part, AutoSubprojectView *view, - SubprojectItem *item, TQWidget *parent, const char *name) - : AddSubprojectDlgBase(parent, name, true) + SubprojectItem *item, TQWidget *tqparent, const char *name) + : AddSubprojectDlgBase(tqparent, name, true) { setIcon(SmallIcon("folder_new.png")); @@ -82,31 +82,31 @@ void AddSubprojectDialog::accept() TQFileInfo file( dir, name ); if( file.exists() && !file.isDir() ) { - KMessageBox::sorry(this, i18n("A file named %1 already exists.").arg(name)); + KMessageBox::sorry(this, i18n("A file named %1 already exists.").tqarg(name)); TQDialog::accept(); return; } else if( file.isDir() ) { if( KMessageBox::warningContinueCancel(this, i18n("A subdirectory %1 already exists. " - "Do you wish to add it as a subproject?").arg(name)) + "Do you wish to add it as a subproject?").tqarg(name)) == KMessageBox::Cancel ){ TQDialog::accept(); return; } } else if (!dir.mkdir(name)) { - KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").arg(name)); + KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").tqarg(name)); TQDialog::accept(); return; } if(!dir.cd(name)) { - KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").arg(name)); + KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").tqarg(name)); TQDialog::accept(); return; } // Adjust SUBDIRS variable in containing Makefile.am - if (m_subProject->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) + if (m_subProject->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1) { TQFile subdirsfile( m_subProject->path + "/subdirs" ); if ( subdirsfile.open( IO_WriteOnly | IO_Append ) ) @@ -116,7 +116,7 @@ void AddSubprojectDialog::accept() subdirsfile.close(); } } - else if (m_subProject->variables["SUBDIRS"].find("$(AUTODIRS)") != -1) + else if (m_subProject->variables["SUBDIRS"].tqfind("$(AUTODIRS)") != -1) { } else @@ -148,7 +148,7 @@ void AddSubprojectDialog::accept() m_subprojectView->parse( newitem ); } else { if (!f.open(IO_WriteOnly)) { - KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name)); + KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").tqarg(name)); return; } TQTextStream stream(&f); @@ -162,7 +162,7 @@ void AddSubprojectDialog::accept() if ( !m_part->isKDE() ) { TQString projroot = m_part->projectDirectory() + "/"; TQString subdirectory = dir.path(); - TQString relpath = subdirectory.replace(0, projroot.length(),""); + TQString relpath = subdirectory.tqreplace(0, projroot.length(),""); TQString configureFile = m_part->getAutoConfFile(projroot); diff --git a/buildtools/autotools/addsubprojectdlg.h b/buildtools/autotools/addsubprojectdlg.h index c1d3b7bf..9ccd1373 100644 --- a/buildtools/autotools/addsubprojectdlg.h +++ b/buildtools/autotools/addsubprojectdlg.h @@ -25,10 +25,11 @@ class SubprojectItem; class AddSubprojectDialog : public AddSubprojectDlgBase { Q_OBJECT + TQ_OBJECT public: AddSubprojectDialog( AutoProjectPart *part, AutoSubprojectView *widget, - SubprojectItem *item, TQWidget *parent = 0, const char *name = 0 ); + SubprojectItem *item, TQWidget *tqparent = 0, const char *name = 0 ); ~AddSubprojectDialog(); private: diff --git a/buildtools/autotools/addsubprojectdlgbase.ui b/buildtools/autotools/addsubprojectdlgbase.ui index b4c762b1..73851ee4 100644 --- a/buildtools/autotools/addsubprojectdlgbase.ui +++ b/buildtools/autotools/addsubprojectdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AddSubprojectDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>AddSubprojectDlgBase</cstring> </property> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -39,7 +39,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>fileGroupBox</cstring> </property> @@ -50,7 +50,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -61,7 +61,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>spStaticLabel</cstring> </property> @@ -73,7 +73,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -102,7 +102,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -123,14 +123,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>buttonLayout</cstring> </property> @@ -151,14 +151,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>createButton</cstring> </property> @@ -169,7 +169,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelButton</cstring> </property> @@ -190,8 +190,8 @@ <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/buildtools/autotools/addtargetdlg.cpp b/buildtools/autotools/addtargetdlg.cpp index 5ca96c45..8a0c400c 100644 --- a/buildtools/autotools/addtargetdlg.cpp +++ b/buildtools/autotools/addtargetdlg.cpp @@ -29,8 +29,8 @@ AddTargetDialog::AddTargetDialog(AutoProjectWidget *widget, SubprojectItem *item, - TQWidget *parent, const char *name) - : AddTargetDialogBase(parent, name, true) + TQWidget *tqparent, const char *name) + : AddTargetDialogBase(tqparent, name, true) { m_subproject = item; m_widget = widget; @@ -54,7 +54,7 @@ AddTargetDialog::AddTargetDialog(AutoProjectWidget *widget, SubprojectItem *item setIcon ( SmallIcon ( "targetnew_kdevelop.png" ) ); - canonicalLabel->setText ( TQString::null ); + canonicalLabel->setText ( TQString() ); } @@ -165,13 +165,13 @@ void AddTargetDialog::accept() #endif if( primary.endsWith("LIBRARIES") && !name.startsWith("lib") && !module_box->isChecked() ) - name.prepend( TQString::fromLatin1("lib") ); + name.prepend( TQString::tqfromLatin1("lib") ); if( primary == "LTLIBRARIES" && !name.endsWith(".la") ) - name.append( TQString::fromLatin1(".la") ); + name.append( TQString::tqfromLatin1(".la") ); if ( primary == "LIBRARIES" && !name.endsWith(".a") ) - name.append ( TQString::fromLatin1(".a") ); + name.append ( TQString::tqfromLatin1(".a") ); TQPtrListIterator<TargetItem> it(m_subproject->targets); for (; it.current(); ++it) diff --git a/buildtools/autotools/addtargetdlg.h b/buildtools/autotools/addtargetdlg.h index 8c44aef4..f05cdb94 100644 --- a/buildtools/autotools/addtargetdlg.h +++ b/buildtools/autotools/addtargetdlg.h @@ -22,10 +22,11 @@ class SubprojectItem; class AddTargetDialog : public AddTargetDialogBase { Q_OBJECT + TQ_OBJECT public: AddTargetDialog( AutoProjectWidget *widget, SubprojectItem *item, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~AddTargetDialog(); protected slots: diff --git a/buildtools/autotools/addtargetdlgbase.ui b/buildtools/autotools/addtargetdlgbase.ui index 25687563..f8b8d689 100644 --- a/buildtools/autotools/addtargetdlgbase.ui +++ b/buildtools/autotools/addtargetdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AddTargetDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>add_target_dialog</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>primary_label</cstring> </property> @@ -44,19 +44,19 @@ <property name="text"> <string>&Primary:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>primary_combo</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>primary_combo</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>prefix_label</cstring> </property> @@ -67,19 +67,19 @@ <property name="text"> <string>Pre&fix:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>prefix_combo</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>prefix_combo</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>filename_label</cstring> </property> @@ -90,7 +90,7 @@ <property name="text"> <string>File &name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -112,7 +112,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>246</width> <height>20</height> @@ -127,7 +127,7 @@ <string>[CANONICALIZED NAME]</string> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -155,14 +155,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>ldflags_group</cstring> </property> @@ -173,7 +173,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>allstatic_box</cstring> </property> @@ -181,7 +181,7 @@ <string>Do not link against shared libraries (-all-static)</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>avoidversion_box</cstring> </property> @@ -189,7 +189,7 @@ <string>Do not assign version numbers to libraries (-avoid-version)</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>module_box</cstring> </property> @@ -197,7 +197,7 @@ <string>Create a library that can be dynamically loaded (-module)</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>noundefined_box</cstring> </property> @@ -205,7 +205,7 @@ <string>Library does not depend on external symbols (-no-undefined)</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout11_2</cstring> </property> @@ -216,7 +216,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>ldflagsother_label</cstring> </property> @@ -240,7 +240,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -261,14 +261,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>okbutton</cstring> </property> @@ -282,7 +282,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelbutton</cstring> </property> @@ -337,11 +337,11 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">primaryChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>ksqueezedtextlabel.h</includehint> </includehints> diff --git a/buildtools/autotools/addtranslationdlg.cpp b/buildtools/autotools/addtranslationdlg.cpp index 559e1369..6057bb65 100644 --- a/buildtools/autotools/addtranslationdlg.cpp +++ b/buildtools/autotools/addtranslationdlg.cpp @@ -31,8 +31,8 @@ #include "autoprojectpart.h" -AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *parent, const char *name) - : TQDialog(parent, name, true) +AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *tqparent, const char *name) + : TQDialog(tqparent, name, true) { setCaption(i18n("Add Translation")); @@ -42,12 +42,12 @@ AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *pare (void) new TQLabel(i18n("Language:"), hbox); lang_combo = new TQComboBox(hbox); - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - layout->addWidget(hbox); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout->addWidget(hbox); TQFrame *frame = new TQFrame(this); frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); - layout->addWidget(frame, 0); + tqlayout->addWidget(frame, 0); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); @@ -56,8 +56,8 @@ AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *pare ok_button->setDefault(true); connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); - buttonbox->layout(); - layout->addWidget(buttonbox, 0); + buttonbox->tqlayout(); + tqlayout->addWidget(buttonbox, 0); TQStringList rawlist, list; rawlist << "af" << "ar" << "bg" << "bo" << "br" << "bs" << "ca" << "cs" << "cy" << "da" @@ -101,7 +101,7 @@ void AddTranslationDialog::accept() f.close(); dir = m_part->buildDirectory() + "/po"; - m_part->startMakeCommand(dir, TQString::fromLatin1("force-reedit")); + m_part->startMakeCommand(dir, TQString::tqfromLatin1("force-reedit")); TQDialog::accept(); } diff --git a/buildtools/autotools/addtranslationdlg.h b/buildtools/autotools/addtranslationdlg.h index 762c9790..5fb8b288 100644 --- a/buildtools/autotools/addtranslationdlg.h +++ b/buildtools/autotools/addtranslationdlg.h @@ -18,12 +18,13 @@ class TQComboBox; class AutoProjectPart; -class AddTranslationDialog : public QDialog +class AddTranslationDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - AddTranslationDialog( AutoProjectPart *part, TQWidget *parent = 0, const char *name = 0 ); + AddTranslationDialog( AutoProjectPart *part, TQWidget *tqparent = 0, const char *name = 0 ); ~AddTranslationDialog(); private: diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index d3cf3864..7002b7c8 100644 --- a/buildtools/autotools/autodetailsview.cpp +++ b/buildtools/autotools/autodetailsview.cpp @@ -15,7 +15,7 @@ #include "autodetailsview.h" -/** Qt */ +/** TQt */ #include <tqregexp.h> #include <tqlistview.h> #include <tqwidget.h> @@ -57,8 +57,8 @@ #include "subclassesdlg.h" -AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name) - : AutoProjectViewBase(parent, name) +AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *tqparent, const char *name) + : AutoProjectViewBase(tqparent, name) { m_widget = widget; m_part = part; @@ -71,7 +71,7 @@ AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* par m_listView->setAllColumnsShowFocus( true ); m_listView->setRootIsDecorated( true ); m_listView->setResizeMode( TQListView::LastColumn ); - m_listView->addColumn( TQString::null ); + m_listView->addColumn( TQString() ); m_listView->header()->hide(); targetOptionsAction->setEnabled( false ); addNewFileAction->setEnabled( false ); @@ -126,7 +126,7 @@ void AutoDetailsView::slotSelectionChanged( TQListViewItem* item ) if ( pvitem->type() == ProjectItem::File ) { - titem = static_cast <TargetItem*> ( pvitem->parent() ); + titem = static_cast <TargetItem*> ( pvitem->tqparent() ); TQString primary = titem->primary; if ( primary == "PROGRAMS" || primary == "LIBRARIES" || @@ -177,7 +177,7 @@ void AutoDetailsView::initActions() KActionCollection * actions = new KActionCollection( this ); targetOptionsAction = new AutoToolsAction( i18n( "Options..." ), "configure", 0, - this, TQT_SLOT( slotTargetOptions() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotTargetOptions() ), actions, "target options" ); targetOptionsAction->setWhatsThis(i18n("<b>Options</b><p>Target options dialog that " "provides settings for linker flags and lists " @@ -188,7 +188,7 @@ void AutoDetailsView::initActions() TQToolTip::add( m_button1, tr2i18n( "Create New File..." ) ); addNewFileAction = new AutoToolsAction( i18n( "Create New File..." ), "filenew", 0, - this, TQT_SLOT( slotAddNewFile() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotAddNewFile() ), actions, "add new file" ); addNewFileAction->setWhatsThis(i18n("<b>Create new file</b><p>Creates a new file and " "adds it to a currently selected target.")); @@ -197,7 +197,7 @@ void AutoDetailsView::initActions() TQToolTip::add( m_button2, tr2i18n( "Add Existing Files..." ) ); addExistingFileAction = new AutoToolsAction( i18n( "Add Existing Files..." ), "fileimport", 0, - this, TQT_SLOT( slotAddExistingFile() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotAddExistingFile() ), actions, "add existing file" ); addExistingFileAction->setWhatsThis(i18n("<b>Add existing files</b><p>Adds existing " "file to a currently selected target. Header " @@ -208,12 +208,12 @@ void AutoDetailsView::initActions() addExistingFileAction->setEnabled( false ); addIconAction = new KAction( i18n( "Add Icon..." ), "iconadd_kdevelop", 0, - this, TQT_SLOT( slotAddIcon() ), actions, "add icon" ); + TQT_TQOBJECT(this), TQT_SLOT( slotAddIcon() ), actions, "add icon" ); addIconAction->setWhatsThis(i18n("<b>Add icon</b><p>Adds an icon to a KDEICON target.")); TQToolTip::add( m_button4, tr2i18n( "Build Target")); buildTargetAction = new AutoToolsAction( i18n( "Build Target..." ), "launch", 0, - this, TQT_SLOT( slotBuildTarget() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotBuildTarget() ), actions, "build target" ); buildTargetAction->setWhatsThis(i18n("<b>Build target</b><p>Constructs a series of " "make commands to build the selected target. " @@ -223,7 +223,7 @@ void AutoDetailsView::initActions() TQToolTip::add( m_button5, tr2i18n( "Execute Target...")); executeTargetAction = new AutoToolsAction( i18n( "Execute Target..." ), "exec", 0, - this, TQT_SLOT( slotExecuteTarget() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotExecuteTarget() ), actions, "execute target" ); executeTargetAction->setWhatsThis(i18n("<b>Execute target</b><p>Executes the target " "and tries to build in case it is not built.")); @@ -231,7 +231,7 @@ void AutoDetailsView::initActions() executeTargetAction->setEnabled( false ); setActiveTargetAction = new KAction( i18n( "Make Target Active" ), "", 0, - this, TQT_SLOT( slotSetActiveTarget() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotSetActiveTarget() ), actions, "set active target" ); setActiveTargetAction->setWhatsThis(i18n("<b>Make target active</b><p>Marks the " "currently selected target as 'active'. New " @@ -241,7 +241,7 @@ void AutoDetailsView::initActions() "command builds it.")); TQToolTip::add( m_button3, tr2i18n( "Remove")); - removeDetailAction = new AutoToolsAction( i18n( "Remove" ), "editdelete", 0, this, + removeDetailAction = new AutoToolsAction( i18n( "Remove" ), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveDetail() ), actions, "remove detail" ); removeDetailAction->setWhatsThis(i18n("<b>Remove</b><p>Shows a list of targets " @@ -269,7 +269,7 @@ TQString AutoDetailsView::getUiFileLink(const TQString& relpath, const TQString& return (*it).second; } - return TQString::null; + return TQString(); } void AutoDetailsView::slotTargetOptions() @@ -298,7 +298,7 @@ void AutoDetailsView::slotAddNewFile() if (createFileSupport) { KDevCreateFile::CreatedFile crFile = - createFileSupport->createNewFile(TQString::null, + createFileSupport->createNewFile(TQString(), m_widget->selectedSubproject()->path); /* if (crFile.status == KDevCreateFile::CreatedFile::STATUS_OK) { @@ -365,7 +365,7 @@ void AutoDetailsView::slotBuildTarget() TargetItem* titem = 0; if ( pvitem->type() == ProjectItem::File ) - titem = static_cast <TargetItem*> ( pvitem->parent() ); + titem = static_cast <TargetItem*> ( pvitem->tqparent() ); else titem = static_cast <TargetItem*> ( m_listView->selectedItem() ); @@ -383,7 +383,7 @@ void AutoDetailsView::slotExecuteTarget() TargetItem* titem = 0; if ( pvitem->type() == ProjectItem::File ) - titem = static_cast <TargetItem*> ( pvitem->parent() ); + titem = static_cast <TargetItem*> ( pvitem->tqparent() ); else titem = static_cast <TargetItem*> ( m_listView->selectedItem() ); @@ -409,7 +409,7 @@ void AutoDetailsView::slotRemoveDetail() if ( !fitem ) return; - TargetItem *titem = static_cast<TargetItem*>( fitem->parent() ); + TargetItem *titem = static_cast<TargetItem*>( fitem->tqparent() ); RemoveFileDialog dlg( m_widget, m_part, m_widget->selectedSubproject(), titem, fitem->text( 0 ), this, "remove file dialog" ); @@ -499,7 +499,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, else caption = titem->name; - KPopupMenu popup( i18n( "Target: %1" ).arg( caption ), this ); + KPopupMenu popup( i18n( "Target: %1" ).tqarg( caption ), this ); if ( titem->primary == "PROGRAMS" || titem->primary == "LIBRARIES" || titem->primary == "LTLIBRARIES" || titem->primary == "JAVA" ) @@ -554,7 +554,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, return; } - KPopupMenu popup( i18n( "File: %1" ).arg( fitem->name ), this ); + KPopupMenu popup( i18n( "File: %1" ).tqarg( fitem->name ), this ); removeDetailAction->plug( &popup ); KURL::List urls; @@ -563,7 +563,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, int idSubclassWidget = popup.insertItem(SmallIconSet("qmake_subclass"), i18n("Subclassing Wizard...") ); - popup.setWhatsThis(idSubclassWidget, i18n("<b>Subclass widget</b><p>Launches " + popup.tqsetWhatsThis(idSubclassWidget, i18n("<b>Subclass widget</b><p>Launches " "<b>Subclassing</b> wizard. " "It allows to create a subclass from the " "class defined in .ui file. " @@ -572,22 +572,22 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, "class.")); int idUISubclasses = popup.insertItem(SmallIconSet("qmake_subclass"), i18n("List of Subclasses...")); - popup.setWhatsThis(idUISubclasses, i18n("<b>List of subclasses</b><p>Shows " + popup.tqsetWhatsThis(idUISubclasses, i18n("<b>List of subclasses</b><p>Shows " "subclasses list editor. " "There is possibility to add or remove " "subclasses from the list.")); int idUpdateWidgetclass = popup.insertItem(SmallIconSet("qmake_subclass"), i18n("Edit ui-Subclass...")); - popup.setWhatsThis(idUpdateWidgetclass, i18n("<b>Edit ui-subclass</b><p>Launches " + popup.tqsetWhatsThis(idUpdateWidgetclass, i18n("<b>Edit ui-subclass</b><p>Launches " "<b>Subclassing</b> wizard and prompts " "to implement missing in childclass " "slots and functions.")); int idViewUIH = popup.insertItem(SmallIconSet("qmake_ui_h"), i18n("Open ui.h File")); - popup.setWhatsThis(idViewUIH, i18n("<b>Open ui.h file</b><p>Opens .ui.h file " + popup.tqsetWhatsThis(idViewUIH, i18n("<b>Open ui.h file</b><p>Opens .ui.h file " "associated with the selected .ui.")); - if (!fitem->name.contains(TQRegExp("ui$")) || fitem->is_subst == true) + if (!fitem->name.tqcontains(TQRegExp("ui$")) || fitem->is_subst == true) { popup.removeItem(idUISubclasses); popup.removeItem(idViewUIH); @@ -625,7 +625,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, list << DomUtil::Pair(srcfile_relpath,uifile_relpath); DomUtil::writePairListEntry(dom, "/kdevautoproject/subclassing", "subclass", "sourcefile", "uifile", list); - newFileNames[i] = newFileNames[i].replace(TQRegExp(m_part->projectDirectory()+"/"),""); + newFileNames[i] = newFileNames[i].tqreplace(TQRegExp(m_part->projectDirectory()+"/"),""); } m_subclasslist = DomUtil::readPairListEntry(dom,"/kdevautoproject/subclassing", "subclass","sourcefile", "uifile"); @@ -636,13 +636,13 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, { TQString noext = m_widget->selectedSubproject()->path + "/" + fitem->name; - if (noext.findRev('.')>-1) - noext = noext.left(noext.findRev('.')); + if (noext.tqfindRev('.')>-1) + noext = noext.left(noext.tqfindRev('.')); TQStringList dummy; TQString uifile = fitem->uiFileLink; - if (uifile.findRev('/')>-1) + if (uifile.tqfindRev('/')>-1) { TQStringList uisplit = TQStringList::split('/',uifile); uifile=uisplit[uisplit.count()-1]; diff --git a/buildtools/autotools/autodetailsview.h b/buildtools/autotools/autodetailsview.h index 60f10738..0c649b95 100644 --- a/buildtools/autotools/autodetailsview.h +++ b/buildtools/autotools/autodetailsview.h @@ -32,9 +32,10 @@ class AutoDetailsView : protected AutoProjectViewBase friend class RemoveFileDialog; friend class FileItem; Q_OBJECT + TQ_OBJECT public: - AutoDetailsView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name ); + AutoDetailsView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *tqparent, const char *name ); virtual ~AutoDetailsView(); TQString getUiFileLink( const TQString &path, const TQString& filename ); diff --git a/buildtools/autotools/autolistviewitems.cpp b/buildtools/autotools/autolistviewitems.cpp index 865e82d0..3fb0bffd 100644 --- a/buildtools/autotools/autolistviewitems.cpp +++ b/buildtools/autotools/autolistviewitems.cpp @@ -27,22 +27,22 @@ * Class ProjectItem */ -ProjectItem::ProjectItem( Type type, TQListView *parent, const TQString &text ) - : TQListViewItem( parent, text ), typ( type ) +ProjectItem::ProjectItem( Type type, TQListView *tqparent, const TQString &text ) + : TQListViewItem( tqparent, text ), typ( type ) { bld = false; } -ProjectItem::ProjectItem( Type type, ProjectItem *parent, const TQString &text ) - : TQListViewItem( parent, text ), typ( type ) +ProjectItem::ProjectItem( Type type, ProjectItem *tqparent, const TQString &text ) + : TQListViewItem( tqparent, text ), typ( type ) { bld = false; } void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment ) + int column, int width, int tqalignment ) { if ( isBold() ) { @@ -50,7 +50,7 @@ void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg, font.setBold( true ); p->setFont( font ); } - TQListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, tqalignment ); } @@ -58,15 +58,15 @@ void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg, * Class SubprojectItem */ -SubprojectItem::SubprojectItem( TQListView *parent, const TQString &text ) - : ProjectItem( Subproject, parent, text ) +SubprojectItem::SubprojectItem( TQListView *tqparent, const TQString &text ) + : ProjectItem( Subproject, tqparent, text ) { init(); } -SubprojectItem::SubprojectItem( SubprojectItem *parent, const TQString &text ) - : ProjectItem( Subproject, parent, text ) +SubprojectItem::SubprojectItem( SubprojectItem *tqparent, const TQString &text ) + : ProjectItem( Subproject, tqparent, text ) { init(); } @@ -84,7 +84,7 @@ TQString SubprojectItem::relativePath() TQString relpath = subdir; SubprojectItem *it = this; - while ( (it= dynamic_cast<SubprojectItem*>(it->parent())) ) + while ( (it= dynamic_cast<SubprojectItem*>(it->tqparent())) ) { relpath.prepend(it->subdir + "/"); } @@ -130,7 +130,7 @@ if(!is_subst) return; bool ok; - TQString text = QInputDialog::getText( + TQString text = TQInputDialog::getText( i18n("Edit Substitution"), i18n("Substitution:"), TQLineEdit::Normal, name, &ok ); if ( ok && !text.isEmpty() ) @@ -152,7 +152,7 @@ return; void FileItem::changeMakefileEntry(const TQString& new_name) { - TargetItem* target = dynamic_cast<TargetItem*>(parent()); + TargetItem* target = dynamic_cast<TargetItem*>(tqparent()); TQMap<TQString,TQString> replaceMap; @@ -167,7 +167,7 @@ void FileItem::changeMakefileEntry(const TQString& new_name) if ( SubprojectItem* subProject = lv->m_part->m_widget->selectedSubproject() ) { TQStringList sources = TQStringList::split(TQRegExp("[ \t\n]"), subProject->variables[varname]); - TQStringList::iterator it = sources.find(name); + TQStringList::iterator it = sources.tqfind(name); (*it) = new_name; subProject->variables[varname] = sources.join(" "); replaceMap.insert(varname, subProject->variables[varname]); diff --git a/buildtools/autotools/autolistviewitems.h b/buildtools/autotools/autolistviewitems.h index 008fecc4..5f61fef0 100644 --- a/buildtools/autotools/autolistviewitems.h +++ b/buildtools/autotools/autolistviewitems.h @@ -26,16 +26,16 @@ class AutoProjectPart; /** * Base class for all items appearing in ProjectOverview and ProjectDetails. */ -class ProjectItem : public QListViewItem +class ProjectItem : public TQListViewItem { public: enum Type { Subproject, Target, File }; - ProjectItem( Type type, TQListView *parent, const TQString &text ); - ProjectItem( Type type, ProjectItem *parent, const TQString &text ); + ProjectItem( Type type, TQListView *tqparent, const TQString &text ); + ProjectItem( Type type, ProjectItem *tqparent, const TQString &text ); void paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment ); + int column, int width, int tqalignment ); void setBold( bool b ) { bld = b; @@ -62,8 +62,8 @@ private: class SubprojectItem : public ProjectItem { public: - SubprojectItem( TQListView *parent, const TQString &text ); - SubprojectItem( SubprojectItem *parent, const TQString &text ); + SubprojectItem( TQListView *tqparent, const TQString &text ); + SubprojectItem( SubprojectItem *tqparent, const TQString &text ); /** name of the directory */ TQString subdir; diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index 38604ee0..a2c500a4 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -65,8 +65,8 @@ static const KDevPluginInfo data("kdevautoproject"); K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) ) -AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args) - : KDevBuildTool(&data, parent, name ? name : "AutoProjectPart") +AutoProjectPart::AutoProjectPart(TQObject *tqparent, const char *name, const TQStringList &args) + : KDevBuildTool(&data, tqparent, name ? name : "AutoProjectPart") , m_lastCompilationFailed(false) { setInstance(AutoProjectFactory::instance()); @@ -407,16 +407,16 @@ TQString AutoProjectPart::mainProgram() const KMessageBox::error( m_widget, i18n("There is no active target.\n" "Unable to determine the main program."), i18n("No active target found") ); kdDebug ( 9020 ) << k_funcinfo << "Error! : There's no active target! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl; - return TQString::null; + return TQString(); } if ( titem->primary != "PROGRAMS" ) { KMessageBox::error( m_widget, i18n("Active target \"%1\" is not binary ( %2 ).\n" "Unable to determine the main program. If you want this\n" "to be the active target, set a main program under\n" - "Project -> Project Options -> Run Options").arg(titem->name).arg(titem->primary), i18n("Active target is not a library") ); + "Project -> Project Options -> Run Options").tqarg(titem->name).tqarg(titem->primary), i18n("Active target is not a library") ); kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl; - return TQString::null; + return TQString(); } TQString relprojectpath = URLUtil::getRelativePath( topsourceDirectory(), projectDirectory() ); @@ -525,7 +525,7 @@ void AutoProjectPart::addFiles ( const TQStringList& fileList ) for ( it = fileList.begin(); it != fileList.end(); ++it ) { - int pos = ( *it ).findRev('/'); + int pos = ( *it ).tqfindRev('/'); if (pos != -1) { directory = ( *it ).left(pos); @@ -597,7 +597,7 @@ TQString AutoProjectPart::currentBuildConfig() const TQDomDocument &dom = *projectDom(); TQString config = DomUtil::readEntry(dom, "/kdevautoproject/general/useconfiguration"); - if (config.isEmpty() || !allBuildConfigs().contains(config)) + if (config.isEmpty() || !allBuildConfigs().tqcontains(config)) config = "default"; return config; @@ -643,20 +643,20 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ { int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory\n" "and no configure script for this project.\n" - "Run automake & friends and configure first?").arg(buildDirectory()), TQString::null, i18n("Run Them"), i18n("Do Not Run")); + "Run automake & friends and configure first?").tqarg(buildDirectory()), TQString(), i18n("Run Them"), i18n("Do Not Run")); if (r == KMessageBox::No) - return TQString::null; + return TQString(); preCommand = makefileCvsCommand(); if (preCommand.isNull()) - return TQString::null; + return TQString(); preCommand += " && "; preCommand += configureCommand() + " && "; } else { - int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").arg(dir), TQString::null, i18n("Run configure"), i18n("Do Not Run")); + int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").tqarg(dir), TQString(), i18n("Run configure"), i18n("Do Not Run")); if (r == KMessageBox::No) - return TQString::null; + return TQString(); preCommand = configureCommand() + " && "; } } @@ -668,7 +668,7 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ kdDebug(9020) << k_funcinfo << "nice = " << prio<< endl; if (prio != 0) { - nice = TQString("nice -n%1 ").arg(prio); + nice = TQString("nice -n%1 ").tqarg(prio); } if (cmdline.isEmpty()) @@ -732,13 +732,13 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr // These are the internal libraries dependency.remove("$(top_builddir)/"); - if( !alreadyScheduledDeps.contains(*l2it) ) + if( !alreadyScheduledDeps.tqcontains(*l2it) ) { alreadyScheduledDeps << *l2it; tdir = buildDirectory(); if (!tdir.endsWith("/") && !tdir.isEmpty()) tdir += "/"; - int pos = dependency.findRev('/'); + int pos = dependency.tqfindRev('/'); if (pos == -1) { tname = dependency; @@ -782,7 +782,7 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr tdir = buildDirectory(); if (!tdir.endsWith("/") && !tdir.isEmpty()) tdir += "/"; - int pos = dependency.findRev('/'); + int pos = dependency.tqfindRev('/'); if (pos == -1) { tname = dependency; @@ -792,7 +792,7 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr tdir += dependency.left(pos+1); tname = dependency.mid(pos+1); } - KMessageBox::error( 0, i18n("Found a circular dependency in the project, between this target and %1.\nCannot build this project until this is resolved.").arg(tname), i18n("Circular Dependency found") ); + KMessageBox::error( 0, i18n("Found a circular dependency in the project, between this target and %1.\nCannot build this project until this is resolved.").tqarg(tname), i18n("Circular Dependency found") ); return false; } } @@ -812,7 +812,7 @@ void AutoProjectPart::slotBuild() m_needMakefileCvs = false; } - startMakeCommand(buildDirectory(), TQString::fromLatin1("")); + startMakeCommand(buildDirectory(), TQString::tqfromLatin1("")); } @@ -912,28 +912,28 @@ TQString AutoProjectPart::configureCommand() const cmdline += "/configure\""; TQString cc = DomUtil::readEntry(dom, prefix + "ccompilerbinary"); if (!cc.isEmpty()) - cmdline.prepend(TQString("CC=%1 ").arg(cc)); + cmdline.prepend(TQString("CC=%1 ").tqarg(cc)); TQString cflags = DomUtil::readEntry(dom, prefix + "cflags"); if (!cflags.isEmpty()) - cmdline.prepend(TQString("CFLAGS=\"%1\" ").arg(cflags)); + cmdline.prepend(TQString("CFLAGS=\"%1\" ").tqarg(cflags)); TQString cxx = DomUtil::readEntry(dom, prefix + "cxxcompilerbinary"); if (!cxx.isEmpty()) - cmdline.prepend(TQString("CXX=%1 ").arg(cxx)); + cmdline.prepend(TQString("CXX=%1 ").tqarg(cxx)); TQString cxxflags = DomUtil::readEntry(dom, prefix + "cxxflags"); if (!cxxflags.isEmpty()) - cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").arg(cxxflags)); + cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").tqarg(cxxflags)); TQString f77 = DomUtil::readEntry(dom, prefix + "f77compilerbinary"); if (!f77.isEmpty()) - cmdline.prepend(TQString("F77=%1 ").arg(f77)); + cmdline.prepend(TQString("F77=%1 ").tqarg(f77)); TQString fflags = DomUtil::readEntry(dom, prefix + "f77flags"); if (!fflags.isEmpty()) - cmdline.prepend(TQString("FFLAGS=\"%1\" ").arg(fflags)); + cmdline.prepend(TQString("FFLAGS=\"%1\" ").tqarg(fflags)); TQString cppflags = DomUtil::readEntry(dom, prefix + "cppflags"); if (!cppflags.isEmpty()) - cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").arg(cppflags)); + cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").tqarg(cppflags)); TQString ldflags = DomUtil::readEntry(dom, prefix + "ldflags"); if (!ldflags.isEmpty()) - cmdline.prepend(TQString("LDFLAGS=\"%1\" ").arg(ldflags)); + cmdline.prepend(TQString("LDFLAGS=\"%1\" ").tqarg(ldflags)); TQString configargs = DomUtil::readEntry(dom, prefix + "configargs"); if (!configargs.isEmpty()) { @@ -997,7 +997,7 @@ TQString AutoProjectPart::makefileCvsCommand() const TQString nice; kdDebug(9020) << "makefileCvsCommand() nice = " << prio<< endl; if (prio != 0) { - nice = TQString("nice -n%1 ").arg(prio); + nice = TQString("nice -n%1 ").tqarg(prio); } if (TQFile::exists(topsourceDirectory() + "/Makefile.cvs")) @@ -1009,7 +1009,7 @@ TQString AutoProjectPart::makefileCvsCommand() const else { KMessageBox::sorry(m_widget, i18n("There is neither a Makefile.cvs file nor an " "autogen.sh script in the project directory.")); - return TQString::null; + return TQString(); } cmdline.prepend(nice); @@ -1034,7 +1034,7 @@ void AutoProjectPart::slotMakefilecvs() void AutoProjectPart::slotInstall() { - startMakeCommand(buildDirectory(), TQString::fromLatin1("install")); + startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install")); } @@ -1045,25 +1045,25 @@ void AutoProjectPart::slotInstallWithKdesu() slotBuild(); // After that issue "make install" with the root user - startMakeCommand(buildDirectory(), TQString::fromLatin1("install"), true); + startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install"), true); } void AutoProjectPart::slotClean() { - startMakeCommand(buildDirectory(), TQString::fromLatin1("clean")); + startMakeCommand(buildDirectory(), TQString::tqfromLatin1("clean")); } void AutoProjectPart::slotDistClean() { - startMakeCommand(buildDirectory(), TQString::fromLatin1("distclean")); + startMakeCommand(buildDirectory(), TQString::tqfromLatin1("distclean")); } void AutoProjectPart::slotMakeMessages() { - startMakeCommand(buildDirectory(), TQString::fromLatin1("package-messages")); + startMakeCommand(buildDirectory(), TQString::tqfromLatin1("package-messages")); } @@ -1103,7 +1103,7 @@ void AutoProjectPart::slotExecute() if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/autokdesu", false) ){ //slotInstallWithKdesu assumes that it hasn't just been build... kdDebug(9020) << "slotExecute: before startMakeCommand" << endl; - _auto ? slotInstallWithKdesu() : startMakeCommand(buildDirectory(), TQString::fromLatin1("install"), true); + _auto ? slotInstallWithKdesu() : startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install"), true); } else{ kdDebug(9020) << "slotExecute: before slotInstall" << endl; @@ -1171,7 +1171,7 @@ void AutoProjectPart::executeTarget(const TQDir& dir, const TargetItem* titem) KMessageBox::error( m_widget, i18n("Active target \"%1\" is not binary ( %2 ).\n" "Unable to determine the main program. If you want this\n" "to be the active target, set a main program under\n" - "Project -> Project Options -> Run Options").arg(titem->name).arg(titem->primary), i18n("Active target is not a library") ); + "Project -> Project Options -> Run Options").tqarg(titem->name).tqarg(titem->primary), i18n("Active target is not a library") ); kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl; program += titem->name; }else @@ -1282,7 +1282,7 @@ void AutoProjectPart::slotBuildConfigAboutToShow() { TQStringList l = allBuildConfigs(); buildConfigAction->setItems(l); - buildConfigAction->setCurrentItem(l.findIndex(currentBuildConfig())); + buildConfigAction->setCurrentItem(l.tqfindIndex(currentBuildConfig())); } void AutoProjectPart::restorePartialProjectSession ( const TQDomElement* el ) @@ -1316,7 +1316,7 @@ void AutoProjectPart::slotCommandFinished( const TQString& command ) if( m_buildCommand != command ) return; - m_buildCommand = TQString::null; + m_buildCommand = TQString(); m_timestamp.clear(); TQStringList fileList = allFiles(); @@ -1356,7 +1356,7 @@ bool AutoProjectPart::isDirty() TQString fileName = *it; ++it; - TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( fileName ); + TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( fileName ); TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified(); if( it == m_timestamp.end() || *it != t ){ return true; @@ -1386,7 +1386,7 @@ TQStringList recursiveATFind( const TQString &currDir, const TQString &baseDir ) kdDebug(9020) << "Dir " << currDir << endl; TQStringList fileList; - if( !currDir.contains( "/..") && !currDir.contains("/.") ) + if( !currDir.tqcontains( "/..") && !currDir.tqcontains("/.") ) { TQDir dir(currDir); TQStringList dirList = dir.entryList(TQDir::Dirs ); diff --git a/buildtools/autotools/autoprojectpart.h b/buildtools/autotools/autoprojectpart.h index 706eacae..16be5886 100644 --- a/buildtools/autotools/autoprojectpart.h +++ b/buildtools/autotools/autoprojectpart.h @@ -34,9 +34,10 @@ class ConfigWidgetProxy; class AutoProjectPart : public KDevBuildTool { Q_OBJECT + TQ_OBJECT public: - AutoProjectPart( TQObject *parent, const char *name, const TQStringList &args ); + AutoProjectPart( TQObject *tqparent, const char *name, const TQStringList &args ); virtual ~AutoProjectPart(); /** @@ -132,7 +133,7 @@ private: bool m_needMakefileCvs; bool m_lastCompilationFailed; bool m_isKDE; - QPair<TQDir, TargetItem*> m_executeTargetAfterBuild; + TQPair<TQDir, TargetItem*> m_executeTargetAfterBuild; TQString m_runProg; ConfigWidgetProxy * _configProxy; diff --git a/buildtools/autotools/autoprojectviewbase.ui b/buildtools/autotools/autoprojectviewbase.ui index ad5142ba..0285c110 100644 --- a/buildtools/autotools/autoprojectviewbase.ui +++ b/buildtools/autotools/autoprojectviewbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>AutoProjectViewBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AutoProjectViewBase</cstring> </property> @@ -19,9 +19,9 @@ <property name="margin"> <number>4</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -30,7 +30,7 @@ <property name="spacing"> <number>2</number> </property> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_button1</cstring> </property> @@ -38,7 +38,7 @@ <string></string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_button2</cstring> </property> @@ -46,7 +46,7 @@ <string></string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_button3</cstring> </property> @@ -54,7 +54,7 @@ <string></string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_button4</cstring> </property> @@ -62,7 +62,7 @@ <string></string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_button5</cstring> </property> @@ -80,14 +80,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>m_optionsButton</cstring> </property> @@ -116,7 +116,7 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index 321aa349..57b63573 100644 --- a/buildtools/autotools/autoprojectwidget.cpp +++ b/buildtools/autotools/autoprojectwidget.cpp @@ -72,7 +72,7 @@ static TQString nicePrimary( const TQString &primary ) else if ( primary == "JAVA" ) return i18n( "Java" ); else - return TQString::null; + return TQString(); } @@ -87,7 +87,7 @@ AutoProjectWidget::AutoProjectWidget( AutoProjectPart *part, bool kde ) m_choosenTarget = 0; m_makefileHandler = new MakefileHandler(); - TQSplitter *splitter = new TQSplitter(Vertical, this); + TQSplitter *splitter = new TQSplitter(Qt::Vertical, this); initOverview ( splitter ); initDetailview ( splitter ); @@ -101,14 +101,14 @@ AutoProjectWidget::~AutoProjectWidget() delete m_makefileHandler; } -void AutoProjectWidget::initOverview ( TQWidget* parent ) +void AutoProjectWidget::initOverview ( TQWidget* tqparent ) { - m_subprojectView = new AutoSubprojectView( this, m_part, parent, "project overview widget" ); + m_subprojectView = new AutoSubprojectView( this, m_part, tqparent, "project overview widget" ); } -void AutoProjectWidget::initDetailview ( TQWidget* parent ) +void AutoProjectWidget::initDetailview ( TQWidget* tqparent ) { - m_detailView = new AutoDetailsView( this, m_part, parent, "project details widget" ); + m_detailView = new AutoDetailsView( this, m_part, tqparent, "project details widget" ); } void AutoProjectWidget::initActions() @@ -216,7 +216,7 @@ TQString AutoProjectWidget::pathForTarget(const TargetItem *titem) const { if (!titem) - return TQString::null; + return TQString(); kdDebug(9020) << "Looking for target " << titem->name << endl; int prefixLen = m_part->projectDirectory().length() + 1; @@ -225,7 +225,7 @@ TQString AutoProjectWidget::pathForTarget(const TargetItem *titem) const { SubprojectItem* spitem = static_cast<SubprojectItem*>(it.current() ); kdDebug(9020) << "Checking: " << spitem->path << endl; - if (spitem->targets.containsRef(titem)) + if (spitem->targets.tqcontainsRef(titem)) { kdDebug(9020) << "Found it!" << endl; TQString relpath = (spitem->path).mid(prefixLen); @@ -233,7 +233,7 @@ TQString AutoProjectWidget::pathForTarget(const TargetItem *titem) const } } kdDebug(9020) << "Not found" << endl; - return TQString::null; + return TQString(); } TQStringList AutoProjectWidget::allLibraries() @@ -314,7 +314,7 @@ TQStringList AutoProjectWidget::allFiles() TQString AutoProjectWidget::subprojectDirectory() { if ( !selectedSubproject() ) - return TQString::null; + return TQString(); return selectedSubproject()->path; } @@ -387,7 +387,7 @@ TQString AutoProjectWidget::activeDirectory() /* if ( selectedSubproject() ) return selectedSubproject()->path; else*/ - return TQString::null; + return TQString(); } } @@ -405,7 +405,7 @@ void AutoProjectWidget::addFiles( const TQStringList &list ) for ( it = fileList.begin(); it != fileList.end(); ++it ) { - int pos = ( *it ).findRev('/'); + int pos = ( *it ).tqfindRev('/'); if (pos != -1) fileName = ( *it ).mid(pos+1); else @@ -557,7 +557,7 @@ void AutoProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item ) // Delete the items from the details view first. if ( m_shownSubproject ) { - // Remove all TargetItems and all of their children from the view + // Remove all TargetItems and all of their tqchildren from the view kdDebug ( 9020 ) << "m_shownSubproject (before takeItem()): " << m_shownSubproject->subdir << endl; TQListViewItem* i = m_detailView->listView()->firstChild(); @@ -575,7 +575,7 @@ void AutoProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item ) if ( !m_shownSubproject) return; kdDebug ( 9020 ) << "m_shownSubproject (after takeItem()): " << selectedSubproject()->subdir << endl; - // Insert all TargetItems and all of their children into the view + // Insert all TargetItems and all of their tqchildren into the view TQPtrListIterator<TargetItem> it2( selectedSubproject()->targets ); for ( ; it2.current(); ++it2 ) { @@ -632,9 +632,9 @@ TargetItem *AutoProjectWidget::createTargetItem( const TQString &name, if ( docgroup ) text = i18n( "Documentation data" ); else if ( icongroup ) - text = i18n( "KDE Icon data" ).arg( prefix ); + text = i18n( "KDE Icon data" ).tqarg( prefix ); else - text = i18n( "%1 (%2 in %3)" ).arg( name ).arg( nicePrimary( primary ) ).arg( prefix ); + text = i18n( "%1 (%2 in %3)" ).tqarg( name ).tqarg( nicePrimary( primary ) ).tqarg( prefix ); // Workaround because of TQListView not being able to create // items without actually inserting them @@ -652,7 +652,7 @@ TargetItem *AutoProjectWidget::createTargetItem( const TQString &name, FileItem *AutoProjectWidget::createFileItem( const TQString &name, SubprojectItem *subproject ) { bool is_subst; - if(name.find("$(") == 0 || name.find("${") == 0) + if(name.tqfind("$(") == 0 || name.tqfind("${") == 0) is_subst = true; else is_subst = false; diff --git a/buildtools/autotools/autoprojectwidget.h b/buildtools/autotools/autoprojectwidget.h index ff79ce71..7d21fd55 100644 --- a/buildtools/autotools/autoprojectwidget.h +++ b/buildtools/autotools/autoprojectwidget.h @@ -45,9 +45,10 @@ class KListViewItem; class TQListViewItem; class MakefileHandler; -class AutoProjectWidget : public QVBox +class AutoProjectWidget : public TQVBox { Q_OBJECT + TQ_OBJECT friend class RemoveFileDialog; friend class TargetOptionsDialog; // to access projectDom() via m_part->projectDom() public: @@ -132,13 +133,13 @@ public: SubprojectItem* selectedSubproject(); /** - * Creates a TargetItem instance without a parent item. + * Creates a TargetItem instance without a tqparent item. */ TargetItem *createTargetItem( const TQString &name, const TQString &prefix, const TQString &primary, bool take = true ); /** - * Creates a FileItem instance without a parent item. + * Creates a FileItem instance without a tqparent item. */ FileItem *createFileItem( const TQString &name, SubprojectItem *subproject ); @@ -202,8 +203,8 @@ public slots: void slotOverviewSelectionChanged( TQListViewItem *item ); protected: - void initOverview ( TQWidget* parent ); - void initDetailview ( TQWidget* parent ); + void initOverview ( TQWidget* tqparent ); + void initDetailview ( TQWidget* tqparent ); void initActions (); virtual void focusInEvent( TQFocusEvent *e ); diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 9e1f9735..e1d15d90 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -13,7 +13,7 @@ *************************************************************************** */ -/** Qt */ +/** TQt */ #include <tqregexp.h> #include <tqcheckbox.h> #include <tqstringlist.h> @@ -60,7 +60,7 @@ namespace AutoProjectPrivate bool isHeader( const TQString& fileName ) { - return TQStringList::split( ";", "h;H;hh;hxx;hpp;tcc;h++" ).contains( TQFileInfo(fileName).extension(false) ); + return TQStringList::split( ";", "h;H;hh;hxx;hpp;tcc;h++" ).tqcontains( TQFileInfo(fileName).extension(false) ); } static TQString cleanWhitespace( const TQString &str ) @@ -81,11 +81,11 @@ static TQString cleanWhitespace( const TQString &str ) static void removeDir( const TQString& dirName ) { TQDir d( dirName ); - const QFileInfoList* fileList = d.entryInfoList(); + const TQFileInfoList* fileList = d.entryInfoList(); if( !fileList ) return; - QFileInfoListIterator it( *fileList ); + TQFileInfoListIterator it( *fileList ); while( it.current() ){ const TQFileInfo* fileInfo = it.current(); ++it; @@ -107,8 +107,8 @@ static void removeDir( const TQString& dirName ) } -AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name) -: AutoProjectViewBase(parent, name) +AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *tqparent, const char *name) +: AutoProjectViewBase(tqparent, name) { m_widget = widget; @@ -116,7 +116,7 @@ AutoSubprojectView::AutoSubprojectView(AutoProjectWidget* widget, AutoProjectPar m_listView->setSorting(-1); m_listView->header()->hide(); - m_listView->addColumn( TQString::null ); + m_listView->addColumn( TQString() ); connect( m_listView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); @@ -173,7 +173,7 @@ void AutoSubprojectView::initActions() KActionCollection * actions = new KActionCollection( this ); subProjectOptionsAction = new AutoToolsAction( i18n( "Options..." ), "configure", 0, - this, TQT_SLOT( slotSubprojectOptions() ), actions, "subproject options" ); + TQT_TQOBJECT(this), TQT_SLOT( slotSubprojectOptions() ), actions, "subproject options" ); subProjectOptionsAction->setWhatsThis(i18n("<qt><b>Options</b><p>Shows subproject options dialog " "that provides settings for compiler, include paths, " "prefixes and build order.</qt>")); @@ -181,24 +181,24 @@ void AutoSubprojectView::initActions() TQToolTip::add( m_button1, tr2i18n( "Add new subproject...")); addSubprojectAction = new AutoToolsAction( i18n( "Add new subproject..." ), "folder_new", 0, - this, TQT_SLOT( slotAddSubproject() ), actions, "add subproject" ); + TQT_TQOBJECT(this), TQT_SLOT( slotAddSubproject() ), actions, "add subproject" ); addSubprojectAction->setWhatsThis(i18n("<qt><b>Add new subproject</b><p>Creates a new " "subproject in currently selected subproject.</qt>")); addSubprojectAction->plug( m_button1 ); removeSubprojectAction = new KAction( i18n( "Remove Subproject..." ), "remove_subdir", 0, - this, TQT_SLOT( slotRemoveSubproject() ), actions, "remove subproject" ); + TQT_TQOBJECT(this), TQT_SLOT( slotRemoveSubproject() ), actions, "remove subproject" ); removeSubprojectAction->setWhatsThis(i18n("<qt><b>Remove subproject</b><p>Removes the subproject. Asks if the " "subproject should be also removed from disk. Only subprojects " "which do not hold other subprojects can be removed.</qt>")); addExistingSubprojectAction = new KAction( i18n( "Add Existing Subprojects..." ), "fileimport", 0, - this, TQT_SLOT( slotAddExistingSubproject() ), actions, "add existing subproject" ); + TQT_TQOBJECT(this), TQT_SLOT( slotAddExistingSubproject() ), actions, "add existing subproject" ); addExistingSubprojectAction->setWhatsThis(i18n("<qt><b>Add existing subprojects</b><p>Imports existing " "subprojects containing Makefile.am.</qt>")); TQToolTip::add( m_button2, tr2i18n( "Add Target...")); addTargetAction = new AutoToolsAction( i18n( "Add Target..." ), "targetnew_kdevelop", 0, - this, TQT_SLOT( slotAddTarget() ), actions, "add target" ); + TQT_TQOBJECT(this), TQT_SLOT( slotAddTarget() ), actions, "add target" ); addTargetAction->setWhatsThis(i18n( "<qt><b>Add target</b><p>Adds a new target to " "the currently selected subproject. Target can be a " "binary program, library, script, also a collection of " @@ -206,19 +206,19 @@ void AutoSubprojectView::initActions() addTargetAction->plug( m_button2 ); TQToolTip::add( m_button3, tr2i18n( "Add Service...")); - addServiceAction = new AutoToolsAction( i18n( "Add Service..." ), "servicenew_kdevelop", 0, this, + addServiceAction = new AutoToolsAction( i18n( "Add Service..." ), "servicenew_kdevelop", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddService() ), actions, "add service" ); addServiceAction->setWhatsThis(i18n("<qt><b>Add service</b><p>Creates a .desktop file describing the service.</qt>")); addServiceAction->plug( m_button3 ); TQToolTip::add( m_button4, tr2i18n( "Add Application...")); - addApplicationAction = new AutoToolsAction( i18n( "Add Application..." ), "window_new", 0, this, + addApplicationAction = new AutoToolsAction( i18n( "Add Application..." ), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddApplication() ), actions, "add application" ); addApplicationAction->setWhatsThis(i18n("<qt><b>Add application</b><p>Creates an application .desktop file.</qt>")); addApplicationAction->plug( m_button4 ); TQToolTip::add( m_button5, tr2i18n( "Build")); - buildSubprojectAction = new AutoToolsAction( i18n( "Build" ), "launch", 0, this, + buildSubprojectAction = new AutoToolsAction( i18n( "Build" ), "launch", 0, TQT_TQOBJECT(this), TQT_SLOT( slotBuildSubproject() ), actions, "build subproject" ); buildSubprojectAction->setWhatsThis(i18n("<qt><b>Build</b><p>Runs <b>make</b> from the directory of " "the selected subproject.<br> Environment variables and " @@ -226,11 +226,11 @@ void AutoSubprojectView::initActions() "dialog, <b>Make Options</b> tab.</qt>")); buildSubprojectAction->plug( m_button5 ); - forceReeditSubprojectAction = new KAction( i18n( "Force Reedit" ), 0, 0, this, + forceReeditSubprojectAction = new KAction( i18n( "Force Reedit" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotForceReeditSubproject() ), actions, "force-reedit subproject" ); forceReeditSubprojectAction->setWhatsThis(i18n("<qt><b>Force Reedit</b><p>Runs <b>make force-reedit</b> " "from the directory of the selected subproject.<br>This " - "recreates makefile (tip: and solves most of .moc related " + "recreates makefile (tip: and solves most of .tqmoc related " "problems)<br>Environment variables and make arguments can " "be specified in the project settings dialog, " "<b>Make Options</b> tab.</qt>")); @@ -238,21 +238,21 @@ void AutoSubprojectView::initActions() if (!m_part->isKDE()) forceReeditSubprojectAction->setEnabled(false); - cleanSubprojectAction = new KAction( i18n( "Clean" ), 0, 0, this, + cleanSubprojectAction = new KAction( i18n( "Clean" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotCleanSubproject() ), actions, "clean subproject" ); cleanSubprojectAction->setWhatsThis(i18n("<qt><b>Clean</b><p>Runs <b>make clean</b> from the directory of " "the selected subproject.<br> Environment variables and make " "arguments can be specified in the project settings dialog, " "<b>Make Options</b> tab.</qt>")); - installSubprojectAction = new KAction( i18n( "Install" ), 0, 0, this, + installSubprojectAction = new KAction( i18n( "Install" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotInstallSubproject() ), actions, "install subproject" ); installSubprojectAction->setWhatsThis(i18n("<qt><b>Install</b><p>Runs <b>make install</b> from the directory " "of the selected subproject.<br> Environment variables and " "make arguments can be specified in the project settings " "dialog, <b>Make Options</b> tab.</qt>")); installSuSubprojectAction = new KAction( i18n( "Install (as root user)" ), 0, 0, - this, TQT_SLOT( slotInstallSuSubproject() ), actions, "install subproject as root" ); + TQT_TQOBJECT(this), TQT_SLOT( slotInstallSuSubproject() ), actions, "install subproject as root" ); installSuSubprojectAction->setWhatsThis(i18n("<qt><b>Install as root user</b><p>Runs <b>make install</b> " "command from the directory of the selected subproject " "with root privileges.<br> It is executed via kdesu " @@ -260,12 +260,12 @@ void AutoSubprojectView::initActions() "can be specified in the project settings dialog, " "<b>Make Options</b> tab.</qt>")); - expandAction = new KAction( i18n( "Expand Subtree" ), 0, 0, this, + expandAction = new KAction( i18n( "Expand Subtree" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotExpandTree()), actions, "expandAction" ); - collapseAction = new KAction( i18n( "Collapse Subtree" ), 0, 0, this, + collapseAction = new KAction( i18n( "Collapse Subtree" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCollapseTree()), actions, "collapseAction" ); - otherAction = new KAction( i18n( "Manage Custom Commands..." ), 0, 0, this, + otherAction = new KAction( i18n( "Manage Custom Commands..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotManageBuildCommands() ), actions, "manage custom commands" ); otherAction->setWhatsThis(i18n("<qt><b>Manage custom commands</b><p>Allows to create, edit and " "delete custom build commands which appears in the subproject " @@ -280,7 +280,7 @@ void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, con if ( !item ) return ; - KPopupMenu popup( i18n( "Subproject: %1" ).arg( item->text( 0 ) ), this ); + KPopupMenu popup( i18n( "Subproject: %1" ).tqarg( item->text( 0 ) ), this ); subProjectOptionsAction->plug( &popup ); popup.insertSeparator(); @@ -317,7 +317,7 @@ void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, con } int id = popup.insertItem(it.key(), this, TQT_SLOT(slotCustomBuildCommand(int))); m_commandList.append(it.data()); - popup.setItemParameter(id, m_commandList.findIndex(it.data())); + popup.setItemParameter(id, m_commandList.tqfindIndex(it.data())); } popup.insertSeparator(); @@ -422,7 +422,7 @@ void AutoSubprojectView::slotBuildSubproject() TQString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() ); - m_part->startMakeCommand( m_part->buildDirectory() + relpath, TQString::fromLatin1( "" ) ); + m_part->startMakeCommand( m_part->buildDirectory() + relpath, TQString::tqfromLatin1( "" ) ); } void AutoSubprojectView::slotRemoveSubproject() @@ -433,28 +433,28 @@ void AutoSubprojectView::slotRemoveSubproject() if( !spitem ) return; - SubprojectItem* parent = static_cast<SubprojectItem*>( spitem->parent() ); - if( !parent || !parent->listView() || spitem->childCount() != 0 ){ + SubprojectItem* tqparent = static_cast<SubprojectItem*>( spitem->tqparent() ); + if( !tqparent || !tqparent->listView() || spitem->childCount() != 0 ){ KMessageBox::error( 0, i18n("This item cannot be removed"), i18n("Automake Manager") ); return; } - TQStringList list = TQStringList::split( TQRegExp("[ \t]"), parent->variables["SUBDIRS"] ); - TQStringList::Iterator it = list.find( spitem->subdir ); + TQStringList list = TQStringList::split( TQRegExp("[ \t]"), tqparent->variables["SUBDIRS"] ); + TQStringList::Iterator it = list.tqfind( spitem->subdir ); TQString subdirToRemove = spitem->subdir; bool topsubdirs = true; - if ((parent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") == -1) - && (parent->variables["SUBDIRS"].find("$(AUTODIRS)") == -1)) + if ((tqparent->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") == -1) + && (tqparent->variables["SUBDIRS"].tqfind("$(AUTODIRS)") == -1)) { topsubdirs = false; if( it == list.end() ){ - KMessageBox::sorry(this, i18n("There is no subproject %1 in SUBDIRS").arg(spitem->subdir)); + KMessageBox::sorry(this, i18n("There is no subproject %1 in SUBDIRS").tqarg(spitem->subdir)); return; } } - RemoveSubprojectDialog dlg(i18n("Remove Subproject %1").arg(spitem->text(0)), - i18n("Do you really want to remove subproject %1 with all targets and files?").arg(spitem->text(0))); + RemoveSubprojectDialog dlg(i18n("Remove Subproject %1").tqarg(spitem->text(0)), + i18n("Do you really want to remove subproject %1 with all targets and files?").tqarg(spitem->text(0))); if( dlg.exec() ){ bool removeSources = dlg.removeFromDisk(); @@ -462,11 +462,11 @@ void AutoSubprojectView::slotRemoveSubproject() if (!topsubdirs) { list.remove( it ); - parent->variables[ "SUBDIRS" ] = list.join( " " ); + tqparent->variables[ "SUBDIRS" ] = list.join( " " ); } - parent->listView()->setSelected( parent, true ); - kapp->processEvents( 500 ); + tqparent->listView()->setSelected( tqparent, true ); + kapp->tqprocessEvents( 500 ); if( removeSources ){ @@ -483,7 +483,7 @@ void AutoSubprojectView::slotRemoveSubproject() TQString projroot = m_part->projectDirectory() + "/"; TQString subdirectory = spitem->path; - TQString relpath = subdirectory.replace(0, projroot.length(),""); + TQString relpath = subdirectory.tqreplace(0, projroot.length(),""); TQString configureFile = m_part->getAutoConfFile(projroot); @@ -511,9 +511,9 @@ void AutoSubprojectView::slotRemoveSubproject() // Adjust SUBDIRS variable in containing Makefile.am - if (parent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) + if (tqparent->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1) { - TQFile subdirsfile( parent->path + "/subdirs" ); + TQFile subdirsfile( tqparent->path + "/subdirs" ); TQStringList topdirs; if ( subdirsfile.open( IO_ReadOnly ) ) { @@ -534,9 +534,9 @@ void AutoSubprojectView::slotRemoveSubproject() TQMap<TQString,TQString> replaceMap; replaceMap.insert( "SUBDIRS", subdirToRemove ); - AutoProjectTool::removeFromMakefileam( parent->path + "/Makefile.am", replaceMap ); + AutoProjectTool::removeFromMakefileam( tqparent->path + "/Makefile.am", replaceMap ); - TQString relmakefile = ( parent->path + "/Makefile" ).mid( m_part->projectDirectory().length()+1 ); + TQString relmakefile = ( tqparent->path + "/Makefile" ).mid( m_part->projectDirectory().length()+1 ); kdDebug(9020) << "Relative makefile path: " << relmakefile << endl; // check for config.status @@ -563,7 +563,7 @@ void AutoSubprojectView::parsePrimary( SubprojectItem *item, { // Parse line foo_bar = bla bla - int pos = lhs.findRev( '_' ); + int pos = lhs.tqfindRev( '_' ); TQString prefix = lhs.left( pos ); TQString primary = lhs.right( lhs.length() - pos - 1 ); // kdDebug(9020) << "Prefix:" << prefix << ",Primary:" << primary << endl; @@ -707,7 +707,7 @@ void AutoSubprojectView::parseKDEICON( SubprojectItem *item, { // Parse a line foo_ICON = bla bla - int pos = lhs.find( "_ICON" ); + int pos = lhs.tqfind( "_ICON" ); TQString prefix = lhs.left( pos ); if ( prefix == "KDE" ) prefix = "kde_icon"; @@ -766,7 +766,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, // Take care of KDE hacks: // TOPSUBDIRS is an alias for all directories // listed in the subdirs file - if ( subdirs.find( "$(TOPSUBDIRS)" ) != -1 ) + if ( subdirs.tqfind( "$(TOPSUBDIRS)" ) != -1 ) { TQStringList dirs; TQFile subdirsfile( item->path + "/subdirs" ); @@ -795,18 +795,18 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, } } - subdirs.replace( TQRegExp( "\\$\\(TOPSUBDIRS\\)" ), dirs.join( " " ) ); + subdirs.tqreplace( TQRegExp( "\\$\\(TOPSUBDIRS\\)" ), dirs.join( " " ) ); } // AUTODIRS is an alias for all subdirectories - if ( subdirs.find( "$(AUTODIRS)" ) != -1 ) + if ( subdirs.tqfind( "$(AUTODIRS)" ) != -1 ) { TQDir d( item->path ); TQStringList dirs = d.entryList( TQDir::Dirs ); dirs.remove( "." ); dirs.remove( ".." ); dirs.remove( "CVS" ); - subdirs.replace( TQRegExp( "\\$\\(AUTODIRS\\)" ), dirs.join( " " ) ); + subdirs.tqreplace( TQRegExp( "\\$\\(AUTODIRS\\)" ), dirs.join( " " ) ); } // If there are any variables in the subdirs line then search @@ -822,7 +822,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, // Search the whole Makefile(.am?) // Note that if the variable isn't found it just disappears // (Perhaps we should add it back in this case?) - TQMap<TQString, TQString>::ConstIterator varit = item->variables.find( varname ); + TQMap<TQString, TQString>::ConstIterator varit = item->variables.tqfind( varname ); if ( varit != item->variables.end() ) { kdDebug( 9020 ) << "Found Makefile var " << varname << ", adding dirs <" << varit.data() << ">" << endl; @@ -832,7 +832,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, { kdDebug( 9020 ) << "Not found Makefile var " << varname << endl; } - subdirs.replace( TQRegExp( "\\$\\(\\s*" + varname + "\\s*\\)" ), varvalue ); + subdirs.tqreplace( TQRegExp( "\\$\\(\\s*" + varname + "\\s*\\)" ), varvalue ); } //search for AC_SUBST variables and try to replace them with variables @@ -847,7 +847,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, // Search the whole Makefile(.am?) // Note that if the variable isn't found it just disappears // (Perhaps we should add it back in this case?) - TQMap<TQString, TQString>::ConstIterator varit = item->variables.find( varname ); + TQMap<TQString, TQString>::ConstIterator varit = item->variables.tqfind( varname ); if ( varit != item->variables.end() ) { kdDebug( 9020 ) << "Found Makefile var " << varname << ", adding dirs <" << varit.data() << ">" << endl; @@ -857,7 +857,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, { kdDebug( 9020 ) << "Not found Makefile var " << varname << endl; } - subdirs.replace( TQRegExp( "\\@" + varname + "\\@" ), varvalue ); + subdirs.tqreplace( TQRegExp( "\\@" + varname + "\\@" ), varvalue ); } TQStringList l = TQStringList::split( TQRegExp( "[ \t]" ), subdirs ); @@ -879,14 +879,14 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, open = false; if ( newitem->subdir == "pics" ) open = false; - if ( newitem && static_cast<SubprojectItem*>( newitem->parent() ) + if ( newitem && static_cast<SubprojectItem*>( newitem->tqparent() ) ->subdir == "doc" ) open = false; if ( newitem && static_cast<SubprojectItem*> - ( newitem->parent() ) ->subdir == "po" ) + ( newitem->tqparent() ) ->subdir == "po" ) open = false; if ( newitem && static_cast<SubprojectItem*> - ( newitem->parent() ) ->subdir == "pics" ) + ( newitem->tqparent() ) ->subdir == "pics" ) open = false; newitem->setOpen( open ); @@ -914,7 +914,7 @@ void AutoSubprojectView::parse( SubprojectItem *item ) parseKDEDOCS( item, lhs, rhs ); else if ( lhs.right( 5 ) == "_ICON" ) parseKDEICON( item, lhs, rhs ); - else if ( lhs.find( '_' ) > 0 ) + else if ( lhs.tqfind( '_' ) > 0 ) parsePrimary( item, lhs, rhs ); else if ( lhs.right( 3 ) == "dir" ) parsePrefix( item, lhs, rhs ); @@ -937,7 +937,7 @@ void AutoSubprojectView::parse( SubprojectItem *item ) TQString fname = *fileIt; ++fileIt; - if( AutoProjectPrivate::isHeader(fname) && !headers.contains(fname) ){ + if( AutoProjectPrivate::isHeader(fname) && !headers.tqcontains(fname) ){ FileItem *fitem = m_widget->createFileItem( fname, item ); noinst_HEADERS_item->sources.append( fitem ); } @@ -1045,7 +1045,7 @@ void AutoSubprojectView::slotManageBuildCommands( ) { config->writeEntry(widget->commandsTable->text(i, 0), widget->commandsTable->text(i, 1)+":::"+ - TQString("%1").arg(static_cast<TQComboTableItem*>(widget-> + TQString("%1").tqarg(static_cast<TQComboTableItem*>(widget-> commandsTable->item(i, 2))->currentItem())); } config->sync(); diff --git a/buildtools/autotools/autosubprojectview.h b/buildtools/autotools/autosubprojectview.h index 81c772dc..f7a6b6e6 100644 --- a/buildtools/autotools/autosubprojectview.h +++ b/buildtools/autotools/autosubprojectview.h @@ -41,9 +41,10 @@ namespace AutoProjectPrivate class AutoSubprojectView : public AutoProjectViewBase { Q_OBJECT + TQ_OBJECT public: - AutoSubprojectView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name ); + AutoSubprojectView( AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *tqparent, const char *name ); virtual ~AutoSubprojectView(); public: diff --git a/buildtools/autotools/autotoolsaction.cpp b/buildtools/autotools/autotoolsaction.cpp index b5191b37..2d336c9b 100644 --- a/buildtools/autotools/autotoolsaction.cpp +++ b/buildtools/autotools/autotoolsaction.cpp @@ -26,73 +26,73 @@ AutoToolsAction::~AutoToolsAction() AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ) -: KAction( text, cut, receiver, slot, parent, name ) + KActionCollection* tqparent, const char* name ) +: KAction( text, cut, receiver, slot, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ) -: KAction( text, pix, cut, receiver, slot, parent, name ) + KActionCollection* tqparent, const char* name ) +: KAction( text, pix, cut, receiver, slot, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ) -: KAction( text, pix, cut, receiver, slot, parent, name ) + KActionCollection* tqparent, const char* name ) +: KAction( text, pix, cut, receiver, slot, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const KGuiItem& item, const KShortcut & cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ) -: KAction( item, cut, receiver, slot, parent, name ) + KActionCollection* tqparent, const char* name ) +: KAction( item, cut, receiver, slot, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, - TQObject* parent, const char* name ) -: KAction( text, cut, parent, name ) + TQObject* tqparent, const char* name ) +: KAction( text, cut, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* parent, const char* name ) -: KAction( text, cut, receiver, slot, parent, name ) + TQObject* tqparent, const char* name ) +: KAction( text, cut, receiver, slot, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, - const KShortcut& cut, TQObject* parent, const char* name ) -: KAction( text, pix, cut, parent, name ) + const KShortcut& cut, TQObject* tqparent, const char* name ) +: KAction( text, pix, cut, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, - const KShortcut& cut, TQObject* parent, const char* name ) -: KAction( text, pix, cut, parent, name ) + const KShortcut& cut, TQObject* tqparent, const char* name ) +: KAction( text, pix, cut, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, const TQObject* receiver, - const char* slot, TQObject* parent, const char * name ) -: KAction( text, pix, cut, receiver, slot, parent, name ) + const char* slot, TQObject* tqparent, const char * name ) +: KAction( text, pix, cut, receiver, slot, tqparent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut & cut, const TQObject* receiver, - const char* slot, TQObject* parent, const char * name ) -: KAction( text, pix, cut, receiver, slot, parent, name ) + const char* slot, TQObject* tqparent, const char * name ) +: KAction( text, pix, cut, receiver, slot, tqparent, name ) { } -AutoToolsAction::AutoToolsAction( TQObject * parent, const char * name ) -: KAction( parent, name ) +AutoToolsAction::AutoToolsAction( TQObject * tqparent, const char * name ) +: KAction( tqparent, name ) { } @@ -107,7 +107,7 @@ int AutoToolsAction::plug( TQWidget* w, int index ) if (kapp && !kapp->authorizeKAction(name())) return -1; - if ( ::qt_cast<TQToolButton*>( w ) ) + if ( ::tqqt_cast<TQToolButton*>( w ) ) { TQToolButton* tb = static_cast<TQToolButton*>( w ); connect( tb, TQT_SIGNAL( clicked() ), this, TQT_SLOT( activate() ) ); @@ -145,7 +145,7 @@ void AutoToolsAction::updateEnabled( int i ) { TQWidget* w = container( i ); - if ( ::qt_cast<TQToolButton*>( w ) ) + if ( ::tqqt_cast<TQToolButton*>( w ) ) static_cast<TQToolButton*>( w )->setEnabled( isEnabled() ); else KAction::updateEnabled( i ) ; diff --git a/buildtools/autotools/autotoolsaction.h b/buildtools/autotools/autotoolsaction.h index 574b20b1..990102f1 100644 --- a/buildtools/autotools/autotoolsaction.h +++ b/buildtools/autotools/autotoolsaction.h @@ -21,7 +21,7 @@ class TQObject; class KActionCollection; /** - * A KAction derivative that will work with the QToolButtons used in + * A KAction derivative that will work with the TQToolButtons used in * the Automake Manager * @author Matt Rogers */ @@ -32,33 +32,33 @@ public: AutoToolsAction( const TQString& text, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ); + KActionCollection* tqparent, const char* name ); AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ); + KActionCollection* tqparent, const char* name ); AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ); + KActionCollection* tqparent, const char* name ); AutoToolsAction( const KGuiItem& item, const KShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ); + KActionCollection* tqparent, const char* name ); - AutoToolsAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 ); + AutoToolsAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* tqparent = 0, const char* name = 0 ); AutoToolsAction( const TQString& text, const KShortcut& cut, - const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); + const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(), - TQObject* parent = 0, const char* name = 0 ); + TQObject* tqparent = 0, const char* name = 0 ); AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(), - TQObject* parent = 0, const char* name = 0 ); + TQObject* tqparent = 0, const char* name = 0 ); AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, - const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); + const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, - const TQObject* receiver, const char* slot, TQObject* parent, + const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); - AutoToolsAction( TQObject* parent = 0, const char* name = 0 ); + AutoToolsAction( TQObject* tqparent = 0, const char* name = 0 ); virtual int plug( TQWidget *widget, int index = -1 ); diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp index 4ffc326b..d09f0a7b 100644 --- a/buildtools/autotools/choosetargetdialog.cpp +++ b/buildtools/autotools/choosetargetdialog.cpp @@ -58,12 +58,12 @@ public: }; ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectPart* part, - TQStringList fileList, TQWidget* parent, const char* name ) -: KDialogBase( parent, name, false, i18n("Automake Manager - Choose Target"), + TQStringList fileList, TQWidget* tqparent, const char* name ) +: KDialogBase( tqparent, name, false, i18n("Automake Manager - Choose Target"), Ok | Cancel, KDialogBase::Ok, true /* seperator */ ) { - Q_UNUSED( parent ); + Q_UNUSED( tqparent ); Q_UNUSED( name ); d = new ChooseTargetDialog::Private; d->widget = widget; @@ -76,7 +76,7 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP d->baseUI->subprojectComboBox->setAutoCompletion( true ); d->baseUI->targetComboBox->setAutoCompletion( true ); d->baseUI->newFileList->header()->hide(); - d->baseUI->newFileList->addColumn( TQString::null ); + d->baseUI->newFileList->addColumn( TQString() ); d->baseUI->newFileList->setSorting(-1); setIcon ( SmallIcon ( "target_kdevelop" ) ); @@ -128,7 +128,7 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP for ( it = fileList.begin(); it != fileList.end(); ++it ) { - int pos = ( *it ).findRev('/'); + int pos = ( *it ).tqfindRev('/'); if (pos != -1) fileName = ( *it ).mid(pos+1); else @@ -246,7 +246,7 @@ void ChooseTargetDialog::slotOk() { bool found = false; - int pos = ( *it ).findRev('/'); + int pos = ( *it ).tqfindRev('/'); if (pos != -1) { directory = ( *it ).left(pos); diff --git a/buildtools/autotools/choosetargetdialog.h b/buildtools/autotools/choosetargetdialog.h index 7ca7a3f4..d1ebdab6 100644 --- a/buildtools/autotools/choosetargetdialog.h +++ b/buildtools/autotools/choosetargetdialog.h @@ -29,9 +29,10 @@ class TQWidget; class ChooseTargetDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: ChooseTargetDialog( AutoProjectWidget* widget, AutoProjectPart* part, - TQStringList fileList, TQWidget* parent = 0, + TQStringList fileList, TQWidget* tqparent = 0, const char* name = 0 ); ~ChooseTargetDialog(); diff --git a/buildtools/autotools/choosetargetdlgbase.ui b/buildtools/autotools/choosetargetdlgbase.ui index 3581e595..f41433cd 100644 --- a/buildtools/autotools/choosetargetdlgbase.ui +++ b/buildtools/autotools/choosetargetdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ChooseTargetDlgBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ChooseTargetDlgBase</cstring> </property> @@ -12,7 +12,7 @@ <height>306</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>444</width> <height>306</height> @@ -25,7 +25,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -51,7 +51,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>activeTargetRadioButton</cstring> </property> @@ -62,7 +62,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>chooseTargetRadioButton</cstring> </property> @@ -72,7 +72,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>chosenTargetGroupBox</cstring> </property> @@ -102,7 +102,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>targetStaticLabel</cstring> </property> @@ -114,7 +114,7 @@ <string>Target:</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>chosenTargetLabel</cstring> </property> @@ -132,7 +132,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -151,20 +151,20 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>cancelNoticeLabel</cstring> </property> <property name="text"> <string><qt><b>Note:</b> If you cancel, your files will be created but will <b>not</b> be added to the project.</qt></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> </vbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>neverAskAgainCheckbox</cstring> </property> @@ -205,13 +205,13 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">slotActiveTargetToggled(bool)</slot> <slot access="protected">slotChooseTargetToggled(bool)</slot> <slot access="private">slotSubprojectChanged(const QString&)</slot> <slot access="private">slotTargetChanged(const QString&)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp index 0be8903b..1e877a5c 100644 --- a/buildtools/autotools/configureoptionswidget.cpp +++ b/buildtools/autotools/configureoptionswidget.cpp @@ -51,7 +51,7 @@ public: static TQString currentText(TQComboBox *combo, const TQStringList &names) { if (combo->currentItem() == -1) - return TQString::null; + return TQString(); return names[combo->currentItem()]; } static void setCurrentText(TQComboBox *combo, const TQString &str, const TQStringList &names) @@ -69,10 +69,10 @@ public: }; -ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget *parent, const char *name) - : ConfigureOptionsWidgetBase(parent, name) +ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget *tqparent, const char *name) + : ConfigureOptionsWidgetBase(tqparent, name) { - config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this)); + config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); m_part = part; env_groupBox->setColumnLayout( 1, Qt::Vertical ); @@ -98,7 +98,7 @@ ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget * config_combo->insertStringList(allConfigs); dirty = false; - currentConfig = TQString::null; + currentConfig = TQString(); configChanged(part->currentBuildConfig()); fixLayout(); @@ -111,20 +111,20 @@ ConfigureOptionsWidget::~ConfigureOptionsWidget() void ConfigureOptionsWidget::fixLayout() { - int w1 = ccompiler_label->sizeHint().width(); - int w2 = cbinary_label->sizeHint().width(); - int w3 = cflags_label->sizeHint().width(); - int w4 = cxxcompiler_label->sizeHint().width(); - int w5 = cxxbinary_label->sizeHint().width(); - int w6 = cxxflags_label->sizeHint().width(); - int w7 = f77compiler_label->sizeHint().width(); - int w8 = f77binary_label->sizeHint().width(); - int w9 = f77flags_label->sizeHint().width(); - - int w = QMAX(w1, QMAX(w2, w3)); - w = QMAX(w, QMAX(w4, w5)); - w = QMAX(w, QMAX(w6, w7)); - w = QMAX(w, QMAX(w8, w9)); + int w1 = ccompiler_label->tqsizeHint().width(); + int w2 = cbinary_label->tqsizeHint().width(); + int w3 = cflags_label->tqsizeHint().width(); + int w4 = cxxcompiler_label->tqsizeHint().width(); + int w5 = cxxbinary_label->tqsizeHint().width(); + int w6 = cxxflags_label->tqsizeHint().width(); + int w7 = f77compiler_label->tqsizeHint().width(); + int w8 = f77binary_label->tqsizeHint().width(); + int w9 = f77flags_label->tqsizeHint().width(); + + int w = TQMAX(w1, TQMAX(w2, w3)); + w = TQMAX(w, TQMAX(w4, w5)); + w = TQMAX(w, TQMAX(w6, w7)); + w = TQMAX(w, TQMAX(w8, w9)); ccompiler_label->setMinimumWidth(w); cxxcompiler_label->setMinimumWidth(w); @@ -236,7 +236,7 @@ void ConfigureOptionsWidget::saveSettings(const TQString &config) DomUtil::writeEntry(dom, prefix + "cxxflags", cxxflags_edit->text()); DomUtil::writeEntry(dom, prefix + "f77flags", f77flags_edit->text()); - if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").arg(config), TQString::null, i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").tqarg(config), TQString(), i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes) TQTimer::singleShot(0, m_part, TQT_SLOT(slotConfigure())); } @@ -267,8 +267,8 @@ void ConfigureOptionsWidget::topsourcedirClicked() void ConfigureOptionsWidget::configComboTextChanged(const TQString &config) { - bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty(); - bool canRemove = allConfigs.contains(config) && config != "default"; + bool canAdd = !allConfigs.tqcontains(config) && !config.tqcontains("/") && !config.isEmpty(); + bool canRemove = allConfigs.tqcontains(config) && config != "default"; addconfig_button->setEnabled(canAdd); removeconfig_button->setEnabled(canRemove); } @@ -276,7 +276,7 @@ void ConfigureOptionsWidget::configComboTextChanged(const TQString &config) void ConfigureOptionsWidget::configChanged(const TQString &config) { - if (config == currentConfig || !allConfigs.contains(config)) + if (config == currentConfig || !allConfigs.tqcontains(config)) return; if (!currentConfig.isNull() && dirty) @@ -317,7 +317,7 @@ void ConfigureOptionsWidget::configRemoved() config_combo->clear(); config_combo->insertStringList(allConfigs); - currentConfig = TQString::null; + currentConfig = TQString(); configChanged("default"); } @@ -396,7 +396,7 @@ KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin if (!factory) { TQString errorMessage = KLibLoader::self()->lastErrorMessage(); KMessageBox::error(0, i18n("There was an error loading the module %1.\n" - "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage)); + "The diagnostics is:\n%2").tqarg(service->name()).tqarg(errorMessage)); exit(1); } @@ -405,7 +405,7 @@ KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin if (prop.isValid()) args = TQStringList::split(" ", prop.toString()); - TQObject *obj = factory->create(this, service->name().latin1(), + TQObject *obj = factory->create(TQT_TQOBJECT(this), service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) { diff --git a/buildtools/autotools/configureoptionswidget.h b/buildtools/autotools/configureoptionswidget.h index 9272b3f2..fd8afade 100644 --- a/buildtools/autotools/configureoptionswidget.h +++ b/buildtools/autotools/configureoptionswidget.h @@ -25,9 +25,10 @@ class EnvironmentVariablesWidget; class ConfigureOptionsWidget : public ConfigureOptionsWidgetBase { Q_OBJECT + TQ_OBJECT public: - ConfigureOptionsWidget( AutoProjectPart *part, TQWidget *parent = 0, const char *name = 0 ); + ConfigureOptionsWidget( AutoProjectPart *part, TQWidget *tqparent = 0, const char *name = 0 ); ~ConfigureOptionsWidget(); public slots: diff --git a/buildtools/autotools/configureoptionswidgetbase.ui b/buildtools/autotools/configureoptionswidgetbase.ui index 0eb47ac7..c8374366 100644 --- a/buildtools/autotools/configureoptionswidgetbase.ui +++ b/buildtools/autotools/configureoptionswidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ConfigureOptionsWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>configure_options_widget</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>config_label</cstring> </property> @@ -49,7 +49,7 @@ <cstring>config_combo</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>config_combo</cstring> </property> @@ -81,14 +81,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>8</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addconfig_button</cstring> </property> @@ -99,7 +99,7 @@ <bool>false</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeconfig_button</cstring> </property> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -129,11 +129,11 @@ </spacer> </hbox> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabwidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>general_tab</cstring> </property> @@ -155,7 +155,7 @@ <string>Options to pass to configure, e.g. --prefix=<install dir></string> </property> </widget> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>builddir_label</cstring> </property> @@ -176,14 +176,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>topsourcedir_label</cstring> </property> @@ -229,17 +229,17 @@ building in the project directory, you probably want this to be blank.</string> </property> </widget> - <widget class="QPushButton" row="4" column="4"> + <widget class="TQPushButton" row="4" column="4"> <property name="name"> <cstring>builddir_button</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -259,24 +259,24 @@ probably want this to be blank.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton" row="6" column="4"> + <widget class="TQPushButton" row="6" column="4"> <property name="name"> <cstring>topsourcedir_button</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -313,14 +313,14 @@ then it is relative to the project directory. <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="10" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="10" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>ldflags_label</cstring> </property> @@ -345,7 +345,7 @@ nonstandard directory <lib dir></string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -388,14 +388,14 @@ headers in a nonstandard directory <include dir></string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="8" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="8" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>cppflags_label</cstring> </property> @@ -410,7 +410,7 @@ headers in a nonstandard directory <include dir></string> headers in a nonstandard directory <include dir></string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>configargs_label</cstring> </property> @@ -421,7 +421,7 @@ headers in a nonstandard directory <include dir></string> <cstring>configargs_edit</cstring> </property> </widget> - <widget class="QGroupBox" row="12" column="0" rowspan="1" colspan="5"> + <widget class="TQGroupBox" row="12" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>env_groupBox</cstring> </property> @@ -444,7 +444,7 @@ headers in a nonstandard directory <include dir></string> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>c_tab</cstring> </property> @@ -455,7 +455,7 @@ headers in a nonstandard directory <include dir></string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>ccompiler_label</cstring> </property> @@ -466,7 +466,7 @@ headers in a nonstandard directory <include dir></string> <cstring>cservice_combo</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>cservice_combo</cstring> </property> @@ -481,14 +481,14 @@ headers in a nonstandard directory <include dir></string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>cflags_label</cstring> </property> @@ -504,7 +504,7 @@ headers in a nonstandard directory <include dir></string> <cstring>cflags_edit</cstring> </property> </widget> - <widget class="QPushButton" row="4" column="2"> + <widget class="TQPushButton" row="4" column="2"> <property name="name"> <cstring>cflags_button</cstring> </property> @@ -516,7 +516,7 @@ headers in a nonstandard directory <include dir></string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -536,14 +536,14 @@ headers in a nonstandard directory <include dir></string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>168</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>cbinary_label</cstring> </property> @@ -569,7 +569,7 @@ headers in a nonstandard directory <include dir></string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -578,7 +578,7 @@ headers in a nonstandard directory <include dir></string> </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>cxx_tab</cstring> </property> @@ -589,7 +589,7 @@ headers in a nonstandard directory <include dir></string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>cxxcompiler_label</cstring> </property> @@ -600,7 +600,7 @@ headers in a nonstandard directory <include dir></string> <cstring>cxxservice_combo</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>cxxservice_combo</cstring> </property> @@ -615,14 +615,14 @@ headers in a nonstandard directory <include dir></string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>cxxbinary_label</cstring> </property> @@ -648,14 +648,14 @@ headers in a nonstandard directory <include dir></string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>cxxflags_label</cstring> </property> @@ -671,7 +671,7 @@ headers in a nonstandard directory <include dir></string> <cstring>cxxflags_edit</cstring> </property> </widget> - <widget class="QPushButton" row="4" column="2"> + <widget class="TQPushButton" row="4" column="2"> <property name="name"> <cstring>cxxflags_button</cstring> </property> @@ -683,7 +683,7 @@ headers in a nonstandard directory <include dir></string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -703,7 +703,7 @@ headers in a nonstandard directory <include dir></string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -712,7 +712,7 @@ headers in a nonstandard directory <include dir></string> </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>fortran_tab</cstring> </property> @@ -723,7 +723,7 @@ headers in a nonstandard directory <include dir></string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>f77compiler_label</cstring> </property> @@ -734,7 +734,7 @@ headers in a nonstandard directory <include dir></string> <cstring>f77service_combo</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>f77service_combo</cstring> </property> @@ -749,14 +749,14 @@ headers in a nonstandard directory <include dir></string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>f77binary_label</cstring> </property> @@ -782,14 +782,14 @@ headers in a nonstandard directory <include dir></string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>f77flags_label</cstring> </property> @@ -805,7 +805,7 @@ headers in a nonstandard directory <include dir></string> <cstring>f77flags_edit</cstring> </property> </widget> - <widget class="QPushButton" row="4" column="2"> + <widget class="TQPushButton" row="4" column="2"> <property name="name"> <cstring>f77flags_button</cstring> </property> @@ -817,7 +817,7 @@ headers in a nonstandard directory <include dir></string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -837,7 +837,7 @@ headers in a nonstandard directory <include dir></string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1017,7 +1017,7 @@ headers in a nonstandard directory <include dir></string> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">builddirClicked()</slot> <slot access="protected">cflagsClicked()</slot> <slot access="protected">configAdded()</slot> @@ -1031,9 +1031,9 @@ headers in a nonstandard directory <include dir></string> <slot access="protected">f77serviceChanged()</slot> <slot access="protected">setDirty()</slot> <slot access="protected">topsourcedirClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp index 2235f357..f67d9295 100644 --- a/buildtools/autotools/fileselectorwidget.cpp +++ b/buildtools/autotools/fileselectorwidget.cpp @@ -48,20 +48,20 @@ #include "kfilednddetailview.h" #include "kfiledndiconview.h" -KDnDDirOperator::KDnDDirOperator ( const KURL &urlName, TQWidget* parent, const char* name ) : KDirOperator ( urlName, parent, name ) +KDnDDirOperator::KDnDDirOperator ( const KURL &urlName, TQWidget* tqparent, const char* name ) : KDirOperator ( urlName, tqparent, name ) { } -KFileView* KDnDDirOperator::createView( TQWidget* parent, KFile::FileView view ) +KFileView* KDnDDirOperator::createView( TQWidget* tqparent, KFile::FileView view ) { KFileView* new_view = 0L; if( (view & KFile::Detail) == KFile::Detail ) { - new_view = new KFileDnDDetailView( parent, "detail view"); + new_view = new KFileDnDDetailView( tqparent, "detail view"); } else if ((view & KFile::Simple) == KFile::Simple ) { - new_view = new KFileDnDIconView( parent, "simple view"); + new_view = new KFileDnDIconView( tqparent, "simple view"); new_view->setViewName( i18n("Short View") ); } @@ -69,11 +69,11 @@ KFileView* KDnDDirOperator::createView( TQWidget* parent, KFile::FileView view ) } -FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, TQWidget* parent, const char* name ) : TQWidget(parent, name) +FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, TQWidget* tqparent, const char* name ) : TQWidget(tqparent, name) { m_part = part; - // widgets and layout + // widgets and tqlayout TQVBoxLayout* lo = new TQVBoxLayout(this); TQHBox *hlow = new TQHBox (this); @@ -98,7 +98,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, hlow->setMaximumHeight(up->height()); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); - cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); KURLCompletion* cmpl = new KURLCompletion(); cmbPath->setCompletionObject( cmpl ); lo->addWidget(cmbPath); @@ -114,7 +114,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, filterIcon = new TQLabel(filterBox); filterIcon->setPixmap( BarIcon("filter") ); filter = new KHistoryCombo(filterBox, "filter"); - filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); lo->addWidget(filterBox); @@ -148,7 +148,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, { if (groupEl.tagName() == "group") { - list << groupEl.attribute("pattern").replace ( TQRegExp ( ";" ), " " ) + " (" + groupEl.attribute("name") + ")"; + list << groupEl.attribute("pattern").tqreplace ( TQRegExp ( ";" ), " " ) + " (" + groupEl.attribute("name") + ")"; } groupEl = groupEl.nextSibling().toElement(); } diff --git a/buildtools/autotools/fileselectorwidget.h b/buildtools/autotools/fileselectorwidget.h index 636cec87..187348fa 100644 --- a/buildtools/autotools/fileselectorwidget.h +++ b/buildtools/autotools/fileselectorwidget.h @@ -40,20 +40,22 @@ class KFile; class KDnDDirOperator : public KDirOperator { Q_OBJECT + TQ_OBJECT public: - KDnDDirOperator ( const KURL& urlName = KURL(), TQWidget *parent = 0, const char* name = 0 ); + KDnDDirOperator ( const KURL& urlName = KURL(), TQWidget *tqparent = 0, const char* name = 0 ); protected: - virtual KFileView* createView( TQWidget* parent, KFile::FileView view ); + virtual KFileView* createView( TQWidget* tqparent, KFile::FileView view ); }; -class FileSelectorWidget : public QWidget +class FileSelectorWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - FileSelectorWidget( AutoProjectPart* part, KFile::Mode, TQWidget* parent = 0, const char* name = 0 ); + FileSelectorWidget( AutoProjectPart* part, KFile::Mode, TQWidget* tqparent = 0, const char* name = 0 ); ~FileSelectorWidget(); KDnDDirOperator * dirOperator() diff --git a/buildtools/autotools/kfilednddetailview.cpp b/buildtools/autotools/kfilednddetailview.cpp index 098d975f..d98e7a81 100644 --- a/buildtools/autotools/kfilednddetailview.cpp +++ b/buildtools/autotools/kfilednddetailview.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ ////////////////////////////////////////////////////// -// Qt specific includes +// TQt specific includes #include <tqptrlist.h> #include <tqapplication.h> ////////////////////////////////////////////////////// @@ -33,8 +33,8 @@ static int autoOpenTime = 750; #endif //----------------------------------------------- -KFileDnDDetailView::KFileDnDDetailView(TQWidget *parent, const char *name ) - : KFileDetailView(parent,name), m_autoOpenTimer( this ), +KFileDnDDetailView::KFileDnDDetailView(TQWidget *tqparent, const char *name ) + : KFileDetailView(tqparent,name), m_autoOpenTimer( this ), m_autoOpenTime( autoOpenTime ), m_useAutoOpenTimer( true ), m_dropItem(0), m_dndEnabled( true ) { @@ -207,6 +207,6 @@ void KFileDnDDetailView::setDnDEnabled( bool useDnD ){ viewport()->setAcceptDrops( useDnD ); } //----------------------------------------------- -#ifndef NO_INCLUDE_MOCFILES +#ifndef NO_INCLUDE_TQMOCFILES #include "kfilednddetailview.moc" #endif diff --git a/buildtools/autotools/kfilednddetailview.h b/buildtools/autotools/kfilednddetailview.h index 0cf13f7e..762d6921 100644 --- a/buildtools/autotools/kfilednddetailview.h +++ b/buildtools/autotools/kfilednddetailview.h @@ -19,7 +19,7 @@ #define KFILEDNDDETAILVIEW_H ////////////////////////////////////////////////////////////////////// -// Qt specific include files +// TQt specific include files #include <tqwidget.h> #include <tqtimer.h> ////////////////////////////////////////////////////////////////////// @@ -40,9 +40,10 @@ class KFileDnDDetailView : public KFileDetailView { Q_OBJECT + TQ_OBJECT public: /** */ - KFileDnDDetailView( TQWidget *parent = 0, const char *name = 0 ); + KFileDnDDetailView( TQWidget *tqparent = 0, const char *name = 0 ); /** */ virtual ~KFileDnDDetailView(); /** @@ -78,9 +79,9 @@ public: return m_useAutoOpenTimer; } /** */ - virtual void readConfig( KConfig*, const TQString& group = TQString::null ); + virtual void readConfig( KConfig*, const TQString& group = TQString() ); /** */ - virtual void writeConfig( KConfig*, const TQString& group = TQString::null ); + virtual void writeConfig( KConfig*, const TQString& group = TQString() ); signals: // Signals /** * Emitted whenever an decodable item is dropped in the view. diff --git a/buildtools/autotools/kfiledndiconview.cpp b/buildtools/autotools/kfiledndiconview.cpp index 1a491c62..d230eee7 100644 --- a/buildtools/autotools/kfiledndiconview.cpp +++ b/buildtools/autotools/kfiledndiconview.cpp @@ -2,7 +2,7 @@ * kfiledndiconview.cpp - description * ------------------- * begin : Wed Nov 1 2000 -* copyright : (C) 2000 by Björn Sahlström +* copyright : (C) 2000 by Bj�rn Sahlstr�m * email : kbjorn@users.sourceforge.net ***************************************************************************/ @@ -16,7 +16,7 @@ ***************************************************************************/ ////////////////////////////////////////////////////// -// Qt specific includes +// TQt specific includes #include <tqptrlist.h> #include <tqapplication.h> ////////////////////////////////////////////////////// @@ -33,8 +33,8 @@ static int autoOpenTime = 750; #endif //----------------------------------------------- -KFileDnDIconView::KFileDnDIconView( TQWidget *parent, const char *name ) - : KFileIconView(parent,name), m_autoOpenTimer( this ), +KFileDnDIconView::KFileDnDIconView( TQWidget *tqparent, const char *name ) + : KFileIconView(tqparent,name), m_autoOpenTimer( this ), m_autoOpenTime( autoOpenTime ), m_useAutoOpenTimer( true ), m_dropItem(0), m_dndEnabled( true ) { @@ -84,7 +84,7 @@ void KFileDnDIconView::contentsDragEnterEvent( TQDragEnterEvent *e ) { return; } e->acceptAction(); // Yes - TQIconViewItem *i = findItem( contentsToViewport( e->pos() ) ); + TQIconViewItem *i = tqfindItem( contentsToViewport( e->pos() ) ); if ( i && m_useAutoOpenTimer) { // are we over an item ? m_dropItem = i; // set new m_dropItem m_autoOpenTimer.start( m_autoOpenTime ); // restart timer @@ -97,7 +97,7 @@ void KFileDnDIconView::contentsDragMoveEvent( TQDragMoveEvent *e ) { return; } e->acceptAction(); // Yes - TQIconViewItem *i = findItem( contentsToViewport( e->pos() ) ); + TQIconViewItem *i = tqfindItem( contentsToViewport( e->pos() ) ); if( ! m_useAutoOpenTimer ) return; if ( i ) { // are we over an item ? @@ -189,6 +189,6 @@ bool KFileDnDIconView::acceptDrag(TQDropEvent* e ) const { || e->action() == TQDropEvent::Link ); } //----------------------------------------------- -#ifndef NO_INCLUDE_MOCFILES +#ifndef NO_INCLUDE_TQMOCFILES #include "kfiledndiconview.moc" #endif diff --git a/buildtools/autotools/kfiledndiconview.h b/buildtools/autotools/kfiledndiconview.h index e2b3402e..e58062b3 100644 --- a/buildtools/autotools/kfiledndiconview.h +++ b/buildtools/autotools/kfiledndiconview.h @@ -35,9 +35,10 @@ class KFileDnDIconView : public KFileIconView { Q_OBJECT + TQ_OBJECT public: // Public methods - KFileDnDIconView( TQWidget *parent = 0, const char *name = 0 ); + KFileDnDIconView( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~KFileDnDIconView(); /** @@ -77,8 +78,8 @@ public: // Public methods return m_useAutoOpenTimer; } - virtual void readConfig( KConfig*, const TQString& group = TQString::null ); - virtual void writeConfig( KConfig*, const TQString& group = TQString::null ); + virtual void readConfig( KConfig*, const TQString& group = TQString() ); + virtual void writeConfig( KConfig*, const TQString& group = TQString() ); signals: /** @@ -101,7 +102,7 @@ protected: /** * Creates a @ref TQDragObject containing all urls of the selected @ref KFileItem of the view, - * @returns the @ref QDragObject + * @returns the @ref TQDragObject */ virtual TQDragObject* dragObject(); diff --git a/buildtools/autotools/kimporticonview.cpp b/buildtools/autotools/kimporticonview.cpp index 3634886a..87c0d19f 100644 --- a/buildtools/autotools/kimporticonview.cpp +++ b/buildtools/autotools/kimporticonview.cpp @@ -26,8 +26,8 @@ #include "kimporticonview.h" -KImportIconView::KImportIconView(const TQString& strIntro, TQWidget *parent, const char *name) - : KFileDnDIconView(parent, name) +KImportIconView::KImportIconView(const TQString& strIntro, TQWidget *tqparent, const char *name) + : KFileDnDIconView(tqparent, name) { m_strIntro = strIntro; m_bDropped = false; diff --git a/buildtools/autotools/kimporticonview.h b/buildtools/autotools/kimporticonview.h index 3cfd5745..c0674eb7 100644 --- a/buildtools/autotools/kimporticonview.h +++ b/buildtools/autotools/kimporticonview.h @@ -24,9 +24,10 @@ class KImportIconView : public KFileDnDIconView { Q_OBJECT + TQ_OBJECT public: - KImportIconView( const TQString& strIntro, TQWidget *parent, const char *name ); + KImportIconView( const TQString& strIntro, TQWidget *tqparent, const char *name ); virtual ~KImportIconView(); void somethingDropped ( bool dropped ); diff --git a/buildtools/autotools/makefilehandler.cpp b/buildtools/autotools/makefilehandler.cpp index db30508d..ef2354f1 100644 --- a/buildtools/autotools/makefilehandler.cpp +++ b/buildtools/autotools/makefilehandler.cpp @@ -81,7 +81,7 @@ void MakefileHandler::parse( const TQString& folder, bool recursive ) if ( recursive && ast && ast->hasChildren() ) { - TQValueList<AutoTools::AST*> astChildList = ast->children(); + TQValueList<AutoTools::AST*> astChildList = ast->tqchildren(); TQValueList<AutoTools::AST*>::iterator it(astChildList.begin()), clEnd(astChildList.end()); for ( ; it != clEnd; ++it ) { @@ -122,7 +122,7 @@ void MakefileHandler::parse( const TQString& folder, bool recursive ) AutoTools::ProjectAST* MakefileHandler::astForFolder( const TQString& folderPath ) { - if ( d->folderToFileMap.contains( folderPath ) ) + if ( d->folderToFileMap.tqcontains( folderPath ) ) { TQString filePath = d->folderToFileMap[folderPath]; return d->projects[filePath]; @@ -145,14 +145,14 @@ TQString MakefileHandler::resolveVariable( const TQString& variable, AutoTools:: return variable; kdDebug(9020) << k_funcinfo << "attempting to resolve '" << variable << "'"<< endl; - ASTList childList = ast->children(); + ASTList childList = ast->tqchildren(); ASTList::iterator it( childList.begin() ), clEnd( childList.end() ); for ( ; it != clEnd; ++it ) { if ( ( *it )->nodeType() == AutoTools::AST::AssignmentAST ) { AutoTools::AssignmentAST* assignment = static_cast<AutoTools::AssignmentAST*>( ( *it ) ); - if ( variable.find( assignment->scopedID ) != -1 ) + if ( variable.tqfind( assignment->scopedID ) != -1 ) { kdDebug(9020) << k_funcinfo << "Resolving variable '" << variable << "' to '" << assignment->values.join( TQString::null ).stripWhiteSpace() << "'" << endl; diff --git a/buildtools/autotools/managecustomcommand.cpp b/buildtools/autotools/managecustomcommand.cpp index a602a3a9..92db0620 100644 --- a/buildtools/autotools/managecustomcommand.cpp +++ b/buildtools/autotools/managecustomcommand.cpp @@ -22,8 +22,8 @@ #include <klocale.h> -ManageCustomCommand::ManageCustomCommand(TQWidget *parent, const char *name) - :ManageCustomBuildCommandsBase(parent, name) +ManageCustomCommand::ManageCustomCommand(TQWidget *tqparent, const char *name) + :ManageCustomBuildCommandsBase(tqparent, name) { } diff --git a/buildtools/autotools/managecustomcommand.h b/buildtools/autotools/managecustomcommand.h index b4e4af49..22f78431 100644 --- a/buildtools/autotools/managecustomcommand.h +++ b/buildtools/autotools/managecustomcommand.h @@ -24,8 +24,9 @@ class ManageCustomCommand: public ManageCustomBuildCommandsBase { Q_OBJECT + TQ_OBJECT public: - ManageCustomCommand( TQWidget *parent = 0, const char *name = 0 ); + ManageCustomCommand( TQWidget *tqparent = 0, const char *name = 0 ); void setRowProperties( int row ); public slots: diff --git a/buildtools/autotools/managecustomcommandsbase.ui b/buildtools/autotools/managecustomcommandsbase.ui index 43164ef5..47c018ea 100644 --- a/buildtools/autotools/managecustomcommandsbase.ui +++ b/buildtools/autotools/managecustomcommandsbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ManageCustomBuildCommandsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ManageCustomBuildCommandsBase</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>addButton</cstring> </property> @@ -30,7 +30,7 @@ <string>&Add</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>removeButton</cstring> </property> @@ -38,7 +38,7 @@ <string>&Remove</string> </property> </widget> - <widget class="QTable" row="0" column="0" rowspan="3" colspan="1"> + <widget class="TQTable" row="0" column="0" rowspan="3" colspan="1"> <column> <property name="text"> <string>Menu Text</string> @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -117,9 +117,9 @@ <tabstop>addButton</tabstop> <tabstop>removeButton</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>addButton_clicked()</slot> <slot>removeButton_clicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp index e44a32c3..9dfffefb 100644 --- a/buildtools/autotools/misc.cpp +++ b/buildtools/autotools/misc.cpp @@ -24,7 +24,7 @@ #include "kdevcompileroptions.h" -static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent ) +static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *tqparent ) { KService::Ptr service = KService::serviceByDesktopName( name ); if ( !service ) @@ -47,7 +47,7 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec if (prop.isValid()) args = TQStringList::split(" ", prop.toString()); - TQObject *obj = factory->create(parent, service->name().latin1(), + TQObject *obj = factory->create(tqparent, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) { @@ -65,22 +65,22 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec args = TQStringList::split( " ", prop.toString() ); return KParts::ComponentFactory - ::createInstanceFromService<KDevCompilerOptions>( service, parent, + ::createInstanceFromService<KDevCompilerOptions>( service, tqparent, service->name().latin1(), args );*/ } -TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent ) +TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *tqparent ) { - KDevCompilerOptions * plugin = createCompilerOptions( compiler, parent ); + KDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(tqparent) ); if ( plugin ) { - TQString newflags = plugin->exec( parent, flags ); + TQString newflags = plugin->exec( tqparent, flags ); delete plugin; return newflags; } - return TQString::null; + return TQString(); } @@ -128,7 +128,7 @@ void AutoProjectTool::parseMakefileam(const TQString &fileName, TQMap<TQString, rhs[rhs.length() - 1] = ' '; } - // The need for stripWhiteSpace seems to be a Qt bug. + // The need for stripWhiteSpace seems to be a TQt bug. // make our list nice and neat. TQStringList bits = TQStringList::split(" ", rhs); rhs = bits.join(" "); @@ -238,11 +238,11 @@ void AutoProjectTool::setMakefileam ( const TQString &fileName, TQMap<TQString, if ( re.exactMatch ( s ) ) { TQString lhs = re.cap ( 2 ); - bool notFound = ( variables.find ( lhs ) == variables.end() ); + bool notFound = ( variables.tqfind ( lhs ) == variables.end() ); if ( notFound ) { - if ( seenLhs.find ( lhs ) == seenLhs.end() ) + if ( seenLhs.tqfind ( lhs ) == seenLhs.end() ) { // not interested in this line at all // write it out as is.. @@ -446,7 +446,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri if (re.exactMatch(s)) { TQString lhs = re.cap(2); - TQMap<TQString, bool>* ourRhs = interest.find(lhs); + TQMap<TQString, bool>* ourRhs = interest.tqfind(lhs); if (!ourRhs) { @@ -478,7 +478,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri // add this line to we we want to add to remove duplicates. for (uint index = 0; index < bits.size(); index++) { - TQMap<TQString, bool>::iterator findEntry = ourRhs->find(bits[index]); + TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(bits[index]); if (findEntry == ourRhs->end()) { // we haven't seen it, so add it, so we don't add it again later.. @@ -490,7 +490,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri } // now write the line out if it is not going to be empty. TQString newLine(lhs); - if (seenLhs.find(lhs) == seenLhs.end()) + if (seenLhs.tqfind(lhs) == seenLhs.end()) { newLine += " = "; seenLhs[lhs] = ""; @@ -537,7 +537,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri { // check if any of these values are down to remove. TQString newLine(lhs); - if (seenLhs.find(lhs) == seenLhs.end()) + if (seenLhs.tqfind(lhs) == seenLhs.end()) { newLine += " = "; seenLhs[lhs] = ""; @@ -551,7 +551,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri bool added = false; for (TQStringList::Iterator posIter = bits.begin(); posIter != bits.end();posIter++) { - TQMap<TQString, bool>::iterator findEntry = ourRhs->find(*posIter); + TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(*posIter); if (findEntry == ourRhs->end()) { // we do not want to remove it.. @@ -598,7 +598,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri { // now we have to deal with this multiLine value.. // ourRhs will always be a value, as we only get multiLine if we're interested in it.. - TQMap<TQString, bool>* ourRhs = interest.find(lastLhs); + TQMap<TQString, bool>* ourRhs = interest.tqfind(lastLhs); if (add) { @@ -607,7 +607,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri // add this line to we we want to add to remove duplicates. for (uint index = 0; index < lastRhs.size(); index++) { - TQMap<TQString, bool>::iterator findEntry = ourRhs->find(lastRhs[index]); + TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(lastRhs[index]); if (findEntry == ourRhs->end()) { // we haven't seen it, so add it, so we don't add it again later.. @@ -619,7 +619,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri } // now write the line out if it is not going to be empty. TQString newLine(lastLhs); - if (seenLhs.find(lastLhs) == seenLhs.end()) + if (seenLhs.tqfind(lastLhs) == seenLhs.end()) { newLine += " = "; seenLhs[lastLhs] = ""; @@ -665,7 +665,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri { // check if any of these values are down to remove. TQString newLine(lastLhs); - if (seenLhs.find(lastLhs) == seenLhs.end()) + if (seenLhs.tqfind(lastLhs) == seenLhs.end()) { newLine += " = "; seenLhs[lastLhs] = ""; @@ -678,7 +678,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri bool added = false; for (TQStringList::Iterator posIter = lastRhs.begin(); posIter != lastRhs.end();posIter++) { - TQMap<TQString, bool>::iterator findEntry = ourRhs->find(*posIter); + TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(*posIter); if (findEntry == ourRhs->end()) { // we do not want to remove it.. @@ -724,7 +724,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri TQMap<TQString, bool>* ourRhs = it.current(); TQString newLine(lhs); - if (seenLhs.find(lhs) == seenLhs.end()) + if (seenLhs.tqfind(lhs) == seenLhs.end()) { newLine += " = "; seenLhs[lastLhs] = ""; @@ -814,7 +814,7 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath) { if (close.search(line) >= 0) { - line = line.replace(close.search(line), 1, ""); + line = line.tqreplace(close.search(line), 1, ""); list += TQStringList::split(" ", line); break; } @@ -829,11 +829,11 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath) } else if (ac_regex.search(line) >= 0) { - line = line.replace(ac_regex.search(line), ac_match.length() - 1, ""); + line = line.tqreplace(ac_regex.search(line), ac_match.length() - 1, ""); if (open.search(line) >= 0) { - line = line.replace(open.search(line), 1, ""); + line = line.tqreplace(open.search(line), 1, ""); } if (line.endsWith(cont)) @@ -845,7 +845,7 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath) { if (close.search(line) >= 0) { - line = line.replace(close.search(line), 1, ""); + line = line.tqreplace(close.search(line), 1, ""); } } @@ -946,7 +946,7 @@ void AutoProjectTool::configureinSaveMakefiles(TQString fileName, TQStringList m else if (ac_regex.search(line) >= 0) { line = line.stripWhiteSpace(); - line = line.replace(ac_regex.search(line), ac_match.length() - 1, ""); + line = line.tqreplace(ac_regex.search(line), ac_match.length() - 1, ""); if (line.endsWith(cont)) { line.setLength(line.length() - 1); @@ -954,11 +954,11 @@ void AutoProjectTool::configureinSaveMakefiles(TQString fileName, TQStringList m } if (open.search(line) >= 0) { - line = line.replace(open.search(line), 1, ""); + line = line.tqreplace(open.search(line), 1, ""); } if (close.search(line) >= 0) { - line = line.replace(close.search(line), 1, ""); + line = line.tqreplace(close.search(line), 1, ""); } if (!multiLine) diff --git a/buildtools/autotools/misc.h b/buildtools/autotools/misc.h index 2f8a092d..26bb0e83 100644 --- a/buildtools/autotools/misc.h +++ b/buildtools/autotools/misc.h @@ -27,7 +27,7 @@ public: * Loads the compiler options plugin for the given compiler, executes the dialog * with some initial flags, and returns the new flags. */ - static TQString execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent ); + static TQString execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *tqparent ); /** * Returns the canonicalized version of a file name, i.e. @@ -48,7 +48,7 @@ public: static void addRemoveMakefileam(const TQString &fileName, TQMap<TQString, TQString> variables, bool add); /** - * Parses configure.in and splits AC_OUTPUT into a QStringList + * Parses configure.in and splits AC_OUTPUT into a TQStringList */ static TQStringList configureinLoadMakefiles( TQString configureinpath ); diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp index e265a969..a650fd53 100644 --- a/buildtools/autotools/removefiledlg.cpp +++ b/buildtools/autotools/removefiledlg.cpp @@ -43,8 +43,8 @@ static bool fileListContains(const TQPtrList<FileItem> &list, const TQString &na RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, TargetItem *item, const TQString &filename, - TQWidget *parent, const char *name) - : RemoveFileDlgBase(parent, name, true) + TQWidget *tqparent, const char *name) + : RemoveFileDlgBase(tqparent, name, true) { removeFromTargetsCheckBox = 0; @@ -63,7 +63,7 @@ RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* p TQString joinedtargets = " *" + targets.join("\n *"); removeFromTargetsCheckBox->setText ( i18n ( "The file %1 is still used by the following targets:\n%2\n" - "Remove it from all of them?").arg(filename).arg(joinedtargets) ); + "Remove it from all of them?").tqarg(filename).tqarg(joinedtargets) ); setMinimumSize(TQSize(size().width(), size().height() + removeFromTargetsCheckBox->size().height()*2) ); } diff --git a/buildtools/autotools/removefiledlg.h b/buildtools/autotools/removefiledlg.h index 81e24d5f..36e1c2bd 100644 --- a/buildtools/autotools/removefiledlg.h +++ b/buildtools/autotools/removefiledlg.h @@ -26,11 +26,12 @@ class TargetItem; class RemoveFileDialog : public RemoveFileDlgBase { Q_OBJECT + TQ_OBJECT public: RemoveFileDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, TargetItem *item, const TQString &filename, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~RemoveFileDialog(); protected: diff --git a/buildtools/autotools/removefiledlgbase.ui b/buildtools/autotools/removefiledlgbase.ui index d7b66011..6aaab95e 100644 --- a/buildtools/autotools/removefiledlgbase.ui +++ b/buildtools/autotools/removefiledlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>RemoveFileDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>RemoveFileDlgBase</cstring> </property> @@ -19,9 +19,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -37,14 +37,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>247</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeButton</cstring> </property> @@ -55,7 +55,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelButton</cstring> </property> @@ -65,11 +65,11 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>fileGroupBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -82,7 +82,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>fileLayout</cstring> </property> @@ -90,7 +90,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>removeLabel</cstring> </property> @@ -98,7 +98,7 @@ <string>[REMOVE QUESTION]</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>removeCheckBox</cstring> </property> @@ -106,11 +106,11 @@ <string>Also &remove it from disk</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>noticeLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> @@ -124,7 +124,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>targetBox</cstring> </property> @@ -143,7 +143,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>targetLabel</cstring> </property> @@ -159,7 +159,7 @@ <string>[TARGET NAME]</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>directoryStaticLabel</cstring> </property> @@ -179,7 +179,7 @@ <string>Directory:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>targetStaticLabel</cstring> </property> @@ -199,7 +199,7 @@ <string>Target:</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>directoryLabel</cstring> </property> @@ -228,6 +228,6 @@ <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp index 5783900c..962a386c 100644 --- a/buildtools/autotools/removetargetdlg.cpp +++ b/buildtools/autotools/removetargetdlg.cpp @@ -42,8 +42,8 @@ RemoveTargetDialog::RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, - TargetItem *titem, TQWidget* parent, const char* name ) - : RemoveTargetDlgBase ( parent, name, true, 0 ) + TargetItem *titem, TQWidget* tqparent, const char* name ) + : RemoveTargetDlgBase ( tqparent, name, true, 0 ) { removeLabel->setText ( i18n ( "Do you really want to remove <b>%1</b><br>with <b>all files</b> that are attached to it<br>and <b>all dependencies</b>?" ).arg ( titem->name ) ); directoryLabel->setText ( spitem->path ); @@ -96,8 +96,8 @@ void RemoveTargetDialog::init() { TQString canonname = AutoProjectTool::canonicalize ( titem->name ); - if ( spitem->variables[canonname + "_LIBADD"].contains ( m_titem->name ) > 0 || - spitem->variables[canonname + "_LDADD"].contains ( m_titem->name ) > 0 ) + if ( spitem->variables[canonname + "_LIBADD"].tqcontains ( m_titem->name ) > 0 || + spitem->variables[canonname + "_LDADD"].tqcontains ( m_titem->name ) > 0 ) { dependencyListBox->insertItem ( SmallIcon ( "target_kdevelop" ), spitem->path + " (" + titem->name + ")" ); @@ -116,7 +116,7 @@ void RemoveTargetDialog::accept () progressBar->show(); progressBar->setFormat ( i18n ( "Removing Target... %p%" ) ); - qApp->processEvents(); + tqApp->processEvents(); TQString canonname = AutoProjectTool::canonicalize ( m_titem->name ); TQString varname = m_titem->prefix + "_" + m_titem->primary; @@ -136,7 +136,7 @@ void RemoveTargetDialog::accept () TQString curCanonname = AutoProjectTool::canonicalize ( titem->name ); TQStringList dependencies; - if ( spitem->variables[curCanonname + "_LIBADD"].contains ( m_titem->name ) ) + if ( spitem->variables[curCanonname + "_LIBADD"].tqcontains ( m_titem->name ) ) curVarname = curCanonname + "_LIBADD"; else curVarname = curCanonname + "_LDADD"; @@ -148,7 +148,7 @@ void RemoveTargetDialog::accept () for ( uint i = 0; i < dependencies.size(); ++i ) { TQString s = dependencies[i]; - if ( s.contains ( m_titem->name ) > 0 ) + if ( s.tqcontains ( m_titem->name ) > 0 ) dependencies.remove ( s ); } @@ -250,7 +250,7 @@ void RemoveTargetDialog::accept () // before removing the files, check if they are mentioned in "noinst_HEADERS = blabla1.h blabla2.h" TQStringList noInstHeaders = TQStringList::split ( TQRegExp ( "[ \t\n]" ), m_spitem->variables["noinst_HEADERS"] ); - if ( noInstHeaders.contains ( fitem->name ) ) + if ( noInstHeaders.tqcontains ( fitem->name ) ) { noInstHeaders.remove ( fitem->name ); @@ -265,7 +265,7 @@ void RemoveTargetDialog::accept () fileList.append ( m_spitem->path.mid ( m_part->projectDirectory().length() + 1 ) + "/" + fitem->name ); - qApp->processEvents(); + tqApp->processEvents(); progressBar->setValue ( progressBar->value() + 1 ); } diff --git a/buildtools/autotools/removetargetdlg.h b/buildtools/autotools/removetargetdlg.h index a9981007..8a376678 100644 --- a/buildtools/autotools/removetargetdlg.h +++ b/buildtools/autotools/removetargetdlg.h @@ -35,7 +35,7 @@ class RemoveTargetDialog : public RemoveTargetDlgBase public: RemoveTargetDialog( AutoProjectWidget *widget, AutoProjectPart* part, SubprojectItem *spitem, - TargetItem *titem, TQWidget* parent = 0, const char* name = 0 ); + TargetItem *titem, TQWidget* tqparent = 0, const char* name = 0 ); ~RemoveTargetDialog(); private: diff --git a/buildtools/autotools/removetargetdlgbase.ui b/buildtools/autotools/removetargetdlgbase.ui index 8e3660d3..860dfb4a 100644 --- a/buildtools/autotools/removetargetdlgbase.ui +++ b/buildtools/autotools/removetargetdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>RemoveTargetDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>RemoveTargetDlgBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>targetBox</cstring> </property> @@ -46,7 +46,7 @@ <string>[TARGET DIRECTORY]</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>targetLabel</cstring> </property> @@ -54,7 +54,7 @@ <string>[TARGET NAME]</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>directoryStaticLabel</cstring> </property> @@ -74,7 +74,7 @@ <string>Directory:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>targetStaticLabel</cstring> </property> @@ -96,17 +96,17 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>fileGroupBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>140</height> @@ -119,7 +119,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>removeLabel</cstring> </property> @@ -127,7 +127,7 @@ <string>[REMOVE QUESTION]</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>removeCheckBox</cstring> </property> @@ -135,11 +135,11 @@ <string>Also &remove it from disk</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> @@ -151,7 +151,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -193,14 +193,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="5" column="0"> + <widget class="TQLayoutWidget" row="5" column="0"> <property name="name"> <cstring>buttonLayout</cstring> </property> @@ -221,14 +221,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeButton</cstring> </property> @@ -239,7 +239,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelButton</cstring> </property> @@ -254,8 +254,8 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>ksqueezedtextlabel.h</includehint> <includehint>klistbox.h</includehint> diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp index a7fd2c11..314fc710 100644 --- a/buildtools/autotools/subprojectoptionsdlg.cpp +++ b/buildtools/autotools/subprojectoptionsdlg.cpp @@ -42,10 +42,10 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProjectWidget *widget, - SubprojectItem *item, TQWidget *parent, const char *name) - : SubprojectOptionsDialogBase(parent, name, true) + SubprojectItem *item, TQWidget *tqparent, const char *name) + : SubprojectOptionsDialogBase(tqparent, name, true) { - setCaption(i18n("Subproject Options for '%1'").arg(item->subdir)); + setCaption(i18n("Subproject Options for '%1'").tqarg(item->subdir)); subProject = item; m_part = part; @@ -90,7 +90,7 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj TQString subProjectName = *it; if( subProjectName.isEmpty() ){ - subProjectName = TQString::fromLatin1( "." ); + subProjectName = TQString::tqfromLatin1( "." ); } TQCheckListItem *clitem = new TQCheckListItem(insideinc_listview, subProjectName, TQCheckListItem::CheckBox); if (lastItem) @@ -182,7 +182,7 @@ void SubprojectOptionsDialog::storeConfig() } TQString old_metasources = subProject->variables["METASOURCES"]; - TQString new_metasources = metasources_checkbox->isChecked() ? TQString::fromLatin1("AUTO") : TQString::null; + TQString new_metasources = metasources_checkbox->isChecked() ? TQString::tqfromLatin1("AUTO") : TQString(); if (new_metasources != old_metasources) { subProject->variables["METASOURCES"] = new_metasources; replaceMap.insert("METASOURCES", new_metasources); @@ -304,7 +304,7 @@ void SubprojectOptionsDialog::outsideAddClicked() { KURLRequesterDlg dialog( "", i18n( "Add Include directory: Choose directory, give -Idirectory or use a variable with -I$(FOOBAR)" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - dialog.urlRequester() ->setURL( TQString::null ); + dialog.urlRequester() ->setURL( TQString() ); if ( dialog.exec() != TQDialog::Accepted ) return ; TQString file = dialog.urlRequester() ->url(); diff --git a/buildtools/autotools/subprojectoptionsdlg.h b/buildtools/autotools/subprojectoptionsdlg.h index 648c007d..2e54af32 100644 --- a/buildtools/autotools/subprojectoptionsdlg.h +++ b/buildtools/autotools/subprojectoptionsdlg.h @@ -22,10 +22,11 @@ class SubprojectItem; class SubprojectOptionsDialog : public SubprojectOptionsDialogBase { Q_OBJECT + TQ_OBJECT public: SubprojectOptionsDialog( AutoProjectPart *part, AutoProjectWidget *widget, - SubprojectItem *item, TQWidget *parent = 0, const char *name = 0 ); + SubprojectItem *item, TQWidget *tqparent = 0, const char *name = 0 ); ~SubprojectOptionsDialog(); private: diff --git a/buildtools/autotools/subprojectoptionsdlgbase.ui b/buildtools/autotools/subprojectoptionsdlgbase.ui index f2723e5a..89f5b4f3 100644 --- a/buildtools/autotools/subprojectoptionsdlgbase.ui +++ b/buildtools/autotools/subprojectoptionsdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>SubprojectOptionsDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>sub project options widget</cstring> </property> @@ -19,11 +19,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>subprojectoptions_tabwidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>cflags_label</cstring> </property> @@ -49,7 +49,7 @@ <cstring>cflags_edit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -73,7 +73,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cflags_button</cstring> </property> @@ -85,7 +85,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>25</height> @@ -110,14 +110,14 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>cxxflags_label</cstring> </property> @@ -132,7 +132,7 @@ <cstring>cxxflags_edit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -148,7 +148,7 @@ <cstring>cxxflags_edit</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cxxflags_button</cstring> </property> @@ -160,7 +160,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>25</height> @@ -185,14 +185,14 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>fflags_label</cstring> </property> @@ -207,7 +207,7 @@ <cstring>fflags_edit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -223,7 +223,7 @@ <cstring>fflags_edit</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>fflags_button</cstring> </property> @@ -235,7 +235,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>25</height> @@ -260,7 +260,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -269,7 +269,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -280,15 +280,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>metasources_checkbox</cstring> </property> @@ -296,15 +296,15 @@ <string>Automatically &generate metasources</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -325,14 +325,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>insidemoveup_button</cstring> </property> @@ -340,7 +340,7 @@ <string>Move &Up</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>insidemovedown_button</cstring> </property> @@ -358,7 +358,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -367,7 +367,7 @@ </spacer> </vbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>insideinc_label</cstring> </property> @@ -382,7 +382,7 @@ <cstring>insideinc_listview</cstring> </property> </widget> - <widget class="QListView" row="1" column="0"> + <widget class="TQListView" row="1" column="0"> <column> <property name="text"> <string></string> @@ -403,15 +403,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -432,14 +432,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsideadd_button</cstring> </property> @@ -447,7 +447,7 @@ <string>&Add...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsideedit_button</cstring> </property> @@ -455,7 +455,7 @@ <string>&Edit...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsideremove_button</cstring> </property> @@ -463,7 +463,7 @@ <string>&Remove</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsidemoveup_button</cstring> </property> @@ -471,7 +471,7 @@ <string>Move U&p</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsidemovedown_button</cstring> </property> @@ -489,7 +489,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -498,7 +498,7 @@ </spacer> </vbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -513,7 +513,7 @@ <cstring>outsideinc_listview</cstring> </property> </widget> - <widget class="QListView" row="1" column="0"> + <widget class="TQListView" row="1" column="0"> <column> <property name="text"> <string></string> @@ -538,7 +538,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -549,7 +549,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="1" column="0"> + <widget class="TQListView" row="1" column="0"> <column> <property name="text"> <string>Name</string> @@ -582,7 +582,7 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>prefixes_label</cstring> </property> @@ -597,7 +597,7 @@ <cstring>prefix_listview</cstring> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -618,14 +618,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addprefix_button</cstring> </property> @@ -633,7 +633,7 @@ <string>&Add...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>editprefix_button</cstring> </property> @@ -641,7 +641,7 @@ <string>&Edit...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeprefix_button</cstring> </property> @@ -659,7 +659,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -670,7 +670,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -681,7 +681,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>Layout9_2</cstring> </property> @@ -702,14 +702,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buildmoveup_button</cstring> </property> @@ -717,7 +717,7 @@ <string>Move &Up</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buildmovedown_button</cstring> </property> @@ -735,7 +735,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -744,7 +744,7 @@ </spacer> </vbox> </widget> - <widget class="QListView" row="1" column="0"> + <widget class="TQListView" row="1" column="0"> <column> <property name="text"> <string></string> @@ -763,7 +763,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>buildorder_label</cstring> </property> @@ -781,7 +781,7 @@ </grid> </widget> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -802,14 +802,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>okbutton</cstring> </property> @@ -820,7 +820,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelbutton</cstring> </property> @@ -967,7 +967,7 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">buildorderMoveDownClicked()</slot> <slot access="protected">cflagsClicked()</slot> <slot access="protected">cxxFlagsClicked()</slot> @@ -983,7 +983,7 @@ <slot access="protected">removePrefixClicked()</slot> <slot access="private">addPrefixClicked()</slot> <slot access="private">editPrefixClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp index 39cd35f2..14e5ee96 100644 --- a/buildtools/autotools/targetoptionsdlg.cpp +++ b/buildtools/autotools/targetoptionsdlg.cpp @@ -34,10 +34,10 @@ #include "urlutil.h" TargetOptionsDialog::TargetOptionsDialog(AutoProjectWidget *widget, TargetItem *item, - TQWidget *parent, const char *name) - : TargetOptionsDialogBase(parent, name, true) + TQWidget *tqparent, const char *name) + : TargetOptionsDialogBase(tqparent, name, true) { - setCaption( i18n("Target Options for '%1'").arg(item->name) ); + setCaption( i18n("Target Options for '%1'").tqarg(item->name) ); setIcon( SmallIcon("configure") ); target = item; @@ -79,26 +79,26 @@ TargetOptionsDialog::~TargetOptionsDialog() void TargetOptionsDialog::readConfig() { TQString flagsstr = target->ldflags; - flagsstr.replace(TQRegExp("$(KDE_PLUGIN)"), "-avoid-version -module -no-undefined $(KDE_RPATH)"); + flagsstr.tqreplace(TQRegExp("$(KDE_PLUGIN)"), "-avoid-version -module -no-undefined $(KDE_RPATH)"); TQStringList l1 = TQStringList::split(TQRegExp("[ \t]"), flagsstr); TQStringList::Iterator l1it; - l1it = l1.find("-all-static"); + l1it = l1.tqfind("-all-static"); if (l1it != l1.end()) { allstatic_box->setChecked(true); l1.remove(l1it); } - l1it = l1.find("-avoid-version"); + l1it = l1.tqfind("-avoid-version"); if (l1it != l1.end()) { avoidversion_box->setChecked(true); l1.remove(l1it); } - l1it = l1.find("-module"); + l1it = l1.tqfind("-module"); if (l1it != l1.end()) { module_box->setChecked(true); l1.remove(l1it); } - l1it = l1.find("-no-undefined"); + l1it = l1.tqfind("-no-undefined"); if (l1it != l1.end()) { noundefined_box->setChecked(true); l1.remove(l1it); @@ -295,7 +295,7 @@ void TargetOptionsDialog::outsideAddClicked() KURLRequesterDlg dialog( "", i18n( "Add Library: Choose the .a/.so file, give -l<libname> or use a variable with $(FOOBAR)" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); dialog.urlRequester() ->setFilter( "*.so|"+i18n("Shared Library (*.so)")+"\n*.a|"+i18n("Static Library (*.a)") ); - dialog.urlRequester() ->setURL( TQString::null ); + dialog.urlRequester() ->setURL( TQString() ); dialog.urlRequester() ->completionObject() ->setDir( m_widget->selectedSubproject()->path ); dialog.urlRequester() ->fileDialog() ->setURL( KURL::fromPathOrURL( m_widget->selectedSubproject()->path ) ); if ( dialog.exec() != TQDialog::Accepted ) @@ -354,4 +354,4 @@ void TargetOptionsDialog::accept() } #include "targetoptionsdlg.moc" -// kate: indent-mode csands; space-indent on; indent-width 4; replace-tabs on; +// kate: indent-mode csands; space-indent on; indent-width 4; tqreplace-tabs on; diff --git a/buildtools/autotools/targetoptionsdlg.h b/buildtools/autotools/targetoptionsdlg.h index 3b938046..7e64ca96 100644 --- a/buildtools/autotools/targetoptionsdlg.h +++ b/buildtools/autotools/targetoptionsdlg.h @@ -21,10 +21,11 @@ class TargetItem; class TargetOptionsDialog : public TargetOptionsDialogBase { Q_OBJECT + TQ_OBJECT public: TargetOptionsDialog( AutoProjectWidget *widget, TargetItem *item, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~TargetOptionsDialog(); private: diff --git a/buildtools/autotools/targetoptionsdlgbase.ui b/buildtools/autotools/targetoptionsdlgbase.ui index 07487ac2..5da3e0b5 100644 --- a/buildtools/autotools/targetoptionsdlgbase.ui +++ b/buildtools/autotools/targetoptionsdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>TargetOptionsDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>target_options_dialog</cstring> </property> @@ -22,11 +22,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget5</cstring> </property> @@ -37,7 +37,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -52,7 +52,7 @@ <cstring>allstatic_box</cstring> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout12</cstring> </property> @@ -63,7 +63,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>allstatic_box</cstring> </property> @@ -71,7 +71,7 @@ <string>&Do not link against shared libraries (-all-static)</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>avoidversion_box</cstring> </property> @@ -79,7 +79,7 @@ <string>Do not &assign version numbers to libraries (-avoid-version)</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>module_box</cstring> </property> @@ -87,7 +87,7 @@ <string>Create a library that can &be dynamically loaded (-module)</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>noundefined_box</cstring> </property> @@ -95,7 +95,7 @@ <string>Library does not depend on external symbols (-no-&undefined)</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -106,7 +106,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>ldflagsother_label</cstring> </property> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -169,7 +169,7 @@ <cstring>dependencies_edit</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>dependencies_label</cstring> </property> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -211,7 +211,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -220,7 +220,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget6</cstring> </property> @@ -231,7 +231,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>insidelib_label</cstring> </property> @@ -256,14 +256,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>7</height> </size> </property> </spacer> - <widget class="QListView" row="4" column="0"> + <widget class="TQListView" row="4" column="0"> <column> <property name="text"> <string></string> @@ -282,7 +282,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>outsidelib_label</cstring> </property> @@ -297,7 +297,7 @@ <cstring>outsidelib_listview</cstring> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>Layout9_3</cstring> </property> @@ -318,14 +318,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>insidemoveup_button</cstring> </property> @@ -333,7 +333,7 @@ <string>Move &Up</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>insidemovedown_button</cstring> </property> @@ -351,7 +351,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -360,7 +360,7 @@ </spacer> </vbox> </widget> - <widget class="QListView" row="1" column="0"> + <widget class="TQListView" row="1" column="0"> <column> <property name="text"> <string></string> @@ -379,7 +379,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLayoutWidget" row="4" column="1"> + <widget class="TQLayoutWidget" row="4" column="1"> <property name="name"> <cstring>Layout10_4</cstring> </property> @@ -400,14 +400,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsideadd_button</cstring> </property> @@ -415,7 +415,7 @@ <string>&Add...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsideedit_button</cstring> </property> @@ -423,7 +423,7 @@ <string>&Edit...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsideremove_button</cstring> </property> @@ -431,7 +431,7 @@ <string>&Remove</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsidemoveup_button</cstring> </property> @@ -439,7 +439,7 @@ <string>Mo&ve Up</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outsidemovedown_button</cstring> </property> @@ -457,7 +457,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -468,7 +468,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>arguments_page</cstring> </property> @@ -479,7 +479,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>argumentBox</cstring> </property> @@ -495,7 +495,7 @@ <cstring>run_arguments_edit</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>arguments_label_1</cstring> </property> @@ -515,7 +515,7 @@ <cstring>m_cwdEdit</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="2" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -523,7 +523,7 @@ <string>Working Directory:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>arguments_label_2</cstring> </property> @@ -555,7 +555,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>120</height> @@ -565,7 +565,7 @@ </grid> </widget> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -586,14 +586,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>okbutton</cstring> </property> @@ -607,7 +607,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelbutton</cstring> </property> @@ -703,7 +703,7 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">insideMoveDownClicked()</slot> <slot access="protected">insideMoveUpClicked()</slot> <slot access="protected">outsideAddClicked()</slot> @@ -711,9 +711,9 @@ <slot access="protected">outsideMoveDownClicked()</slot> <slot access="protected">outsideMoveUpClicked()</slot> <slot access="protected">outsideRemoveClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> |