diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 10:00:25 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 10:00:25 -0600 |
| commit | 1623fe64102c18ab098b79656b80f28cef840756 (patch) | |
| tree | 78f35fef11ea3dbbca1ba4c99937736a1a0894cf /buildtools | |
| parent | b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04 (diff) | |
| download | tdevelop-1623fe64102c18ab098b79656b80f28cef840756.tar.gz tdevelop-1623fe64102c18ab098b79656b80f28cef840756.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.
Diffstat (limited to 'buildtools')
83 files changed, 514 insertions, 514 deletions
diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp index 580fe4cb..2e788896 100644 --- a/buildtools/ada/adaglobaloptionsdlg.cpp +++ b/buildtools/ada/adaglobaloptionsdlg.cpp @@ -6,7 +6,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqlineedit.h> #include <tqcombobox.h> diff --git a/buildtools/ada/adaproject_optionsdlgbase.ui b/buildtools/ada/adaproject_optionsdlgbase.ui index f6ee3232..7804c9c3 100644 --- a/buildtools/ada/adaproject_optionsdlgbase.ui +++ b/buildtools/ada/adaproject_optionsdlgbase.ui @@ -32,7 +32,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>160</height> @@ -90,7 +90,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>8</height> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -144,7 +144,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -250,7 +250,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -267,7 +267,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -278,7 +278,7 @@ <property name="name"> <cstring>mainSourceUrl</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>26</height> @@ -317,7 +317,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -334,7 +334,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>400</width> <height>20</height> diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index 5d47b818..d97a62d1 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -420,7 +420,7 @@ KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name) if (!factory) { TQString errorMessage = KLibLoader::self()->lastErrorMessage(); KMessageBox::error(0, i18n("There was an error loading the module %1.\n" - "The diagnostics are:\n%2").arg(service->name()).arg(errorMessage)); + "The diagnostics are:\n%2").tqarg(service->name()).tqarg(errorMessage)); exit(1); } diff --git a/buildtools/ant/antoptionswidget.ui b/buildtools/ant/antoptionswidget.ui index 0beab188..d5dea45a 100644 --- a/buildtools/ant/antoptionswidget.ui +++ b/buildtools/ant/antoptionswidget.ui @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>86</height> @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>86</height> @@ -99,7 +99,7 @@ <property name="text"> <string>&Properties:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>240</width> <height>16</height> diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp index ac77dd94..52e4fc51 100644 --- a/buildtools/ant/antprojectpart.cpp +++ b/buildtools/ant/antprojectpart.cpp @@ -6,7 +6,7 @@ #include <tqpopupmenu.h> #include <tqvbox.h> #include <tqtable.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqvaluestack.h> #include <tqdir.h> @@ -458,7 +458,7 @@ void AntProjectPart::ant(const TQString &target) if (!m_classPath.count() == 0) cp = "CLASSPATH="+m_classPath.join(":"); - makeFrontend()->queueCommand(m_projectDirectory, cmd.arg(cp).arg(m_projectDirectory).arg(target).arg(m_antOptions.m_buildXML).arg(verb).arg(options)); + makeFrontend()->queueCommand(m_projectDirectory, cmd.tqarg(cp).tqarg(m_projectDirectory).tqarg(target).tqarg(m_antOptions.m_buildXML).tqarg(verb).tqarg(options)); } @@ -562,15 +562,15 @@ void AntProjectPart::contextMenu(TQPopupMenu *popup, const Context *context) popup->insertSeparator(); if (inProject) { - int id = popup->insertItem( i18n("Remove %1 From Project").arg(popupstr), + int id = popup->insertItem( i18n("Remove %1 From Project").tqarg(popupstr), this, TQT_SLOT(slotRemoveFromProject()) ); - popup->setWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project.")); + popup->tqsetWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project.")); } else { - int id = popup->insertItem( i18n("Add %1 to Project").arg(popupstr), + int id = popup->insertItem( i18n("Add %1 to Project").tqarg(popupstr), this, TQT_SLOT(slotAddToProject()) ); - popup->setWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project.")); + popup->tqsetWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project.")); } } diff --git a/buildtools/autotools/addapplicationdlg.cpp b/buildtools/autotools/addapplicationdlg.cpp index f14ce964..e6bdc20d 100644 --- a/buildtools/autotools/addapplicationdlg.cpp +++ b/buildtools/autotools/addapplicationdlg.cpp @@ -16,7 +16,7 @@ #include <tqfile.h> #include <tqheader.h> #include <tqlistview.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqapplication.h> #include <klineedit.h> #include <kdebug.h> diff --git a/buildtools/autotools/addapplicationdlgbase.ui b/buildtools/autotools/addapplicationdlgbase.ui index 9b357801..234fa8b3 100644 --- a/buildtools/autotools/addapplicationdlgbase.ui +++ b/buildtools/autotools/addapplicationdlgbase.ui @@ -66,7 +66,7 @@ <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> @@ -192,7 +192,7 @@ <property name="text"> <string>E&xecutable:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -210,7 +210,7 @@ <property name="text"> <string>&Icon:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -228,7 +228,7 @@ <property name="text"> <string>&Section:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -246,7 +246,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"> @@ -264,7 +264,7 @@ <property name="text"> <string>&Name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -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,7 +301,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -370,7 +370,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -403,7 +403,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -456,7 +456,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp index 927b32f1..341953e0 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.cpp +++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp @@ -15,7 +15,7 @@ ***************************************************************************/ #include <tqgroupbox.h> -#include <layout.h> +#include <tqlayout.h> #include <kprogress.h> #include <klocale.h> @@ -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); diff --git a/buildtools/autotools/addexistingdlgbase.ui b/buildtools/autotools/addexistingdlgbase.ui index 5223bd16..47c8dcef 100644 --- a/buildtools/autotools/addexistingdlgbase.ui +++ b/buildtools/autotools/addexistingdlgbase.ui @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>317</width> <height>20</height> @@ -93,7 +93,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -221,7 +221,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <vbox> <property name="name"> @@ -229,7 +229,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -245,7 +245,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>84</width> <height>20</height> @@ -284,7 +284,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>84</width> <height>20</height> @@ -297,13 +297,13 @@ <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> @@ -325,7 +325,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> @@ -333,7 +333,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -349,7 +349,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -388,7 +388,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -401,13 +401,13 @@ <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> diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp index 3faf3d1a..55533a3d 100644 --- a/buildtools/autotools/addexistingfilesdlg.cpp +++ b/buildtools/autotools/addexistingfilesdlg.cpp @@ -21,7 +21,7 @@ #include <tqlabel.h> //#include <tqlistbox.h> #include <tqpushbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqpixmap.h> diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp index 0471c230..34108fb3 100644 --- a/buildtools/autotools/addfiledlg.cpp +++ b/buildtools/autotools/addfiledlg.cpp @@ -15,10 +15,10 @@ #include <tqfile.h> #include <tqfileinfo.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlineedit.h> #include <tqpushbutton.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kbuttonbox.h> #include <kdebug.h> diff --git a/buildtools/autotools/addfiledlgbase.ui b/buildtools/autotools/addfiledlgbase.ui index 0d86b1a0..79029915 100644 --- a/buildtools/autotools/addfiledlgbase.ui +++ b/buildtools/autotools/addfiledlgbase.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -150,7 +150,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -188,7 +188,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -217,7 +217,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -245,7 +245,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/autotools/addicondlg.cpp b/buildtools/autotools/addicondlg.cpp index 639c04ce..81d0d859 100644 --- a/buildtools/autotools/addicondlg.cpp +++ b/buildtools/autotools/addicondlg.cpp @@ -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/addicondlgbase.ui b/buildtools/autotools/addicondlgbase.ui index 7a3336dc..14947fe2 100644 --- a/buildtools/autotools/addicondlgbase.ui +++ b/buildtools/autotools/addicondlgbase.ui @@ -34,7 +34,7 @@ <property name="text"> <string>&Type:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -52,7 +52,7 @@ <property name="text"> <string>&Size:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -75,7 +75,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"> @@ -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"> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -212,7 +212,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/autotools/addprefixdlg.cpp b/buildtools/autotools/addprefixdlg.cpp index b4b642ac..4c2f1493 100644 --- a/buildtools/autotools/addprefixdlg.cpp +++ b/buildtools/autotools/addprefixdlg.cpp @@ -12,7 +12,7 @@ #include "addprefixdlg.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <kbuttonbox.h> #include <kfiledialog.h> @@ -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/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp index 8147f55f..ccc10ec2 100644 --- a/buildtools/autotools/addservicedlg.cpp +++ b/buildtools/autotools/addservicedlg.cpp @@ -15,7 +15,7 @@ #include <tqfile.h> #include <tqheader.h> #include <tqlistview.h> -#include <textstream.h> +#include <tqtextstream.h> #include <klineedit.h> #include <kdebug.h> #include <kicondialog.h> @@ -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/addservicedlgbase.ui b/buildtools/autotools/addservicedlgbase.ui index c1f52b22..82b7ee9d 100644 --- a/buildtools/autotools/addservicedlgbase.ui +++ b/buildtools/autotools/addservicedlgbase.ui @@ -54,7 +54,7 @@ <property name="text"> <string>&Icon:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -77,7 +77,7 @@ <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> @@ -138,7 +138,7 @@ <property name="text"> <string>&Library:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -156,7 +156,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"> @@ -174,7 +174,7 @@ <property name="text"> <string>&Name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -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"> @@ -274,7 +274,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -307,7 +307,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -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"> @@ -436,7 +436,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp index 274fa48b..f156a5e1 100644 --- a/buildtools/autotools/addsubprojectdlg.cpp +++ b/buildtools/autotools/addsubprojectdlg.cpp @@ -12,10 +12,10 @@ #include "addsubprojectdlg.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqstringlist.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kbuttonbox.h> #include <kdebug.h> #include <kfiledialog.h> @@ -82,25 +82,25 @@ 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; } @@ -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); diff --git a/buildtools/autotools/addsubprojectdlgbase.ui b/buildtools/autotools/addsubprojectdlgbase.ui index 3c2e4828..7505f390 100644 --- a/buildtools/autotools/addsubprojectdlgbase.ui +++ b/buildtools/autotools/addsubprojectdlgbase.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -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,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -151,7 +151,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/autotools/addtargetdlg.cpp b/buildtools/autotools/addtargetdlg.cpp index d2a832c1..868cc504 100644 --- a/buildtools/autotools/addtargetdlg.cpp +++ b/buildtools/autotools/addtargetdlg.cpp @@ -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/addtargetdlgbase.ui b/buildtools/autotools/addtargetdlgbase.ui index 9e8b561f..763d5984 100644 --- a/buildtools/autotools/addtargetdlgbase.ui +++ b/buildtools/autotools/addtargetdlgbase.ui @@ -44,7 +44,7 @@ <property name="text"> <string>&Primary:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -67,7 +67,7 @@ <property name="text"> <string>Pre&fix:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -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> @@ -155,7 +155,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -261,7 +261,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/autotools/addtranslationdlg.cpp b/buildtools/autotools/addtranslationdlg.cpp index 0d395298..9962aeb2 100644 --- a/buildtools/autotools/addtranslationdlg.cpp +++ b/buildtools/autotools/addtranslationdlg.cpp @@ -16,7 +16,7 @@ #include <tqfileinfo.h> #include <tqhbox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqstrlist.h> @@ -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/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index 478aa9e8..45d0886e 100644 --- a/buildtools/autotools/autodetailsview.cpp +++ b/buildtools/autotools/autodetailsview.cpp @@ -20,7 +20,7 @@ #include <tqlistview.h> #include <tqwidget.h> #include <tqheader.h> -#include <layout.h> +#include <tqlayout.h> /** KDE Libs */ #include <kxmlguiclient.h> @@ -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,19 +572,19 @@ 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) diff --git a/buildtools/autotools/autolistviewitems.cpp b/buildtools/autotools/autolistviewitems.cpp index e77aa84b..6ffa69a0 100644 --- a/buildtools/autotools/autolistviewitems.cpp +++ b/buildtools/autotools/autolistviewitems.cpp @@ -42,7 +42,7 @@ ProjectItem::ProjectItem( Type type, ProjectItem *parent, const TQString &text ) 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 ); } diff --git a/buildtools/autotools/autolistviewitems.h b/buildtools/autotools/autolistviewitems.h index 162d8467..0dc28dc5 100644 --- a/buildtools/autotools/autolistviewitems.h +++ b/buildtools/autotools/autolistviewitems.h @@ -35,7 +35,7 @@ public: ProjectItem( Type type, ProjectItem *parent, 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; diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index 5e282acf..7f17cb6d 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -414,7 +414,7 @@ TQString AutoProjectPart::mainProgram() const 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(); } @@ -643,7 +643,7 @@ 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(), 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(); preCommand = makefileCvsCommand(); @@ -654,7 +654,7 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ } else { - int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").arg(dir), TQString(), 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(); 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()) @@ -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")) @@ -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/autotdesu", 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 diff --git a/buildtools/autotools/autoprojectviewbase.ui b/buildtools/autotools/autoprojectviewbase.ui index 3e33fb41..625ab370 100644 --- a/buildtools/autotools/autoprojectviewbase.ui +++ b/buildtools/autotools/autoprojectviewbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index 12a28ee5..86adb657 100644 --- a/buildtools/autotools/autoprojectwidget.cpp +++ b/buildtools/autotools/autoprojectwidget.cpp @@ -26,7 +26,7 @@ #include <tqregexp.h> #include <tqsplitter.h> #include <tqstringlist.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqtoolbutton.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -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 diff --git a/buildtools/autotools/autoprojectwidget.h b/buildtools/autotools/autoprojectwidget.h index b7b2db15..74c960fb 100644 --- a/buildtools/autotools/autoprojectwidget.h +++ b/buildtools/autotools/autoprojectwidget.h @@ -22,7 +22,7 @@ #include <tqmap.h> #include <tqvbox.h> #include <tqhbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtoolbutton.h> #include <kiconloader.h> #include <klocale.h> diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 4c6f87a9..5916b332 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -18,7 +18,7 @@ #include <tqcheckbox.h> #include <tqstringlist.h> #include <tqtable.h> -#include <layout.h> +#include <tqlayout.h> /** KDE Libs */ #include <kxmlguiclient.h> @@ -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(); @@ -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() @@ -448,13 +448,13 @@ void AutoSubprojectView::slotRemoveSubproject() { 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(); @@ -466,7 +466,7 @@ void AutoSubprojectView::slotRemoveSubproject() } parent->listView()->setSelected( parent, true ); - kapp->processEvents( 500 ); + kapp->tqprocessEvents( 500 ); if( removeSources ){ @@ -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/choosetargetdlgbase.ui b/buildtools/autotools/choosetargetdlgbase.ui index f98c9145..b754d1f7 100644 --- a/buildtools/autotools/choosetargetdlgbase.ui +++ b/buildtools/autotools/choosetargetdlgbase.ui @@ -12,7 +12,7 @@ <height>306</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>444</width> <height>306</height> @@ -158,7 +158,7 @@ <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> diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp index 8ff8d36c..d847a559 100644 --- a/buildtools/autotools/configureoptionswidget.cpp +++ b/buildtools/autotools/configureoptionswidget.cpp @@ -111,15 +111,15 @@ 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 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)); @@ -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(), 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())); } @@ -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); } diff --git a/buildtools/autotools/configureoptionswidgetbase.ui b/buildtools/autotools/configureoptionswidgetbase.ui index 9090f705..35315f76 100644 --- a/buildtools/autotools/configureoptionswidgetbase.ui +++ b/buildtools/autotools/configureoptionswidgetbase.ui @@ -81,7 +81,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>8</height> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -233,13 +233,13 @@ probably want this to be blank.</string> <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,7 +259,7 @@ 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> @@ -270,13 +270,13 @@ probably want this to be blank.</string> <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,7 +313,7 @@ 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> @@ -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,7 +388,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> @@ -481,7 +481,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> @@ -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,7 +536,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>168</height> @@ -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> @@ -615,7 +615,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> @@ -648,7 +648,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> @@ -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> @@ -749,7 +749,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> @@ -782,7 +782,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> @@ -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> diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp index 3e73da6f..a403337d 100644 --- a/buildtools/autotools/fileselectorwidget.cpp +++ b/buildtools/autotools/fileselectorwidget.cpp @@ -14,7 +14,7 @@ * * ***************************************************************************/ -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqhbox.h> #include <tqlabel.h> @@ -73,7 +73,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, { 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); diff --git a/buildtools/autotools/fileselectorwidget.h b/buildtools/autotools/fileselectorwidget.h index 1a5e4419..96b5c79c 100644 --- a/buildtools/autotools/fileselectorwidget.h +++ b/buildtools/autotools/fileselectorwidget.h @@ -12,7 +12,7 @@ #ifndef _FILESELECTORWIDGET_H_ #define _FILESELECTORWIDGET_H_ -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqhbox.h> #include <tqlabel.h> diff --git a/buildtools/autotools/makefilehandler.cpp b/buildtools/autotools/makefilehandler.cpp index db30508d..7e19dd56 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 ) { @@ -145,7 +145,7 @@ 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 ) { diff --git a/buildtools/autotools/managecustomcommandsbase.ui b/buildtools/autotools/managecustomcommandsbase.ui index eab430e9..3690fa32 100644 --- a/buildtools/autotools/managecustomcommandsbase.ui +++ b/buildtools/autotools/managecustomcommandsbase.ui @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp index e2bdbb04..cbe4d24c 100644 --- a/buildtools/autotools/misc.cpp +++ b/buildtools/autotools/misc.cpp @@ -12,7 +12,7 @@ #include <tqdir.h> #include <tqfile.h> #include <tqregexp.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqdict.h> #include <kdebug.h> diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp index f5901395..95447092 100644 --- a/buildtools/autotools/removefiledlg.cpp +++ b/buildtools/autotools/removefiledlg.cpp @@ -15,7 +15,7 @@ #include <tqgroupbox.h> #include <tqfile.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqregexp.h> @@ -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/removefiledlgbase.ui b/buildtools/autotools/removefiledlgbase.ui index 7befbc0d..606d7e0f 100644 --- a/buildtools/autotools/removefiledlgbase.ui +++ b/buildtools/autotools/removefiledlgbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>247</width> <height>20</height> @@ -69,7 +69,7 @@ <property name="name"> <cstring>fileGroupBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -110,7 +110,7 @@ <property name="name"> <cstring>noticeLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp index 2e694491..10dc1f06 100644 --- a/buildtools/autotools/removetargetdlg.cpp +++ b/buildtools/autotools/removetargetdlg.cpp @@ -21,7 +21,7 @@ #include <tqgroupbox.h> #include <tqfile.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqregexp.h> diff --git a/buildtools/autotools/removetargetdlgbase.ui b/buildtools/autotools/removetargetdlgbase.ui index 514bdbaa..4f8fb286 100644 --- a/buildtools/autotools/removetargetdlgbase.ui +++ b/buildtools/autotools/removetargetdlgbase.ui @@ -100,13 +100,13 @@ <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> @@ -139,7 +139,7 @@ <property name="name"> <cstring>textLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -221,7 +221,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp index 4c61077d..139193b4 100644 --- a/buildtools/autotools/subprojectoptionsdlg.cpp +++ b/buildtools/autotools/subprojectoptionsdlg.cpp @@ -14,7 +14,7 @@ #include <tqdom.h> #include <tqheader.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqcheckbox.h> @@ -45,7 +45,7 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj SubprojectItem *item, TQWidget *parent, const char *name) : SubprojectOptionsDialogBase(parent, 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(); + 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); diff --git a/buildtools/autotools/subprojectoptionsdlgbase.ui b/buildtools/autotools/subprojectoptionsdlgbase.ui index 6c069718..be60569f 100644 --- a/buildtools/autotools/subprojectoptionsdlgbase.ui +++ b/buildtools/autotools/subprojectoptionsdlgbase.ui @@ -85,7 +85,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>25</height> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -160,7 +160,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>25</height> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -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> @@ -282,7 +282,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> @@ -298,7 +298,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> @@ -325,7 +325,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -358,7 +358,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -405,7 +405,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <grid> <property name="name"> @@ -432,7 +432,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -489,7 +489,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -618,7 +618,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -659,7 +659,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -702,7 +702,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -735,7 +735,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -802,7 +802,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp index 9e10873c..7c40fbfc 100644 --- a/buildtools/autotools/targetoptionsdlg.cpp +++ b/buildtools/autotools/targetoptionsdlg.cpp @@ -14,7 +14,7 @@ #include <tqcheckbox.h> #include <tqheader.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqregexp.h> #include <klineedit.h> #include <kbuttonbox.h> @@ -37,7 +37,7 @@ TargetOptionsDialog::TargetOptionsDialog(AutoProjectWidget *widget, TargetItem * TQWidget *parent, const char *name) : TargetOptionsDialogBase(parent, 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; diff --git a/buildtools/autotools/targetoptionsdlgbase.ui b/buildtools/autotools/targetoptionsdlgbase.ui index 7e721a42..4b883535 100644 --- a/buildtools/autotools/targetoptionsdlgbase.ui +++ b/buildtools/autotools/targetoptionsdlgbase.ui @@ -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> @@ -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> @@ -256,7 +256,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>7</height> @@ -318,7 +318,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -351,7 +351,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -400,7 +400,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -457,7 +457,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -555,7 +555,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>120</height> @@ -586,7 +586,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui index df063672..4858696b 100644 --- a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui +++ b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -98,7 +98,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui index 62d74ec6..ece262fe 100644 --- a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui +++ b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui @@ -37,7 +37,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> @@ -95,7 +95,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -155,7 +155,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>200</width> <height>20</height> @@ -166,7 +166,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -215,7 +215,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>192</width> <height>20</height> @@ -226,7 +226,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp index 09238787..7062ab18 100644 --- a/buildtools/custommakefiles/custommanagerwidget.cpp +++ b/buildtools/custommakefiles/custommanagerwidget.cpp @@ -12,7 +12,7 @@ #include "custommanagerwidget.h" #include <tqstringlist.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlistbox.h> #include <tqwhatsthis.h> #include <tqtooltip.h> diff --git a/buildtools/custommakefiles/custommanagerwidgetbase.ui b/buildtools/custommakefiles/custommanagerwidgetbase.ui index a141c0b1..c74ef412 100644 --- a/buildtools/custommakefiles/custommanagerwidgetbase.ui +++ b/buildtools/custommakefiles/custommanagerwidgetbase.ui @@ -55,7 +55,7 @@ This will be used when adding/removing files in directories and re-populating th <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>108</height> diff --git a/buildtools/custommakefiles/customotherconfigwidgetbase.ui b/buildtools/custommakefiles/customotherconfigwidgetbase.ui index 86917b10..ffba0357 100644 --- a/buildtools/custommakefiles/customotherconfigwidgetbase.ui +++ b/buildtools/custommakefiles/customotherconfigwidgetbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> @@ -79,7 +79,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -139,7 +139,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index 7ccf8e1c..ecdabd64 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -242,7 +242,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context m_contextDirName = m_contextDirName.mid( project()->projectDirectory().length() + 1 ); int id = popup->insertItem( i18n( "Make Active Directory" ), this, TQT_SLOT( slotChooseActiveDirectory() ) ); - popup->setWhatsThis( id, i18n( "<b>Make active directory</b><p>" + popup->tqsetWhatsThis( id, i18n( "<b>Make active directory</b><p>" "Chooses this directory as the destination for new files created using wizards " "like the <i>New Class</i> wizard." ) ); } @@ -258,7 +258,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context { id = popup->insertItem( i18n( "Remove from blacklist" ), this, TQT_SLOT( slotChangeBlacklist() ) ); - popup->setWhatsThis( id, i18n( "<b>Remove from blacklist</b><p>" + popup->tqsetWhatsThis( id, i18n( "<b>Remove from blacklist</b><p>" "Removes the given file or directory from the " "blacklist if it is already in it.<br>The blacklist contains files and" " directories that should be ignored even if they match a project filetype " @@ -268,7 +268,7 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context { id = popup->insertItem( i18n( "Add to blacklist" ), this, TQT_SLOT( slotChangeBlacklist() ) ); - popup->setWhatsThis( id, i18n( "<b>Add to blacklist</b><p>" + popup->tqsetWhatsThis( id, i18n( "<b>Add to blacklist</b><p>" "Adds the given file or directory to the blacklist.<br>The blacklist contains files and" " directories that should be ignored even if they match a project filetype " "pattern" ) ); @@ -318,13 +318,13 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context { int id = popup->insertItem( i18n( "Add Selected File/Dir(s) to Project" ), this, TQT_SLOT( slotAddToProject() ) ); - popup->setWhatsThis( id, i18n( "<b>Add to project</b><p>Adds selected file/dir(s) to the list of files in the project. " + popup->tqsetWhatsThis( id, i18n( "<b>Add to project</b><p>Adds selected file/dir(s) to the list of files in the project. " "Note that the files should be manually added to the corresponding makefile or build.xml." ) ); if ( dirAddRecursive ) { int id = popup->insertItem( i18n( "Add Selected Dir(s) to Project (recursive)" ), this, TQT_SLOT( slotAddToProjectRecursive() ) ); - popup->setWhatsThis( id, i18n( "<b>Add to project</b><p>Recursively adds selected dir(s) to the list of files in the project. " + popup->tqsetWhatsThis( id, i18n( "<b>Add to project</b><p>Recursively adds selected dir(s) to the list of files in the project. " "Note that the files should be manually added to the corresponding makefile or build.xml." ) ); } } @@ -333,14 +333,14 @@ void CustomProjectPart::contextMenu( TQPopupMenu *popup, const Context *context { int id = popup->insertItem( i18n( "Remove Selected File/Dir(s) From Project" ), this, TQT_SLOT( slotRemoveFromProject() ) ); - popup->setWhatsThis( id, i18n( "<b>Remove from project</b><p>Removes selected file/dir(s) from the list of files in the project. " + popup->tqsetWhatsThis( id, i18n( "<b>Remove from project</b><p>Removes selected file/dir(s) from the list of files in the project. " "Note that the files should be manually excluded from the corresponding makefile or build.xml." ) ); if ( dirDelRecursive ) { int id = popup->insertItem( i18n( "Remove Selected Dir(s) From Project (recursive)" ), this, TQT_SLOT( slotRemoveFromProjectRecursive() ) ); - popup->setWhatsThis( id, i18n( "<b>Remove from project</b><p>Recursively removes selected dir(s) from the list of files in the project. " + popup->tqsetWhatsThis( id, i18n( "<b>Remove from project</b><p>Recursively removes selected dir(s) from the list of files in the project. " "Note that the files should be manually excluded from the corresponding makefile or build.xml." ) ); } } @@ -944,7 +944,7 @@ void CustomProjectPart::startMakeCommand( const TQString &dir, const TQString &t TQString nice; if ( prio != 0 ) { - nice = TQString( "nice -n%1 " ).arg( prio ); + nice = TQString( "nice -n%1 " ).tqarg( prio ); } cmdline.prepend( nice ); @@ -1013,12 +1013,12 @@ void CustomProjectPart::slotCompileFile() void CustomProjectPart::slotInstallActiveDir() { - startMakeCommand( buildDirectory() + "/" + activeDirectory(), TQString::fromLatin1( "install" ) ); + startMakeCommand( buildDirectory() + "/" + activeDirectory(), TQString::tqfromLatin1( "install" ) ); } void CustomProjectPart::slotInstall() { - startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ) ); + startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ) ); } @@ -1029,12 +1029,12 @@ void CustomProjectPart::slotInstallWithKdesu() slotBuild(); // After that issue "make install" with the root user - startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ), true ); + startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ), true ); } void CustomProjectPart::slotClean() { - startMakeCommand( buildDirectory(), TQString::fromLatin1( "clean" ) ); + startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "clean" ) ); } @@ -1056,7 +1056,7 @@ void CustomProjectPart::slotExecute() // Use tdesu?? if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autotdesu", false ) ) //slotInstallWithKdesu assumes that it hasn't just been build... - _auto ? slotInstallWithKdesu() : startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ), true ); + _auto ? slotInstallWithKdesu() : startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ), true ); else slotInstall(); _auto = true; diff --git a/buildtools/lib/parsers/autotools/autotoolsast.cpp b/buildtools/lib/parsers/autotools/autotoolsast.cpp index 0512be78..659fe47f 100644 --- a/buildtools/lib/parsers/autotools/autotoolsast.cpp +++ b/buildtools/lib/parsers/autotools/autotoolsast.cpp @@ -28,7 +28,7 @@ namespace AutoTools { AST::~AST() { - for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList<AST*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) { AST *node = *it; delete node; @@ -37,13 +37,13 @@ AST::~AST() void AST::addChildAST(AST *node) { - m_children.append(node); + m_tqchildren.append(node); } void AST::writeBack(TQString &buffer) { - for (TQValueList<AST*>::const_iterator it = m_children.constBegin(); - it != m_children.constEnd(); ++it) + for (TQValueList<AST*>::const_iterator it = m_tqchildren.constBegin(); + it != m_tqchildren.constEnd(); ++it) { if (*it) (*it)->writeBack(buffer); @@ -60,12 +60,12 @@ TQString AST::indentation() bool AST::hasChildren() const { - return !m_children.isEmpty(); + return !m_tqchildren.isEmpty(); } -TQValueList<AST*> AST::children() const +TQValueList<AST*> AST::tqchildren() const { - return m_children; + return m_tqchildren; } //ProjectAST diff --git a/buildtools/lib/parsers/autotools/autotoolsast.h b/buildtools/lib/parsers/autotools/autotoolsast.h index adefc640..0f5dcdc9 100644 --- a/buildtools/lib/parsers/autotools/autotoolsast.h +++ b/buildtools/lib/parsers/autotools/autotoolsast.h @@ -37,7 +37,7 @@ namespace AutoTools * AST node. * This is the base class. Objects of this type are not created by the parser. * - * Each AST node holds the list of its children which are always deleted in the + * Each AST node holds the list of its tqchildren which are always deleted in the * destructor. This way, it's possible call delete for only root AST node and * others will be deleted automatically. * @@ -85,20 +85,20 @@ public: /** @return The indentation string based on node depth.*/ virtual TQString indentation(); - //! \return true if this AST has children + //! \return true if this AST has tqchildren bool hasChildren() const; /** - * Get the children of this ast + * Get the tqchildren of this ast * \return the list of this ast's childre */ - TQValueList<AST*> children() const; + TQValueList<AST*> tqchildren() const; protected: NodeType m_nodeType; - TQValueList<AST*> m_children; + TQValueList<AST*> m_tqchildren; private: int m_depth; diff --git a/buildtools/lib/parsers/autotools/tests/viewer.cpp b/buildtools/lib/parsers/autotools/tests/viewer.cpp index 48cb4f5d..2693a68c 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.cpp +++ b/buildtools/lib/parsers/autotools/tests/viewer.cpp @@ -23,9 +23,9 @@ #include <tqlineedit.h> #include <tqlistbox.h> #include <tqfiledialog.h> -#include <textedit.h> +#include <tqtextedit.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqlistview.h> #include <tqtabwidget.h> diff --git a/buildtools/lib/parsers/autotools/tests/viewerbase.ui b/buildtools/lib/parsers/autotools/tests/viewerbase.ui index 7a00a47a..e319e2b4 100644 --- a/buildtools/lib/parsers/autotools/tests/viewerbase.ui +++ b/buildtools/lib/parsers/autotools/tests/viewerbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="1" rowspan="4" colspan="1"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <vbox> <property name="name"> @@ -128,7 +128,7 @@ <property name="name"> <cstring>allLocation</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>32767</height> @@ -139,7 +139,7 @@ <property name="name"> <cstring>addAll</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>32767</height> @@ -153,7 +153,7 @@ <property name="name"> <cstring>choose</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>32767</height> @@ -175,7 +175,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>32767</height> diff --git a/buildtools/lib/parsers/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp index 90306ff1..5f55af4b 100644 --- a/buildtools/lib/parsers/qmake/qmakeast.cpp +++ b/buildtools/lib/parsers/qmake/qmakeast.cpp @@ -27,28 +27,28 @@ namespace TQMake { AST::~AST() { - for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList<AST*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) { AST *node = *it; delete node; } - m_children.clear(); + m_tqchildren.clear(); } void AST::addChildAST(AST *node) { - m_children.append(node); + m_tqchildren.append(node); } void AST::removeChildAST(AST *node) { - m_children.remove(node); + m_tqchildren.remove(node); } void AST::writeBack(TQString &buffer) { - for (TQValueList<AST*>::const_iterator it = m_children.constBegin(); - it != m_children.constEnd(); ++it) + for (TQValueList<AST*>::const_iterator it = m_tqchildren.constBegin(); + it != m_tqchildren.constEnd(); ++it) { if (*it) { @@ -70,7 +70,7 @@ TQString AST::indentation() void ProjectAST::writeBack(TQString &buffer) { bool hasActualStatements = false; - for (TQValueList<TQMake::AST*>::const_iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList<TQMake::AST*>::const_iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) { if ((*it)->nodeType() != AST::IncludeAST) { @@ -84,7 +84,7 @@ void ProjectAST::writeBack(TQString &buffer) if( !buffer.endsWith(": ") ) buffer += indentation(); buffer += scopedID; - if( m_children.count() == 1 ) + if( m_tqchildren.count() == 1 ) buffer += " : "; else buffer += " {"; @@ -94,9 +94,9 @@ void ProjectAST::writeBack(TQString &buffer) if( !buffer.endsWith(": ") ) buffer += indentation(); buffer += scopedID + "(" + args + ")"; - if( m_children.count() == 1 && hasActualStatements ) + if( m_tqchildren.count() == 1 && hasActualStatements ) buffer += ": "; - else if( (m_children.count() > 0 && hasActualStatements) ) + else if( (m_tqchildren.count() > 0 && hasActualStatements) ) buffer += "{"; else buffer += ""; @@ -104,10 +104,10 @@ void ProjectAST::writeBack(TQString &buffer) else if( !buffer.endsWith(": ") ) buffer += indentation(); AST::writeBack(buffer); - if (isScope() && m_children.count() > 1 ) + if (isScope() && m_tqchildren.count() > 1 ) buffer += indentation() + "}"; - if (isFunctionScope() && (hasActualStatements) && m_children.count() > 1) + if (isFunctionScope() && (hasActualStatements) && m_tqchildren.count() > 1) buffer += indentation() + "}"; } diff --git a/buildtools/lib/parsers/qmake/qmakeast.h b/buildtools/lib/parsers/qmake/qmakeast.h index 15929d2d..a0c5c1de 100644 --- a/buildtools/lib/parsers/qmake/qmakeast.h +++ b/buildtools/lib/parsers/qmake/qmakeast.h @@ -33,7 +33,7 @@ namespace TQMake { AST node. This is the base class. Objects of this type are not created by the parser. -Each AST node holds the list of its children which are always deleted in the +Each AST node holds the list of its tqchildren which are always deleted in the destructor. This way, it's possible call delete for only root AST node and others will be deleted automatically. @@ -79,7 +79,7 @@ public: virtual TQString indentation(); /**The list of child AST nodes.*/ - TQValueList<AST*> m_children; + TQValueList<AST*> m_tqchildren; protected: NodeType m_nodeType; diff --git a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp index 8740f16a..b733a880 100644 --- a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp +++ b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp @@ -29,8 +29,8 @@ void ASTVisitor::processProject(ProjectAST *project) enterScope(project); else if (project->isFunctionScope()) enterFunctionScope(project); - for (TQValueList<TQMake::AST*>::const_iterator it = project->m_children.constBegin(); - it != project->m_children.constEnd(); ++it) + for (TQValueList<TQMake::AST*>::const_iterator it = project->m_tqchildren.constBegin(); + it != project->m_tqchildren.constEnd(); ++it) { AST *ast = *it; if (ast == 0) diff --git a/buildtools/lib/parsers/qmake/tests/viewer.cpp b/buildtools/lib/parsers/qmake/tests/viewer.cpp index dbcc7db7..eef16513 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer.cpp +++ b/buildtools/lib/parsers/qmake/tests/viewer.cpp @@ -23,9 +23,9 @@ #include <tqlineedit.h> #include <tqlistbox.h> #include <tqfiledialog.h> -#include <textedit.h> +#include <tqtextedit.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqlistview.h> #include <tqtabwidget.h> diff --git a/buildtools/lib/parsers/qmake/tests/viewerbase.ui b/buildtools/lib/parsers/qmake/tests/viewerbase.ui index c76abc20..1308cc1d 100644 --- a/buildtools/lib/parsers/qmake/tests/viewerbase.ui +++ b/buildtools/lib/parsers/qmake/tests/viewerbase.ui @@ -28,7 +28,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> @@ -38,7 +38,7 @@ <property name="name"> <cstring>allLocation</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -49,7 +49,7 @@ <property name="name"> <cstring>addAll</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -63,7 +63,7 @@ <property name="name"> <cstring>choose</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -85,7 +85,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> diff --git a/buildtools/lib/widgets/addenvvardlg.cpp b/buildtools/lib/widgets/addenvvardlg.cpp index 80ba96a0..f66bbe93 100644 --- a/buildtools/lib/widgets/addenvvardlg.cpp +++ b/buildtools/lib/widgets/addenvvardlg.cpp @@ -18,7 +18,7 @@ */ #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <kbuttonbox.h> #include <klocale.h> @@ -47,10 +47,10 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) connect( value_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); - TQVBoxLayout *layout = new TQVBoxLayout(this, 10); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10); TQGridLayout *grid = new TQGridLayout(2, 2); - layout->addLayout(grid); + tqlayout->addLayout(grid); grid->addWidget(varname_label, 0, 0); grid->addWidget(varname_edit, 0, 1); grid->addWidget(value_label, 1, 0); @@ -58,7 +58,7 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) TQFrame *frame = new TQFrame(this); frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); - layout->addWidget(frame, 0); + tqlayout->addWidget(frame, 0); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); @@ -67,8 +67,8 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) m_pOk->setDefault(true); connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); - buttonbox->layout(); - layout->addWidget(buttonbox, 0); + buttonbox->tqlayout(); + tqlayout->addWidget(buttonbox, 0); slotTextChanged(); } diff --git a/buildtools/lib/widgets/environmentdisplaydialogbase.ui b/buildtools/lib/widgets/environmentdisplaydialogbase.ui index 5388fe59..e19d27a0 100644 --- a/buildtools/lib/widgets/environmentdisplaydialogbase.ui +++ b/buildtools/lib/widgets/environmentdisplaydialogbase.ui @@ -61,7 +61,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>321</width> <height>21</height> diff --git a/buildtools/lib/widgets/environmentvariableswidgetbase.ui b/buildtools/lib/widgets/environmentvariableswidgetbase.ui index e7246de3..c06239f7 100644 --- a/buildtools/lib/widgets/environmentvariableswidgetbase.ui +++ b/buildtools/lib/widgets/environmentvariableswidgetbase.ui @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>171</height> diff --git a/buildtools/lib/widgets/envvartools.cpp b/buildtools/lib/widgets/envvartools.cpp index 71c44377..13b1391a 100644 --- a/buildtools/lib/widgets/envvartools.cpp +++ b/buildtools/lib/widgets/envvartools.cpp @@ -23,7 +23,7 @@ TQString EnvVarTools::quote( const TQString & arg ) { TQString res = arg; - res.replace(TQRegExp(TQString::fromLatin1("'")), TQString::fromLatin1("'\\''")); + res.replace(TQRegExp(TQString::tqfromLatin1("'")), TQString::tqfromLatin1("'\\''")); res.prepend("\""); res.append("\""); return res; diff --git a/buildtools/lib/widgets/makeoptionswidgetbase.ui b/buildtools/lib/widgets/makeoptionswidgetbase.ui index 9caba3ee..4f0829ae 100644 --- a/buildtools/lib/widgets/makeoptionswidgetbase.ui +++ b/buildtools/lib/widgets/makeoptionswidgetbase.ui @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>20</height> @@ -122,7 +122,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/lib/widgets/removesubprojectdlgbase.ui b/buildtools/lib/widgets/removesubprojectdlgbase.ui index d5206ac6..e891ff07 100644 --- a/buildtools/lib/widgets/removesubprojectdlgbase.ui +++ b/buildtools/lib/widgets/removesubprojectdlgbase.ui @@ -23,13 +23,13 @@ <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> @@ -65,7 +65,7 @@ <property name="name"> <cstring>noticeLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> diff --git a/buildtools/lib/widgets/runoptionswidgetbase.ui b/buildtools/lib/widgets/runoptionswidgetbase.ui index 30f10e48..40d79634 100644 --- a/buildtools/lib/widgets/runoptionswidgetbase.ui +++ b/buildtools/lib/widgets/runoptionswidgetbase.ui @@ -51,7 +51,7 @@ <property name="text"> <string>Note: These options override target specific settings.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> <property name="whatsThis" stdset="0"> diff --git a/buildtools/lib/widgets/subclassesdlgbase.ui b/buildtools/lib/widgets/subclassesdlgbase.ui index e25d1a5d..100100cb 100644 --- a/buildtools/lib/widgets/subclassesdlgbase.ui +++ b/buildtools/lib/widgets/subclassesdlgbase.ui @@ -53,7 +53,7 @@ <property name="name"> <cstring>subclass_url</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>24</height> @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>90</height> @@ -95,7 +95,7 @@ <property name="text"> <string>Related subclass &location:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> <property name="buddy" stdset="0"> @@ -104,7 +104,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>310</width> <height>20</height> diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp index 2dd2a833..a88e901c 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.cpp +++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp @@ -8,7 +8,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqlineedit.h> #include <tqcombobox.h> diff --git a/buildtools/pascal/pascalproject_optionsdlgbase.ui b/buildtools/pascal/pascalproject_optionsdlgbase.ui index 8defc492..f3ffb8c2 100644 --- a/buildtools/pascal/pascalproject_optionsdlgbase.ui +++ b/buildtools/pascal/pascalproject_optionsdlgbase.ui @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>8</height> @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -129,7 +129,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -252,7 +252,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -269,7 +269,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -286,7 +286,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>400</width> <height>20</height> @@ -305,7 +305,7 @@ <property name="name"> <cstring>mainSourceUrl</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>26</height> @@ -344,7 +344,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index 6cb66847..22261004 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -448,7 +448,7 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &na if (!factory) { TQString errorMessage = KLibLoader::self()->lastErrorMessage(); KMessageBox::error(0, i18n("There was an error loading the module %1.\n" - "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage)); + "The diagnostics is:\n%2").tqarg(service->name()).tqarg(errorMessage)); exit(1); } diff --git a/buildtools/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui index f1e2e579..df01a06c 100644 --- a/buildtools/qmake/choosesubprojectdlgbase.ui +++ b/buildtools/qmake/choosesubprojectdlgbase.ui @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/qmake/createscopedlgbase.ui b/buildtools/qmake/createscopedlgbase.ui index d1550092..4ba7212e 100644 --- a/buildtools/qmake/createscopedlgbase.ui +++ b/buildtools/qmake/createscopedlgbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -68,7 +68,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>95</width> <height>20</height> @@ -232,7 +232,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -248,7 +248,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>150</width> <height>20</height> diff --git a/buildtools/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui index fadafc04..d7b78289 100644 --- a/buildtools/qmake/disablesubprojectdlgbase.ui +++ b/buildtools/qmake/disablesubprojectdlgbase.ui @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/qmake/newwidgetdlgbase.ui b/buildtools/qmake/newwidgetdlgbase.ui index 243fbff3..178fa761 100644 --- a/buildtools/qmake/newwidgetdlgbase.ui +++ b/buildtools/qmake/newwidgetdlgbase.ui @@ -95,7 +95,7 @@ <property name="name"> <cstring>ui_classnameEd</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>0</height> @@ -124,7 +124,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>160</height> @@ -159,7 +159,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>310</width> <height>0</height> diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui index 6c1006b3..2df4d131 100644 --- a/buildtools/qmake/projectconfigurationdlgbase.ui +++ b/buildtools/qmake/projectconfigurationdlgbase.ui @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>260</width> <height>16</height> @@ -150,7 +150,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>101</width> <height>20</height> @@ -338,7 +338,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>120</height> @@ -377,7 +377,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout147</cstring> + <cstring>tqlayout147</cstring> </property> <hbox> <property name="name"> @@ -426,7 +426,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout30</cstring> + <cstring>tqlayout30</cstring> </property> <hbox> <property name="name"> @@ -762,7 +762,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout69</cstring> + <cstring>tqlayout69</cstring> </property> <vbox> <property name="name"> @@ -816,7 +816,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> @@ -825,7 +825,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout68</cstring> + <cstring>tqlayout68</cstring> </property> <vbox> <property name="name"> @@ -855,7 +855,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout67</cstring> + <cstring>tqlayout67</cstring> </property> <hbox> <property name="name"> @@ -893,7 +893,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -950,7 +950,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -999,7 +999,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> @@ -1055,7 +1055,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>70</height> @@ -1079,7 +1079,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -1106,7 +1106,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> @@ -1162,7 +1162,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>70</height> @@ -1175,7 +1175,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -1202,7 +1202,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> @@ -1258,7 +1258,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>64</height> @@ -1271,7 +1271,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -1330,7 +1330,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1356,7 +1356,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout26</cstring> + <cstring>tqlayout26</cstring> </property> <hbox> <property name="name"> @@ -1418,7 +1418,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1431,7 +1431,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout27</cstring> + <cstring>tqlayout27</cstring> </property> <hbox> <property name="name"> @@ -1458,7 +1458,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9_2</cstring> + <cstring>tqlayout9_2</cstring> </property> <vbox> <property name="name"> @@ -1514,7 +1514,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>64</height> @@ -1527,7 +1527,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout28_2</cstring> + <cstring>tqlayout28_2</cstring> </property> <hbox> <property name="name"> @@ -1589,7 +1589,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -1634,7 +1634,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout26</cstring> + <cstring>tqlayout26</cstring> </property> <hbox> <property name="name"> @@ -1642,7 +1642,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout23</cstring> + <cstring>tqlayout23</cstring> </property> <vbox> <property name="name"> @@ -1682,7 +1682,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <vbox> <property name="name"> @@ -1722,7 +1722,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout84</cstring> + <cstring>tqlayout84</cstring> </property> <vbox> <property name="name"> @@ -1776,7 +1776,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout85</cstring> + <cstring>tqlayout85</cstring> </property> <vbox> <property name="name"> @@ -1867,7 +1867,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -1889,7 +1889,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <hbox> <property name="name"> @@ -1952,7 +1952,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout23</cstring> + <cstring>tqlayout23</cstring> </property> <vbox> <property name="name"> @@ -1960,7 +1960,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout22</cstring> + <cstring>tqlayout22</cstring> </property> <vbox> <property name="name"> @@ -2010,7 +2010,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>106</height> @@ -2023,7 +2023,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout33</cstring> + <cstring>tqlayout33</cstring> </property> <hbox> <property name="name"> @@ -2062,7 +2062,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout32</cstring> + <cstring>tqlayout32</cstring> </property> <hbox> <property name="name"> @@ -2130,7 +2130,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>250</width> <height>20</height> @@ -2141,7 +2141,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout34</cstring> + <cstring>tqlayout34</cstring> </property> <hbox> <property name="name"> @@ -2162,7 +2162,7 @@ <property name="text"> <string>Value:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> diff --git a/buildtools/qmake/qmakeoptionswidgetbase.ui b/buildtools/qmake/qmakeoptionswidgetbase.ui index 1ae7a808..312536bc 100644 --- a/buildtools/qmake/qmakeoptionswidgetbase.ui +++ b/buildtools/qmake/qmakeoptionswidgetbase.ui @@ -31,7 +31,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -80,7 +80,7 @@ Leave this empty to automatically search for a .pro file in the project director <property name="text"> <string>The following settings determine what the project configuration dialog should do when another subproject is selected while the dialog is still open.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -199,7 +199,7 @@ This disables the reading of any .qmake.cache files or mkspecs.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp index 2c862fb3..b937287c 100644 --- a/buildtools/qmake/scope.cpp +++ b/buildtools/qmake/scope.cpp @@ -158,7 +158,7 @@ bool Scope::loadFromFile( const TQString& filename ) if( DomUtil::readBoolEntry( *m_part->projectDom(), "/kdevtrollproject/qmake/showParseErrors", true ) ) { - KMessageBox::error( 0, i18n( "Could not parse project file: %1" ).arg( filename ), + KMessageBox::error( 0, i18n( "Could not parse project file: %1" ).tqarg( filename ), i18n( "Could not parse project file" ) ); } m_root = 0; @@ -198,7 +198,7 @@ void Scope::saveToFile() const file.close(); }else { - KMessageBox::error( 0, i18n( "Could not write project file: %1" ).arg( filename ), + KMessageBox::error( 0, i18n( "Could not write project file: %1" ).tqarg( filename ), i18n( "Could not write project file" ) ); } #ifdef DEBUG @@ -292,7 +292,7 @@ TQStringList Scope::variableValuesForOp( const TQString& variable , const TQStri return result; TQValueList<TQMake::AST*>::const_iterator it; - for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it ) + for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it ) { TQMake::AST* ast = *it; if ( ast->nodeType() == TQMake::AST::AssignmentAST ) @@ -352,7 +352,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re } TQValueList<TQMake::AST*>::const_iterator it; - for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it ) + for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it ) { if ( stopHere && *it == stopHere ) return ; @@ -628,7 +628,7 @@ bool Scope::deleteFunctionScope( unsigned int num ) Scope* funcScope = m_scopes[ num ]; if ( funcScope ) { - TQMake::AST* ast = m_root->m_children[ m_root->m_children.findIndex( funcScope->m_root ) ]; + TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.findIndex( funcScope->m_root ) ]; if( !ast ) return false; m_scopes.remove( num ); @@ -648,7 +648,7 @@ bool Scope::deleteSimpleScope( unsigned int num ) Scope* simpleScope = m_scopes[ num ]; if ( simpleScope ) { - TQMake::AST* ast = m_root->m_children[ m_root->m_children.findIndex( simpleScope->m_root ) ]; + TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.findIndex( simpleScope->m_root ) ]; if( !ast ) return false; m_scopes.remove( num ); @@ -686,10 +686,10 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir ) return false; TQValueList<TQMake::AST*>::iterator it = findExistingVariable( "TEMPLATE" ); - if ( it != m_root->m_children.end() ) + if ( it != m_root->m_tqchildren.end() ) { TQMake::AssignmentAST * tempast = static_cast<TQMake::AssignmentAST*>( *it ); - if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_children.end() ) + if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_tqchildren.end() ) { Scope* project = m_scopes[ num ]; if( !project ) @@ -723,7 +723,7 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir ) } } TQValueList<TQMake::AST*>::iterator foundit = findExistingVariable( "SUBDIRS" ); - if ( foundit != m_root->m_children.end() ) + if ( foundit != m_root->m_tqchildren.end() ) { TQMake::AssignmentAST * ast = static_cast<TQMake::AssignmentAST*>( *foundit ); updateValues( ast->values, TQStringList( projdir ), true, ast->indent ); @@ -804,11 +804,11 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const if( m_varCache.contains( variable ) ) m_varCache.erase( variable ); - for ( int i = m_root->m_children.count() - 1; i >= 0; --i ) + for ( int i = m_root->m_tqchildren.count() - 1; i >= 0; --i ) { - if ( m_root->m_children[ i ] ->nodeType() == TQMake::AST::AssignmentAST ) + if ( m_root->m_tqchildren[ i ] ->nodeType() == TQMake::AST::AssignmentAST ) { - TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( m_root->m_children[ i ] ); + TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( m_root->m_tqchildren[ i ] ); if ( assignment->scopedID == variable && Scope::isCompatible( assignment->op, op ) ) { updateValues( assignment->values, values, removeFromOp, assignment->indent ); @@ -898,7 +898,7 @@ TQValueList<TQMake::AST*>::iterator Scope::findExistingVariable( const TQString& TQStringList ops; ops << "=" << "+="; - for ( it = m_root->m_children.begin(); it != m_root->m_children.end() ; ++it ) + for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end() ; ++it ) { if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST ) { @@ -909,7 +909,7 @@ TQValueList<TQMake::AST*>::iterator Scope::findExistingVariable( const TQString& } } } - return m_root->m_children.end(); + return m_root->m_tqchildren.end(); } void Scope::init() @@ -921,7 +921,7 @@ void Scope::init() m_maxCustomVarNum = 1; TQValueList<TQMake::AST*>::const_iterator it; - for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it ) + for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it ) { if ( ( *it ) ->nodeType() == TQMake::AST::ProjectAST ) { @@ -1088,7 +1088,7 @@ void Scope::removeCustomVariable( unsigned int id ) { TQMake::AssignmentAST* m = m_customVariables[id]; m_customVariables.remove(id); - m_root->m_children.remove( m ); + m_root->m_tqchildren.remove( m ); } } @@ -1097,8 +1097,8 @@ bool Scope::isVariableReset( const TQString& var ) bool result = false; if( !m_root ) return result; - TQValueList<TQMake::AST*>::const_iterator it = m_root->m_children.begin(); - for ( ; it != m_root->m_children.end(); ++it ) + TQValueList<TQMake::AST*>::const_iterator it = m_root->m_tqchildren.begin(); + for ( ; it != m_root->m_tqchildren.end(); ++it ) { if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST ) { @@ -1120,16 +1120,16 @@ void Scope::removeVariable( const TQString& var, const TQString& op ) TQMake::AssignmentAST* ast = 0; - TQValueList<TQMake::AST*>::iterator it = m_root->m_children.begin(); - for ( ; it != m_root->m_children.end(); ++it ) + TQValueList<TQMake::AST*>::iterator it = m_root->m_tqchildren.begin(); + for ( ; it != m_root->m_tqchildren.end(); ++it ) { if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST ) { ast = static_cast<TQMake::AssignmentAST*>( *it ); if ( ast->scopedID == var && ast->op == op ) { - m_root->m_children.remove( ast ); - it = m_root->m_children.begin(); + m_root->m_tqchildren.remove( ast ); + it = m_root->m_tqchildren.begin(); } } } diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 8e672b4e..abd26606 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -710,7 +710,7 @@ void TrollProjectPart::startTQMakeCommand(const TQString &dir, bool recursive) cmdline += " -recursive "; } - //TQString cmdline = TQString::fromLatin1( isTMakeProject() ? "tmake " : "qmake " ); + //TQString cmdline = TQString::tqfromLatin1( isTMakeProject() ? "tmake " : "qmake " ); // cmdline += fi.baseName() + ".pro"; TQDir d(dir); TQStringList l = d.entryList("*.pro"); @@ -722,7 +722,7 @@ void TrollProjectPart::startTQMakeCommand(const TQString &dir, bool recursive) else cmdline += l[0]; -// cmdline += TQString::fromLatin1( " -o Makefile" ); +// cmdline += TQString::tqfromLatin1( " -o Makefile" ); TQString dircmd = "cd "; dircmd += KProcess::quote(dir); @@ -852,9 +852,9 @@ TQString TrollProjectPart::findTQtDir() TQStringList qtdirs; if( !isTQt4Project() ) qtdirs.push_back( ::getenv("QTDIR") ); - qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); - qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); - qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr" ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt" ); diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index d9706ad8..f2aca642 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -30,7 +30,7 @@ #include <tqheader.h> #include <tqsplitter.h> #include <tqptrstack.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqcombobox.h> #include <kprocess.h> #include <tqtimer.h> @@ -93,7 +93,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) overviewContainer = new TQVBox( splitter, "Projects" ); overviewContainer->setMargin ( 2 ); overviewContainer->setSpacing ( 2 ); - // overviewContainer->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); + // overviewContainer->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); // splitter->setResizeMode(overviewContainer, TQSplitter::FollowSizeHint); projectTools = new TQHBox( overviewContainer, "Project buttons" ); @@ -102,7 +102,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // Add subdir addSubdirButton = new TQToolButton ( projectTools, "Add subproject button" ); addSubdirButton->setPixmap ( SmallIcon ( "folder_new" ) ); - addSubdirButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addSubdirButton->sizePolicy().hasHeightForWidth() ) ); + addSubdirButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addSubdirButton->sizePolicy().hasHeightForWidth() ) ); addSubdirButton->setEnabled ( true ); TQToolTip::add( addSubdirButton, i18n( "Add subproject" ) ); TQWhatsThis::add( addSubdirButton, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. " @@ -111,7 +111,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // Create scope createScopeButton = new TQToolButton ( projectTools, "Create scope button" ); createScopeButton->setPixmap ( SmallIcon ( "qmake_scopenew" ) ); - createScopeButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, createScopeButton->sizePolicy().hasHeightForWidth() ) ); + createScopeButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, createScopeButton->sizePolicy().hasHeightForWidth() ) ); createScopeButton->setEnabled ( true ); TQToolTip::add( createScopeButton, i18n( "Create scope" ) ); TQWhatsThis::add( createScopeButton, i18n( "<b>Create scope</b><p>Creates TQMake scope in the project file in case the subproject is selected or creates nested scope in case the scope is selected." ) ); @@ -119,7 +119,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // build buildProjectButton = new TQToolButton ( projectTools, "Make button" ); buildProjectButton->setPixmap ( SmallIcon ( "make_tdevelop" ) ); - buildProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildProjectButton->sizePolicy().hasHeightForWidth() ) ); + buildProjectButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildProjectButton->sizePolicy().hasHeightForWidth() ) ); buildProjectButton->setEnabled ( true ); TQToolTip::add( buildProjectButton, i18n( "Build project" ) ); TQWhatsThis::add( buildProjectButton, i18n( "<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>" @@ -128,7 +128,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // rebuild rebuildProjectButton = new TQToolButton ( projectTools, "Rebuild button" ); rebuildProjectButton->setPixmap ( SmallIcon ( "rebuild" ) ); - rebuildProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildProjectButton->sizePolicy().hasHeightForWidth() ) ); + rebuildProjectButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildProjectButton->sizePolicy().hasHeightForWidth() ) ); rebuildProjectButton->setEnabled ( true ); TQToolTip::add( rebuildProjectButton, i18n( "Rebuild project" ) ); TQWhatsThis::add( rebuildProjectButton, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from the project directory.<br>" @@ -138,7 +138,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // run executeProjectButton = new TQToolButton ( projectTools, "Run button" ); executeProjectButton->setPixmap ( SmallIcon ( "exec" ) ); - executeProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeProjectButton->sizePolicy().hasHeightForWidth() ) ); + executeProjectButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeProjectButton->sizePolicy().hasHeightForWidth() ) ); executeProjectButton->setEnabled ( true ); TQToolTip::add( executeProjectButton, i18n( "Execute main program" ) ); TQWhatsThis::add( executeProjectButton, i18n( "<b>Execute main program</b><p>Executes the main program specified in project settings, <b>Run Options</b> tab." ) ); @@ -148,7 +148,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // Project configuration projectconfButton = new TQToolButton ( projectTools, "Project configuration button" ); projectconfButton->setPixmap ( SmallIcon ( "configure" ) ); - projectconfButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, projectconfButton->sizePolicy().hasHeightForWidth() ) ); + projectconfButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, projectconfButton->sizePolicy().hasHeightForWidth() ) ); projectconfButton->setEnabled ( true ); TQToolTip::add( projectconfButton, i18n( "Subproject settings" ) ); TQWhatsThis::add( projectconfButton, i18n( "<b>Subproject settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog for the currently selected subproject. " @@ -189,7 +189,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) detailContainer = new TQVBox( splitter, "Details" ); detailContainer->setMargin ( 2 ); detailContainer->setSpacing ( 2 ); - // detailContainer->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + // detailContainer->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); // Details Toolbar fileTools = new TQHBox( detailContainer, "Detail buttons" ); @@ -199,7 +199,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // Add new file button newfileButton = new TQToolButton ( fileTools, "Create new file" ); newfileButton->setPixmap ( SmallIcon ( "filenew" ) ); - newfileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, newfileButton->sizePolicy().hasHeightForWidth() ) ); + newfileButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, newfileButton->sizePolicy().hasHeightForWidth() ) ); newfileButton->setEnabled ( true ); TQToolTip::add( newfileButton, i18n( "Create new file" ) ); TQWhatsThis::add( newfileButton, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) ); @@ -207,7 +207,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // Add existing files button addfilesButton = new TQToolButton ( fileTools, "Add existing files" ); addfilesButton->setPixmap ( SmallIcon ( "fileimport" ) ); - addfilesButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addfilesButton->sizePolicy().hasHeightForWidth() ) ); + addfilesButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addfilesButton->sizePolicy().hasHeightForWidth() ) ); addfilesButton->setEnabled ( true ); TQToolTip::add( addfilesButton, i18n( "Add existing files" ) ); TQWhatsThis::add( addfilesButton, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is " @@ -217,7 +217,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // remove file button removefileButton = new TQToolButton ( fileTools, "Remove file" ); removefileButton->setPixmap ( SmallIcon ( "button_cancel" ) ); - removefileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, removefileButton->sizePolicy().hasHeightForWidth() ) ); + removefileButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, removefileButton->sizePolicy().hasHeightForWidth() ) ); removefileButton->setEnabled ( true ); TQToolTip::add( removefileButton, i18n( "Remove file" ) ); TQWhatsThis::add( removefileButton, i18n( "<b>Remove file</b><p>Removes file from a current group. Does not remove file from disk." ) ); @@ -225,7 +225,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // build selected file buildFileButton = new TQToolButton ( fileTools, "Make file button" ); buildFileButton->setPixmap ( SmallIcon ( "compfile" ) ); - buildFileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildFileButton->sizePolicy().hasHeightForWidth() ) ); + buildFileButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildFileButton->sizePolicy().hasHeightForWidth() ) ); buildFileButton->setEnabled ( true ); TQToolTip::add( buildFileButton, i18n( "Compile file" ) ); TQWhatsThis::add( buildFileButton, i18n( "<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>" @@ -235,7 +235,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // build buildTargetButton = new TQToolButton ( fileTools, "Make sp button" ); buildTargetButton->setPixmap ( SmallIcon ( "make_tdevelop" ) ); - buildTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildTargetButton->sizePolicy().hasHeightForWidth() ) ); + buildTargetButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildTargetButton->sizePolicy().hasHeightForWidth() ) ); buildTargetButton->setEnabled ( true ); TQToolTip::add( buildTargetButton, i18n( "Build subproject" ) ); TQWhatsThis::add( buildTargetButton, i18n( "<b>Build subproject</b><p>Runs <b>make</b> from the current subproject directory. " @@ -245,7 +245,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // rebuild rebuildTargetButton = new TQToolButton ( fileTools, "Rebuild sp button" ); rebuildTargetButton->setPixmap ( SmallIcon ( "rebuild" ) ); - rebuildTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildTargetButton->sizePolicy().hasHeightForWidth() ) ); + rebuildTargetButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildTargetButton->sizePolicy().hasHeightForWidth() ) ); rebuildTargetButton->setEnabled ( true ); TQToolTip::add( rebuildTargetButton, i18n( "Rebuild subproject" ) ); TQWhatsThis::add( rebuildTargetButton, i18n( "<b>Rebuild subproject</b><p>Runs <b>make clean</b> and then <b>make</b> from the current subproject directory. " @@ -256,7 +256,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // run executeTargetButton = new TQToolButton ( fileTools, "Run sp button" ); executeTargetButton->setPixmap ( SmallIcon ( "exec" ) ); - executeTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeTargetButton->sizePolicy().hasHeightForWidth() ) ); + executeTargetButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeTargetButton->sizePolicy().hasHeightForWidth() ) ); executeTargetButton->setEnabled ( true ); TQToolTip::add( executeTargetButton, i18n( "Execute subproject" ) ); TQWhatsThis::add( executeTargetButton, i18n( "<b>Execute subproject</b><p>Executes the target program for the currently selected subproject. " @@ -271,7 +271,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // Configure file button excludeFileFromScopeButton = new TQToolButton ( fileTools, "Exclude file" ); excludeFileFromScopeButton->setPixmap ( SmallIcon ( "configure_file" ) ); - excludeFileFromScopeButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, excludeFileFromScopeButton->sizePolicy().hasHeightForWidth() ) ); + excludeFileFromScopeButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, excludeFileFromScopeButton->sizePolicy().hasHeightForWidth() ) ); excludeFileFromScopeButton->setEnabled ( true ); TQToolTip::add( excludeFileFromScopeButton , i18n( "Exclude file" ) ); TQWhatsThis::add( excludeFileFromScopeButton , i18n( "<b>Exclude file</b><p>Exclude the selected file from this scope." ) ); @@ -529,7 +529,7 @@ TQString TrollProjectWidget::getCurrentOutputFilename() void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item ) { - // If no children in detailview + // If no tqchildren in detailview // it is a subdir template if ( item && details->childCount() ) { @@ -556,7 +556,7 @@ void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item ) void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl ) { - // Insert all GroupItems and all of their children into the view + // Insert all GroupItems and all of their tqchildren into the view if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 ) return ; @@ -974,7 +974,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i QMakeScopeItem *spitem = static_cast<QMakeScopeItem*>( item ); KPopupMenu popup( this ); - popup.insertTitle( i18n( "Subproject %1" ).arg( item->text( 0 ) ) ); + popup.insertTitle( i18n( "Subproject %1" ).tqarg( item->text( 0 ) ) ); int idBuild = -2; int idRebuild = -2; @@ -994,72 +994,72 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i if ( spitem->scope->scopeType() == Scope::ProjectScope && ( !spitem->scope->parent() || spitem->scope->parent()->scopeType() == Scope::ProjectScope ) ) { idBuild = popup.insertItem( SmallIcon( "make_tdevelop" ), i18n( "Build" ) ); - popup.setWhatsThis( idBuild, i18n( "<b>Build</b><p>Runs <b>make</b> from the selected subproject directory.<br>" + popup.tqsetWhatsThis( idBuild, i18n( "<b>Build</b><p>Runs <b>make</b> from the selected subproject directory.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab." ) ); idInstall = popup.insertItem( i18n( "Install" ) ); - popup.setWhatsThis( idBuild, i18n( "<b>Install</b><p>Runs <b>make install</b> from the selected subproject directory.<br>" + popup.tqsetWhatsThis( idBuild, i18n( "<b>Install</b><p>Runs <b>make install</b> from the selected subproject directory.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab." ) ); idClean = popup.insertItem( i18n( "Clean" ) ); - popup.setWhatsThis( idBuild, i18n( "<b>Clean project</b><p>Runs <b>make clean</b> command from the project " + popup.tqsetWhatsThis( idBuild, i18n( "<b>Clean project</b><p>Runs <b>make clean</b> command from the project " "directory.<br> Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab." ) ); idDistClean = popup.insertItem( i18n( "Dist-Clean" ) ); - popup.setWhatsThis( idBuild, i18n( "<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the project " + popup.tqsetWhatsThis( idBuild, i18n( "<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the project " "directory.<br> Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab." ) ); idRebuild = popup.insertItem( SmallIcon( "rebuild" ), i18n( "Rebuild" ) ); - popup.setWhatsThis( idRebuild, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from " + popup.tqsetWhatsThis( idRebuild, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from " "the project directory.<br>Environment variables and make arguments can be " "specified in the project settings dialog, <b>Make Options</b> tab." ) ); idQmake = popup.insertItem( SmallIcon( "qmakerun" ), i18n( "Run qmake" ) ); - popup.setWhatsThis( idQmake, i18n( "<b>Run qmake</b><p>Runs <b>qmake</b> from the selected subproject directory. This creates or regenerates Makefile." ) ); + popup.tqsetWhatsThis( idQmake, i18n( "<b>Run qmake</b><p>Runs <b>qmake</b> from the selected subproject directory. This creates or regenerates Makefile." ) ); idQmakeRecursive = popup.insertItem( SmallIcon( "qmakerun" ), i18n( "Run qmake recursively" ) ); - popup.setWhatsThis( idQmakeRecursive, i18n( "<b>Run qmake recursively</b><p>Runs <b>qmake</b> from the selected " + popup.tqsetWhatsThis( idQmakeRecursive, i18n( "<b>Run qmake recursively</b><p>Runs <b>qmake</b> from the selected " "subproject directory and recurses into all subproject directories. " "This creates or regenerates Makefile." ) ); popup.insertSeparator(); idAddSubproject = popup.insertItem( SmallIcon( "folder_new" ), i18n( "Add Subproject..." ) ); - popup.setWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. " + popup.tqsetWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. " "This action is allowed only if a type of the subproject is 'subdirectories'. The type of the subproject can be " "defined in <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) ); if ( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 ) popup.setItemEnabled( idAddSubproject, false ); idRemoveSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Remove Subproject..." ) ); - popup.setWhatsThis( idRemoveSubproject, i18n( "<b>Remove subproject</b><p>Removes currently selected subproject. Does not delete any file from disk. Deleted subproject can be later added by calling 'Add Subproject' action." ) ); + popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Remove subproject</b><p>Removes currently selected subproject. Does not delete any file from disk. Deleted subproject can be later added by calling 'Add Subproject' action." ) ); if ( spitem->parent() == NULL ) popup.setItemEnabled( idRemoveSubproject, false ); idAddScope = popup.insertItem( SmallIcon( "qmake_scopenew" ), i18n( "Create Scope..." ) ); - popup.setWhatsThis( idAddScope, i18n( "<b>Create scope</b><p>Creates TQMake scope in the project file of the currently selected subproject." ) ); + popup.tqsetWhatsThis( idAddScope, i18n( "<b>Create scope</b><p>Creates TQMake scope in the project file of the currently selected subproject." ) ); popup.insertSeparator(); idProjectConfiguration = popup.insertItem( SmallIcon( "configure" ), i18n( "Subproject Settings" ) ); - popup.setWhatsThis( idProjectConfiguration, i18n( "<b>Subproject settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. " + popup.tqsetWhatsThis( idProjectConfiguration, i18n( "<b>Subproject settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. " "It provides settings for:<br>subproject type and configuration,<br>include and library paths,<br>lists of dependencies and " "external libraries,<br>build order,<br>intermediate files locations,<br>compiler options." ) ); } else { idAddScope = popup.insertItem( SmallIcon( "qmake_scopenew" ), i18n( "Create Scope..." ) ); - popup.setWhatsThis( idAddScope, i18n( "<b>Create Scope</b><p>Creates TQMake scope in the currently selected scope." ) ); + popup.tqsetWhatsThis( idAddScope, i18n( "<b>Create Scope</b><p>Creates TQMake scope in the currently selected scope." ) ); idRemoveScope = popup.insertItem( SmallIcon( "editdelete" ), i18n( "Remove Scope" ) ); - popup.setWhatsThis( idRemoveScope, i18n( "<b>Remove Scope</b><p>Removes currently selected scope." ) ); + popup.tqsetWhatsThis( idRemoveScope, i18n( "<b>Remove Scope</b><p>Removes currently selected scope." ) ); popup.insertSeparator(); idAddSubproject = popup.insertItem( SmallIcon( "folder_new" ), i18n( "Add Subproject..." ) ); - popup.setWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to the currently selected scope. " + popup.tqsetWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to the currently selected scope. " "This action is allowed only if the type of the subproject is 'subdirectories'. The type of the subproject can be " "defined in the <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) ); if ( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 ) popup.setItemEnabled( idAddSubproject, false ); idDisableSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Disable Subproject..." ) ); - popup.setWhatsThis( idRemoveSubproject, i18n( "<b>Disable subproject</b><p>Disables the currently selected subproject when this scope is active. Does not delete the directory from disk. The deleted subproject can be later added by using the 'Add Subproject' action." ) ); + popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Disable subproject</b><p>Disables the currently selected subproject when this scope is active. Does not delete the directory from disk. The deleted subproject can be later added by using the 'Add Subproject' action." ) ); if( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 && spitem->scope->parent()->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 ) popup.setItemEnabled( idDisableSubproject, false ); popup.insertSeparator(); idProjectConfiguration = popup.insertItem( SmallIcon( "configure" ), i18n( "Scope Settings" ) ); - popup.setWhatsThis( idProjectConfiguration, i18n( "<b>Scope settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. " + popup.tqsetWhatsThis( idProjectConfiguration, i18n( "<b>Scope settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. " "It provides settings for:<br>subproject type and configuration,<br>include and library paths,<br>lists of dependencies and " "external libraries,<br>build order,<br>intermediate files locations,<br>compiler options." ) ); } @@ -1090,12 +1090,12 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i else if ( r == idBuild ) { slotBuildTarget(); - // m_part->startMakeCommand(projectDirectory() + relpath, TQString::fromLatin1("")); + // m_part->startMakeCommand(projectDirectory() + relpath, TQString::tqfromLatin1("")); } else if ( r == idInstall ) { slotInstallTarget(); - // m_part->startMakeCommand(projectDirectory() + relpath, TQString::fromLatin1("")); + // m_part->startMakeCommand(projectDirectory() + relpath, TQString::tqfromLatin1("")); } else if ( r == idRebuild ) { @@ -1544,41 +1544,41 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it if ( titem->groupType == GroupItem::InstallRoot ) { idInsInstallObject = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Install Object..." ) ); - popup.setWhatsThis( idInsInstallObject, i18n( "<b>Add install object</b><p>Creates TQMake install object. " + popup.tqsetWhatsThis( idInsInstallObject, i18n( "<b>Add install object</b><p>Creates TQMake install object. " "It is possible to define a list of files to install and installation locations for each object. Warning! " "Install objects without path specified will not be saved to a project file." ) ); } else if ( titem->groupType == GroupItem::InstallObject ) { idSetInstObjPath = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Install Path..." ) ); - popup.setWhatsThis( idSetInstObjPath, i18n( "<b>Install path</b><p>Allows to choose the installation path for the current install object." ) ); + popup.tqsetWhatsThis( idSetInstObjPath, i18n( "<b>Install path</b><p>Allows to choose the installation path for the current install object." ) ); idInsNewFilepatternItem = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Pattern of Files to Install..." ) ); - popup.setWhatsThis( idInsNewFilepatternItem, i18n( "<b>Add pattern of files to install</b><p>Defines the pattern to match files which will be installed. " + popup.tqsetWhatsThis( idInsNewFilepatternItem, i18n( "<b>Add pattern of files to install</b><p>Defines the pattern to match files which will be installed. " "It is possible to use wildcards and relative paths like <i>docs/*</i>." ) ); idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove Install Object" ) ); - popup.setWhatsThis( idRemoveFile, i18n( "<b>Remove install object</b><p>Removes the install object the current group." ) ); + popup.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove install object</b><p>Removes the install object the current group." ) ); } else if ( titem->groupType == GroupItem::Translations ) { idInsNewFile = popup.insertItem( SmallIconSet( "filenew" ), i18n( "Create New File..." ) ); - popup.setWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new translation file and adds it to a currently selected TRANSLATIONS group." ) ); + popup.tqsetWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new translation file and adds it to a currently selected TRANSLATIONS group." ) ); idInsExistingFile = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Existing Files..." ) ); - popup.setWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing translation (*.ts) files to a currently selected TRANSLATIONS group. It is " + popup.tqsetWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing translation (*.ts) files to a currently selected TRANSLATIONS group. It is " "possible to copy files to a current subproject directory, create symbolic links or " "add them with the relative path." ) ); idLUpdate = popup.insertItem( SmallIconSet( "konsole" ), i18n( "Update Translation Files" ) ); - popup.setWhatsThis( idLUpdate, i18n( "<b>Update Translation Files</b><p>Runs <b>lupdate</b> command from the current subproject directory. It collects translatable " + popup.tqsetWhatsThis( idLUpdate, i18n( "<b>Update Translation Files</b><p>Runs <b>lupdate</b> command from the current subproject directory. It collects translatable " "messages and saves them into translation files." ) ); idLRelease = popup.insertItem( SmallIconSet( "konsole" ), i18n( "Release Binary Translations" ) ); - popup.setWhatsThis( idLRelease, i18n( "<b>Release Binary Translations</b><p>Runs <b>lrelease</b> command from the current subproject directory. It creates binary " + popup.tqsetWhatsThis( idLRelease, i18n( "<b>Release Binary Translations</b><p>Runs <b>lrelease</b> command from the current subproject directory. It creates binary " "translation files that are ready to be loaded at program execution." ) ); } else // File group containing files { idInsNewFile = popup.insertItem( SmallIconSet( "filenew" ), i18n( "Create New File..." ) ); - popup.setWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) ); + popup.tqsetWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) ); idInsExistingFile = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Existing Files..." ) ); - popup.setWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is " + popup.tqsetWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is " "possible to copy files to a current subproject directory, create symbolic links or " "add them with the relative path." ) ); } @@ -1757,9 +1757,9 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it KPopupMenu popup( this ); if ( !( gitem->groupType == GroupItem::InstallObject ) ) - popup.insertTitle( i18n( "File: %1" ).arg( fitem->text( 0 ) ) ); + popup.insertTitle( i18n( "File: %1" ).tqarg( fitem->text( 0 ) ) ); else - popup.insertTitle( i18n( "Pattern: %1" ).arg( fitem->text( 0 ) ) ); + popup.insertTitle( i18n( "Pattern: %1" ).tqarg( fitem->text( 0 ) ) ); int idRemoveFile = -2; int idSubclassWidget = -2; @@ -1773,37 +1773,37 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it if ( !fitem->uiFileLink.isEmpty() ) { idUpdateWidgetclass = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "Edit ui-Subclass..." ) ); - popup.setWhatsThis( idUpdateWidgetclass, i18n( "<b>Edit ui-subclass</b><p>Launches <b>Subclassing</b> wizard " + popup.tqsetWhatsThis( idUpdateWidgetclass, i18n( "<b>Edit ui-subclass</b><p>Launches <b>Subclassing</b> wizard " "and prompts to implement missing in childclass slots and functions." ) ); } if ( fitem->text( 0 ).contains( ".ui" ) ) { idSubclassWidget = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "Subclassing Wizard..." ) ); - popup.setWhatsThis( idSubclassWidget, i18n( "<b>Subclass widget</b><p>Launches <b>Subclassing</b> wizard. " + popup.tqsetWhatsThis( idSubclassWidget, i18n( "<b>Subclass widget</b><p>Launches <b>Subclassing</b> wizard. " "It allows to create a subclass from the class defined in .ui file. " "There is also possibility to implement slots and functions defined in the base class." ) ); if ( !m_part->isTQt4Project() ) { idViewUIH = popup.insertItem( SmallIconSet( "qmake_ui_h" ), i18n( "Open ui.h File" ) ); - popup.setWhatsThis( idViewUIH, i18n( "<b>Open ui.h file</b><p>Opens .ui.h file associated with the selected .ui." ) ); + popup.tqsetWhatsThis( idViewUIH, i18n( "<b>Open ui.h file</b><p>Opens .ui.h file associated with the selected .ui." ) ); } idUISubclasses = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "List of Subclasses..." ) ); - popup.setWhatsThis( idUISubclasses, i18n( "<b>List of subclasses</b><p>Shows subclasses list editor. " + popup.tqsetWhatsThis( idUISubclasses, i18n( "<b>List of subclasses</b><p>Shows subclasses list editor. " "There is possibility to add or remove subclasses from the list." ) ); } if ( !( gitem->groupType == GroupItem::InstallObject ) ) { idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove File" ) ); - popup.setWhatsThis( idRemoveFile, i18n( "<b>Remove file</b><p>Removes file from a current group. For sources, this also removes the subclassing information." ) ); + popup.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove file</b><p>Removes file from a current group. For sources, this also removes the subclassing information." ) ); idFileProperties = popup.insertItem( SmallIconSet( "configure_file" ), i18n( "Exclude File" ) ); - popup.setWhatsThis( idFileProperties, i18n( "<b>Exclude File</b><p>Excludes the file from this Scope. Does not touch subclassing information" ) ); + popup.tqsetWhatsThis( idFileProperties, i18n( "<b>Exclude File</b><p>Excludes the file from this Scope. Does not touch subclassing information" ) ); } else { idEditInstallPattern = popup.insertItem( SmallIconSet( "configure_file" ), i18n( "Edit Pattern" ) ); - popup.setWhatsThis( idEditInstallPattern, i18n( "<b>Edit pattern</b><p>Allows to edit install files pattern." ) ); + popup.tqsetWhatsThis( idEditInstallPattern, i18n( "<b>Edit pattern</b><p>Allows to edit install files pattern." ) ); idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove Pattern" ) ); - popup.setWhatsThis( idRemoveFile, i18n( "<b>Remove pattern</b><p>Removes install files pattern from the current install object." ) ); + popup.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove pattern</b><p>Removes install files pattern from the current install object." ) ); } if ( !( gitem->groupType == GroupItem::InstallObject ) ) { @@ -1815,7 +1815,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it if ( gitem->groupType == GroupItem::Sources ) { idBuildFile = popup.insertItem( SmallIconSet( "make_tdevelop" ), i18n( "Build File" ) ); - popup.setWhatsThis( idBuildFile, i18n( "<b>Build File</b><p>Builds the object file for this source file." ) ); + popup.tqsetWhatsThis( idBuildFile, i18n( "<b>Build File</b><p>Builds the object file for this source file." ) ); } int r = popup.exec( p ); @@ -1932,7 +1932,7 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem ) if ( KMessageBox::warningYesNo( this, "<qt>" + i18n( "Do you want to delete the file <strong>%1</strong> from the project and your disk?" ) - .arg( fitem->text( 0 ) ) + + .tqarg( fitem->text( 0 ) ) + "</qt>", i18n( "Remove File" ), KStdGuiItem::remove(), @@ -2459,7 +2459,7 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem ) void TrollProjectWidget::slotProjectDirty(const TQString& path) { kdDebug(9024) << "File is dirty:" << path << " using method " << endl; - if( KMessageBox::warningYesNo(this, i18n("The project file \"%1\" has changed on disk\n(Or you have \"%2\" opened in the editor, which also triggers a reload when you change something in the TQMake Manager).\n\nDo you want to reload it?").arg(path).arg(path), i18n("Project File Changed"), i18n("Reload"), i18n("Do Not Reload"), "trollproject_reload_project_file" ) != KMessageBox::No ) + if( KMessageBox::warningYesNo(this, i18n("The project file \"%1\" has changed on disk\n(Or you have \"%2\" opened in the editor, which also triggers a reload when you change something in the TQMake Manager).\n\nDo you want to reload it?").tqarg(path).tqarg(path), i18n("Project File Changed"), i18n("Reload"), i18n("Do Not Reload"), "trollproject_reload_project_file" ) != KMessageBox::No ) { m_part->dirWatch()->stopScan(); TQListViewItemIterator it(m_rootSubproject); diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp index e2f4c0ac..e5d72bcf 100644 --- a/buildtools/script/scriptnewfiledlg.cpp +++ b/buildtools/script/scriptnewfiledlg.cpp @@ -15,7 +15,7 @@ #include <tqfile.h> #include <tqfileinfo.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <klineedit.h> #include <tqpushbutton.h> #include <kbuttonbox.h> @@ -56,14 +56,14 @@ ScriptNewFileDialog::ScriptNewFileDialog(ScriptProjectPart *part, ok_button->setDefault(true); connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); - buttonbox->layout(); - - TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4); - layout->addWidget(filename_label); - layout->addWidget(filename_edit); - layout->addWidget(usetemplate_box); - layout->addWidget(frame, 0); - layout->addWidget(buttonbox, 0); + buttonbox->tqlayout(); + + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4); + tqlayout->addWidget(filename_label); + tqlayout->addWidget(filename_edit); + tqlayout->addWidget(usetemplate_box); + tqlayout->addWidget(frame, 0); + tqlayout->addWidget(buttonbox, 0); m_part = part; } diff --git a/buildtools/script/scriptoptionswidgetbase.ui b/buildtools/script/scriptoptionswidgetbase.ui index c23e3941..7ac003f4 100644 --- a/buildtools/script/scriptoptionswidgetbase.ui +++ b/buildtools/script/scriptoptionswidgetbase.ui @@ -51,7 +51,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> |