diff options
687 files changed, 3709 insertions, 3709 deletions
diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp index 2e788896..580fe4cb 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 <tqlayout.h> +#include <layout.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 7804c9c3..f6ee3232 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>160</height> @@ -90,7 +90,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>8</height> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -144,7 +144,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -250,7 +250,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -267,7 +267,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -278,7 +278,7 @@ <property name="name"> <cstring>mainSourceUrl</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>26</height> @@ -317,7 +317,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -334,7 +334,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>400</width> <height>20</height> diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index d97a62d1..5d47b818 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").tqarg(service->name()).tqarg(errorMessage)); + "The diagnostics are:\n%2").arg(service->name()).arg(errorMessage)); exit(1); } diff --git a/buildtools/ant/antoptionswidget.ui b/buildtools/ant/antoptionswidget.ui index d5dea45a..0beab188 100644 --- a/buildtools/ant/antoptionswidget.ui +++ b/buildtools/ant/antoptionswidget.ui @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>86</height> @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>86</height> @@ -99,7 +99,7 @@ <property name="text"> <string>&Properties:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>240</width> <height>16</height> diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp index 52e4fc51..ac77dd94 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 <tqtextstream.h> +#include <textstream.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.tqarg(cp).tqarg(m_projectDirectory).tqarg(target).tqarg(m_antOptions.m_buildXML).tqarg(verb).tqarg(options)); + makeFrontend()->queueCommand(m_projectDirectory, cmd.arg(cp).arg(m_projectDirectory).arg(target).arg(m_antOptions.m_buildXML).arg(verb).arg(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").tqarg(popupstr), + int id = popup->insertItem( i18n("Remove %1 From Project").arg(popupstr), this, TQT_SLOT(slotRemoveFromProject()) ); - popup->tqsetWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project.")); + popup->setWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project.")); } else { - int id = popup->insertItem( i18n("Add %1 to Project").tqarg(popupstr), + int id = popup->insertItem( i18n("Add %1 to Project").arg(popupstr), this, TQT_SLOT(slotAddToProject()) ); - popup->tqsetWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project.")); + popup->setWhatsThis(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 e6bdc20d..f14ce964 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 <tqtextstream.h> +#include <textstream.h> #include <tqapplication.h> #include <klineedit.h> #include <kdebug.h> diff --git a/buildtools/autotools/addapplicationdlgbase.ui b/buildtools/autotools/addapplicationdlgbase.ui index 234fa8b3..9b357801 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="tqmaximumSize"> + <property name="maximumSize"> <size> <width>24</width> <height>24</height> @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -192,7 +192,7 @@ <property name="text"> <string>E&xecutable:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -210,7 +210,7 @@ <property name="text"> <string>&Icon:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -228,7 +228,7 @@ <property name="text"> <string>&Section:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -246,7 +246,7 @@ <property name="text"> <string>&File name:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -264,7 +264,7 @@ <property name="text"> <string>&Name:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -282,7 +282,7 @@ <property name="text"> <string>Co&mment:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -301,7 +301,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -370,7 +370,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -403,7 +403,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -456,7 +456,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp index 341953e0..927b32f1 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.cpp +++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp @@ -15,7 +15,7 @@ ***************************************************************************/ #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.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.").tqarg(name)); +// KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name)); continue; } TQTextStream stream(&f); diff --git a/buildtools/autotools/addexistingdlgbase.ui b/buildtools/autotools/addexistingdlgbase.ui index 47c8dcef..5223bd16 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>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>317</width> <height>20</height> @@ -93,7 +93,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -221,7 +221,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <vbox> <property name="name"> @@ -229,7 +229,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -245,7 +245,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>84</width> <height>20</height> @@ -284,7 +284,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>84</width> <height>20</height> @@ -297,13 +297,13 @@ <property name="name"> <cstring>sourceGroupBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>240</width> <height>250</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -325,7 +325,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <vbox> <property name="name"> @@ -333,7 +333,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -349,7 +349,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -388,7 +388,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -401,13 +401,13 @@ <property name="name"> <cstring>destGroupBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>100</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp index 55533a3d..3faf3d1a 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 <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqpixmap.h> diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp index 34108fb3..0471c230 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 <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kbuttonbox.h> #include <kdebug.h> diff --git a/buildtools/autotools/addfiledlgbase.ui b/buildtools/autotools/addfiledlgbase.ui index 79029915..0d86b1a0 100644 --- a/buildtools/autotools/addfiledlgbase.ui +++ b/buildtools/autotools/addfiledlgbase.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -150,7 +150,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -188,7 +188,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -217,7 +217,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -245,7 +245,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/autotools/addicondlg.cpp b/buildtools/autotools/addicondlg.cpp index 81d0d859..639c04ce 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::tqfromLatin1("force-reedit")); + m_part->startMakeCommand(destdir, TQString::fromLatin1("force-reedit")); m_widget->emitAddedFile(destpath); diff --git a/buildtools/autotools/addicondlgbase.ui b/buildtools/autotools/addicondlgbase.ui index 14947fe2..7a3336dc 100644 --- a/buildtools/autotools/addicondlgbase.ui +++ b/buildtools/autotools/addicondlgbase.ui @@ -34,7 +34,7 @@ <property name="text"> <string>&Type:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -52,7 +52,7 @@ <property name="text"> <string>&Size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -75,7 +75,7 @@ <property name="text"> <string>File name:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -93,7 +93,7 @@ <property name="text"> <string>&Name:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -212,7 +212,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/autotools/addprefixdlg.cpp b/buildtools/autotools/addprefixdlg.cpp index 4c2f1493..b4b642ac 100644 --- a/buildtools/autotools/addprefixdlg.cpp +++ b/buildtools/autotools/addprefixdlg.cpp @@ -12,7 +12,7 @@ #include "addprefixdlg.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.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 *tqlayout = new TQVBoxLayout(this, 10); + TQVBoxLayout *layout = new TQVBoxLayout(this, 10); TQGridLayout *grid = new TQGridLayout(2, 2); - tqlayout->addLayout(grid); + layout->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); - tqlayout->addWidget(frame, 0); + layout->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->tqlayout(); - tqlayout->addWidget(buttonbox, 0); + buttonbox->layout(); + layout->addWidget(buttonbox, 0); slotPrefixChanged(); } diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp index ccc10ec2..8147f55f 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 <tqtextstream.h> +#include <textstream.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:").tqarg(prop), value, &ok, this); + value = KInputDialog::getText(i18n("Enter Value"), i18n("Property %1:").arg(prop), value, &ok, this); if (!ok) return; diff --git a/buildtools/autotools/addservicedlgbase.ui b/buildtools/autotools/addservicedlgbase.ui index 82b7ee9d..c1f52b22 100644 --- a/buildtools/autotools/addservicedlgbase.ui +++ b/buildtools/autotools/addservicedlgbase.ui @@ -54,7 +54,7 @@ <property name="text"> <string>&Icon:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -77,7 +77,7 @@ <property name="name"> <cstring>icon_button</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>24</width> <height>24</height> @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -138,7 +138,7 @@ <property name="text"> <string>&Library:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -156,7 +156,7 @@ <property name="text"> <string>&File name:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -174,7 +174,7 @@ <property name="text"> <string>&Name:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -192,7 +192,7 @@ <property name="text"> <string>Co&mment:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -274,7 +274,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -307,7 +307,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -405,7 +405,7 @@ <property name="text"> <string>&Properties:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -436,7 +436,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp index f156a5e1..274fa48b 100644 --- a/buildtools/autotools/addsubprojectdlg.cpp +++ b/buildtools/autotools/addsubprojectdlg.cpp @@ -12,10 +12,10 @@ #include "addsubprojectdlg.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.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.").tqarg(name)); + KMessageBox::sorry(this, i18n("A file named %1 already exists.").arg(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?").tqarg(name)) + "Do you wish to add it as a subproject?").arg(name)) == KMessageBox::Cancel ){ TQDialog::accept(); return; } } else if (!dir.mkdir(name)) { - KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").tqarg(name)); + KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").arg(name)); TQDialog::accept(); return; } if(!dir.cd(name)) { - KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").tqarg(name)); + KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").arg(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.").tqarg(name)); + KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name)); return; } TQTextStream stream(&f); diff --git a/buildtools/autotools/addsubprojectdlgbase.ui b/buildtools/autotools/addsubprojectdlgbase.ui index 7505f390..3c2e4828 100644 --- a/buildtools/autotools/addsubprojectdlgbase.ui +++ b/buildtools/autotools/addsubprojectdlgbase.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -73,7 +73,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -102,7 +102,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -151,7 +151,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/autotools/addtargetdlg.cpp b/buildtools/autotools/addtargetdlg.cpp index 868cc504..d2a832c1 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::tqfromLatin1("lib") ); + name.prepend( TQString::fromLatin1("lib") ); if( primary == "LTLIBRARIES" && !name.endsWith(".la") ) - name.append( TQString::tqfromLatin1(".la") ); + name.append( TQString::fromLatin1(".la") ); if ( primary == "LIBRARIES" && !name.endsWith(".a") ) - name.append ( TQString::tqfromLatin1(".a") ); + name.append ( TQString::fromLatin1(".a") ); TQPtrListIterator<TargetItem> it(m_subproject->targets); for (; it.current(); ++it) diff --git a/buildtools/autotools/addtargetdlgbase.ui b/buildtools/autotools/addtargetdlgbase.ui index 763d5984..9e8b561f 100644 --- a/buildtools/autotools/addtargetdlgbase.ui +++ b/buildtools/autotools/addtargetdlgbase.ui @@ -44,7 +44,7 @@ <property name="text"> <string>&Primary:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -67,7 +67,7 @@ <property name="text"> <string>Pre&fix:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -90,7 +90,7 @@ <property name="text"> <string>File &name:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -112,7 +112,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>246</width> <height>20</height> @@ -155,7 +155,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -261,7 +261,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/autotools/addtranslationdlg.cpp b/buildtools/autotools/addtranslationdlg.cpp index 9962aeb2..0d395298 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 <tqlayout.h> +#include <layout.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 *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->addWidget(hbox); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + layout->addWidget(hbox); TQFrame *frame = new TQFrame(this); frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); - tqlayout->addWidget(frame, 0); + layout->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->tqlayout(); - tqlayout->addWidget(buttonbox, 0); + buttonbox->layout(); + layout->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::tqfromLatin1("force-reedit")); + m_part->startMakeCommand(dir, TQString::fromLatin1("force-reedit")); TQDialog::accept(); } diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index 45d0886e..478aa9e8 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 <tqlayout.h> +#include <layout.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" ).tqarg( caption ), this ); + KPopupMenu popup( i18n( "Target: %1" ).arg( 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" ).tqarg( fitem->name ), this ); + KPopupMenu popup( i18n( "File: %1" ).arg( 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.tqsetWhatsThis(idSubclassWidget, i18n("<b>Subclass widget</b><p>Launches " + popup.setWhatsThis(idSubclassWidget, i18n("<b>Subclass widget</b><p>Launches " "<b>Subclassing</b> wizard. " "It allows to create a subclass from the " "class defined in .ui file. " @@ -572,19 +572,19 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, "class.")); int idUISubclasses = popup.insertItem(SmallIconSet("qmake_subclass"), i18n("List of Subclasses...")); - popup.tqsetWhatsThis(idUISubclasses, i18n("<b>List of subclasses</b><p>Shows " + popup.setWhatsThis(idUISubclasses, i18n("<b>List of subclasses</b><p>Shows " "subclasses list editor. " "There is possibility to add or remove " "subclasses from the list.")); int idUpdateWidgetclass = popup.insertItem(SmallIconSet("qmake_subclass"), i18n("Edit ui-Subclass...")); - popup.tqsetWhatsThis(idUpdateWidgetclass, i18n("<b>Edit ui-subclass</b><p>Launches " + popup.setWhatsThis(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.tqsetWhatsThis(idViewUIH, i18n("<b>Open ui.h file</b><p>Opens .ui.h file " + popup.setWhatsThis(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 6ffa69a0..e77aa84b 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 tqalignment ) + int column, int width, int alignment ) { 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, tqalignment ); + TQListViewItem::paintCell( p, cg, column, width, alignment ); } diff --git a/buildtools/autotools/autolistviewitems.h b/buildtools/autotools/autolistviewitems.h index 0dc28dc5..162d8467 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 tqalignment ); + int column, int width, int alignment ); void setBold( bool b ) { bld = b; diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index 7f17cb6d..5e282acf 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").tqarg(titem->name).tqarg(titem->primary), i18n("Active target is not a library") ); + "Project -> Project Options -> Run Options").arg(titem->name).arg(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?").tqarg(buildDirectory()), TQString(), i18n("Run Them"), i18n("Do Not Run")); + "Run automake & friends and configure first?").arg(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?").tqarg(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?").arg(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 ").tqarg(prio); + nice = TQString("nice -n%1 ").arg(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.").tqarg(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.").arg(tname), i18n("Circular Dependency found") ); return false; } } @@ -812,7 +812,7 @@ void AutoProjectPart::slotBuild() m_needMakefileCvs = false; } - startMakeCommand(buildDirectory(), TQString::tqfromLatin1("")); + startMakeCommand(buildDirectory(), TQString::fromLatin1("")); } @@ -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 ").tqarg(cc)); + cmdline.prepend(TQString("CC=%1 ").arg(cc)); TQString cflags = DomUtil::readEntry(dom, prefix + "cflags"); if (!cflags.isEmpty()) - cmdline.prepend(TQString("CFLAGS=\"%1\" ").tqarg(cflags)); + cmdline.prepend(TQString("CFLAGS=\"%1\" ").arg(cflags)); TQString cxx = DomUtil::readEntry(dom, prefix + "cxxcompilerbinary"); if (!cxx.isEmpty()) - cmdline.prepend(TQString("CXX=%1 ").tqarg(cxx)); + cmdline.prepend(TQString("CXX=%1 ").arg(cxx)); TQString cxxflags = DomUtil::readEntry(dom, prefix + "cxxflags"); if (!cxxflags.isEmpty()) - cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").tqarg(cxxflags)); + cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").arg(cxxflags)); TQString f77 = DomUtil::readEntry(dom, prefix + "f77compilerbinary"); if (!f77.isEmpty()) - cmdline.prepend(TQString("F77=%1 ").tqarg(f77)); + cmdline.prepend(TQString("F77=%1 ").arg(f77)); TQString fflags = DomUtil::readEntry(dom, prefix + "f77flags"); if (!fflags.isEmpty()) - cmdline.prepend(TQString("FFLAGS=\"%1\" ").tqarg(fflags)); + cmdline.prepend(TQString("FFLAGS=\"%1\" ").arg(fflags)); TQString cppflags = DomUtil::readEntry(dom, prefix + "cppflags"); if (!cppflags.isEmpty()) - cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").tqarg(cppflags)); + cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").arg(cppflags)); TQString ldflags = DomUtil::readEntry(dom, prefix + "ldflags"); if (!ldflags.isEmpty()) - cmdline.prepend(TQString("LDFLAGS=\"%1\" ").tqarg(ldflags)); + cmdline.prepend(TQString("LDFLAGS=\"%1\" ").arg(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 ").tqarg(prio); + nice = TQString("nice -n%1 ").arg(prio); } if (TQFile::exists(topsourceDirectory() + "/Makefile.cvs")) @@ -1034,7 +1034,7 @@ void AutoProjectPart::slotMakefilecvs() void AutoProjectPart::slotInstall() { - startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install")); + startMakeCommand(buildDirectory(), TQString::fromLatin1("install")); } @@ -1045,25 +1045,25 @@ void AutoProjectPart::slotInstallWithKdesu() slotBuild(); // After that issue "make install" with the root user - startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install"), true); + startMakeCommand(buildDirectory(), TQString::fromLatin1("install"), true); } void AutoProjectPart::slotClean() { - startMakeCommand(buildDirectory(), TQString::tqfromLatin1("clean")); + startMakeCommand(buildDirectory(), TQString::fromLatin1("clean")); } void AutoProjectPart::slotDistClean() { - startMakeCommand(buildDirectory(), TQString::tqfromLatin1("distclean")); + startMakeCommand(buildDirectory(), TQString::fromLatin1("distclean")); } void AutoProjectPart::slotMakeMessages() { - startMakeCommand(buildDirectory(), TQString::tqfromLatin1("package-messages")); + startMakeCommand(buildDirectory(), TQString::fromLatin1("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::tqfromLatin1("install"), true); + _auto ? slotInstallWithKdesu() : startMakeCommand(buildDirectory(), TQString::fromLatin1("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").tqarg(titem->name).tqarg(titem->primary), i18n("Active target is not a library") ); + "Project -> Project Options -> Run Options").arg(titem->name).arg(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 625ab370..3e33fb41 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>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index 86adb657..12a28ee5 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 <tqtextstream.h> +#include <textstream.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 tqchildren from the view + // Remove all TargetItems and all of their children 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 tqchildren into the view + // Insert all TargetItems and all of their children 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" ).tqarg( prefix ); + text = i18n( "KDE Icon data" ).arg( prefix ); else - text = i18n( "%1 (%2 in %3)" ).tqarg( name ).tqarg( nicePrimary( primary ) ).tqarg( prefix ); + text = i18n( "%1 (%2 in %3)" ).arg( name ).arg( nicePrimary( primary ) ).arg( 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 74c960fb..b7b2db15 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 <tqlayout.h> +#include <layout.h> #include <tqtoolbutton.h> #include <kiconloader.h> #include <klocale.h> diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 5916b332..4c6f87a9 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 <tqlayout.h> +#include <layout.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" ).tqarg( item->text( 0 ) ), this ); + KPopupMenu popup( i18n( "Subproject: %1" ).arg( 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::tqfromLatin1( "" ) ); + m_part->startMakeCommand( m_part->buildDirectory() + relpath, TQString::fromLatin1( "" ) ); } 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").tqarg(spitem->subdir)); + KMessageBox::sorry(this, i18n("There is no subproject %1 in SUBDIRS").arg(spitem->subdir)); return; } } - 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))); + 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))); if( dlg.exec() ){ bool removeSources = dlg.removeFromDisk(); @@ -466,7 +466,7 @@ void AutoSubprojectView::slotRemoveSubproject() } parent->listView()->setSelected( parent, true ); - kapp->tqprocessEvents( 500 ); + kapp->processEvents( 500 ); if( removeSources ){ @@ -1045,7 +1045,7 @@ void AutoSubprojectView::slotManageBuildCommands( ) { config->writeEntry(widget->commandsTable->text(i, 0), widget->commandsTable->text(i, 1)+":::"+ - TQString("%1").tqarg(static_cast<TQComboTableItem*>(widget-> + TQString("%1").arg(static_cast<TQComboTableItem*>(widget-> commandsTable->item(i, 2))->currentItem())); } config->sync(); diff --git a/buildtools/autotools/choosetargetdlgbase.ui b/buildtools/autotools/choosetargetdlgbase.ui index b754d1f7..f98c9145 100644 --- a/buildtools/autotools/choosetargetdlgbase.ui +++ b/buildtools/autotools/choosetargetdlgbase.ui @@ -12,7 +12,7 @@ <height>306</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <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="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp index d847a559..8ff8d36c 100644 --- a/buildtools/autotools/configureoptionswidget.cpp +++ b/buildtools/autotools/configureoptionswidget.cpp @@ -111,15 +111,15 @@ ConfigureOptionsWidget::~ConfigureOptionsWidget() void ConfigureOptionsWidget::fixLayout() { - 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 w1 = ccompiler_label->sizeHint().width(); + int w2 = cbinary_label->sizeHint().width(); + int w3 = cflags_label->sizeHint().width(); + int w4 = cxxcompiler_label->sizeHint().width(); + int w5 = cxxbinary_label->sizeHint().width(); + int w6 = cxxflags_label->sizeHint().width(); + int w7 = f77compiler_label->sizeHint().width(); + int w8 = f77binary_label->sizeHint().width(); + int w9 = f77flags_label->sizeHint().width(); int w = 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?").tqarg(config), TQString(), i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").arg(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").tqarg(service->name()).tqarg(errorMessage)); + "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage)); exit(1); } diff --git a/buildtools/autotools/configureoptionswidgetbase.ui b/buildtools/autotools/configureoptionswidgetbase.ui index 35315f76..9090f705 100644 --- a/buildtools/autotools/configureoptionswidgetbase.ui +++ b/buildtools/autotools/configureoptionswidgetbase.ui @@ -81,7 +81,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>8</height> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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="tqminimumSize"> + <property name="minimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <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="tqsizeHint"> + <property name="sizeHint"> <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="tqminimumSize"> + <property name="minimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <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="tqsizeHint"> + <property name="sizeHint"> <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="tqsizeHint"> + <property name="sizeHint"> <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="tqsizeHint"> + <property name="sizeHint"> <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="tqsizeHint"> + <property name="sizeHint"> <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="tqmaximumSize"> + <property name="maximumSize"> <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="tqsizeHint"> + <property name="sizeHint"> <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="tqsizeHint"> + <property name="sizeHint"> <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="tqsizeHint"> + <property name="sizeHint"> <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="tqsizeHint"> + <property name="sizeHint"> <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="tqmaximumSize"> + <property name="maximumSize"> <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="tqsizeHint"> + <property name="sizeHint"> <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="tqsizeHint"> + <property name="sizeHint"> <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="tqsizeHint"> + <property name="sizeHint"> <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="tqmaximumSize"> + <property name="maximumSize"> <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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp index a403337d..3e73da6f 100644 --- a/buildtools/autotools/fileselectorwidget.cpp +++ b/buildtools/autotools/fileselectorwidget.cpp @@ -14,7 +14,7 @@ * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.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 tqlayout + // widgets and layout 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->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + cmbPath->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + filter->setSizePolicy( 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 96b5c79c..1a5e4419 100644 --- a/buildtools/autotools/fileselectorwidget.h +++ b/buildtools/autotools/fileselectorwidget.h @@ -12,7 +12,7 @@ #ifndef _FILESELECTORWIDGET_H_ #define _FILESELECTORWIDGET_H_ -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqhbox.h> #include <tqlabel.h> diff --git a/buildtools/autotools/makefilehandler.cpp b/buildtools/autotools/makefilehandler.cpp index 7e19dd56..db30508d 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->tqchildren(); + TQValueList<AutoTools::AST*> astChildList = ast->children(); 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->tqchildren(); + ASTList childList = ast->children(); 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 3690fa32..eab430e9 100644 --- a/buildtools/autotools/managecustomcommandsbase.ui +++ b/buildtools/autotools/managecustomcommandsbase.ui @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp index cbe4d24c..e2bdbb04 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 <tqtextstream.h> +#include <textstream.h> #include <tqdict.h> #include <kdebug.h> diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp index 95447092..f5901395 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 <tqlayout.h> +#include <layout.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?").tqarg(filename).tqarg(joinedtargets) ); + "Remove it from all of them?").arg(filename).arg(joinedtargets) ); setMinimumSize(TQSize(size().width(), size().height() + removeFromTargetsCheckBox->size().height()*2) ); } diff --git a/buildtools/autotools/removefiledlgbase.ui b/buildtools/autotools/removefiledlgbase.ui index 606d7e0f..7befbc0d 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>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>247</width> <height>20</height> @@ -69,7 +69,7 @@ <property name="name"> <cstring>fileGroupBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -110,7 +110,7 @@ <property name="name"> <cstring>noticeLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp index 10dc1f06..2e694491 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 <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqregexp.h> diff --git a/buildtools/autotools/removetargetdlgbase.ui b/buildtools/autotools/removetargetdlgbase.ui index 4f8fb286..514bdbaa 100644 --- a/buildtools/autotools/removetargetdlgbase.ui +++ b/buildtools/autotools/removetargetdlgbase.ui @@ -100,13 +100,13 @@ <property name="name"> <cstring>fileGroupBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>140</height> @@ -139,7 +139,7 @@ <property name="name"> <cstring>textLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -221,7 +221,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp index 139193b4..4c61077d 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 <tqlayout.h> +#include <layout.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'").tqarg(item->subdir)); + setCaption(i18n("Subproject Options for '%1'").arg(item->subdir)); subProject = item; m_part = part; @@ -90,7 +90,7 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj TQString subProjectName = *it; if( subProjectName.isEmpty() ){ - subProjectName = TQString::tqfromLatin1( "." ); + subProjectName = TQString::fromLatin1( "." ); } 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::tqfromLatin1("AUTO") : TQString(); + TQString new_metasources = metasources_checkbox->isChecked() ? TQString::fromLatin1("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 be60569f..6c069718 100644 --- a/buildtools/autotools/subprojectoptionsdlgbase.ui +++ b/buildtools/autotools/subprojectoptionsdlgbase.ui @@ -85,7 +85,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>25</height> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -160,7 +160,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>25</height> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -235,7 +235,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>25</height> @@ -260,7 +260,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -282,7 +282,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <vbox> <property name="name"> @@ -298,7 +298,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -325,7 +325,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -358,7 +358,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -405,7 +405,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> @@ -432,7 +432,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -489,7 +489,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -618,7 +618,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -659,7 +659,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -702,7 +702,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -735,7 +735,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -802,7 +802,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp index 7c40fbfc..9e10873c 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 <tqlayout.h> +#include <layout.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'").tqarg(item->name) ); + setCaption( i18n("Target Options for '%1'").arg(item->name) ); setIcon( SmallIcon("configure") ); target = item; diff --git a/buildtools/autotools/targetoptionsdlgbase.ui b/buildtools/autotools/targetoptionsdlgbase.ui index 4b883535..7e721a42 100644 --- a/buildtools/autotools/targetoptionsdlgbase.ui +++ b/buildtools/autotools/targetoptionsdlgbase.ui @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -211,7 +211,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -256,7 +256,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>7</height> @@ -318,7 +318,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -351,7 +351,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -400,7 +400,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -457,7 +457,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -555,7 +555,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>120</height> @@ -586,7 +586,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui index 4858696b..df063672 100644 --- a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui +++ b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -98,7 +98,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui index ece262fe..62d74ec6 100644 --- a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui +++ b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui @@ -37,7 +37,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -95,7 +95,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -155,7 +155,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>20</height> @@ -166,7 +166,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -215,7 +215,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>192</width> <height>20</height> @@ -226,7 +226,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp index 7062ab18..09238787 100644 --- a/buildtools/custommakefiles/custommanagerwidget.cpp +++ b/buildtools/custommakefiles/custommanagerwidget.cpp @@ -12,7 +12,7 @@ #include "custommanagerwidget.h" #include <tqstringlist.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqwhatsthis.h> #include <tqtooltip.h> diff --git a/buildtools/custommakefiles/custommanagerwidgetbase.ui b/buildtools/custommakefiles/custommanagerwidgetbase.ui index c74ef412..a141c0b1 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>108</height> diff --git a/buildtools/custommakefiles/customotherconfigwidgetbase.ui b/buildtools/custommakefiles/customotherconfigwidgetbase.ui index ffba0357..86917b10 100644 --- a/buildtools/custommakefiles/customotherconfigwidgetbase.ui +++ b/buildtools/custommakefiles/customotherconfigwidgetbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -79,7 +79,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -139,7 +139,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index ecdabd64..7ccf8e1c 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->tqsetWhatsThis( id, i18n( "<b>Make active directory</b><p>" + popup->setWhatsThis( 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->tqsetWhatsThis( id, i18n( "<b>Remove from blacklist</b><p>" + popup->setWhatsThis( 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->tqsetWhatsThis( id, i18n( "<b>Add to blacklist</b><p>" + popup->setWhatsThis( 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->tqsetWhatsThis( id, i18n( "<b>Add to project</b><p>Adds selected file/dir(s) to the list of files in the project. " + popup->setWhatsThis( 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->tqsetWhatsThis( id, i18n( "<b>Add to project</b><p>Recursively adds selected dir(s) to the list of files in the project. " + popup->setWhatsThis( 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->tqsetWhatsThis( id, i18n( "<b>Remove from project</b><p>Removes selected file/dir(s) from the list of files in the project. " + popup->setWhatsThis( 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->tqsetWhatsThis( id, i18n( "<b>Remove from project</b><p>Recursively removes selected dir(s) from the list of files in the project. " + popup->setWhatsThis( 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 " ).tqarg( prio ); + nice = TQString( "nice -n%1 " ).arg( prio ); } cmdline.prepend( nice ); @@ -1013,12 +1013,12 @@ void CustomProjectPart::slotCompileFile() void CustomProjectPart::slotInstallActiveDir() { - startMakeCommand( buildDirectory() + "/" + activeDirectory(), TQString::tqfromLatin1( "install" ) ); + startMakeCommand( buildDirectory() + "/" + activeDirectory(), TQString::fromLatin1( "install" ) ); } void CustomProjectPart::slotInstall() { - startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ) ); + startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ) ); } @@ -1029,12 +1029,12 @@ void CustomProjectPart::slotInstallWithKdesu() slotBuild(); // After that issue "make install" with the root user - startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ), true ); + startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ), true ); } void CustomProjectPart::slotClean() { - startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "clean" ) ); + startMakeCommand( buildDirectory(), TQString::fromLatin1( "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::tqfromLatin1( "install" ), true ); + _auto ? slotInstallWithKdesu() : startMakeCommand( buildDirectory(), TQString::fromLatin1( "install" ), true ); else slotInstall(); _auto = true; diff --git a/buildtools/lib/parsers/autotools/autotoolsast.cpp b/buildtools/lib/parsers/autotools/autotoolsast.cpp index 659fe47f..0512be78 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_tqchildren.begin(); it != m_tqchildren.end(); ++it) + for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it) { AST *node = *it; delete node; @@ -37,13 +37,13 @@ AST::~AST() void AST::addChildAST(AST *node) { - m_tqchildren.append(node); + m_children.append(node); } void AST::writeBack(TQString &buffer) { - for (TQValueList<AST*>::const_iterator it = m_tqchildren.constBegin(); - it != m_tqchildren.constEnd(); ++it) + for (TQValueList<AST*>::const_iterator it = m_children.constBegin(); + it != m_children.constEnd(); ++it) { if (*it) (*it)->writeBack(buffer); @@ -60,12 +60,12 @@ TQString AST::indentation() bool AST::hasChildren() const { - return !m_tqchildren.isEmpty(); + return !m_children.isEmpty(); } -TQValueList<AST*> AST::tqchildren() const +TQValueList<AST*> AST::children() const { - return m_tqchildren; + return m_children; } //ProjectAST diff --git a/buildtools/lib/parsers/autotools/autotoolsast.h b/buildtools/lib/parsers/autotools/autotoolsast.h index 0f5dcdc9..adefc640 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 tqchildren which are always deleted in the + * Each AST node holds the list of its children 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 tqchildren + //! \return true if this AST has children bool hasChildren() const; /** - * Get the tqchildren of this ast + * Get the children of this ast * \return the list of this ast's childre */ - TQValueList<AST*> tqchildren() const; + TQValueList<AST*> children() const; protected: NodeType m_nodeType; - TQValueList<AST*> m_tqchildren; + TQValueList<AST*> m_children; private: int m_depth; diff --git a/buildtools/lib/parsers/autotools/tests/viewer.cpp b/buildtools/lib/parsers/autotools/tests/viewer.cpp index 2693a68c..48cb4f5d 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 <tqtextedit.h> +#include <textedit.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.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 e319e2b4..7a00a47a 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>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -128,7 +128,7 @@ <property name="name"> <cstring>allLocation</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>32767</height> @@ -139,7 +139,7 @@ <property name="name"> <cstring>addAll</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>32767</height> @@ -153,7 +153,7 @@ <property name="name"> <cstring>choose</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>32767</height> @@ -175,7 +175,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>32767</height> diff --git a/buildtools/lib/parsers/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp index 5f55af4b..90306ff1 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_tqchildren.begin(); it != m_tqchildren.end(); ++it) + for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it) { AST *node = *it; delete node; } - m_tqchildren.clear(); + m_children.clear(); } void AST::addChildAST(AST *node) { - m_tqchildren.append(node); + m_children.append(node); } void AST::removeChildAST(AST *node) { - m_tqchildren.remove(node); + m_children.remove(node); } void AST::writeBack(TQString &buffer) { - for (TQValueList<AST*>::const_iterator it = m_tqchildren.constBegin(); - it != m_tqchildren.constEnd(); ++it) + for (TQValueList<AST*>::const_iterator it = m_children.constBegin(); + it != m_children.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_tqchildren.begin(); it != m_tqchildren.end(); ++it) + for (TQValueList<TQMake::AST*>::const_iterator it = m_children.begin(); it != m_children.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_tqchildren.count() == 1 ) + if( m_children.count() == 1 ) buffer += " : "; else buffer += " {"; @@ -94,9 +94,9 @@ void ProjectAST::writeBack(TQString &buffer) if( !buffer.endsWith(": ") ) buffer += indentation(); buffer += scopedID + "(" + args + ")"; - if( m_tqchildren.count() == 1 && hasActualStatements ) + if( m_children.count() == 1 && hasActualStatements ) buffer += ": "; - else if( (m_tqchildren.count() > 0 && hasActualStatements) ) + else if( (m_children.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_tqchildren.count() > 1 ) + if (isScope() && m_children.count() > 1 ) buffer += indentation() + "}"; - if (isFunctionScope() && (hasActualStatements) && m_tqchildren.count() > 1) + if (isFunctionScope() && (hasActualStatements) && m_children.count() > 1) buffer += indentation() + "}"; } diff --git a/buildtools/lib/parsers/qmake/qmakeast.h b/buildtools/lib/parsers/qmake/qmakeast.h index a0c5c1de..15929d2d 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 tqchildren which are always deleted in the +Each AST node holds the list of its children 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_tqchildren; + TQValueList<AST*> m_children; protected: NodeType m_nodeType; diff --git a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp index b733a880..8740f16a 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_tqchildren.constBegin(); - it != project->m_tqchildren.constEnd(); ++it) + for (TQValueList<TQMake::AST*>::const_iterator it = project->m_children.constBegin(); + it != project->m_children.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 eef16513..dbcc7db7 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 <tqtextedit.h> +#include <textedit.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.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 1308cc1d..c76abc20 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>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -38,7 +38,7 @@ <property name="name"> <cstring>allLocation</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -49,7 +49,7 @@ <property name="name"> <cstring>addAll</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -63,7 +63,7 @@ <property name="name"> <cstring>choose</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -85,7 +85,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> diff --git a/buildtools/lib/widgets/addenvvardlg.cpp b/buildtools/lib/widgets/addenvvardlg.cpp index f66bbe93..80ba96a0 100644 --- a/buildtools/lib/widgets/addenvvardlg.cpp +++ b/buildtools/lib/widgets/addenvvardlg.cpp @@ -18,7 +18,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.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 *tqlayout = new TQVBoxLayout(this, 10); + TQVBoxLayout *layout = new TQVBoxLayout(this, 10); TQGridLayout *grid = new TQGridLayout(2, 2); - tqlayout->addLayout(grid); + layout->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); - tqlayout->addWidget(frame, 0); + layout->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->tqlayout(); - tqlayout->addWidget(buttonbox, 0); + buttonbox->layout(); + layout->addWidget(buttonbox, 0); slotTextChanged(); } diff --git a/buildtools/lib/widgets/environmentdisplaydialogbase.ui b/buildtools/lib/widgets/environmentdisplaydialogbase.ui index e19d27a0..5388fe59 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>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>321</width> <height>21</height> diff --git a/buildtools/lib/widgets/environmentvariableswidgetbase.ui b/buildtools/lib/widgets/environmentvariableswidgetbase.ui index c06239f7..e7246de3 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>171</height> diff --git a/buildtools/lib/widgets/envvartools.cpp b/buildtools/lib/widgets/envvartools.cpp index 13b1391a..71c44377 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::tqfromLatin1("'")), TQString::tqfromLatin1("'\\''")); + res.replace(TQRegExp(TQString::fromLatin1("'")), TQString::fromLatin1("'\\''")); res.prepend("\""); res.append("\""); return res; diff --git a/buildtools/lib/widgets/makeoptionswidgetbase.ui b/buildtools/lib/widgets/makeoptionswidgetbase.ui index 4f0829ae..9caba3ee 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>20</height> @@ -122,7 +122,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/lib/widgets/removesubprojectdlgbase.ui b/buildtools/lib/widgets/removesubprojectdlgbase.ui index e891ff07..d5206ac6 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="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>140</height> @@ -65,7 +65,7 @@ <property name="name"> <cstring>noticeLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> diff --git a/buildtools/lib/widgets/runoptionswidgetbase.ui b/buildtools/lib/widgets/runoptionswidgetbase.ui index 40d79634..30f10e48 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="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> <property name="whatsThis" stdset="0"> diff --git a/buildtools/lib/widgets/subclassesdlgbase.ui b/buildtools/lib/widgets/subclassesdlgbase.ui index 100100cb..e25d1a5d 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="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>24</height> @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> @@ -95,7 +95,7 @@ <property name="text"> <string>Related subclass &location:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <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>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>310</width> <height>20</height> diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp index a88e901c..2dd2a833 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.cpp +++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp @@ -8,7 +8,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.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 f3ffb8c2..8defc492 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>8</height> @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -129,7 +129,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -252,7 +252,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -269,7 +269,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -286,7 +286,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>400</width> <height>20</height> @@ -305,7 +305,7 @@ <property name="name"> <cstring>mainSourceUrl</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>26</height> @@ -344,7 +344,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index 22261004..6cb66847 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").tqarg(service->name()).tqarg(errorMessage)); + "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage)); exit(1); } diff --git a/buildtools/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui index df01a06c..f1e2e579 100644 --- a/buildtools/qmake/choosesubprojectdlgbase.ui +++ b/buildtools/qmake/choosesubprojectdlgbase.ui @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/qmake/createscopedlgbase.ui b/buildtools/qmake/createscopedlgbase.ui index 4ba7212e..d1550092 100644 --- a/buildtools/qmake/createscopedlgbase.ui +++ b/buildtools/qmake/createscopedlgbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -68,7 +68,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>95</width> <height>20</height> @@ -232,7 +232,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -248,7 +248,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>150</width> <height>20</height> diff --git a/buildtools/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui index d7b78289..fadafc04 100644 --- a/buildtools/qmake/disablesubprojectdlgbase.ui +++ b/buildtools/qmake/disablesubprojectdlgbase.ui @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/buildtools/qmake/newwidgetdlgbase.ui b/buildtools/qmake/newwidgetdlgbase.ui index 178fa761..243fbff3 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="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>0</height> @@ -124,7 +124,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>160</height> @@ -159,7 +159,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>310</width> <height>0</height> diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui index 2df4d131..6c1006b3 100644 --- a/buildtools/qmake/projectconfigurationdlgbase.ui +++ b/buildtools/qmake/projectconfigurationdlgbase.ui @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>260</width> <height>16</height> @@ -150,7 +150,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>20</height> @@ -338,7 +338,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>120</height> @@ -377,7 +377,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout147</cstring> + <cstring>layout147</cstring> </property> <hbox> <property name="name"> @@ -426,7 +426,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout30</cstring> + <cstring>layout30</cstring> </property> <hbox> <property name="name"> @@ -762,7 +762,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout69</cstring> + <cstring>layout69</cstring> </property> <vbox> <property name="name"> @@ -816,7 +816,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -825,7 +825,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout68</cstring> + <cstring>layout68</cstring> </property> <vbox> <property name="name"> @@ -855,7 +855,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout67</cstring> + <cstring>layout67</cstring> </property> <hbox> <property name="name"> @@ -893,7 +893,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -950,7 +950,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -999,7 +999,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -1055,7 +1055,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>70</height> @@ -1079,7 +1079,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -1106,7 +1106,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -1162,7 +1162,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>70</height> @@ -1175,7 +1175,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -1202,7 +1202,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -1258,7 +1258,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -1330,7 +1330,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1356,7 +1356,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout26</cstring> + <cstring>layout26</cstring> </property> <hbox> <property name="name"> @@ -1418,7 +1418,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1431,7 +1431,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout27</cstring> + <cstring>layout27</cstring> </property> <hbox> <property name="name"> @@ -1458,7 +1458,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9_2</cstring> + <cstring>layout9_2</cstring> </property> <vbox> <property name="name"> @@ -1514,7 +1514,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>64</height> @@ -1527,7 +1527,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout28_2</cstring> + <cstring>layout28_2</cstring> </property> <hbox> <property name="name"> @@ -1589,7 +1589,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1634,7 +1634,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout26</cstring> + <cstring>layout26</cstring> </property> <hbox> <property name="name"> @@ -1642,7 +1642,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <vbox> <property name="name"> @@ -1682,7 +1682,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <vbox> <property name="name"> @@ -1722,7 +1722,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout84</cstring> + <cstring>layout84</cstring> </property> <vbox> <property name="name"> @@ -1776,7 +1776,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout85</cstring> + <cstring>layout85</cstring> </property> <vbox> <property name="name"> @@ -1867,7 +1867,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -1889,7 +1889,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -1952,7 +1952,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <vbox> <property name="name"> @@ -1960,7 +1960,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <vbox> <property name="name"> @@ -2010,7 +2010,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>106</height> @@ -2023,7 +2023,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout33</cstring> + <cstring>layout33</cstring> </property> <hbox> <property name="name"> @@ -2062,7 +2062,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout32</cstring> + <cstring>layout32</cstring> </property> <hbox> <property name="name"> @@ -2130,7 +2130,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>250</width> <height>20</height> @@ -2141,7 +2141,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout34</cstring> + <cstring>layout34</cstring> </property> <hbox> <property name="name"> @@ -2162,7 +2162,7 @@ <property name="text"> <string>Value:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> diff --git a/buildtools/qmake/qmakeoptionswidgetbase.ui b/buildtools/qmake/qmakeoptionswidgetbase.ui index 312536bc..1ae7a808 100644 --- a/buildtools/qmake/qmakeoptionswidgetbase.ui +++ b/buildtools/qmake/qmakeoptionswidgetbase.ui @@ -31,7 +31,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</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="tqalignment"> + <property name="alignment"> <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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp index b937287c..2c862fb3 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" ).tqarg( filename ), + KMessageBox::error( 0, i18n( "Could not parse project file: %1" ).arg( 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" ).tqarg( filename ), + KMessageBox::error( 0, i18n( "Could not write project file: %1" ).arg( 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_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it ) + for ( it = m_root->m_children.begin(); it != m_root->m_children.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_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it ) + for ( it = m_root->m_children.begin(); it != m_root->m_children.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_tqchildren[ m_root->m_tqchildren.findIndex( funcScope->m_root ) ]; + TQMake::AST* ast = m_root->m_children[ m_root->m_children.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_tqchildren[ m_root->m_tqchildren.findIndex( simpleScope->m_root ) ]; + TQMake::AST* ast = m_root->m_children[ m_root->m_children.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_tqchildren.end() ) + if ( it != m_root->m_children.end() ) { TQMake::AssignmentAST * tempast = static_cast<TQMake::AssignmentAST*>( *it ); - if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_tqchildren.end() ) + if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_children.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_tqchildren.end() ) + if ( foundit != m_root->m_children.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_tqchildren.count() - 1; i >= 0; --i ) + for ( int i = m_root->m_children.count() - 1; i >= 0; --i ) { - if ( m_root->m_tqchildren[ i ] ->nodeType() == TQMake::AST::AssignmentAST ) + if ( m_root->m_children[ i ] ->nodeType() == TQMake::AST::AssignmentAST ) { - TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( m_root->m_tqchildren[ i ] ); + TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( m_root->m_children[ 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_tqchildren.begin(); it != m_root->m_tqchildren.end() ; ++it ) + for ( it = m_root->m_children.begin(); it != m_root->m_children.end() ; ++it ) { if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST ) { @@ -909,7 +909,7 @@ TQValueList<TQMake::AST*>::iterator Scope::findExistingVariable( const TQString& } } } - return m_root->m_tqchildren.end(); + return m_root->m_children.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_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it ) + for ( it = m_root->m_children.begin(); it != m_root->m_children.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_tqchildren.remove( m ); + m_root->m_children.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_tqchildren.begin(); - for ( ; it != m_root->m_tqchildren.end(); ++it ) + TQValueList<TQMake::AST*>::const_iterator it = m_root->m_children.begin(); + for ( ; it != m_root->m_children.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_tqchildren.begin(); - for ( ; it != m_root->m_tqchildren.end(); ++it ) + TQValueList<TQMake::AST*>::iterator it = m_root->m_children.begin(); + for ( ; it != m_root->m_children.end(); ++it ) { if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST ) { ast = static_cast<TQMake::AssignmentAST*>( *it ); if ( ast->scopedID == var && ast->op == op ) { - m_root->m_tqchildren.remove( ast ); - it = m_root->m_tqchildren.begin(); + m_root->m_children.remove( ast ); + it = m_root->m_children.begin(); } } } diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index abd26606..8e672b4e 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::tqfromLatin1( isTMakeProject() ? "tmake " : "qmake " ); + //TQString cmdline = TQString::fromLatin1( 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::tqfromLatin1( " -o Makefile" ); +// cmdline += TQString::fromLatin1( " -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").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"+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" ); 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 f2aca642..d9706ad8 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 <tqtextstream.h> +#include <textstream.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->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); + // overviewContainer->setSizePolicy(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->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addSubdirButton->sizePolicy().hasHeightForWidth() ) ); + addSubdirButton->setSizePolicy ( 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->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, createScopeButton->sizePolicy().hasHeightForWidth() ) ); + createScopeButton->setSizePolicy ( 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->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildProjectButton->sizePolicy().hasHeightForWidth() ) ); + buildProjectButton->setSizePolicy ( 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->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildProjectButton->sizePolicy().hasHeightForWidth() ) ); + rebuildProjectButton->setSizePolicy ( 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->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeProjectButton->sizePolicy().hasHeightForWidth() ) ); + executeProjectButton->setSizePolicy ( 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->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, projectconfButton->sizePolicy().hasHeightForWidth() ) ); + projectconfButton->setSizePolicy ( 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->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + // detailContainer->setSizePolicy(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->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, newfileButton->sizePolicy().hasHeightForWidth() ) ); + newfileButton->setSizePolicy ( 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->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addfilesButton->sizePolicy().hasHeightForWidth() ) ); + addfilesButton->setSizePolicy ( 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->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, removefileButton->sizePolicy().hasHeightForWidth() ) ); + removefileButton->setSizePolicy ( 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->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildFileButton->sizePolicy().hasHeightForWidth() ) ); + buildFileButton->setSizePolicy ( 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->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildTargetButton->sizePolicy().hasHeightForWidth() ) ); + buildTargetButton->setSizePolicy ( 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->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildTargetButton->sizePolicy().hasHeightForWidth() ) ); + rebuildTargetButton->setSizePolicy ( 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->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeTargetButton->sizePolicy().hasHeightForWidth() ) ); + executeTargetButton->setSizePolicy ( 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->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, excludeFileFromScopeButton->sizePolicy().hasHeightForWidth() ) ); + excludeFileFromScopeButton->setSizePolicy ( 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 tqchildren in detailview + // If no children 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 tqchildren into the view + // Insert all GroupItems and all of their children 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" ).tqarg( item->text( 0 ) ) ); + popup.insertTitle( i18n( "Subproject %1" ).arg( 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.tqsetWhatsThis( idBuild, i18n( "<b>Build</b><p>Runs <b>make</b> from the selected subproject directory.<br>" + popup.setWhatsThis( 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.tqsetWhatsThis( idBuild, i18n( "<b>Install</b><p>Runs <b>make install</b> from the selected subproject directory.<br>" + popup.setWhatsThis( 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.tqsetWhatsThis( idBuild, i18n( "<b>Clean project</b><p>Runs <b>make clean</b> command from the project " + popup.setWhatsThis( 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.tqsetWhatsThis( idBuild, i18n( "<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the project " + popup.setWhatsThis( 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.tqsetWhatsThis( idRebuild, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from " + popup.setWhatsThis( 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.tqsetWhatsThis( idQmake, i18n( "<b>Run qmake</b><p>Runs <b>qmake</b> from the selected subproject directory. This creates or regenerates Makefile." ) ); + popup.setWhatsThis( 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.tqsetWhatsThis( idQmakeRecursive, i18n( "<b>Run qmake recursively</b><p>Runs <b>qmake</b> from the selected " + popup.setWhatsThis( 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.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. " + 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. " "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.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." ) ); + popup.setWhatsThis( idRemoveSubproject, i18n( "<b>Remove subproject</b><p>Removes currently selected subproject. Does not delete any file from disk. Deleted subproject can be later added by calling 'Add Subproject' action." ) ); if ( spitem->parent() == NULL ) popup.setItemEnabled( idRemoveSubproject, false ); idAddScope = popup.insertItem( SmallIcon( "qmake_scopenew" ), i18n( "Create Scope..." ) ); - popup.tqsetWhatsThis( idAddScope, i18n( "<b>Create scope</b><p>Creates TQMake scope in the project file of the currently selected subproject." ) ); + popup.setWhatsThis( 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.tqsetWhatsThis( idProjectConfiguration, i18n( "<b>Subproject settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. " + popup.setWhatsThis( 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.tqsetWhatsThis( idAddScope, i18n( "<b>Create Scope</b><p>Creates TQMake scope in the currently selected scope." ) ); + popup.setWhatsThis( idAddScope, i18n( "<b>Create Scope</b><p>Creates TQMake scope in the currently selected scope." ) ); idRemoveScope = popup.insertItem( SmallIcon( "editdelete" ), i18n( "Remove Scope" ) ); - popup.tqsetWhatsThis( idRemoveScope, i18n( "<b>Remove Scope</b><p>Removes currently selected scope." ) ); + popup.setWhatsThis( idRemoveScope, i18n( "<b>Remove Scope</b><p>Removes currently selected scope." ) ); popup.insertSeparator(); idAddSubproject = popup.insertItem( SmallIcon( "folder_new" ), i18n( "Add Subproject..." ) ); - 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. " + 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. " "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.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." ) ); + popup.setWhatsThis( idRemoveSubproject, i18n( "<b>Disable subproject</b><p>Disables the currently selected subproject when this scope is active. Does not delete the directory from disk. The deleted subproject can be later added by using the 'Add Subproject' action." ) ); if( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 && spitem->scope->parent()->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 ) popup.setItemEnabled( idDisableSubproject, false ); popup.insertSeparator(); idProjectConfiguration = popup.insertItem( SmallIcon( "configure" ), i18n( "Scope Settings" ) ); - popup.tqsetWhatsThis( idProjectConfiguration, i18n( "<b>Scope settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. " + popup.setWhatsThis( 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::tqfromLatin1("")); + // m_part->startMakeCommand(projectDirectory() + relpath, TQString::fromLatin1("")); } else if ( r == idInstall ) { slotInstallTarget(); - // m_part->startMakeCommand(projectDirectory() + relpath, TQString::tqfromLatin1("")); + // m_part->startMakeCommand(projectDirectory() + relpath, TQString::fromLatin1("")); } 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.tqsetWhatsThis( idInsInstallObject, i18n( "<b>Add install object</b><p>Creates TQMake install object. " + popup.setWhatsThis( 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.tqsetWhatsThis( idSetInstObjPath, i18n( "<b>Install path</b><p>Allows to choose the installation path for the current install object." ) ); + popup.setWhatsThis( 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.tqsetWhatsThis( idInsNewFilepatternItem, i18n( "<b>Add pattern of files to install</b><p>Defines the pattern to match files which will be installed. " + popup.setWhatsThis( 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.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove install object</b><p>Removes the install object the current group." ) ); + popup.setWhatsThis( 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.tqsetWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new translation file and adds it to a currently selected TRANSLATIONS group." ) ); + popup.setWhatsThis( 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.tqsetWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing translation (*.ts) files to a currently selected TRANSLATIONS group. It is " + popup.setWhatsThis( 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.tqsetWhatsThis( idLUpdate, i18n( "<b>Update Translation Files</b><p>Runs <b>lupdate</b> command from the current subproject directory. It collects translatable " + popup.setWhatsThis( 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.tqsetWhatsThis( idLRelease, i18n( "<b>Release Binary Translations</b><p>Runs <b>lrelease</b> command from the current subproject directory. It creates binary " + popup.setWhatsThis( 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.tqsetWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) ); + popup.setWhatsThis( 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.tqsetWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is " + popup.setWhatsThis( 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" ).tqarg( fitem->text( 0 ) ) ); + popup.insertTitle( i18n( "File: %1" ).arg( fitem->text( 0 ) ) ); else - popup.insertTitle( i18n( "Pattern: %1" ).tqarg( fitem->text( 0 ) ) ); + popup.insertTitle( i18n( "Pattern: %1" ).arg( 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.tqsetWhatsThis( idUpdateWidgetclass, i18n( "<b>Edit ui-subclass</b><p>Launches <b>Subclassing</b> wizard " + popup.setWhatsThis( 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.tqsetWhatsThis( idSubclassWidget, i18n( "<b>Subclass widget</b><p>Launches <b>Subclassing</b> wizard. " + popup.setWhatsThis( idSubclassWidget, i18n( "<b>Subclass widget</b><p>Launches <b>Subclassing</b> wizard. " "It allows to create a subclass from the class defined in .ui file. " "There is also possibility to implement slots and functions defined in the base class." ) ); if ( !m_part->isTQt4Project() ) { idViewUIH = popup.insertItem( SmallIconSet( "qmake_ui_h" ), i18n( "Open ui.h File" ) ); - popup.tqsetWhatsThis( idViewUIH, i18n( "<b>Open ui.h file</b><p>Opens .ui.h file associated with the selected .ui." ) ); + popup.setWhatsThis( idViewUIH, i18n( "<b>Open ui.h file</b><p>Opens .ui.h file associated with the selected .ui." ) ); } idUISubclasses = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "List of Subclasses..." ) ); - popup.tqsetWhatsThis( idUISubclasses, i18n( "<b>List of subclasses</b><p>Shows subclasses list editor. " + popup.setWhatsThis( idUISubclasses, i18n( "<b>List of subclasses</b><p>Shows subclasses list editor. " "There is possibility to add or remove subclasses from the list." ) ); } if ( !( gitem->groupType == GroupItem::InstallObject ) ) { idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove File" ) ); - popup.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove file</b><p>Removes file from a current group. For sources, this also removes the subclassing information." ) ); + popup.setWhatsThis( 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.tqsetWhatsThis( idFileProperties, i18n( "<b>Exclude File</b><p>Excludes the file from this Scope. Does not touch subclassing information" ) ); + popup.setWhatsThis( 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.tqsetWhatsThis( idEditInstallPattern, i18n( "<b>Edit pattern</b><p>Allows to edit install files pattern." ) ); + popup.setWhatsThis( idEditInstallPattern, i18n( "<b>Edit pattern</b><p>Allows to edit install files pattern." ) ); idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove Pattern" ) ); - popup.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove pattern</b><p>Removes install files pattern from the current install object." ) ); + popup.setWhatsThis( 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.tqsetWhatsThis( idBuildFile, i18n( "<b>Build File</b><p>Builds the object file for this source file." ) ); + popup.setWhatsThis( 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?" ) - .tqarg( fitem->text( 0 ) ) + + .arg( 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?").tqarg(path).tqarg(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?").arg(path).arg(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 e5d72bcf..e2f4c0ac 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 <tqlayout.h> +#include <layout.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->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); + 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); m_part = part; } diff --git a/buildtools/script/scriptoptionswidgetbase.ui b/buildtools/script/scriptoptionswidgetbase.ui index 7ac003f4..c23e3941 100644 --- a/buildtools/script/scriptoptionswidgetbase.ui +++ b/buildtools/script/scriptoptionswidgetbase.ui @@ -51,7 +51,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/editors/editor-chooser/editchooser.ui b/editors/editor-chooser/editchooser.ui index a5862a50..3c395ce7 100644 --- a/editors/editor-chooser/editchooser.ui +++ b/editors/editor-chooser/editchooser.ui @@ -102,7 +102,7 @@ already open files.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> diff --git a/embedded/visualboyadvance/vbaconfigwidgetbase.ui b/embedded/visualboyadvance/vbaconfigwidgetbase.ui index d2ca54cb..812657ac 100644 --- a/embedded/visualboyadvance/vbaconfigwidgetbase.ui +++ b/embedded/visualboyadvance/vbaconfigwidgetbase.ui @@ -125,7 +125,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>0</height> @@ -147,7 +147,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>0</height> diff --git a/kdevdesigner/designer/about.ui b/kdevdesigner/designer/about.ui index 7034bca4..48d53486 100644 --- a/kdevdesigner/designer/about.ui +++ b/kdevdesigner/designer/about.ui @@ -66,7 +66,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -79,7 +79,7 @@ <property name="text"> <string>Version 3.2</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -92,7 +92,7 @@ <property name="text"> <string>Copyright (C) 2000-2003 Trolltech AS. All Rights Reserved.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -113,7 +113,7 @@ <property name="text"> <string><p>Qt Commercial Edition license holders: This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.</p><p></p><p>Qt Free Edition users: This program is licensed to you under the terms of the GNU General Public License Version 2. For details, see the file LICENSE.GPL that came with this software distribution.</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp index 9eb97cbd..a4988bda 100644 --- a/kdevdesigner/designer/actiondnd.cpp +++ b/kdevdesigner/designer/actiondnd.cpp @@ -38,7 +38,7 @@ #include <tqbitmap.h> #include <tqdragobject.h> #include <tqinputdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmainwindow.h> #include <tqmenudata.h> #include <tqmessagebox.h> @@ -140,7 +140,7 @@ QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolB setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); } void QDesignerToolBarSeparator::setOrientation( Qt::Orientation o ) @@ -153,9 +153,9 @@ void QDesignerToolBarSeparator::styleChange( TQStyle& ) setOrientation( orient ); } -TQSize QDesignerToolBarSeparator::tqsizeHint() const +TQSize QDesignerToolBarSeparator::sizeHint() const { - int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, + int extent = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); if ( orient ==Qt::Horizontal ) return TQSize( extent, 0 ); @@ -172,7 +172,7 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * ) flags |= TQStyle::Style_Horizontal; tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), - tqcolorGroup(), flags ); + colorGroup(), flags ); } @@ -349,7 +349,7 @@ void QDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e ) menu.insertItem( i18n( "Delete Toolbar" ), 1 ); int res = menu.exec( e->globalPos() ); if ( res != -1 ) { - RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).tqarg( name() ), + RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).arg( name() ), formWindow, 0, this ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -409,7 +409,7 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject * int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ). - tqarg( a->name() ).tqarg( caption() ), + arg( a->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -429,7 +429,7 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject * formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); } else if ( res == ID_DELTOOLBAR ) { - RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).tqarg( name() ), + RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).arg( name() ), formWindow, 0, this ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -464,7 +464,7 @@ void QDesignerToolBar::removeWidget( TQWidget *w ) int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ). - tqarg( a->name() ).tqarg( caption() ), + arg( a->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -487,7 +487,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ). - tqarg( a->name() ).tqarg( caption() ), + arg( a->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -504,7 +504,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) } if ( !drag->drag() ) { AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Action '%1' to Toolbar '%2'" ). - tqarg( a->name() ).tqarg( caption() ), + arg( a->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -571,7 +571,7 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e ) } AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Action '%1' to Toolbar '%2'" ). - tqarg( a->name() ).tqarg( caption() ), + arg( a->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -699,7 +699,7 @@ void QDesignerToolBar::doInsertWidget( const TQPoint &p ) if ( !insertAnchor ) index = 0; AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Widget '%1' to Toolbar '%2'" ). - tqarg( w->name() ).tqarg( caption() ), + arg( w->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); diff --git a/kdevdesigner/designer/actiondnd.h b/kdevdesigner/designer/actiondnd.h index 5e830949..0050ace8 100644 --- a/kdevdesigner/designer/actiondnd.h +++ b/kdevdesigner/designer/actiondnd.h @@ -160,7 +160,7 @@ class QDesignerToolBarSeparator : public TQWidget public: QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; Qt::Orientation orientation() const { return orient; } public slots: void setOrientation( Qt::Orientation ); diff --git a/kdevdesigner/designer/actioneditor.ui b/kdevdesigner/designer/actioneditor.ui index 38d1f966..c2c5988c 100644 --- a/kdevdesigner/designer/actioneditor.ui +++ b/kdevdesigner/designer/actioneditor.ui @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp index 60a14cdf..50c604bd 100644 --- a/kdevdesigner/designer/command.cpp +++ b/kdevdesigner/designer/command.cpp @@ -43,11 +43,11 @@ #include <tqwidget.h> #include <tqmetaobject.h> #include <tqapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmessagebox.h> #include <tqlistbox.h> #include <tqiconview.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqptrstack.h> #include <tqheader.h> #include <tqsplitter.h> @@ -261,19 +261,19 @@ void ResizeCommand::unexecute() InsertCommand::InsertCommand( const TQString &n, FormWindow *fw, TQWidget *w, const TQRect &g ) - : Command( n, fw ), widget( w ), tqgeometry( g ) + : Command( n, fw ), widget( w ), geometry( g ) { } void InsertCommand::execute() { - if ( tqgeometry.size() == TQSize( 0, 0 ) ) { - widget->move( tqgeometry.topLeft() ); + if ( geometry.size() == TQSize( 0, 0 ) ) { + widget->move( geometry.topLeft() ); widget->adjustSize(); } else { - TQSize s = tqgeometry.size().expandedTo( widget->tqminimumSize() ); - s = s.expandedTo( widget->tqminimumSizeHint() ); - TQRect r( tqgeometry.topLeft(), s ); + TQSize s = geometry.size().expandedTo( widget->minimumSize() ); + s = s.expandedTo( widget->minimumSizeHint() ); + TQRect r( geometry.topLeft(), s ); widget->setGeometry( r ); } widget->show(); @@ -369,17 +369,17 @@ DeleteCommand::DeleteCommand( const TQString &n, FormWindow *fw, TQWidgetList copyOfWidgets = widgets; copyOfWidgets.setAutoDelete(FALSE); - // Include the tqchildren of the selected items when deleting + // Include the children of the selected items when deleting for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - TQObjectList *tqchildren = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); - for ( TQWidget *c = (TQWidget *)tqchildren->first(); c; c = (TQWidget *)tqchildren->next() ) { + TQObjectList *children = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); + for ( TQWidget *c = (TQWidget *)children->first(); c; c = (TQWidget *)children->next() ) { if ( copyOfWidgets.find( c ) == -1 && formWindow()->widgets()->find( c ) ) { widgets.insert(widgets.at() + 1, c); widgets.prev(); copyOfWidgets.append(c); } } - delete tqchildren; + delete children; } } @@ -490,7 +490,7 @@ bool SetPropertyCommand::canMerge( Command *c ) if ( !widget ) return FALSE; const TQMetaProperty *p = - widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, TRUE ), TRUE ); + widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { if ( propName == "toolTip" || propName == "whatsThis" ) return TRUE; @@ -563,26 +563,26 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ if ( select ) editor->propertyList()->setCurrentProperty( propName ); const TQMetaProperty *p = - widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, TRUE ), TRUE ); + widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { if ( propName == "hAlign" ) { - p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); - int align = widget->property( "tqalignment" ).toInt(); + p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", TRUE ), TRUE ); + int align = widget->property( "alignment" ).toInt(); align &= ~( AlignHorizontal_Mask ); align |= p->keyToValue( currentItemText ); - widget->setProperty( "tqalignment", TQVariant( align ) ); + widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "vAlign" ) { - p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); - int align = widget->property( "tqalignment" ).toInt(); + p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", TRUE ), TRUE ); + int align = widget->property( "alignment" ).toInt(); align &= ~( AlignVertical_Mask ); align |= p->keyToValue( currentItemText ); - widget->setProperty( "tqalignment", TQVariant( align ) ); + widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "wordwrap" ) { - int align = widget->property( "tqalignment" ).toInt(); + int align = widget->property( "alignment" ).toInt(); align &= ~WordBreak; if ( v.toBool() ) align |= WordBreak; - widget->setProperty( "tqalignment", TQVariant( align ) ); + widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "layoutSpacing" ) { TQVariant val = v; if ( val.toString() == "default" ) @@ -674,21 +674,21 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw, TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase ) + : Command( n, fw ), layout( wl, parent, fw, layoutBase ) { } void LayoutHorizontalCommand::execute() { formWindow()->clearSelection( FALSE ); - tqlayout.doLayout(); + layout.doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } void LayoutHorizontalCommand::unexecute() { formWindow()->clearSelection( FALSE ); - tqlayout.undoLayout(); + layout.undoLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -697,21 +697,21 @@ void LayoutHorizontalCommand::unexecute() LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw, TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TRUE, TRUE ) + : Command( n, fw ), layout( wl, parent, fw, layoutBase, TRUE, TRUE ) { } void LayoutHorizontalSplitCommand::execute() { formWindow()->clearSelection( FALSE ); - tqlayout.doLayout(); + layout.doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } void LayoutHorizontalSplitCommand::unexecute() { formWindow()->clearSelection( FALSE ); - tqlayout.undoLayout(); + layout.undoLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -720,21 +720,21 @@ void LayoutHorizontalSplitCommand::unexecute() LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw, TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase ) + : Command( n, fw ), layout( wl, parent, fw, layoutBase ) { } void LayoutVerticalCommand::execute() { formWindow()->clearSelection( FALSE ); - tqlayout.doLayout(); + layout.doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } void LayoutVerticalCommand::unexecute() { formWindow()->clearSelection( FALSE ); - tqlayout.undoLayout(); + layout.undoLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -743,21 +743,21 @@ void LayoutVerticalCommand::unexecute() LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw, TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TRUE, TRUE ) + : Command( n, fw ), layout( wl, parent, fw, layoutBase, TRUE, TRUE ) { } void LayoutVerticalSplitCommand::execute() { formWindow()->clearSelection( FALSE ); - tqlayout.doLayout(); + layout.doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } void LayoutVerticalSplitCommand::unexecute() { formWindow()->clearSelection( FALSE ); - tqlayout.undoLayout(); + layout.undoLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -766,21 +766,21 @@ void LayoutVerticalSplitCommand::unexecute() LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw, TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl, int xres, int yres ) - : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) ) + : Command( n, fw ), layout( wl, parent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) ) { } void LayoutGridCommand::execute() { formWindow()->clearSelection( FALSE ); - tqlayout.doLayout(); + layout.doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } void LayoutGridCommand::unexecute() { formWindow()->clearSelection( FALSE ); - tqlayout.undoLayout(); + layout.undoLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -793,21 +793,21 @@ BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw, WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase ); spacing = MetaDataBase::spacing( TQT_TQOBJECT(layoutBase) ); margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) ); - tqlayout = 0; + layout = 0; if ( lay == WidgetFactory::HBox ) - tqlayout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 ); + layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 ); else if ( lay == WidgetFactory::VBox ) - tqlayout = new VerticalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 ); + layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 ); else if ( lay == WidgetFactory::Grid ) - tqlayout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), FALSE ); + layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), FALSE ); } void BreakLayoutCommand::execute() { - if ( !tqlayout ) + if ( !layout ) return; formWindow()->clearSelection( FALSE ); - tqlayout->breakLayout(); + layout->breakLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) w->resize( TQMAX( 16, w->width() ), TQMAX( 16, w->height() ) ); @@ -815,10 +815,10 @@ void BreakLayoutCommand::execute() void BreakLayoutCommand::unexecute() { - if ( !tqlayout ) + if ( !layout ) return; formWindow()->clearSelection( FALSE ); - tqlayout->doLayout(); + layout->doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), spacing ); MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), margin ); @@ -2390,8 +2390,8 @@ TQString RenameMenuCommand::makeLegal( const TQString &str ) // remove illegal characters TQString d; char c = 0, i = 0; - while ( !str.tqat(i).isNull() ) { - c = str.tqat(i).latin1(); + while ( !str.at(i).isNull() ) { + c = str.at(i).latin1(); if ( c == '-' || c == ' ' ) d += '_'; else if ( ( c >= '0' && c <= '9') || ( c >= 'A' && c <= 'Z' ) diff --git a/kdevdesigner/designer/command.h b/kdevdesigner/designer/command.h index 909c8ea4..b2c2d161 100644 --- a/kdevdesigner/designer/command.h +++ b/kdevdesigner/designer/command.h @@ -208,7 +208,7 @@ public: private: TQWidget *widget; - TQRect tqgeometry; + TQRect geometry; }; @@ -290,7 +290,7 @@ public: Type type() const { return LayoutHorizontal; } private: - HorizontalLayout tqlayout; + HorizontalLayout layout; }; @@ -306,7 +306,7 @@ public: Type type() const { return LayoutHorizontalSplitter; } private: - HorizontalLayout tqlayout; + HorizontalLayout layout; }; @@ -322,7 +322,7 @@ public: Type type() const { return LayoutVertical; } private: - VerticalLayout tqlayout; + VerticalLayout layout; }; @@ -338,7 +338,7 @@ public: Type type() const { return LayoutVerticalSplitter; } private: - VerticalLayout tqlayout; + VerticalLayout layout; }; @@ -354,7 +354,7 @@ public: Type type() const { return LayoutGrid; } private: - GridLayout tqlayout; + GridLayout layout; }; @@ -369,7 +369,7 @@ public: Type type() const { return BreakLayout; } private: - Layout *tqlayout; + Layout *layout; int spacing; int margin; TQWidget *lb; diff --git a/kdevdesigner/designer/configtoolboxdialog.ui b/kdevdesigner/designer/configtoolboxdialog.ui index 05a1e52f..226cdd35 100644 --- a/kdevdesigner/designer/configtoolboxdialog.ui +++ b/kdevdesigner/designer/configtoolboxdialog.ui @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>342</width> <height>0</height> @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>0</height> @@ -215,7 +215,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>0</height> diff --git a/kdevdesigner/designer/configtoolboxdialog.ui.h b/kdevdesigner/designer/configtoolboxdialog.ui.h index 711c51e6..7dcd6530 100644 --- a/kdevdesigner/designer/configtoolboxdialog.ui.h +++ b/kdevdesigner/designer/configtoolboxdialog.ui.h @@ -87,7 +87,7 @@ void ConfigToolboxDialog::addTool() if ( (*it)->isSelected() ) { if ( (*it)->childCount() == 0 ) { - // Selected, no tqchildren + // Selected, no children TQListViewItem *i = new TQListViewItem( listViewCommon, listViewCommon->lastItem() ); i->setText( 0, (*it)->text(0) ); i->setPixmap( 0, *((*it)->pixmap(0)) ); @@ -96,7 +96,7 @@ void ConfigToolboxDialog::addTool() } else if ( !addKids ) { // Children processing not set, so set it // Also find the item were we shall quit - // processing tqchildren...if any such item + // processing children...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); nextParent = (*it)->parent(); @@ -106,7 +106,7 @@ void ConfigToolboxDialog::addTool() } } } else if ( ((*it)->childCount() == 0) && addKids ) { - // Leaf node, and we _do_ process tqchildren + // Leaf node, and we _do_ process children TQListViewItem *i = new TQListViewItem( listViewCommon, listViewCommon->lastItem() ); i->setText( 0, (*it)->text(0) ); i->setPixmap( 0, *((*it)->pixmap(0)) ); diff --git a/kdevdesigner/designer/connectiondialog.ui b/kdevdesigner/designer/connectiondialog.ui index cfc590a5..51995633 100644 --- a/kdevdesigner/designer/connectiondialog.ui +++ b/kdevdesigner/designer/connectiondialog.ui @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/connectiondialog.ui.h b/kdevdesigner/designer/connectiondialog.ui.h index 4969c8fd..25a5d5f2 100644 --- a/kdevdesigner/designer/connectiondialog.ui.h +++ b/kdevdesigner/designer/connectiondialog.ui.h @@ -175,7 +175,7 @@ ConnectionContainer *ConnectionDialog::addConnection( TQObject *sender, TQObject void ConnectionDialog::updateConnectionState( ConnectionContainer *c ) { - c->tqrepaint(); + c->repaint(); if ( c->isValid() ) connectionsTable->verticalHeader()->setLabel( c->row(), *validConnection, TQString() ); diff --git a/kdevdesigner/designer/connectionitems.cpp b/kdevdesigner/designer/connectionitems.cpp index d43bb874..12b03a1d 100644 --- a/kdevdesigner/designer/connectionitems.cpp +++ b/kdevdesigner/designer/connectionitems.cpp @@ -49,11 +49,11 @@ static const char* const ignore_slots[] = { "update()", "update(int,int,int,int)", "update(const TQRect&)", - "tqrepaint()", - "tqrepaint(bool)", - "tqrepaint(int,int,int,int,bool)", - "tqrepaint(const TQRect&,bool)", - "tqrepaint(const TQRegion&,bool)", + "repaint()", + "repaint(bool)", + "repaint(int,int,int,int,bool)", + "repaint(const TQRect&,bool)", + "repaint(const TQRegion&,bool)", "show()", "hide()", "iconify()", @@ -170,7 +170,7 @@ void ConnectionItem::paint( TQPainter *p, const TQColorGroup &cg, p->setFont( f ); } - p->drawText( x + 2, 0, w - x - 4, h, tqalignment(), currentText() ); + p->drawText( x + 2, 0, w - x - 4, h, alignment(), currentText() ); p->setFont( oldf ); } @@ -338,7 +338,7 @@ SignalItem::SignalItem( TQTable *table, FormWindow *fw ) void SignalItem::senderChanged( TQObject *sender ) { - TQStrList sigs = sender->tqmetaObject()->signalNames( TRUE ); + TQStrList sigs = sender->metaObject()->signalNames( TRUE ); sigs.remove( "destroyed()" ); sigs.remove( "destroyed(TQObject*)" ); sigs.remove( "accessibilityChanged(int)" ); @@ -441,15 +441,15 @@ void SlotItem::updateSlotList() } TQString signal = MetaDataBase::normalizeFunction( lastSignal ); - int n = lastReceiver->tqmetaObject()->numSlots( TRUE ); + int n = lastReceiver->metaObject()->numSlots( TRUE ); TQStringList slts; for( int i = 0; i < n; ++i ) { // accept only public slots. For the form window, also accept protected slots - const TQMetaData* md = lastReceiver->tqmetaObject()->slot( i, TRUE ); - if ( ( (lastReceiver->tqmetaObject()->slot( i, TRUE )->tqt_mo_access == TQMetaData::Public) || + const TQMetaData* md = lastReceiver->metaObject()->slot( i, TRUE ); + if ( ( (lastReceiver->metaObject()->slot( i, TRUE )->tqt_mo_access == TQMetaData::Public) || (formWindow->isMainContainer( TQT_TQOBJECT(lastReceiver) ) && - lastReceiver->tqmetaObject()->slot(i, TRUE)->tqt_mo_access == + lastReceiver->metaObject()->slot(i, TRUE)->tqt_mo_access == TQMetaData::Protected) ) && !ignoreSlot( md->tqt_mo_ci_name ) && checkConnectArgs( signal.latin1(), lastReceiver, md->tqt_mo_ci_name ) ) diff --git a/kdevdesigner/designer/connectionitems.h b/kdevdesigner/designer/connectionitems.h index 4087c59f..76c57065 100644 --- a/kdevdesigner/designer/connectionitems.h +++ b/kdevdesigner/designer/connectionitems.h @@ -183,7 +183,7 @@ public: } bool isModified() const { return mod; } - void setModified( bool b ) { mod = b; tqrepaint(); } + void setModified( bool b ) { mod = b; repaint(); } bool isValid() const { return se->currentText()[0] != '<' && si->currentText()[0] != '<' && @@ -191,7 +191,7 @@ public: sl->currentText()[0] != '<'; } - void tqrepaint() { + void repaint() { se->table()->updateCell( se->row(), se->col() ); si->table()->updateCell( si->row(), si->col() ); re->table()->updateCell( re->row(), re->col() ); diff --git a/kdevdesigner/designer/createtemplate.ui b/kdevdesigner/designer/createtemplate.ui index 60f6a3b6..e03340b1 100644 --- a/kdevdesigner/designer/createtemplate.ui +++ b/kdevdesigner/designer/createtemplate.ui @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/customwidgeteditor.ui b/kdevdesigner/designer/customwidgeteditor.ui index 7ba5dd29..85e09c9b 100644 --- a/kdevdesigner/designer/customwidgeteditor.ui +++ b/kdevdesigner/designer/customwidgeteditor.ui @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -246,7 +246,7 @@ <property name="name"> <cstring>buttonChoosePixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -293,7 +293,7 @@ <property name="name"> <cstring>buttonChooseHeader</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -527,7 +527,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -546,7 +546,7 @@ </property> <property name="whatsThis" stdset="0"> <string><p><b>Container Widget</b></p> -<p>If this custom widget is able to contain other widgets (tqchildren), check this checkbox.</p></string> +<p>If this custom widget is able to contain other widgets (children), check this checkbox.</p></string> </property> </widget> </grid> @@ -600,7 +600,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -814,7 +814,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -900,7 +900,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp index d2d0f5b5..b94b0a03 100644 --- a/kdevdesigner/designer/customwidgeteditorimpl.cpp +++ b/kdevdesigner/designer/customwidgeteditorimpl.cpp @@ -48,9 +48,9 @@ #include <tqapplication.h> #include <tqlistview.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdom.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqcheckbox.h> #include <klocale.h> @@ -199,8 +199,8 @@ void CustomWidgetEditor::currentWidgetChanged( TQListBoxItem *i ) previewPixmap->setPixmap( *w->pixmap ); else previewPixmap->setText( "" ); - spinWidth->setValue( w->tqsizeHint.width() ); - spinHeight->setValue( w->tqsizeHint.height() ); + spinWidth->setValue( w->sizeHint.width() ); + spinHeight->setValue( w->sizeHint.height() ); sizeHor->setCurrentItem( size_type_to_int( w->sizePolicy.horData() ) ); sizeVer->setCurrentItem( size_type_to_int( w->sizePolicy.verData() ) ); checkContainer->setChecked( w->isContainer ); @@ -222,7 +222,7 @@ void CustomWidgetEditor::addWidgetClicked() TQMessageBox::information( this, i18n( "Adding Custom Widget" ), i18n( "Custom widget names must be unique.\n" "A custom widget called '%1' already exists, so it is not possible " - "to add another widget with this name." ).tqarg( s ) ); + "to add another widget with this name." ).arg( s ) ); return; } @@ -310,7 +310,7 @@ void CustomWidgetEditor::heightChanged( int h ) if ( !i || !w ) return; - w->tqsizeHint.setHeight( h ); + w->sizeHint.setHeight( h ); updateCustomWidgetSizes(); } @@ -354,7 +354,7 @@ void CustomWidgetEditor::widthChanged( int wid ) if ( !i || !w ) return; - w->tqsizeHint.setWidth( wid ); + w->sizeHint.setWidth( wid ); updateCustomWidgetSizes(); } @@ -397,7 +397,7 @@ void CustomWidgetEditor::checkWidgetName() TQMessageBox::information( this, i18n( "Renaming Custom Widget" ), i18n( "Custom widget names must be unique.\n" "A custom widget called '%1' already exists, so it is not possible " - "to rename this widget with this name." ).tqarg( s ) ); + "to rename this widget with this name." ).arg( s ) ); if ( i != boxWidgets->item( boxWidgets->currentItem() ) ) { boxWidgets->setCurrentItem( i ); tqApp->processEvents(); @@ -710,8 +710,8 @@ void CustomWidgetEditor::saveDescription() << "\">" << w->includeFile << "</header>" << endl; ts << makeIndent2( indent ) << "<sizehint>" << endl; indent++; - ts << makeIndent2( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl; - ts << makeIndent2( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl; + ts << makeIndent2( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl; + ts << makeIndent2( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl; indent--; ts << makeIndent2( indent ) << "</sizehint>" << endl; ts << makeIndent2( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl; @@ -802,7 +802,7 @@ void CustomWidgetEditor::horDataChanged( int a ) CustomWidget *cw = (CustomWidget*)o; if ( cw->realClassName() == boxWidgets->currentText() ) { if ( cw->sizePolicy() == osp ) - cw->tqsetSizePolicy( w->sizePolicy ); + cw->setSizePolicy( w->sizePolicy ); } } } @@ -823,7 +823,7 @@ void CustomWidgetEditor::verDataChanged( int a ) CustomWidget *cw = (CustomWidget*)o; if ( cw->realClassName() == boxWidgets->currentText() ) { if ( cw->sizePolicy() == osp ) - cw->tqsetSizePolicy( w->sizePolicy ); + cw->setSizePolicy( w->sizePolicy ); } } } diff --git a/kdevdesigner/designer/dbconnectioneditor.ui b/kdevdesigner/designer/dbconnectioneditor.ui index abf8beed..40ef0a9b 100644 --- a/kdevdesigner/designer/dbconnectioneditor.ui +++ b/kdevdesigner/designer/dbconnectioneditor.ui @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -113,7 +113,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/dbconnectionimpl.cpp b/kdevdesigner/designer/dbconnectionimpl.cpp index 3cfd1fdc..eea4bb3e 100644 --- a/kdevdesigner/designer/dbconnectionimpl.cpp +++ b/kdevdesigner/designer/dbconnectionimpl.cpp @@ -32,7 +32,7 @@ #include <tqcombobox.h> #include <tqspinbox.h> #include <klineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqsqldatabase.h> DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent, diff --git a/kdevdesigner/designer/dbconnections.ui b/kdevdesigner/designer/dbconnections.ui index e373b2be..64cc65c1 100644 --- a/kdevdesigner/designer/dbconnections.ui +++ b/kdevdesigner/designer/dbconnections.ui @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -142,7 +142,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -209,7 +209,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -237,7 +237,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -256,7 +256,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/dbconnectionsimpl.cpp b/kdevdesigner/designer/dbconnectionsimpl.cpp index b5b4409f..a9403a69 100644 --- a/kdevdesigner/designer/dbconnectionsimpl.cpp +++ b/kdevdesigner/designer/dbconnectionsimpl.cpp @@ -27,7 +27,7 @@ #include "dbconnectionsimpl.h" #include <tqptrlist.h> #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include "project.h" #include <tqlistbox.h> #include <tqcombobox.h> diff --git a/kdevdesigner/designer/designer_pch.h b/kdevdesigner/designer/designer_pch.h index fa840181..5171ca63 100644 --- a/kdevdesigner/designer/designer_pch.h +++ b/kdevdesigner/designer/designer_pch.h @@ -16,7 +16,7 @@ #include <tqdialog.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqlistbox.h> #include <tqlistview.h> diff --git a/kdevdesigner/designer/designerapp.cpp b/kdevdesigner/designer/designerapp.cpp index ebe10a70..22d1e531 100644 --- a/kdevdesigner/designer/designerapp.cpp +++ b/kdevdesigner/designer/designerapp.cpp @@ -48,7 +48,7 @@ void set_splash_status( const TQString &txt ) if ( !splash ) return; TQString splashText = "Licensed to " - + TQString::tqfromLatin1( TQT_PRODUCT_LICENSEE ) + "\n" + + TQString::fromLatin1( TQT_PRODUCT_LICENSEE ) + "\n" + txt; splash->message( splashText, TQt::AlignRight|TQt::AlignTop ); } diff --git a/kdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp index cfafb4e9..767ecf3a 100644 --- a/kdevdesigner/designer/designerappiface.cpp +++ b/kdevdesigner/designer/designerappiface.cpp @@ -37,7 +37,7 @@ #include "../shared/widgetdatabase.h" #include <tqvariant.h> #include <tqlistview.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqstatusbar.h> #include "pixmapcollection.h" #include "hierarchyview.h" @@ -770,8 +770,8 @@ void DesignerFormWindowImpl::addFunction( const TQCString &function, const TQStr void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, const TQVariant &value ) { - int id = o->tqmetaObject()->findProperty( property, TRUE ); - const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE ); + int id = o->metaObject()->findProperty( property, TRUE ); + const TQMetaProperty* p = o->metaObject()->property( id, TRUE ); if ( p && p->isValid() ) o->setProperty( property, value ); else @@ -780,8 +780,8 @@ void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, con TQVariant DesignerFormWindowImpl::property( TQObject *o, const char *prop ) const { - int id = o->tqmetaObject()->findProperty( prop, TRUE ); - const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE ); + int id = o->metaObject()->findProperty( prop, TRUE ); + const TQMetaProperty* p = o->metaObject()->property( id, TRUE ); if ( p && p->isValid() ) return o->property( prop ); return MetaDataBase::fakeProperty( o, prop ); diff --git a/kdevdesigner/designer/editfunctions.ui b/kdevdesigner/designer/editfunctions.ui index 1119282a..c3483b1d 100644 --- a/kdevdesigner/designer/editfunctions.ui +++ b/kdevdesigner/designer/editfunctions.ui @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -283,7 +283,7 @@ <property name="text"> <string>&Function:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -316,7 +316,7 @@ <property name="text"> <string>&Return type:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -354,7 +354,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -379,7 +379,7 @@ <property name="text"> <string>S&pecifier:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -432,7 +432,7 @@ <property name="text"> <string>&Access:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -480,7 +480,7 @@ <property name="text"> <string>&Type:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -518,7 +518,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -566,7 +566,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/editfunctionsimpl.cpp b/kdevdesigner/designer/editfunctionsimpl.cpp index b28ff0ad..ca757b6a 100644 --- a/kdevdesigner/designer/editfunctionsimpl.cpp +++ b/kdevdesigner/designer/editfunctionsimpl.cpp @@ -41,7 +41,7 @@ #include <tqcombobox.h> #include <tqstrlist.h> #include <tqmessagebox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqgroupbox.h> #include <tqheader.h> @@ -132,7 +132,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) void EditFunctions::okClicked() { TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow) ); - TQString n = i18n( "Add/Remove functions of '%1'" ).tqarg( formWindow->name() ); + TQString n = i18n( "Add/Remove functions of '%1'" ).arg( formWindow->name() ); TQPtrList<Command> commands; TQValueList<MetaDataBase::Function>::Iterator fit; if ( !functionList.isEmpty() ) { diff --git a/kdevdesigner/designer/filechooser.cpp b/kdevdesigner/designer/filechooser.cpp index 961cfee0..9f4a9401 100644 --- a/kdevdesigner/designer/filechooser.cpp +++ b/kdevdesigner/designer/filechooser.cpp @@ -28,25 +28,25 @@ #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqfiledialog.h> -#include <tqlayout.h> +#include <layout.h> #include <kfiledialog.h> FileChooser::FileChooser( TQWidget *parent, const char *name ) : TQWidget( parent, name ), md( File ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); - tqlayout->setMargin( 0 ); + TQHBoxLayout *layout = new TQHBoxLayout( this ); + layout->setMargin( 0 ); lineEdit = new TQLineEdit( this, "filechooser_lineedit" ); - tqlayout->addWidget( lineEdit ); + layout->addWidget( lineEdit ); connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( fileNameChanged( const TQString & ) ) ); button = new TQPushButton( "...", this, "filechooser_button" ); button->setFixedWidth( button->fontMetrics().width( " ... " ) ); - tqlayout->addWidget( button ); + layout->addWidget( button ); connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( chooseFile() ) ); diff --git a/kdevdesigner/designer/finddialog.ui b/kdevdesigner/designer/finddialog.ui index f806a3aa..9b16cd8c 100644 --- a/kdevdesigner/designer/finddialog.ui +++ b/kdevdesigner/designer/finddialog.ui @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp index 93486243..325862aa 100644 --- a/kdevdesigner/designer/formfile.cpp +++ b/kdevdesigner/designer/formfile.cpp @@ -77,7 +77,7 @@ FormFile::FormFile( const TQString &fn, bool temp, Project *p, const char *name if ( !temp ) checkFileName( FALSE ); - connect(this, TQT_SIGNAL(somethingChanged(FormFile* )), this, TQT_SLOT(emitNewtqStatus(FormFile* ))); + connect(this, TQT_SIGNAL(somethingChanged(FormFile* )), this, TQT_SLOT(emitNewStatus(FormFile* ))); } FormFile::~FormFile() @@ -192,7 +192,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified ) f2.writeBlock( data ); } else { TQMessageBox::warning( MainWindow::self, i18n( "Save" ), - i18n( "The file %1 could not be saved" ).tqarg( codeFile() ) ); + i18n( "The file %1 could not be saved" ).arg( codeFile() ) ); } } } @@ -215,7 +215,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified ) f2.writeBlock( data ); } else if ( tqApp->type() != TQApplication::Tty ) { TQMessageBox::warning( MainWindow::self, i18n( "Save" ), - i18n( "The file %1 could not be saved" ).tqarg( codeFile() ) ); + i18n( "The file %1 could not be saved" ).arg( codeFile() ) ); } } } @@ -227,7 +227,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified ) bool formCodeOnly = isModified( WFormCode ) && !isModified( WFormWindow ); if ( !resource.save( pro->makeAbsolute( filename ), formCodeOnly ) ) { if ( MainWindow::self ) - MainWindow::self->statusMessage( i18n( "Failed to save file '%1'.").tqarg( formCodeOnly ? codeFile(): filename ) ); + MainWindow::self->statusMessage( i18n( "Failed to save file '%1'.").arg( formCodeOnly ? codeFile(): filename ) ); if ( formCodeOnly ) return FALSE; return saveAs(); @@ -263,7 +263,7 @@ bool FormFile::saveAs( bool ignoreModified ) fn = KFileDialog::getSaveFileName( f, i18n( "*.ui|TQt User-Interface Files" ) + "\n" + i18n( "*|All Files" ), MainWindow::self, /*0,*/ - i18n( "Save Form '%1' As").tqarg( formName() )/*, + i18n( "Save Form '%1' As").arg( formName() )/*, MainWindow::self ? &MainWindow::self->lastSaveFilter : 0*/ ); if ( fn.isEmpty() ) return FALSE; @@ -294,7 +294,7 @@ bool FormFile::saveAs( bool ignoreModified ) pro->setModified( TRUE ); timeStamp.setFileName( pro->makeAbsolute( codeFile() ) ); if ( ed && TQT_TQOBJECT(formWindow()) ) - ed->setCaption( i18n( "Edit %1" ).tqarg( formWindow()->name() ) ); + ed->setCaption( i18n( "Edit %1" ).arg( formWindow()->name() ) ); setModified( TRUE ); if ( pro->isDummy() ) fw->mainWindow()->addRecentlyOpenedFile( fn ); @@ -326,7 +326,7 @@ bool FormFile::closeEvent() editor()->save(); switch ( TQMessageBox::warning( MainWindow::self, i18n( "Save Form" ), - i18n( "Save changes to form '%1'?" ).tqarg( filename ), + i18n( "Save changes to form '%1'?" ).arg( filename ), i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { case 0: // save if ( !save() ) @@ -653,7 +653,7 @@ void FormFile::checkTimeStamp() if ( codeEdited ) { if ( TQMessageBox::information( MainWindow::self, i18n( "TQt Designer" ), i18n( "File '%1' has been changed outside TQt Designer.\n" - "Do you want to reload it?" ).tqarg( timeStamp.fileName() ), + "Do you want to reload it?" ).arg( timeStamp.fileName() ), i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) { TQFile f( timeStamp.fileName() ); if ( f.open( IO_ReadOnly ) ) { @@ -854,7 +854,7 @@ bool FormFile::checkFileName( bool allowBreak ) if ( ff ) TQMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ), i18n( "The project already contains a form with a\n" - "filename of '%1'. Please choose a new filename." ).tqarg( filename ) ); + "filename of '%1'. Please choose a new filename." ).arg( filename ) ); while ( ff ) { TQString fn; while ( fn.isEmpty() ) { @@ -899,7 +899,7 @@ void FormFile::notifyFormWindowChange() pro->formOpened( fw ); } -void FormFile::emitNewtqStatus(FormFile *file) +void FormFile::emitNewStatus(FormFile *file) { - fw->mainWindow()->part()->emitNewtqStatus(fileName(), isModified()); + fw->mainWindow()->part()->emitNewStatus(fileName(), isModified()); } diff --git a/kdevdesigner/designer/formfile.h b/kdevdesigner/designer/formfile.h index 097beff4..f6d71a26 100644 --- a/kdevdesigner/designer/formfile.h +++ b/kdevdesigner/designer/formfile.h @@ -116,7 +116,7 @@ signals: private slots: void formWindowChangedSomehow(); void notifyFormWindowChange(); - void emitNewtqStatus(FormFile* file); + void emitNewStatus(FormFile* file); private: bool isFormWindowModified() const; diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp index fbd7e1ad..05636e38 100644 --- a/kdevdesigner/designer/formwindow.cpp +++ b/kdevdesigner/designer/formwindow.cpp @@ -31,7 +31,7 @@ #include "sizehandle.h" #include "metadatabase.h" #include "resource.h" -#include "tqlayout.h" +#include "layout.h" #include "connectiondialog.h" #include <widgetdatabase.h> #include "pixmapchooser.h" @@ -55,11 +55,11 @@ #include <tqobjectlist.h> #include <tqtimer.h> #include <tqapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> #include <tqstatusbar.h> #include <tqapplication.h> -#include <tqpalette.h> +#include <palette.h> #include <tqmessagebox.h> #include <tqpopupmenu.h> #include <tqsizegrip.h> @@ -108,7 +108,7 @@ static void restoreCursors( TQWidget *start, FormWindow *fw ) } } -#if defined(TQ_WS_WIN32) // #### needed for the workaround for tqrepaint problem on windows +#if defined(TQ_WS_WIN32) // #### needed for the workaround for repaint problem on windows #include <tqt_windows.h> static void flickerfree_update( TQWidget *w ) { @@ -260,7 +260,7 @@ void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e ) grid_name.sprintf("FormWindowGrid_%d_%d", mainWindow()->grid().x(), mainWindow()->grid().y()); if( !TQPixmapCache::find( grid_name, grid ) ) { grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) ); - grid.fill( tqcolorGroup().color( TQColorGroup::Foreground ) ); + grid.fill( colorGroup().color( TQColorGroup::Foreground ) ); TQBitmap mask( grid.width(), grid.height() ); mask.fill( color0 ); TQPainter p( &mask ); @@ -321,7 +321,7 @@ TQPoint FormWindow::gridPoint( const TQPoint &p ) void FormWindow::drawSizePreview( const TQPoint &pos, const TQString& text ) { unclippedPainter->save(); - unclippedPainter->setPen( TQPen( tqcolorGroup().foreground(), 1 )); + unclippedPainter->setPen( TQPen( colorGroup().foreground(), 1 )); unclippedPainter->setRasterOp( CopyROP ); if ( !sizePreviewPixmap.isNull() ) unclippedPainter->drawPixmap( sizePreviewPos, sizePreviewPixmap ); @@ -383,13 +383,13 @@ void FormWindow::insertWidget() "properties as well as signals and slots to integrate custom widgets into " "<i>TQt Designer</i>, and provide a pixmap which will be used to represent " "the widget on the form.</p>") - .tqarg(WidgetDatabase::toolTip( id )) ); - TQToolTip::add( w, i18n("A %1 (custom widget)").tqarg(WidgetDatabase::toolTip( id )) ); + .arg(WidgetDatabase::toolTip( id )) ); + TQToolTip::add( w, i18n("A %1 (custom widget)").arg(WidgetDatabase::toolTip( id )) ); } else { TQString tt = WidgetDatabase::toolTip( id ); TQString wt = WidgetDatabase::whatsThis( id ); if ( !wt.isEmpty() && !tt.isEmpty() ) - TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").tqarg( tt ).tqarg( wt ) ); + TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").arg( tt ).arg( wt ) ); } TQString s = w->name(); @@ -416,8 +416,8 @@ void FormWindow::insertWidget() r.setHeight( 20 ); } } else { - r.setWidth( w->tqsizeHint().width() ); - r.setHeight( w->tqsizeHint().height() ); + r.setWidth( w->sizeHint().width() ); + r.setHeight( w->sizeHint().height() ); } } @@ -463,13 +463,13 @@ void FormWindow::insertWidget() else setCursorToAll( CrossCursor, w ); - InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).tqarg( w->name() ), this, w, r ); + InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).arg( w->name() ), this, w, r ); TQPtrList<Command> commands; commands.append( mv ); commands.append( cmd ); - MacroCommand *mc = new MacroCommand( i18n( "Insert %1" ).tqarg( w->name() ), this, commands ); + MacroCommand *mc = new MacroCommand( i18n( "Insert %1" ).arg( w->name() ), this, commands ); commandHistory()->addCommand( mc ); mc->execute(); } @@ -479,7 +479,7 @@ void FormWindow::insertWidget() else setCursorToAll( CrossCursor, w ); - InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).tqarg( w->name() ), this, w, r ); + InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).arg( w->name() ), this, w, r ); commandHistory()->addCommand( cmd ); cmd->execute(); } @@ -510,13 +510,13 @@ void FormWindow::insertWidget( TQWidget *w, bool checkName ) "properties as well as signals and slots to integrate custom widgets into " "<i>TQt Designer</i>, and provide a pixmap which will be used to represent " "the widget on the form.</p>") - .tqarg(WidgetDatabase::toolTip( id )) ); - TQToolTip::add( w, i18n("A %1 (custom widget)").tqarg(WidgetDatabase::toolTip( id )) ); + .arg(WidgetDatabase::toolTip( id )) ); + TQToolTip::add( w, i18n("A %1 (custom widget)").arg(WidgetDatabase::toolTip( id )) ); } else { TQString tt = WidgetDatabase::toolTip( id ); TQString wt = WidgetDatabase::whatsThis( id ); if ( !wt.isEmpty() && !tt.isEmpty() ) - TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").tqarg( tt ).tqarg( wt ) ); + TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").arg( tt ).arg( wt ) ); } restoreCursors( w, this ); @@ -577,7 +577,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) switch ( currTool ) { case POINTER_TOOL: if ( !isMainContainer( TQT_TQOBJECT(w) ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget - // if the clicked widget is not in a tqlayout, raise it + // if the clicked widget is not in a layout, raise it if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) w->raise(); if ( ( e->state() & ControlButton ) ) { // with control pressed, always start rubber band selection @@ -592,7 +592,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) if ( !sel ) { // ...and widget no selectted: unselect all clearSelection( FALSE ); } else { // ...widget selected - // only if widget has a tqlayout (it is a tqlayout meta widget or a laid out container!), unselect its childs + // only if widget has a layout (it is a layout meta widget or a laid out container!), unselect its childs if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ) { TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); setPropertyShowingBlocked( TRUE ); @@ -622,7 +622,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w) ) ) w = w->parentWidget(); - if ( e->button() == Qt::LeftButton ) { // left button: store original tqgeometry and more as the widget might start moving + if ( e->button() == Qt::LeftButton ) { // left button: store original geometry and more as the widget might start moving widgetPressed = TRUE; widgetGeom = TQRect( w->pos(), w->size() ); oldPressPos = w->mapFromGlobal( e->globalPos() ); @@ -660,9 +660,9 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) break; clearSelection( FALSE ); validForBuddy = TRUE; - mainWindow()->statusMessage( i18n( "Set buddy for '%1' to..." ).tqarg( w->name() ) ); + mainWindow()->statusMessage( i18n( "Set buddy for '%1' to..." ).arg( w->name() ) ); } else { - mainWindow()->statusMessage( i18n( "Connect '%1' with..." ).tqarg( w->name() ) ); + mainWindow()->statusMessage( i18n( "Connect '%1' with..." ).arg( w->name() ) ); } saveBackground(); startPos = mapFromGlobal( e->globalPos() ); @@ -824,7 +824,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) targetContainer = wa; hadOwnPalette = wa->ownPalette(); restorePalette = wa->palette(); - wa->setPaletteBackgroundColor( wa->tqcolorGroup().midlight() ); + wa->setPaletteBackgroundColor( wa->colorGroup().midlight() ); } } else if ( targetContainer ) { @@ -837,7 +837,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) // finally move the selected widgets and show/update preview label moveSelectedWidgets( x - p.x(), y - p.y() ); - sizePreviewLabel->setText( i18n( "%1/%2" ).tqarg( w->pos().x() ).tqarg( w->pos().y() ) ); + sizePreviewLabel->setText( i18n( "%1/%2" ).arg( w->pos().x() ).arg( w->pos().y() ) ); sizePreviewLabel->adjustSize(); TQRect lg( mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ), sizePreviewLabel->size() ); checkPreviewGeometry( lg ); @@ -871,7 +871,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) if ( newendWidget && ( isMainContainer( TQT_TQOBJECT(newendWidget) ) || insertedWidgets.find( newendWidget ) ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) ) endWidget = newendWidget; - mainWindow()->statusMessage( i18n( "Connect '%1' to '%2'" ).tqarg( startWidget->name() ). + mainWindow()->statusMessage( i18n( "Connect '%1' to '%2'" ).arg( startWidget->name() ). arg( endWidget->name() ) ); currentPos = mapFromGlobal( e->globalPos() ); tqApp->processEvents(); @@ -899,10 +899,10 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) else if ( insertedWidgets.find( newendWidget ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) ) endWidget = newendWidget; if ( endWidget ) - mainWindow()->statusMessage( i18n( "Set buddy '%1' to '%2'" ).tqarg( startWidget->name() ). + mainWindow()->statusMessage( i18n( "Set buddy '%1' to '%2'" ).arg( startWidget->name() ). arg( endWidget->name() ) ); else - mainWindow()->statusMessage( i18n( "Set buddy '%1' to ..." ).tqarg( startWidget->name() ) ); + mainWindow()->statusMessage( i18n( "Set buddy '%1' to ..." ).arg( startWidget->name() ) ); currentPos = mapFromGlobal( e->globalPos() ); tqApp->processEvents(); if ( drawRecRect && oldendWidget ) @@ -958,15 +958,15 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) if ( wa == it.key()->parentWidget() ) goto make_move_command; - // break tqlayout if necessary + // break layout if necessary if ( WidgetFactory::layoutType( wa ) != WidgetFactory::NoLayout ) { if ( TQMessageBox::information( mainWindow(), i18n( "Inserting Widget" ), i18n( "You tried to insert a widget into the " - "tqlayout Container Widget '%1'.\n" + "layout Container Widget '%1'.\n" "This is not possible. " - "In order to insert the widget, the tqlayout of '%1'\n" + "In order to insert the widget, the layout of '%1'\n" "must first be broken.\n" - "Break the tqlayout or cancel the operation?" ). + "Break the layout or cancel the operation?" ). arg( wa->name() ). arg( wa->name() ), i18n( "&Break Layout" ), i18n( "&Cancel" ) ) ) goto make_move_command; // cancel @@ -1044,7 +1044,7 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) TQString oldBuddy = startWidget->property( "buddy" ).toString(); if ( oldBuddy.isNull() ) oldBuddy = ""; - SetPropertyCommand *cmd = new SetPropertyCommand( i18n( "Set Buddy for %1" ).tqarg( startWidget->name() ), + SetPropertyCommand *cmd = new SetPropertyCommand( i18n( "Set Buddy for %1" ).arg( startWidget->name() ), this, TQT_TQOBJECT(startWidget), mainWindow()->propertyeditor(), "buddy", startWidget->property( "buddy" ), endWidget->name(), endWidget->name(), @@ -1067,11 +1067,11 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) if ( WidgetFactory::layoutType( insertParent ) != WidgetFactory::NoLayout ) { if ( TQMessageBox::information( mainWindow(), i18n( "Inserting Widget" ), i18n( "You tried to insert a widget into the " - "tqlayout Container Widget '%1'.\n" + "layout Container Widget '%1'.\n" "This is not possible. " - "In order to insert the widget, the tqlayout of '%1'\n" + "In order to insert the widget, the layout of '%1'\n" "must first be broken.\n" - "Break the tqlayout or cancel the operation?" ). + "Break the layout or cancel the operation?" ). arg( insertParent->name() ). arg( insertParent->name() ), i18n( "&Break Layout" ), i18n( "&Cancel" ) ) == 0 ) { breakLayout( insertParent ); @@ -1327,7 +1327,7 @@ void FormWindow::continueRectDraw( const TQPoint &p, const TQPoint &global, TQWi if ( currRect == r ) { TQString t = i18n( "%1/%2" ); - t = t.tqarg( r.width() - 1 ).tqarg( r.height() - 1 ); + t = t.arg( r.width() - 1 ).arg( r.height() - 1 ); drawSizePreview( pos, t ); return; } @@ -1339,7 +1339,7 @@ void FormWindow::continueRectDraw( const TQPoint &p, const TQPoint &global, TQWi currRect = r; if ( t == Insert ) { TQString t = i18n( "%1/%2" ); - t = t.tqarg( r.width() - 1 ).tqarg( r.height() - 1 ); + t = t.arg( r.width() - 1 ).arg( r.height() - 1 ); drawSizePreview( pos, t ); } unclippedPainter->setClipRegion( TQRegion( rect() ).subtract( TQRect( sizePreviewPos, sizePreviewPixmap.size() ) ) ); @@ -1502,13 +1502,13 @@ void FormWindow::editAdjustSize() TQPtrList<Command> commands; TQWidgetList widgets = selectedWidgets(); if ( widgets.isEmpty() ) { - TQRect oldr = tqgeometry(); + TQRect oldr = geometry(); mainContainer()->adjustSize(); resize( mainContainer()->size() ); // check whether our own size constraint hit us if ( size() != mainContainer()->size() ) mainContainer()->resize( size() ); - TQRect nr = tqgeometry(); + TQRect nr = geometry(); if ( oldr != nr ) { ResizeCommand *cmd = new ResizeCommand( i18n( "Adjust Size" ), this, this, oldr, nr ); commandHistory()->addCommand( cmd ); @@ -1518,9 +1518,9 @@ void FormWindow::editAdjustSize() for ( TQWidget* w = widgets.first(); w; w = widgets.next() ) { if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) continue; - TQRect oldr = w->tqgeometry(); + TQRect oldr = w->geometry(); w->adjustSize(); - TQRect nr = w->tqgeometry(); + TQRect nr = w->geometry(); if ( oldr != nr ) commands.append( new ResizeCommand( i18n("Adjust Size"), this, w, oldr, nr ) ); } @@ -1759,7 +1759,7 @@ void FormWindow::currentToolChanged() emitShowProperties( TQT_TQOBJECT(mainContainer()) ); break; default: - mainWindow()->statusMessage( i18n( "Click on the form to insert a %1..." ).tqarg( WidgetDatabase::toolTip( currTool ).lower() ) ); + mainWindow()->statusMessage( i18n( "Click on the form to insert a %1..." ).arg( WidgetDatabase::toolTip( currTool ).lower() ) ); setCursorToAll( CrossCursor, this ); if ( mainWindow()->formWindow() == this ) emitShowProperties( TQT_TQOBJECT(mainContainer()) ); @@ -1832,7 +1832,7 @@ bool FormWindow::checkCustomWidgets() if ( !missingCustomWidgets.isEmpty() ) { TQString txt = i18n( "The following custom widgets are used in '%1',\n" - "but are not known to TQt Designer:\n" ).tqarg( name() ); + "but are not known to TQt Designer:\n" ).arg( name() ); for ( TQStringList::Iterator sit = missingCustomWidgets.begin(); sit != missingCustomWidgets.end(); ++sit ) txt += " " + *sit + "\n"; txt += i18n( "If you save this form and generate code for it using uic, \n" @@ -1910,11 +1910,11 @@ void FormWindow::checkAccels() insertedWidgets[ (void*)o ] ) { TQWidget *w = (TQWidget*)o; const TQMetaProperty* text = - w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE ); + w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE ); const TQMetaProperty* title = - w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE ); + w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE ); const TQMetaProperty* pageTitle = - w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pageTitle", TRUE ), TRUE ); + w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE ); if ( text ) find_accel( w->property( "text" ).toString(), accels, w ); if ( title ) @@ -1935,7 +1935,7 @@ void FormWindow::checkAccels() ok = FALSE; switch ( TQMessageBox::information( mainWindow(), i18n( "Check Accelerators" ), i18n( "Accelerator '%1' is used once.", "Accelerator '%1' is used %n times.", (*it).count() - ).tqarg( it.key().upper() ), + ).arg( it.key().upper() ), i18n( "&Select" ), i18n( "&Cancel" ), TQString(), 2 ) ) { case 0: // select @@ -2581,7 +2581,7 @@ void FormWindow::setMainContainer( TQWidget *w ) delete mContainer; mContainer = w; insertedWidgets.insert( mContainer, mContainer ); - delete tqlayout(); + delete layout(); TQHBoxLayout *l = new TQHBoxLayout( this ); l->addWidget( w ); if ( resetPropertyWidget ) { diff --git a/kdevdesigner/designer/gotolinedialog.ui b/kdevdesigner/designer/gotolinedialog.ui index 28c1005e..99df35d2 100644 --- a/kdevdesigner/designer/gotolinedialog.ui +++ b/kdevdesigner/designer/gotolinedialog.ui @@ -101,7 +101,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -139,7 +139,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp index c91f5333..2f2d97b4 100644 --- a/kdevdesigner/designer/hierarchyview.cpp +++ b/kdevdesigner/designer/hierarchyview.cpp @@ -46,7 +46,7 @@ #include "kdevdesigner_part.h" #include <klocale.h> -#include <tqpalette.h> +#include <palette.h> #include <tqobjectlist.h> #include <tqheader.h> #include <tqpopupmenu.h> @@ -654,7 +654,7 @@ void HierarchyList::removeTabPage() QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw; DeleteTabPageCommand *cmd = new DeleteTabPageCommand( i18n( "Delete Page %1 of %2" ). - tqarg( dtw->pageTitle() ).tqarg( tw->name() ), + arg( dtw->pageTitle() ).arg( tw->name() ), formWindow, tw, tw->currentPage() ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -665,7 +665,7 @@ void HierarchyList::removeTabPage() QDesignerWizard *dw = (QDesignerWizard*)wiz; DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ). - tqarg( dw->pageTitle() ).tqarg( wiz->name() ), + arg( dw->pageTitle() ).arg( wiz->name() ), formWindow, wiz, wiz->indexOf( wiz->currentPage() ), TRUE ); formWindow->commandHistory()->addCommand( cmd ); @@ -1102,11 +1102,11 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) if ( i->rtti() == HierarchyItem::Definition ) i = i->parent(); ListEditor dia( this, 0, TRUE ); - dia.setCaption( i18n( "Edit %1" ).tqarg( i->text( 0 ) ) ); + dia.setCaption( i18n( "Edit %1" ).arg( i->text( 0 ) ) ); TQStringList entries = lIface->definitionEntries( i->text( 0 ), MainWindow::self->designerInterface() ); dia.setList( entries ); dia.exec(); - Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).tqarg( i->text( 0 )), formWindow, + Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).arg( i->text( 0 )), formWindow, lIface, i->text( 0 ), dia.items() ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1218,7 +1218,7 @@ void FormDefinitionView::save( TQListViewItem *p, TQListViewItem *i ) lst << i->text( 0 ); i = i->nextSibling(); } - Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).tqarg( p->text( 0 ) ), formWindow, + Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).arg( p->text( 0 ) ), formWindow, lIface, p->text( 0 ), lst ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); diff --git a/kdevdesigner/designer/iconvieweditor.ui b/kdevdesigner/designer/iconvieweditor.ui index 369fdb67..8711bd6b 100644 --- a/kdevdesigner/designer/iconvieweditor.ui +++ b/kdevdesigner/designer/iconvieweditor.ui @@ -130,7 +130,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -179,7 +179,7 @@ <property name="name"> <cstring>itemText</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -229,7 +229,7 @@ <property name="name"> <cstring>itemDeletePixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -252,7 +252,7 @@ <property name="name"> <cstring>itemChoosePixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -309,7 +309,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/iconvieweditorimpl.cpp b/kdevdesigner/designer/iconvieweditorimpl.cpp index 07db9813..a5781e89 100644 --- a/kdevdesigner/designer/iconvieweditorimpl.cpp +++ b/kdevdesigner/designer/iconvieweditorimpl.cpp @@ -129,7 +129,7 @@ void IconViewEditor::applyClicked() items.append( item ); } - PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n( "Edit the Items of '%1'" ).tqarg( iconview->name() ), + PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n( "Edit the Items of '%1'" ).arg( iconview->name() ), formwindow, iconview, items ); cmd->execute(); formwindow->commandHistory()->addCommand( cmd ); diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp index bb0f2955..65724614 100644 --- a/kdevdesigner/designer/kdevdesigner_part.cpp +++ b/kdevdesigner/designer/kdevdesigner_part.cpp @@ -30,7 +30,7 @@ #include <kiconloader.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtoolbar.h> #include <tqmenubar.h> #include <tqptrlist.h> @@ -146,9 +146,9 @@ void KDevDesignerPart::setupActions( ) action = new KAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize"); stateSync(action, m_widget->actionEditAdjustSize); - action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithtqlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h"); + action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h"); stateSync(action, m_widget->actionEditHLayout); - action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvtqlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v"); + action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v"); stateSync(action, m_widget->actionEditVLayout); action = new KAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(layoutGridLayout()), actionCollection(), "layout_grid"); stateSync(action, m_widget->actionEditGridLayout); @@ -552,9 +552,9 @@ void KDevDesignerPart::emitEditSource(const TQString &formName) emit editSource(designerType(), formName); } -void KDevDesignerPart::emitNewtqStatus(const TQString &formName, int status) +void KDevDesignerPart::emitNewStatus(const TQString &formName, int status) { - emit newtqStatus(formName, status); + emit newStatus(formName, status); } void KDevDesignerPart::toolsEditCustomWidgets( ) diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h index 5d402856..4a98f1a7 100644 --- a/kdevdesigner/designer/kdevdesigner_part.h +++ b/kdevdesigner/designer/kdevdesigner_part.h @@ -61,7 +61,7 @@ public: void emitEditFunction(const TQString &formName, const TQString &functionName); void emitEditSource(const TQString &formName); - void emitNewtqStatus(const TQString &formName, int status); + void emitNewStatus(const TQString &formName, int status); protected: virtual bool openFile(); diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp index f908dd4b..89dfe821 100644 --- a/kdevdesigner/designer/layout.cpp +++ b/kdevdesigner/designer/layout.cpp @@ -25,11 +25,11 @@ **********************************************************************/ #include "formwindow.h" -#include "tqlayout.h" +#include "layout.h" #include <widgetdatabase.h> #include "widgetfactory.h" -#include <tqlayout.h> +#include <layout.h> #include <tqevent.h> #include <tqpainter.h> #include <tqpen.h> @@ -44,7 +44,7 @@ bool operator<( const TQGuardedPtr<TQWidget> &p1, const TQGuardedPtr<TQWidget> & } /*! - \class Layout tqlayout.h + \class Layout layout.h \brief Baseclass for layouting widgets in the Designer Classes derived from this abstract base class are used for layouting @@ -67,7 +67,7 @@ Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *l widgets.setAutoDelete( FALSE ); layoutBase = lb; if ( !doSetup && layoutBase ) - oldGeometry = layoutBase->tqgeometry(); + oldGeometry = layoutBase->geometry(); } /*! The widget list we got in the constructor might contain too much @@ -85,7 +85,7 @@ void Layout::setup() TQWidget *w = 0; // Go through all widgets of the list we got. As we can only - // tqlayout widgets which have the same parent, we first do some + // layout widgets which have the same parent, we first do some // sorting which means create a list for each parent containing // its child here. After that we keep working on the list of // childs which has the most entries. @@ -120,7 +120,7 @@ void Layout::setup() } // If we found no list (because no widget did fit at all) or the - // best list has only one entry and we do not tqlayout a container, + // best list has only one entry and we do not layout a container, // we leave here. if ( !lastList || ( lastList->count() < 2 && ( !layoutBase || @@ -133,11 +133,11 @@ void Layout::setup() } // Now we have a new and clean widget list, which makes sense - // to tqlayout + // to layout widgets = *lastList; // Also use the only correct parent later, so store it parent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() ); - // Now calculate the position where the tqlayout-meta-widget should + // Now calculate the position where the layout-meta-widget should // be placed and connect to widgetDestroyed() signals of the // widgets to get informed if one gets deleted to be able to // handle that and do not crash in this case @@ -149,7 +149,7 @@ void Layout::setup() geometries.insert( w, TQRect( w->pos(), w->size() ) ); // Change the Z-order, as saving/loading uses the Z-order for // writing/creating widgets and this has to be the same as in - // the tqlayout. Else saving + loading will give different results + // the layout. Else saving + loading will give different results w->raise(); } } @@ -182,7 +182,7 @@ bool Layout::prepareLayout( bool &needMove, bool &needReparent ) return TRUE; } -void Layout::finishLayout( bool needMove, TQLayout *tqlayout ) +void Layout::finishLayout( bool needMove, TQLayout *layout ) { if ( needMove ) layoutBase->move( startPoint ); @@ -193,7 +193,7 @@ void Layout::finishLayout( bool needMove, TQLayout *tqlayout ) layoutBase->setGeometry( oldGeometry ); oldGeometry = g; layoutBase->show(); - tqlayout->activate(); + layout->activate(); formWindow->insertWidget( layoutBase ); formWindow->selectWidget( TQT_TQOBJECT(layoutBase) ); TQString n = layoutBase->name(); @@ -236,7 +236,7 @@ void Layout::breakLayout() if ( !widgets.isEmpty() ) { TQWidget *w; for ( w = widgets.first(); w; w = widgets.next() ) - rects.insert( w, w->tqgeometry() ); + rects.insert( w, w->geometry() ); } WidgetFactory::deleteLayout( layoutBase ); bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 || @@ -311,16 +311,16 @@ void HorizontalLayout::doLayout() if ( !prepareLayout( needMove, needReparent ) ) return; - TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox ); + TQHBoxLayout *layout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) - tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() ); + layout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); else - tqlayout->addWidget( w ); + layout->addWidget( w ); if ( ::tqqt_cast<TQLayoutWidget*>(w) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); } @@ -330,7 +330,7 @@ void HorizontalLayout::doLayout() if ( ::tqqt_cast<TQSplitter*>(layoutBase) ) ( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal ); - finishLayout( needMove, tqlayout ); + finishLayout( needMove, layout ); } @@ -375,16 +375,16 @@ void VerticalLayout::doLayout() if ( !prepareLayout( needMove, needReparent ) ) return; - TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox ); + TQVBoxLayout *layout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) - tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() ); + layout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); else - tqlayout->addWidget( w ); + layout->addWidget( w ); if ( ::tqqt_cast<TQLayoutWidget*>(w) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); } @@ -394,7 +394,7 @@ void VerticalLayout::doLayout() if ( ::tqqt_cast<TQSplitter*>(layoutBase) ) ( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical ); - finishLayout( needMove, tqlayout ); + finishLayout( needMove, layout ); } @@ -747,7 +747,7 @@ void GridLayout::doLayout() if ( !prepareLayout( needMove, needReparent ) ) return; - QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid ); + QDesignerGridLayout *layout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid ); if ( !grid ) buildGrid(); @@ -759,18 +759,18 @@ void GridLayout::doLayout() if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE ); if ( rs * cs == 1 ) { - tqlayout->addWidget( w, r, c, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->tqalignment() : 0 ); + layout->addWidget( w, r, c, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 ); } else { - tqlayout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->tqalignment() : 0 ); + layout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 ); } if ( ::tqqt_cast<TQLayoutWidget*>(w) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); w->show(); } else { - qWarning("ooops, widget '%s' does not fit in tqlayout", w->name() ); + qWarning("ooops, widget '%s' does not fit in layout", w->name() ); } } - finishLayout( needMove, tqlayout ); + finishLayout( needMove, layout ); } void GridLayout::setup() @@ -787,7 +787,7 @@ void GridLayout::buildGrid() // Pixel to cell conversion: // By keeping a list of start'n'stop values (x & y) for each widget, // it is possible to create a very small grid of cells to represent - // the widget tqlayout. + // the widget layout. // ----------------------------------------------------------------- // We need a list of both start and stop values for x- & y-axis @@ -798,7 +798,7 @@ void GridLayout::buildGrid() int index = 0; TQWidget* w = 0; for ( w = widgets.first(); w; w = widgets.next() ) { - TQRect widgetPos = w->tqgeometry(); + TQRect widgetPos = w->geometry(); x[index] = widgetPos.left(); x[index+1] = widgetPos.right(); y[index] = widgetPos.top(); @@ -829,7 +829,7 @@ void GridLayout::buildGrid() current++; } - // Create the smallest grid possible to represent the current tqlayout + // Create the smallest grid possible to represent the current layout // Since no widget will be placed in the last row and column, we'll // skip them to increase speed even further delete grid; @@ -837,7 +837,7 @@ void GridLayout::buildGrid() // Mark the cells in the grid that contains a widget for ( w = widgets.first(); w; w = widgets.next() ) { - TQRect c(0,0,0,0), widgetPos = w->tqgeometry(); + TQRect c(0,0,0,0), widgetPos = w->geometry(); // From left til right (not including) for (uint cw=0; cw<x.size(); cw++) { if ( x[cw] == widgetPos.left() ) @@ -936,25 +936,25 @@ void Spacer::setSizeType( SizeType t ) sizeP = TQSizePolicy( TQSizePolicy::Minimum, (TQSizePolicy::SizeType)t ); else sizeP = TQSizePolicy( (TQSizePolicy::SizeType)t, TQSizePolicy::Minimum ); - tqsetSizePolicy( sizeP ); + setSizePolicy( sizeP ); } Spacer::SizeType Spacer::sizeType() const { if ( orient ==Qt::Vertical ) - return (SizeType)tqsizePolicy().verData(); - return (SizeType)tqsizePolicy().horData(); + return (SizeType)sizePolicy().verData(); + return (SizeType)sizePolicy().horData(); } -int Spacer::tqalignment() const +int Spacer::alignment() const { if ( orient ==Qt::Vertical ) return AlignHCenter; return AlignVCenter; } -TQSize Spacer::tqminimumSize() const +TQSize Spacer::minimumSize() const { TQSize s = TQSize( 20,20 ); if ( sizeType() == Expanding ) @@ -965,7 +965,7 @@ TQSize Spacer::tqminimumSize() const return s; } -TQSize Spacer::tqsizeHint() const +TQSize Spacer::sizeHint() const { return sh; } @@ -975,7 +975,7 @@ void Spacer::setSizeHint( const TQSize &s ) { sh = s; if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout ) - resize( tqsizeHint() ); + resize( sizeHint() ); updateGeometry(); } diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h index d71368ab..c42fb373 100644 --- a/kdevdesigner/designer/layout.h +++ b/kdevdesigner/designer/layout.h @@ -31,7 +31,7 @@ #include <tqmap.h> #include <tqguardedptr.h> #include <tqobject.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmap.h> #include <tqwidgetlist.h> @@ -51,7 +51,7 @@ public: virtual void undoLayout(); virtual void breakLayout(); virtual bool prepareLayout( bool &needMove, bool &needReparent ); - virtual void finishLayout( bool needMove, TQLayout *tqlayout ); + virtual void finishLayout( bool needMove, TQLayout *layout ); protected: TQWidgetList widgets; @@ -125,8 +125,8 @@ class Spacer : public TQWidget TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation ) Q_ENUMS( SizeType ) TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType ) - TQ_PROPERTY( TQSize tqsizeHint READ tqsizeHint WRITE setSizeHint DESIGNABLE true STORED true ) - TQ_OVERRIDE( TQRect tqgeometry DESIGNABLE false ) + TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true ) + TQ_OVERRIDE( TQRect geometry DESIGNABLE false ) private: enum { HSize = 6, HMask = 0x3f, VMask = HMask << HSize, @@ -142,11 +142,11 @@ public: Spacer( TQWidget *parent, const char *name ); - TQSize tqminimumSize() const; - TQSize tqsizeHint() const; + TQSize minimumSize() const; + TQSize sizeHint() const; void setSizeType( SizeType t ); SizeType sizeType() const; - int tqalignment() const; + int alignment() const; Qt::Orientation orientation() const; void setOrientation( Qt::Orientation o ); void setInteraciveMode( bool b ) { interactive = b; }; diff --git a/kdevdesigner/designer/listboxdnd.cpp b/kdevdesigner/designer/listboxdnd.cpp index 920559c5..54498478 100644 --- a/kdevdesigner/designer/listboxdnd.cpp +++ b/kdevdesigner/designer/listboxdnd.cpp @@ -152,8 +152,8 @@ void ListBoxDnd::updateLine( const TQPoint & dragPos ) TQListBoxItem *item = itemAt( dragPos ); int ypos = item ? - ( src->tqitemRect( item ).bottom() - ( line->height() / 2 ) ) : - ( src->tqitemRect( ((TQListBox *)src)->firstItem() ).top() ); + ( src->itemRect( item ).bottom() - ( line->height() / 2 ) ) : + ( src->itemRect( ((TQListBox *)src)->firstItem() ).top() ); line->resize( src->viewport()->width(), line->height() ); line->move( 0, ypos ); @@ -166,9 +166,9 @@ TQListBoxItem * ListBoxDnd::itemAt( TQPoint pos ) TQListBoxItem * last = src->item( src->count() - 1 ); int i = src->index( result ); - if ( result && ( pos.y() < (src->tqitemRect(result).top() + src->itemHeight(i)/2) ) ) + if ( result && ( pos.y() < (src->itemRect(result).top() + src->itemHeight(i)/2) ) ) result = result->prev(); - else if ( !result && pos.y() > src->tqitemRect( last ).bottom() ) + else if ( !result && pos.y() > src->itemRect( last ).bottom() ) result = last; return result; @@ -240,7 +240,7 @@ bool ListBoxItemDrag::canDecode( TQDragMoveEvent * event ) bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * after ) { - TQByteArray data = event->tqencodedData( "qt/listboxitem" ); + TQByteArray data = event->encodedData( "qt/listboxitem" ); if ( data.size() ) { event->accept(); diff --git a/kdevdesigner/designer/listboxeditor.ui b/kdevdesigner/designer/listboxeditor.ui index 2827c93d..df584ddf 100644 --- a/kdevdesigner/designer/listboxeditor.ui +++ b/kdevdesigner/designer/listboxeditor.ui @@ -91,7 +91,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -196,7 +196,7 @@ <property name="name"> <cstring>itemDeletePixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -219,7 +219,7 @@ <property name="name"> <cstring>itemChoosePixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -250,7 +250,7 @@ <property name="name"> <cstring>itemText</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -303,7 +303,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/listboxeditorimpl.cpp b/kdevdesigner/designer/listboxeditorimpl.cpp index 98c5c835..db3ddcc8 100644 --- a/kdevdesigner/designer/listboxeditorimpl.cpp +++ b/kdevdesigner/designer/listboxeditorimpl.cpp @@ -161,7 +161,7 @@ void ListBoxEditor::applyClicked() items.append( item ); } - PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n( "Edit the Items of '%1'" ).tqarg( listbox->name() ), + PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n( "Edit the Items of '%1'" ).arg( listbox->name() ), formwindow, listbox, items ); cmd->execute(); formwindow->commandHistory()->addCommand( cmd ); diff --git a/kdevdesigner/designer/listboxrename.cpp b/kdevdesigner/designer/listboxrename.cpp index 53f0deea..0a32d292 100644 --- a/kdevdesigner/designer/listboxrename.cpp +++ b/kdevdesigner/designer/listboxrename.cpp @@ -113,7 +113,7 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) case TQEvent::Resize: if ( clickedItem && ed && !ed->isHidden() ) { - TQRect rect = src->tqitemRect( clickedItem ); + TQRect rect = src->itemRect( clickedItem ); ed->resize( rect.right() - rect.left() - 1, rect.bottom() - rect.top() - 1 ); } @@ -130,7 +130,7 @@ void ListBoxRename::showLineEdit() { if ( !clickedItem || activity ) return; - TQRect rect = src->tqitemRect( clickedItem ); + TQRect rect = src->itemRect( clickedItem ); ed->resize( rect.right() - rect.left() - 1, rect.bottom() - rect.top() - 1 ); ed->move( rect.left() + 1, rect.top() + 1 ); diff --git a/kdevdesigner/designer/listeditor.ui b/kdevdesigner/designer/listeditor.ui index 30b766a0..c477ff1a 100644 --- a/kdevdesigner/designer/listeditor.ui +++ b/kdevdesigner/designer/listeditor.ui @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/listviewdnd.cpp b/kdevdesigner/designer/listviewdnd.cpp index 953551df..32dcc6d5 100644 --- a/kdevdesigner/designer/listviewdnd.cpp +++ b/kdevdesigner/designer/listviewdnd.cpp @@ -142,12 +142,12 @@ int ListViewDnd::buildFlatList( ListViewItemList & list ) if ( (*it)->isSelected() ) { if ( (*it)->childCount() == 0 ) { - // Selected, no tqchildren + // Selected, no children list.append( *it ); } else if ( !addKids ) { // Children processing not set, so set it // Also find the item were we shall quit - // processing tqchildren...if any such item + // processing children...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); nextParent = (*it)->parent(); @@ -157,7 +157,7 @@ int ListViewDnd::buildFlatList( ListViewItemList & list ) } } } else if ( ((*it)->childCount() == 0) && addKids ) { - // Leaf node, and we _do_ process tqchildren + // Leaf node, and we _do_ process children list.append( *it ); } } @@ -191,8 +191,8 @@ void ListViewDnd::updateLine( const TQPoint & dragPos ) TQListView * src = (TQListView *) this->src; int ypos = item ? - ( src->tqitemRect( item ).bottom() - ( line->height() / 2 ) ) : - ( src->tqitemRect( src->firstChild() ).top() ); + ( src->itemRect( item ).bottom() - ( line->height() / 2 ) ) : + ( src->itemRect( src->firstChild() ).top() ); int xpos = dropDepth( item, dragPos ) * src->treeStepSize(); line->resize( src->viewport()->width() - xpos, line->height() ); @@ -217,7 +217,7 @@ TQListViewItem * ListViewDnd::itemAt( TQPoint pos ) while ( result && !result->isVisible() && result->parent() ) result = result->parent(); - if ( !result && src->firstChild() && (pos.y() > src->tqitemRect(src->firstChild()).bottom()) ) { + if ( !result && src->firstChild() && (pos.y() > src->itemRect(src->firstChild()).bottom()) ) { result = src->lastItem(); if ( !result->isVisible() ) // Handle special case where last item is actually hidden @@ -284,7 +284,7 @@ bool ListViewItemDrag::canDecode( TQDragMoveEvent * event ) bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr ) { - TQByteArray data = event->tqencodedData( "qt/listviewitem" ); + TQByteArray data = event->encodedData( "qt/listviewitem" ); TQListViewItem* itemParent = insertPoint ? insertPoint->parent() : 0; // Change from sibling (default) to child creation diff --git a/kdevdesigner/designer/listvieweditor.ui b/kdevdesigner/designer/listvieweditor.ui index e2f3447f..8a0abe14 100644 --- a/kdevdesigner/designer/listvieweditor.ui +++ b/kdevdesigner/designer/listvieweditor.ui @@ -142,7 +142,7 @@ <property name="name"> <cstring>itemText</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -203,7 +203,7 @@ <property name="name"> <cstring>itemDeletePixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -226,7 +226,7 @@ <property name="name"> <cstring>itemChoosePixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -292,7 +292,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -426,7 +426,7 @@ <property name="name"> <cstring>colDeletePixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -449,7 +449,7 @@ <property name="name"> <cstring>colChoosePixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -480,7 +480,7 @@ <property name="name"> <cstring>colText</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -597,7 +597,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -642,7 +642,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/listvieweditorimpl.cpp b/kdevdesigner/designer/listvieweditorimpl.cpp index 9e6c54ed..bd6c0e64 100644 --- a/kdevdesigner/designer/listvieweditorimpl.cpp +++ b/kdevdesigner/designer/listvieweditorimpl.cpp @@ -127,7 +127,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw void ListViewEditor::applyClicked() { setupItems(); - PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n( "Edit the Items and Columns of '%1'" ).tqarg( listview->name() ), + PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n( "Edit the Items and Columns of '%1'" ).arg( listview->name() ), formwindow, listview, itemsPreview ); cmd->execute(); formwindow->commandHistory()->addCommand( cmd ); diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp index dbc2b932..cc56386a 100644 --- a/kdevdesigner/designer/mainwindow.cpp +++ b/kdevdesigner/designer/mainwindow.cpp @@ -92,7 +92,7 @@ #include <tqpixmap.h> #include <tqworkspace.h> #include <tqfiledialog.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqmessagebox.h> #include <tqbuffer.h> #include <tqdir.h> @@ -113,7 +113,7 @@ #include <tqaccel.h> #include <tqtooltip.h> #include <tqsizegrip.h> -#include <tqtextview.h> +#include <textview.h> #include <tqassistantclient.h> #include <stdlib.h> @@ -537,7 +537,7 @@ int MainWindow::currentTool() const { if ( !actionCurrentTool ) return POINTER_TOOL; - return TQString::tqfromLatin1(actionCurrentTool->name()).toInt(); + return TQString::fromLatin1(actionCurrentTool->name()).toInt(); } void MainWindow::runProjectPrecondition() @@ -735,14 +735,14 @@ void MainWindow::previewForm( const TQString & style ) void MainWindow::helpContents() { - TQWidget *tqfocusWidget = tqApp->tqfocusWidget(); + TQWidget *focusWidget = tqApp->focusWidget(); bool showClassDocu = TRUE; - while ( tqfocusWidget ) { - if ( tqfocusWidget->isA( "PropertyList" ) ) { + while ( focusWidget ) { + if ( focusWidget->isA( "PropertyList" ) ) { showClassDocu = FALSE; break; } - tqfocusWidget = tqfocusWidget->parentWidget(); + focusWidget = focusWidget->parentWidget(); } TQString source = "designer-manual.html"; @@ -767,7 +767,7 @@ void MainWindow::helpContents() if ( propertyEditor->widget() && !showClassDocu ) { if ( !propertyEditor->currentProperty().isEmpty() ) { - TQMetaObject* mo = propertyEditor->tqmetaObjectOfCurrentProperty(); + TQMetaObject* mo = propertyEditor->metaObjectOfCurrentProperty(); TQString s; TQString cp = propertyEditor->currentProperty(); if ( cp == "layoutMargin" ) { @@ -783,7 +783,7 @@ void MainWindow::helpContents() source = propertyDocumentation[ "TQObject/name" ]; } else { while ( mo && !propertyDocumentation.contains( ( s = TQString( mo->className() ) + "/" + cp ) ) ) - mo = mo->tqsuperClass(); + mo = mo->superClass(); if ( mo ) source = "p:" + propertyDocumentation[s]; } @@ -794,7 +794,7 @@ void MainWindow::helpContents() if ( classname.lower() == "spacer" ) source = "qspaceritem.html#details"; else if ( classname == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) - source = "tqlayout.html"; + source = "layout.html"; else source = TQString( WidgetFactory::classNameOf( propertyEditor->widget() ) ).lower() + ".html#details"; } @@ -822,7 +822,7 @@ void MainWindow::helpAbout() dlg.aboutLicense->setText( iface->aboutText() ); } dlg.aboutVersion->setText(TQString("Version ") + TQString(TQT_VERSION_STR)); - dlg.resize( dlg.width(), dlg.tqlayout()->heightForWidth(dlg.width()) ); + dlg.resize( dlg.width(), dlg.layout()->heightForWidth(dlg.width()) ); dlg.exec(); } @@ -1279,7 +1279,7 @@ void MainWindow::insertFormWindow( FormWindow *fw ) { if ( fw ) TQWhatsThis::add( fw, i18n( "<b>The Form Window</b>" - "<p>Use the various tools to add widgets or to change the tqlayout " + "<p>Use the various tools to add widgets or to change the layout " "and behavior of the components in the form. Select one or multiple " "widgets to move them or lay them out. If a single widget is chosen it can " "be resized using the resize handles.</p>" @@ -1484,11 +1484,11 @@ void MainWindow::updateUndoRedo( bool undoAvailable, bool redoAvailable, actionEditUndo->setEnabled( undoAvailable ); actionEditRedo->setEnabled( redoAvailable ); if ( !undoCmd.isEmpty() ) - actionEditUndo->setMenuText( i18n( "&Undo: %1" ).tqarg( undoCmd ) ); + actionEditUndo->setMenuText( i18n( "&Undo: %1" ).arg( undoCmd ) ); else actionEditUndo->setMenuText( i18n( "&Undo: Not Available" ) ); if ( !redoCmd.isEmpty() ) - actionEditRedo->setMenuText( i18n( "&Redo: %1" ).tqarg( redoCmd ) ); + actionEditRedo->setMenuText( i18n( "&Redo: %1" ).arg( redoCmd ) ); else actionEditRedo->setMenuText( i18n( "&Redo: Not Available" ) ); @@ -1554,18 +1554,18 @@ void MainWindow::popupWidgetMenu( const TQPoint &gp, FormWindow * /*fw*/, TQWidg void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int> &props, TQWidget *w ) { - const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE ); + const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE ); if ( text && qstrcmp( text->type(), TQSTRING_OBJECT_NAME_STRING) != 0 ) text = 0; - const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE ); + const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE ); if ( title && qstrcmp( title->type(), TQSTRING_OBJECT_NAME_STRING) != 0 ) title = 0; const TQMetaProperty* pagetitle = - w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pageTitle", TRUE ), TRUE ); + w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE ); if ( pagetitle && qstrcmp( pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0 ) pagetitle = 0; const TQMetaProperty* pixmap = - w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pixmap", TRUE ), TRUE ); + w->metaObject()->property( w->metaObject()->findProperty( "pixmap", TRUE ), TRUE ); if ( pixmap && qstrcmp( pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0 ) pixmap = 0; @@ -1721,7 +1721,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid bool ok = FALSE; bool oldDoWrap = FALSE; if ( ::tqqt_cast<TQLabel*>(w) ) { - int align = w->property( "tqalignment" ).toInt(); + int align = w->property( "alignment" ).toInt(); if ( align & WordBreak ) oldDoWrap = TRUE; } @@ -1737,7 +1737,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid } if ( ok ) { if ( oldDoWrap != doWrap ) { - TQString pn( i18n( "Set 'wordwrap' of '%1'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "wordwrap", TQVariant( oldDoWrap, 0 ), TQVariant( doWrap, 0 ), TQString(), TQString() ); @@ -1746,7 +1746,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE ); } - TQString pn( i18n( "Set the 'text' of '%1'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "text", w->property( "text" ), text, TQString(), TQString() ); @@ -1759,7 +1759,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid TQString title = TQInputDialog::getText( i18n("Title"), i18n( "New title" ), TQLineEdit::Normal, w->property("title").toString(), &ok, this ); if ( ok ) { - TQString pn( i18n( "Set the 'title' of '%2'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "title", w->property( "title" ), title, TQString(), TQString() ); @@ -1772,7 +1772,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ), TQLineEdit::Normal, w->property("pageTitle").toString(), &ok, this ); if ( ok ) { - TQString pn( i18n( "Set the 'pageTitle' of '%2'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Set the 'pageTitle' of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "pageTitle", w->property( "pageTitle" ), @@ -1785,7 +1785,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid TQPixmap oldPix = TQVariant(w->property( "pixmap" )).toPixmap(); TQPixmap pix = qChoosePixmap( this, formWindow(), oldPix ); if ( !pix.isNull() ) { - TQString pn( i18n( "Set the 'pixmap' of '%2'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Set the 'pixmap' of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "pixmap", w->property( "pixmap" ), pix, TQString(), TQString() ); @@ -1802,7 +1802,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command TQTabWidget *tw = (TQTabWidget*)w; if ( id == commands[ "add" ] ) { AddTabPageCommand *cmd = - new AddTabPageCommand( i18n( "Add Page to %1" ).tqarg( tw->name() ), formWindow(), + new AddTabPageCommand( i18n( "Add Page to %1" ).arg( tw->name() ), formWindow(), tw, "Tab" ); formWindow()->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1811,7 +1811,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw; DeleteTabPageCommand *cmd = new DeleteTabPageCommand( i18n( "Delete Page %1 of %2" ). - tqarg( dtw->pageTitle() ).tqarg( tw->name() ), + arg( dtw->pageTitle() ).arg( tw->name() ), formWindow(), tw, tw->currentPage() ); formWindow()->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1821,7 +1821,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command TQToolBox *tb = (TQToolBox*)w; if ( id == commands[ "add" ] ) { AddToolBoxPageCommand *cmd = - new AddToolBoxPageCommand( i18n( "Add Page to %1" ).tqarg( tb->name() ), + new AddToolBoxPageCommand( i18n( "Add Page to %1" ).arg( tb->name() ), formWindow(), tb, "Page" ); formWindow()->commandHistory()->addCommand( cmd ); @@ -1841,7 +1841,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command QDesignerWidgetStack *ws = (QDesignerWidgetStack*)w; if ( id == commands[ "add" ] ) { AddWidgetStackPageCommand *cmd = - new AddWidgetStackPageCommand( i18n( "Add Page to %1" ).tqarg( ws->name() ), + new AddWidgetStackPageCommand( i18n( "Add Page to %1" ).arg( ws->name() ), formWindow(), ws ); formWindow()->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1849,14 +1849,14 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command if ( ws->visibleWidget() ) { DeleteWidgetStackPageCommand *cmd = new DeleteWidgetStackPageCommand( i18n( "Delete Page %1 of %2" ). - tqarg( ws->currentPage() ).tqarg( ws->name() ), + arg( ws->currentPage() ).arg( ws->name() ), formWindow(), ws, ws->visibleWidget() ); formWindow()->commandHistory()->addCommand( cmd ); cmd->execute(); } } else if ( id == commands[ "nextpage" ] ) { int currentPage = w->property( "currentPage" ).toInt(); - TQString pn( i18n( "Raise next page of '%2'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Raise next page of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "currentPage", currentPage, @@ -1866,7 +1866,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "currentPage", TRUE ); } else if ( id == commands[ "prevpage" ] ) { int currentPage = w->property( "currentPage" ).toInt(); - TQString pn( i18n( "Raise previous page of '%2'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Raise previous page of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "currentPage", currentPage, @@ -1881,7 +1881,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) { if ( id == commands[ "add" ] ) { AddContainerPageCommand *cmd = - new AddContainerPageCommand( i18n( "Add Page to %1" ).tqarg( w->name() ), + new AddContainerPageCommand( i18n( "Add Page to %1" ).arg( w->name() ), formWindow(), w, "Page" ); formWindow()->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1892,7 +1892,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command int index = iface->currentIndex( wClassName, w ); DeleteContainerPageCommand *cmd = new DeleteContainerPageCommand( i18n( "Delete Page %1 of %2" ). - tqarg( iface->pageLabel( wClassName, + arg( iface->pageLabel( wClassName, w, index ) ). arg( w->name() ), formWindow(), w, index ); @@ -1942,7 +1942,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command TQWizard *wiz = (TQWizard*)fw->mainContainer(); if ( id == commands[ "add" ] ) { AddWizardPageCommand *cmd = - new AddWizardPageCommand( i18n( "Add Page to %1" ).tqarg( wiz->name() ), + new AddWizardPageCommand( i18n( "Add Page to %1" ).arg( wiz->name() ), formWindow(), wiz, "WizardPage" ); formWindow()->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1951,7 +1951,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command QDesignerWizard *dw = (QDesignerWizard*)wiz; DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ). - tqarg( dw->pageTitle() ).tqarg( wiz->name() ), + arg( dw->pageTitle() ).arg( wiz->name() ), formWindow(), wiz, wiz->indexOf( wiz->currentPage() ) ); formWindow()->commandHistory()->addCommand( cmd ); @@ -1968,7 +1968,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ), TQLineEdit::Normal, dw->pageTitle(), &ok, this ); if ( ok ) { - TQString pn( i18n( "Rename page %1 of %2" ).tqarg( dw->pageTitle() ).tqarg( wiz->name() ) ); + TQString pn( i18n( "Rename page %1 of %2" ).arg( dw->pageTitle() ).arg( wiz->name() ) ); RenameWizardPageCommand *cmd = new RenameWizardPageCommand( pn, formWindow() , wiz, wiz->indexOf( wiz->currentPage() ), text ); @@ -1980,13 +1980,13 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command TQMainWindow *mw = (TQMainWindow*)fw->mainContainer(); if ( id == commands[ "add_toolbar" ] ) { AddToolBarCommand *cmd = - new AddToolBarCommand( i18n( "Add Toolbar to '%1'" ).tqarg( formWindow()->name() ), + new AddToolBarCommand( i18n( "Add Toolbar to '%1'" ).arg( formWindow()->name() ), formWindow(), mw ); formWindow()->commandHistory()->addCommand( cmd ); cmd->execute(); } else if ( id == commands[ "add_menu_item" ] ) { AddMenuCommand *cmd = - new AddMenuCommand( i18n( "Add Menu to '%1'" ).tqarg( formWindow()->name() ), + new AddMenuCommand( i18n( "Add Menu to '%1'" ).arg( formWindow()->name() ), formWindow(), mw ); formWindow()->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -2211,8 +2211,8 @@ void MainWindow::writeConfig() l << w->className; l << w->includeFile; l << TQString::number( (int)w->includePolicy ); - l << TQString::number( w->tqsizeHint.width() ); - l << TQString::number( w->tqsizeHint.height() ); + l << TQString::number( w->sizeHint.width() ); + l << TQString::number( w->sizeHint.height() ); l << TQString::number( w->lstSignals.count() ); for ( TQValueList<TQCString>::ConstIterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it ) l << TQString( fixArgs( *it ) ); @@ -2333,7 +2333,7 @@ void MainWindow::readConfig() r.setWidth( config.readNumEntry( keybase + "Geometries/MainwindowWidth", r.width() ) ); r.setHeight( config.readNumEntry( keybase + "Geometries/MainwindowHeight", r.height() ) ); - TQRect desk = TQApplication::desktop()->tqgeometry(); + TQRect desk = TQApplication::desktop()->geometry(); TQRect inter = desk.intersect( r ); resize( r.size() ); if ( inter.width() * inter.height() > ( r.width() * r.height() / 20 ) ) { @@ -2351,8 +2351,8 @@ void MainWindow::readConfig() w->className = l[ 0 ]; w->includeFile = l[ 1 ]; w->includePolicy = (MetaDataBase::CustomWidget::IncludePolicy)l[ 2 ].toInt(); - w->tqsizeHint.setWidth( l[ 3 ].toInt() ); - w->tqsizeHint.setHeight( l[ 4 ].toInt() ); + w->sizeHint.setWidth( l[ 3 ].toInt() ); + w->sizeHint.setHeight( l[ 4 ].toInt() ); uint c = 5; if ( l.count() > c ) { int numSignals = l[ c ].toInt(); @@ -2513,7 +2513,7 @@ void MainWindow::closeEvent( TQCloseEvent *e ) ++it; if ( pro->isModified() ) { switch ( TQMessageBox::warning( this, i18n( "Save Project Settings" ), - i18n( "Save changes to '%1'?" ).tqarg( pro->fileName() ), + i18n( "Save changes to '%1'?" ).arg( pro->fileName() ), i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { case 0: // save pro->save(); @@ -2610,20 +2610,20 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) } if ( WidgetFactory::hasSpecialEditor( WidgetDatabase:: idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) { - statusMessage( i18n( "Edit %1..." ).tqarg( w->className() ) ); + statusMessage( i18n( "Edit %1..." ).arg( w->className() ) ); WidgetFactory::editWidget( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), this, w, formWindow() ); statusBar()->clear(); return TRUE; } - const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE ); - const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE ); + const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE ); + const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE ); if ( text && text->designable(w) ) { bool ok = FALSE; bool oldDoWrap = FALSE; if ( ::tqqt_cast<TQLabel*>(w) ) { - int align = w->property( "tqalignment" ).toInt(); + int align = w->property( "alignment" ).toInt(); if ( align & WordBreak ) oldDoWrap = TRUE; } @@ -2640,7 +2640,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) } if ( ok ) { if ( oldDoWrap != doWrap ) { - TQString pn( i18n( "Set 'wordwrap' of '%1'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "wordwrap", TQVariant( oldDoWrap, 0 ), TQVariant( doWrap, 0 ), TQString(), TQString() ); @@ -2649,7 +2649,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE ); } - TQString pn( i18n( "Set the 'text' of '%1'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "text", w->property( "text" ), text, TQString(), TQString() ); @@ -2664,7 +2664,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) TQString text; text = TQInputDialog::getText( i18n("Title"), i18n( "New title" ), TQLineEdit::Normal, w->property("title").toString(), &ok, this ); if ( ok ) { - TQString pn( i18n( "Set the 'title' of '%2'" ).tqarg( w->name() ) ); + TQString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "title", w->property( "title" ), text, TQString(), TQString() ); @@ -2706,12 +2706,12 @@ void MainWindow::rebuildCustomWidgetGUI() a->setToggleAction( TRUE ); a->setText( w->className ); a->setIconSet( *w->pixmap ); - a->setStatusTip( i18n( "Insert a %1 (custom widget)" ).tqarg( w->className ) ); + a->setStatusTip( i18n( "Insert a %1 (custom widget)" ).arg( w->className ) ); a->setWhatsThis( i18n("<b>%1 (custom widget)</b>" "<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> menu to " "add and change custom widgets. You can add properties as well as " "signals and slots to integrate them into TQt Designer, " - "and provide a pixmap which will be used to represent the widget on the form.</p>").tqarg( w->className ) ); + "and provide a pixmap which will be used to represent the widget on the form.</p>").arg( w->className ) ); a->addTo( customWidgetToolBar ); a->addTo( customWidgetToolBar2 ); @@ -2856,7 +2856,7 @@ void MainWindow::checkTempFiles() void MainWindow::showDialogHelp() { TQWidget *w = (TQWidget*)sender(); - w = w->tqtopLevelWidget(); + w = w->topLevelWidget(); TQString link = documentationPath() + "/designer-manual-13.html#"; @@ -2967,7 +2967,7 @@ void MainWindow::editFunction( const TQString &func, bool rereadSource ) if ( !MetaDataBase::hasEditor( lang ) ) { TQMessageBox::information( this, i18n( "Edit Source" ), i18n( "There is no plugin for editing %1 code installed.\n" - "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) ); + "Note: Plugins are not available in static TQt configurations." ).arg( lang ) ); return; } diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp index e7ba30f3..72f2469b 100644 --- a/kdevdesigner/designer/mainwindowactions.cpp +++ b/kdevdesigner/designer/mainwindowactions.cpp @@ -44,12 +44,12 @@ #include <tqmessagebox.h> #include <tqstatusbar.h> #include <tqlistbox.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqcombobox.h> #include <tqspinbox.h> #include <tqinputdialog.h> #include <tqdatetimeedit.h> -#include <tqtextedit.h> +#include <textedit.h> #include "defs.h" #include "project.h" @@ -225,7 +225,7 @@ void MainWindow::setupEditActions() /* TQToolBar *tb = new TQToolBar( this, "Edit" ); tb->setCloseMode( TQDockWindow::Undocked ); - TQWhatsThis::add( tb, i18n( "<b>The Edit toolbar</b>%1").tqarg(i18n(toolbarHelp).tqarg("")) ); + TQWhatsThis::add( tb, i18n( "<b>The Edit toolbar</b>%1").arg(i18n(toolbarHelp).arg("")) ); addToolBar( tb, i18n( "Edit" ) ); actionEditUndo->addTo( tb ); actionEditRedo->addTo( tb ); @@ -330,14 +330,14 @@ void MainWindow::setupLayoutActions() connect( actionEditAdjustSize, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editAdjustSize() ) ); actionEditAdjustSize->setEnabled( FALSE ); - actionEditHLayout = new DesignerAction( i18n( "Lay OutQt::Horizontally" ), createIconSet("designer_edithtqlayout.png"), + actionEditHLayout = new DesignerAction( i18n( "Lay OutQt::Horizontally" ), createIconSet("designer_edithlayout.png"), i18n( "Lay Out &Horizontally" ), CTRL + Key_H, TQT_TQOBJECT(this), 0 ); actionEditHLayout->setStatusTip(i18n("Lays out the selected widgets horizontally") ); actionEditHLayout->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Horizontally" ) ); connect( actionEditHLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutHorizontal() ) ); actionEditHLayout->setEnabled( FALSE ); - actionEditVLayout = new DesignerAction( i18n( "Lay OutQt::Vertically" ), createIconSet("designer_editvtqlayout.png"), + actionEditVLayout = new DesignerAction( i18n( "Lay OutQt::Vertically" ), createIconSet("designer_editvlayout.png"), i18n( "Lay Out &Vertically" ), CTRL + Key_L, TQT_TQOBJECT(this), 0 ); actionEditVLayout->setStatusTip(i18n("Lays out the selected widgets vertically") ); actionEditVLayout->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Vertically" ) ); @@ -367,7 +367,7 @@ void MainWindow::setupLayoutActions() actionEditBreakLayout = new DesignerAction( i18n( "Break Layout" ), createIconSet("designer_editbreaklayout.png"), i18n( "&Break Layout" ), CTRL + Key_B, TQT_TQOBJECT(this), 0 ); - actionEditBreakLayout->setStatusTip(i18n("Breaks the selected tqlayout") ); + actionEditBreakLayout->setStatusTip(i18n("Breaks the selected layout") ); actionEditBreakLayout->setWhatsThis( whatsThisFrom( "Layout|Break Layout" ) ); connect( actionEditBreakLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editBreakLayout() ) ); actionEditBreakLayout->setEnabled( FALSE ); @@ -376,23 +376,23 @@ void MainWindow::setupLayoutActions() actionInsertSpacer = new WidgetAction( i18n( "Layout" ), actionGroupTools, TQString::number( id ).latin1() ); actionInsertSpacer->setToggleAction( TRUE ); actionInsertSpacer->setText( WidgetDatabase::className( id ) ); - actionInsertSpacer->setMenuText( i18n( "Add %1").tqarg( WidgetDatabase::className( id ) ) ); + actionInsertSpacer->setMenuText( i18n( "Add %1").arg( WidgetDatabase::className( id ) ) ); actionInsertSpacer->setIconSet( WidgetDatabase::iconSet( id ) ); actionInsertSpacer->setToolTip( WidgetDatabase::toolTip( id ) ); - actionInsertSpacer->setStatusTip( i18n( "Insert a %1").tqarg(WidgetDatabase::toolTip( id )) ); + actionInsertSpacer->setStatusTip( i18n( "Insert a %1").arg(WidgetDatabase::toolTip( id )) ); actionInsertSpacer->setWhatsThis( i18n("<b>A %1</b><p>%2</p>" "<p>Click to insert a single %3," "or double click to keep the tool selected.") - .tqarg(WidgetDatabase::toolTip( id )) - .tqarg(WidgetDatabase::whatsThis( id )) - .tqarg(WidgetDatabase::toolTip( id ) )); + .arg(WidgetDatabase::toolTip( id )) + .arg(WidgetDatabase::whatsThis( id )) + .arg(WidgetDatabase::toolTip( id ) )); actionInsertSpacer->addTo( commonWidgetsToolBar ); commonWidgetsPage.append( actionInsertSpacer ); TQWidget *w; commonWidgetsToolBar->setStretchableWidget( ( w = new TQWidget( commonWidgetsToolBar ) ) ); w->setBackgroundMode( commonWidgetsToolBar->backgroundMode() ); - TQWhatsThis::add( layoutToolBar, i18n( "<b>The Layout toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) ); + TQWhatsThis::add( layoutToolBar, i18n( "<b>The Layout toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) ); actionEditAdjustSize->addTo( layoutToolBar ); layoutToolBar->addSeparator(); actionEditHLayout->addTo( layoutToolBar ); @@ -461,7 +461,7 @@ void MainWindow::setupToolActions() TQToolBar *tb = new TQToolBar( this, "Tools" ); tb->setCloseMode( TQDockWindow::Undocked ); toolsToolBar = tb; - TQWhatsThis::add( tb, i18n( "<b>The Tools toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) ); + TQWhatsThis::add( tb, i18n( "<b>The Tools toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) ); addToolBar( tb, i18n( "Tools" ), TQMainWindow::DockTop, FALSE ); actionPointerTool->addTo( tb ); @@ -505,13 +505,13 @@ void MainWindow::setupToolActions() widgetToolBars.append( tb ); bool plural = grp[(int)grp.length()-1] == 's'; if ( plural ) { - TQWhatsThis::add( tb, i18n( "<b>The %1</b>%2" ).tqarg(grp).tqarg(i18n(toolbarHelp). - tqarg( i18n(" Click on a button to insert a single widget, " - "or double click to insert multiple %1.") ).tqarg(grp)) ); + TQWhatsThis::add( tb, i18n( "<b>The %1</b>%2" ).arg(grp).arg(i18n(toolbarHelp). + arg( i18n(" Click on a button to insert a single widget, " + "or double click to insert multiple %1.") ).arg(grp)) ); } else { - TQWhatsThis::add( tb, i18n( "<b>The %1 Widgets</b>%2" ).tqarg(grp).tqarg(i18n(toolbarHelp). - tqarg( i18n(" Click on a button to insert a single %1 widget, " - "or double click to insert multiple widgets.") ).tqarg(grp)) ); + TQWhatsThis::add( tb, i18n( "<b>The %1 Widgets</b>%2" ).arg(grp).arg(i18n(toolbarHelp). + arg( i18n(" Click on a button to insert a single %1 widget, " + "or double click to insert multiple widgets.") ).arg(grp)) ); } addToolBar( tb, grp ); tb->hide(); @@ -552,11 +552,11 @@ void MainWindow::setupToolActions() a->setToolTip( ttip ); if ( !WidgetDatabase::isWhatsThisLoaded() ) WidgetDatabase::loadWhatsThis( documentationPath() ); - a->setStatusTip( i18n( "Insert a %1").tqarg(WidgetDatabase::className( i )) ); + a->setStatusTip( i18n( "Insert a %1").arg(WidgetDatabase::className( i )) ); - TQString whats = i18n("<b>A %1</b>").tqarg( WidgetDatabase::className( i ) ); + TQString whats = i18n("<b>A %1</b>").arg( WidgetDatabase::className( i ) ); if ( !WidgetDatabase::whatsThis( i ).isEmpty() ) - whats += TQString("<p>%1</p>").tqarg(WidgetDatabase::whatsThis( i )); + whats += TQString("<p>%1</p>").arg(WidgetDatabase::whatsThis( i )); a->setWhatsThis( whats+ i18n("<p>Double click on this tool to keep it selected.</p>") ); if ( grp != "KDE" ) @@ -617,7 +617,7 @@ void MainWindow::setupFileActions() tb->setCloseMode( TQDockWindow::Undocked ); projectToolBar = tb; - TQWhatsThis::add( tb, i18n( "<b>The File toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) ); + TQWhatsThis::add( tb, i18n( "<b>The File toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) ); addToolBar( tb, i18n( "File" ) ); fileMenu = new TQPopupMenu( this, "File" ); menubar->insertItem( i18n( "&File" ), fileMenu ); @@ -883,12 +883,12 @@ void MainWindow::setupPreviewActions() else if ( *it == "MotifPlus" ) info = i18n( "The preview will use the advanced Motif look and feel used by the GIMP toolkit (GTK) on Linux." ); - a = new DesignerAction( i18n( "Preview Form in %1 Style" ).tqarg( *it ), TQPixmap(), - i18n( "... in %1 Style" ).tqarg( *it ), 0, TQT_TQOBJECT(this), 0 ); - a->setStatusTip( i18n("Opens a preview in %1 style").tqarg( *it ) ); + a = new DesignerAction( i18n( "Preview Form in %1 Style" ).arg( *it ), TQPixmap(), + i18n( "... in %1 Style" ).arg( *it ), 0, TQT_TQOBJECT(this), 0 ); + a->setStatusTip( i18n("Opens a preview in %1 style").arg( *it ) ); a->setWhatsThis( i18n("<b>Open a preview in %1 style.</b>" "<p>Use the preview to test the design and " - "signal-slot connections of the current form. %2</p>").tqarg( *it ).tqarg( info ) ); + "signal-slot connections of the current form. %2</p>").arg( *it ).arg( info ) ); mapper->setMapping( a, *it ); connect( a, TQT_SIGNAL(activated()), mapper, TQT_SLOT(map()) ); connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) ); @@ -965,7 +965,7 @@ void MainWindow::setupWindowActions() j++; TQString itemText; if ( j < 10 ) - itemText = TQString("&%1 ").tqarg( j ); + itemText = TQString("&%1 ").arg( j ); if ( ::tqqt_cast<FormWindow*>(w) ) itemText += w->name(); else @@ -1015,7 +1015,7 @@ void MainWindow::setupHelpActions() /* TQToolBar *tb = new TQToolBar( this, "Help" ); tb->setCloseMode( TQDockWindow::Undocked ); - TQWhatsThis::add( tb, i18n( "<b>The Help toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("") )); + TQWhatsThis::add( tb, i18n( "<b>The Help toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("") )); addToolBar( tb, i18n( "Help" ) ); actionHelpWhatsThis->addTo( tb );*/ @@ -1125,7 +1125,7 @@ void MainWindow::fileCloseProject() if ( a ) { if ( pro->isModified() ) { switch ( TQMessageBox::warning( this, i18n( "Save Project Settings" ), - i18n( "Save changes to '%1'?" ).tqarg( pro->fileName() ), + i18n( "Save changes to '%1'?" ).arg( pro->fileName() ), i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { case 0: // save pro->save(); @@ -1166,7 +1166,7 @@ void MainWindow::fileCloseProject() currentProject = 0; if ( lastValid ) { projectSelected( lastValid ); - statusMessage( i18n( "Selected project '%1'" ).tqarg( currentProject->projectName() ) ); + statusMessage( i18n( "Selected project '%1'" ).arg( currentProject->projectName() ) ); } if ( !windows.isEmpty() ) { for ( TQWidget *w = windows.first(); w; w = windows.next() ) { @@ -1276,11 +1276,11 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co arg( filename )/*, 3000*/ ); return; } - statusMessage( i18n( "Importing '%1' using import filter ...").tqarg( filename ) ); + statusMessage( i18n( "Importing '%1' using import filter ...").arg( filename ) ); TQStringList list = iface->import( filter, filename ); iface->release(); if ( list.isEmpty() ) { - statusMessage( i18n( "Nothing to load in '%1'").tqarg( filename )/*, 3000*/ ); + statusMessage( i18n( "Nothing to load in '%1'").arg( filename )/*, 3000*/ ); return; } if ( !inProject ) @@ -1319,7 +1319,7 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile return formWindow(); } - statusMessage( i18n( "Reading file '%1'...").tqarg( filename ) ); + statusMessage( i18n( "Reading file '%1'...").arg( filename ) ); FormFile *ff2 = currentProject->findFormFile( currentProject->makeRelative(filename) ); if ( ff2 && ff2->formWindow() ) { ff2->formWindow()->setFocus(); @@ -1338,10 +1338,10 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile TQApplication::restoreOverrideCursor(); if ( b ) { rebuildCustomWidgetGUI(); - statusMessage( i18n( "Loaded file '%1'").tqarg( filename )/*, 3000 */); + statusMessage( i18n( "Loaded file '%1'").arg( filename )/*, 3000 */); } else { - statusMessage( i18n( "Failed to load file '%1'").tqarg( filename )/*, 5000 */); - TQMessageBox::information( this, i18n("Load File"), i18n("Could not load file '%1'.").tqarg( filename ) ); + statusMessage( i18n( "Failed to load file '%1'").arg( filename )/*, 5000 */); + TQMessageBox::information( this, i18n("Load File"), i18n("Could not load file '%1'.").arg( filename ) ); delete ff; } return (FormWindow*)resource.widget(); @@ -1389,7 +1389,7 @@ bool MainWindow::fileSaveForm() bool MainWindow::fileSaveProject() { currentProject->save(); - statusMessage( i18n( "Project '%1' saved.").tqarg( currentProject->projectName() )/*, 3000 */); + statusMessage( i18n( "Project '%1' saved.").arg( currentProject->projectName() )/*, 3000 */); return TRUE; } @@ -1482,7 +1482,7 @@ void MainWindow::createNewTemplate() ts << " <cstring>" << cn << "Form</cstring>" << endl; ts << "</property>" << endl; ts << "<property stdset=\"1\">" << endl; - ts << " <name>tqgeometry</name>" << endl; + ts << " <name>geometry</name>" << endl; ts << " <rect>" << endl; ts << " <width>300</width>" << endl; ts << " <height>400</height>" << endl; @@ -1567,7 +1567,7 @@ void MainWindow::editPaste() } else { TQMessageBox::information( this, i18n( "Paste Error" ), i18n( "Cannot paste widgets. Designer could not find a container\n" - "to paste into which does not contain a tqlayout. Break the tqlayout\n" + "to paste into which does not contain a layout. Break the layout\n" "of the container you want to paste into and select this container\n" "and then paste again." ) ); } @@ -1761,7 +1761,7 @@ SourceEditor *MainWindow::openSourceEditor() if ( !MetaDataBase::hasEditor( lang ) ) { TQMessageBox::information( this, i18n( "Edit Source" ), i18n( "There is no plugin for editing %1 code installed.\n" - "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) ); + "Note: Plugins are not available in static TQt configurations." ).arg( lang ) ); return 0; } @@ -1784,7 +1784,7 @@ SourceEditor *MainWindow::editSource( SourceFile *f ) if ( !MetaDataBase::hasEditor( lang ) ) { TQMessageBox::information( this, i18n( "Edit Source" ), i18n( "There is no plugin for editing %1 code installed.\n" - "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) ); + "Note: Plugins are not available in static TQt configurations." ).arg( lang ) ); return 0; } @@ -1921,7 +1921,7 @@ void MainWindow::editPreferences() setUsesTextLabel( dia->checkBoxTextLabels->isChecked() ); if (dia->textEditPluginPaths->isModified()) { pluginPaths = dia->textEditPluginPaths->text(); - TQApplication::tqsetLibraryPaths(TQStringList::split("\n", pluginPaths)); + TQApplication::setLibraryPaths(TQStringList::split("\n", pluginPaths)); savePluginPaths = TRUE; } diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp index 498c6827..550c9b60 100644 --- a/kdevdesigner/designer/menubareditor.cpp +++ b/kdevdesigner/designer/menubareditor.cpp @@ -74,7 +74,7 @@ bool MenuBarEditorItemPtrDrag::canDecode( TQDragMoveEvent * e ) bool MenuBarEditorItemPtrDrag::decode( TQDropEvent * e, MenuBarEditorItem ** i ) { - TQByteArray data = e->tqencodedData( "qt/menubareditoritemptr" ); + TQByteArray data = e->encodedData( "qt/menubareditoritemptr" ); TQDataStream stream( data, IO_ReadOnly ); if ( !data.size() ) @@ -502,7 +502,7 @@ void MenuBarEditor::deleteItem( int index ) } } -TQSize MenuBarEditor::tqsizeHint() const +TQSize MenuBarEditor::sizeHint() const { return TQSize( parentWidget()->width(), heightForWidth( parentWidget()->width() ) ); } @@ -576,7 +576,7 @@ bool MenuBarEditor::eventFilter( TQObject * o, TQEvent * e ) lineEdit->hide(); update(); } else if ( e->type() == TQEvent::LayoutHint ) { - resize( tqsizeHint() ); + resize( sizeHint() ); } return TQMenuBar::eventFilter( o, e ); } @@ -586,7 +586,7 @@ void MenuBarEditor::paintEvent( TQPaintEvent * ) TQPainter p( this ); TQRect r = rect(); tqstyle().tqdrawPrimitive( TQStyle::PE_PanelMenuBar, &p, - r, tqcolorGroup() ); + r, colorGroup() ); drawItems( p ); } @@ -817,7 +817,7 @@ void MenuBarEditor::keyPressEvent( TQKeyEvent * e ) void MenuBarEditor::focusOutEvent( TQFocusEvent * e ) { - TQWidget * fw = tqApp->tqfocusWidget(); + TQWidget * fw = tqApp->focusWidget(); if ( e->lostFocus() && !::tqqt_cast<PopupMenuEditor*>(fw) ) hideItem(); update(); @@ -834,7 +834,7 @@ void MenuBarEditor::drawItems( TQPainter & p ) TQPoint pos( borderSize(), 0 ); uint c = 0; - p.setPen( tqcolorGroup().buttonText() ); + p.setPen( colorGroup().buttonText() ); MenuBarEditorItem * i = itemList.first(); while ( i ) { diff --git a/kdevdesigner/designer/menubareditor.h b/kdevdesigner/designer/menubareditor.h index 0725fd5f..ec933d0b 100644 --- a/kdevdesigner/designer/menubareditor.h +++ b/kdevdesigner/designer/menubareditor.h @@ -120,9 +120,9 @@ public: void focusItem( int index = -1 ); void deleteItem( int index = -1 ); - TQSize tqsizeHint() const; - TQSize tqminimumSize() const { return tqsizeHint(); } - TQSize tqminimumSizeHint() const { return tqsizeHint(); } + TQSize sizeHint() const; + TQSize minimumSize() const { return sizeHint(); } + TQSize minimumSizeHint() const { return sizeHint(); } int heightForWidth( int max_width ) const; void show(); diff --git a/kdevdesigner/designer/metadatabase.cpp b/kdevdesigner/designer/metadatabase.cpp index 5f8ce367..fec4a368 100644 --- a/kdevdesigner/designer/metadatabase.cpp +++ b/kdevdesigner/designer/metadatabase.cpp @@ -42,7 +42,7 @@ #include <tqapplication.h> #include <tqobject.h> -#include <tqlayout.h> +#include <layout.h> #include <tqptrdict.h> #include <tqobjectlist.h> #include <tqstrlist.h> @@ -54,7 +54,7 @@ #include <tqdatetime.h> #include <tqfile.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <stdlib.h> @@ -167,14 +167,14 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo if ( doUpdate && ( property == "hAlign" || property == "vAlign" || property == "wordwrap" ) ) { doUpdate = FALSE; - setPropertyChanged( o, "tqalignment", changed || + setPropertyChanged( o, "alignment", changed || isPropertyChanged( o, "hAlign" ) || isPropertyChanged( o, "vAlign" ) || isPropertyChanged( o, "wordwrap" ) ); doUpdate = TRUE; } - if ( doUpdate && property == "tqalignment" ) { + if ( doUpdate && property == "alignment" ) { doUpdate = FALSE; setPropertyChanged( o, "hAlign", changed ); setPropertyChanged( o, "vAlign", changed ); @@ -303,16 +303,16 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing ) } r->spacing = spacing; - TQLayout * tqlayout = 0; - WidgetFactory::layoutType( (TQWidget*)o, tqlayout ); - if ( tqlayout ) { + TQLayout * layout = 0; + WidgetFactory::layoutType( (TQWidget*)o, layout ); + if ( layout ) { int spadef = 6; if ( MainWindow::self->formWindow() ) spadef = MainWindow::self->formWindow()->layoutDefaultSpacing(); if ( spacing == -1 ) - tqlayout->setSpacing( spadef ); + layout->setSpacing( spadef ); else - tqlayout->setSpacing( spacing ); + layout->setSpacing( spacing ); } } @@ -346,8 +346,8 @@ void MetaDataBase::setMargin( TQObject *o, int margin ) } r->margin = margin; - TQLayout * tqlayout = 0; - WidgetFactory::layoutType( (TQWidget*)o, tqlayout ); + TQLayout * layout = 0; + WidgetFactory::layoutType( (TQWidget*)o, layout ); bool isInnerLayout = TRUE; @@ -358,18 +358,18 @@ void MetaDataBase::setMargin( TQObject *o, int margin ) isInnerLayout = FALSE; - if ( tqlayout ) { + if ( layout ) { int mardef = 11; if ( MainWindow::self->formWindow() ) mardef = MainWindow::self->formWindow()->layoutDefaultMargin(); if ( margin == -1 ) { if ( isInnerLayout ) - tqlayout->setMargin( 1 ); + layout->setMargin( 1 ); else - tqlayout->setMargin( TQMAX( 1, mardef ) ); + layout->setMargin( TQMAX( 1, mardef ) ); } else - tqlayout->setMargin( TQMAX( 1, margin ) ); + layout->setMargin( TQMAX( 1, margin ) ); } } @@ -648,12 +648,12 @@ void MetaDataBase::doConnections( TQObject *o ) delete l; } TQString s = "2""%1"; - s = s.tqarg( conn.signal.data() ); + s = s.arg( conn.signal.data() ); TQString s2 = "1""%1"; - s2 = s2.tqarg( conn.slot.data() ); + s2 = s2.arg( conn.slot.data() ); - TQStrList signalList = sender->tqmetaObject()->signalNames( TRUE ); - TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE ); + TQStrList signalList = sender->metaObject()->signalNames( TRUE ); + TQStrList slotList = receiver->metaObject()->slotNames( TRUE ); // avoid warnings if ( signalList.find( conn.signal ) == -1 || @@ -675,13 +675,13 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom } if ( !onlyCustom ) { - TQStrList slotList = o->tqmetaObject()->slotNames( TRUE ); + TQStrList slotList = o->metaObject()->slotNames( TRUE ); if ( slotList.find( slot ) != -1 ) return TRUE; if ( ::tqqt_cast<FormWindow*>(o) ) { o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer()); - slotList = o->tqmetaObject()->slotNames( TRUE ); + slotList = o->metaObject()->slotNames( TRUE ); if ( slotList.find( slot ) != -1 ) return TRUE; } @@ -905,13 +905,13 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl } if ( !onlyCustom ) { - TQStrList functionList = o->tqmetaObject()->slotNames( TRUE ); + TQStrList functionList = o->metaObject()->slotNames( TRUE ); if ( functionList.find( function ) != -1 ) return TRUE; if ( ::tqqt_cast<FormWindow*>(o) ) { o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer()); - functionList = o->tqmetaObject()->slotNames( TRUE ); + functionList = o->metaObject()->slotNames( TRUE ); if ( functionList.find( function ) != -1 ) return TRUE; } @@ -1276,7 +1276,7 @@ MetaDataBase::CustomWidget::CustomWidget() className = "MyCustomWidget"; includeFile = "mywidget.h"; includePolicy = Local; - tqsizeHint = TQSize( -1, -1 ); + sizeHint = TQSize( -1, -1 ); pixmap = new TQPixmap( BarIcon( "designer_customwidget.png", KDevDesignerPartFactory::instance() ) ); id = -1; sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ); @@ -1288,7 +1288,7 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w ) className = w.className; includeFile = w.includeFile; includePolicy = w.includePolicy; - tqsizeHint = w.tqsizeHint; + sizeHint = w.sizeHint; if ( w.pixmap ) pixmap = new TQPixmap( *w.pixmap ); else @@ -1339,7 +1339,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW className = w.className; includeFile = w.includeFile; includePolicy = w.includePolicy; - tqsizeHint = w.tqsizeHint; + sizeHint = w.sizeHint; if ( w.pixmap ) pixmap = new TQPixmap( *w.pixmap ); else @@ -1354,7 +1354,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const { - TQStrList sigList = TQWidget::tqstaticMetaObject()->signalNames( TRUE ); + TQStrList sigList = TQWidget::staticMetaObject()->signalNames( TRUE ); if ( sigList.find( signal ) != -1 ) return TRUE; for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) { @@ -1366,7 +1366,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const { - TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( TRUE ); + TQStrList slotList = TQWidget::staticMetaObject()->slotNames( TRUE ); if ( slotList.find( normalizeFunction( slot ) ) != -1 ) return TRUE; @@ -1379,7 +1379,7 @@ bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const { - TQStrList propList = TQWidget::tqstaticMetaObject()->propertyNames( TRUE ); + TQStrList propList = TQWidget::staticMetaObject()->propertyNames( TRUE ); if ( propList.find( prop ) != -1 ) return TRUE; diff --git a/kdevdesigner/designer/metadatabase.h b/kdevdesigner/designer/metadatabase.h index 9b00deb9..352e10d7 100644 --- a/kdevdesigner/designer/metadatabase.h +++ b/kdevdesigner/designer/metadatabase.h @@ -102,7 +102,7 @@ public: TQString className; TQString includeFile; IncludePolicy includePolicy; - TQSize tqsizeHint; + TQSize sizeHint; TQSizePolicy sizePolicy; TQPixmap *pixmap; TQValueList<TQCString> lstSignals; diff --git a/kdevdesigner/designer/multilineeditor.ui b/kdevdesigner/designer/multilineeditor.ui index 1fe1ea63..f0ff2129 100644 --- a/kdevdesigner/designer/multilineeditor.ui +++ b/kdevdesigner/designer/multilineeditor.ui @@ -124,7 +124,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp index 166ab877..ef1926f3 100644 --- a/kdevdesigner/designer/multilineeditorimpl.cpp +++ b/kdevdesigner/designer/multilineeditorimpl.cpp @@ -35,10 +35,10 @@ #include <kiconloader.h> #include "kdevdesigner_part.h" -#include <tqtextedit.h> +#include <textedit.h> #include <tqrichtext_p.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbutton.h> #include <tqapplication.h> #include <tqaction.h> @@ -231,8 +231,8 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget mlined = (TQTextEdit*)editWidget; mlined->setReadOnly( TRUE ); - const TQMetaProperty *wordWrap = mlined->tqmetaObject()->property( - mlined->tqmetaObject()->findProperty( "wordWrap", TRUE ), TRUE ); + const TQMetaProperty *wordWrap = mlined->metaObject()->property( + mlined->metaObject()->findProperty( "wordWrap", TRUE ), TRUE ); oldWrapMode = 0; oldWrapString = "NoWrap"; if ( wordWrap ) { @@ -241,7 +241,7 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget if ( oldWrapString != "NoWrap" ) doWrap = TRUE; } - textEdit->tqsetAlignment( mlined->tqalignment() ); + textEdit->setAlignment( mlined->alignment() ); textEdit->setWordWrap( mlined->wordWrap() ); textEdit->setWrapColumnOrWidth( mlined->wrapColumnOrWidth() ); textEdit->setWrapPolicy( mlined->wrapPolicy() ); @@ -276,13 +276,13 @@ void MultiLineEditor::okClicked() void MultiLineEditor::applyClicked() { if ( !callStatic ) { - PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n( "Set the Text of '%1'" ).tqarg( mlined->name() ), + PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n( "Set the Text of '%1'" ).arg( mlined->name() ), formwindow, mlined, textEdit->text() ); cmd->execute(); formwindow->commandHistory()->addCommand( cmd ); if ( oldDoWrap != doWrap ) { - TQString pn( i18n( "Set 'wordWrap' of '%2'" ).tqarg( mlined->name() ) ); + TQString pn( i18n( "Set 'wordWrap' of '%2'" ).arg( mlined->name() ) ); SetPropertyCommand *propcmd; if ( doWrap ) propcmd = new SetPropertyCommand( pn, formwindow, @@ -325,7 +325,7 @@ void MultiLineEditor::insertTags( const TQString &tag ) if ( textEdit->hasSelectedText() ) { textEdit->getSelection( &pfrom, &ifrom, &pto, &ito ); TQString buf = textEdit->selectedText(); - buf = TQString( "<%1>%3</%2>" ).tqarg( tag ).tqarg( tagend ).tqarg( buf ); + buf = TQString( "<%1>%3</%2>" ).arg( tag ).arg( tagend ).arg( buf ); textEdit->removeSelectedText(); textEdit->insertAt( buf, pfrom, ifrom ); textEdit->setCursorPosition( pto, ito + 2 + tag.length() ); @@ -333,7 +333,7 @@ void MultiLineEditor::insertTags( const TQString &tag ) else { int para, index; textEdit->getCursorPosition( ¶, &index ); - textEdit->insert( TQString( "<%1></%2>" ).tqarg( tag ).tqarg( tagend ) ); + textEdit->insert( TQString( "<%1></%2>" ).arg( tag ).arg( tagend ) ); index += 2 + tag.length(); textEdit->setCursorPosition( para, index ); } @@ -363,7 +363,7 @@ void MultiLineEditor::showFontDialog() if ( fd->getFont() != "default" ) font = "face=\"" + fd->getFont() + "\""; TQString tag( TQString( "font %1 %2 %3" ) - .tqarg( color ).tqarg( size ).tqarg( font ) ); + .arg( color ).arg( size ).arg( font ) ); if ( selText ) textEdit->setSelection( pfrom, ifrom, pto, ito ); diff --git a/kdevdesigner/designer/multilineeditorimpl.h b/kdevdesigner/designer/multilineeditorimpl.h index 4756f37c..36697cd7 100644 --- a/kdevdesigner/designer/multilineeditorimpl.h +++ b/kdevdesigner/designer/multilineeditorimpl.h @@ -28,7 +28,7 @@ #define MULTILINEEDITORIMPL_H #include <tqaction.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqrichtext_p.h> #include "multilineeditor.h" diff --git a/kdevdesigner/designer/newform.ui b/kdevdesigner/designer/newform.ui index 3fcbd914..81cb4fa5 100644 --- a/kdevdesigner/designer/newform.ui +++ b/kdevdesigner/designer/newform.ui @@ -91,7 +91,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -177,7 +177,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp index 6026a9bd..2d631833 100644 --- a/kdevdesigner/designer/newformimpl.cpp +++ b/kdevdesigner/designer/newformimpl.cpp @@ -158,7 +158,7 @@ void CustomFormItem::insert( Project *pro ) FormFile *ff = new FormFile( filename, TRUE, pro ); if ( !resource.load( ff ) ) { TQMessageBox::information( MainWindow::self, i18n("Load Template"), - i18n("Could not load form description from template '%1'" ).tqarg( filename ) ); + i18n("Could not load form description from template '%1'" ).arg( filename ) ); delete ff; return; } @@ -249,7 +249,7 @@ void NewForm::insertTemplates( TQIconView *tView, TQStringList languages = MetaDataBase::languages(); if ( !MainWindow::self->singleProjectMode() ) { for ( it = languages.begin(); it != languages.end(); ++it ) { - ProjectItem *pi = new ProjectItem( tView, i18n("%1 Project" ).tqarg( *it ) ); + ProjectItem *pi = new ProjectItem( tView, i18n("%1 Project" ).arg( *it ) ); allItems.append( pi ); pi->setLanguage( *it ); pi->setPixmap( BarIcon( "designer_project.png" , KDevDesignerPartFactory::instance()) ); diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp index 33113ef5..f69125bd 100644 --- a/kdevdesigner/designer/outputwindow.cpp +++ b/kdevdesigner/designer/outputwindow.cpp @@ -30,7 +30,7 @@ #include "mainwindow.h" #include <tqlistview.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqapplication.h> #include <tqheader.h> #include <stdlib.h> @@ -196,7 +196,7 @@ ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString } void ErrorItem::paintCell( TQPainter *p, const TQColorGroup & cg, - int column, int width, int tqalignment ) + int column, int width, int alignment ) { TQColorGroup g( cg ); g.setColor( TQColorGroup::Text, type == Error ? TQt::red : TQt::darkYellow ); @@ -205,5 +205,5 @@ void ErrorItem::paintCell( TQPainter *p, const TQColorGroup & cg, f.setBold( TRUE ); p->setFont( f ); } - TQListViewItem::paintCell( p, g, column, width, tqalignment ); + TQListViewItem::paintCell( p, g, column, width, alignment ); } diff --git a/kdevdesigner/designer/outputwindow.h b/kdevdesigner/designer/outputwindow.h index 04ebc065..a3276da6 100644 --- a/kdevdesigner/designer/outputwindow.h +++ b/kdevdesigner/designer/outputwindow.h @@ -45,9 +45,9 @@ public: const TQString &locationString, TQObject *locationObject ); void paintCell( TQPainter *, const TQColorGroup & cg, - int column, int width, int tqalignment ); + int column, int width, int alignment ); - void setRead( bool b ) { read = b; tqrepaint(); } + void setRead( bool b ) { read = b; repaint(); } TQObject *location() const { return object; } int line() const { return text( 2 ).toInt(); } diff --git a/kdevdesigner/designer/paletteeditor.ui b/kdevdesigner/designer/paletteeditor.ui index 79e04792..32b14b54 100644 --- a/kdevdesigner/designer/paletteeditor.ui +++ b/kdevdesigner/designer/paletteeditor.ui @@ -69,7 +69,7 @@ <property name="title"> <string>Build Palette</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignAuto</set> </property> <hbox> @@ -92,7 +92,7 @@ <vsizetype>1</vsizetype> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> @@ -110,7 +110,7 @@ <property name="text"> <string>&3-D effects:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignAuto|AlignVCenter</set> </property> <property name="buddy" stdset="0"> @@ -150,7 +150,7 @@ <vsizetype>1</vsizetype> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> @@ -168,7 +168,7 @@ <property name="text"> <string>Back&ground:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignAuto|AlignVCenter</set> </property> <property name="buddy" stdset="0"> @@ -208,7 +208,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -343,7 +343,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/paletteeditoradvanced.ui b/kdevdesigner/designer/paletteeditoradvanced.ui index a8ba6c03..579f0e68 100644 --- a/kdevdesigner/designer/paletteeditoradvanced.ui +++ b/kdevdesigner/designer/paletteeditoradvanced.ui @@ -266,7 +266,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -323,7 +323,7 @@ <vsizetype>1</vsizetype> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -473,7 +473,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -490,7 +490,7 @@ <vsizetype>1</vsizetype> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -565,7 +565,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp index e8c780fc..903c1a4f 100644 --- a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp +++ b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp @@ -250,15 +250,15 @@ void PaletteEditorAdvanced::onCentral( int item ) case 0: default: c = editPalette.active().color( centralFromItem(item) ); - p = editPalette.active().tqbrush( centralFromItem(item) ).pixmap(); + p = editPalette.active().brush( centralFromItem(item) ).pixmap(); break; case 1: c = editPalette.inactive().color( centralFromItem(item) ); - p = editPalette.inactive().tqbrush( centralFromItem(item) ).pixmap(); + p = editPalette.inactive().brush( centralFromItem(item) ).pixmap(); break; case 2: c = editPalette.disabled().color( centralFromItem(item) ); - p = editPalette.disabled().tqbrush( centralFromItem(item) ).pixmap(); + p = editPalette.disabled().brush( centralFromItem(item) ).pixmap(); break; } @@ -514,17 +514,17 @@ void PaletteEditorAdvanced::updateStyledButtons() default: central = editPalette.active().color( centralFromItem( comboCentral->currentItem() ) ); effect = editPalette.active().color( effectFromItem( comboEffect->currentItem() ) ); - pm = editPalette.active().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); + pm = editPalette.active().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); break; case 1: central = editPalette.inactive().color( centralFromItem( comboCentral->currentItem() ) ); effect = editPalette.inactive().color( effectFromItem( comboEffect->currentItem() ) ); - pm = editPalette.inactive().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); + pm = editPalette.inactive().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); break; case 2: central = editPalette.disabled().color( centralFromItem( comboCentral->currentItem() ) ); effect = editPalette.disabled().color( effectFromItem( comboEffect->currentItem() ) ); - pm = editPalette.disabled().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); + pm = editPalette.disabled().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); break; } diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp index 1da0557b..976343bd 100644 --- a/kdevdesigner/designer/pixmapchooser.cpp +++ b/kdevdesigner/designer/pixmapchooser.cpp @@ -66,12 +66,12 @@ void PixmapView::setPixmap( const TQPixmap &pix ) { pixmap = pix; resizeContents( pixmap.size().width(), pixmap.size().height() ); - viewport()->tqrepaint( FALSE ); + viewport()->repaint( FALSE ); } void PixmapView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch ) { - p->fillRect( cx, cy, cw, ch, tqcolorGroup().brush( TQColorGroup::Base ) ); + p->fillRect( cx, cy, cw, ch, colorGroup().brush( TQColorGroup::Base ) ); p->drawPixmap( 0, 0, pixmap ); } @@ -98,7 +98,7 @@ static void buildImageFormatList( TQString &filter, TQString &all ) else outputExtension = "jpg;*.jpeg"; filter += TQString(tqApp->translate( "qChoosePixmap", "%1-Pixmaps (%2)\n" )). - tqarg( outputFormat ).tqarg( "*." + outputExtension); + arg( outputFormat ).arg( "*." + outputExtension); all += "*." + outputExtension + ";"; } filter.prepend( all + tqApp->translate( "qChoosePixmap", ")\n" ) ); diff --git a/kdevdesigner/designer/pixmapcollection.cpp b/kdevdesigner/designer/pixmapcollection.cpp index 880423a3..936dbc4d 100644 --- a/kdevdesigner/designer/pixmapcollection.cpp +++ b/kdevdesigner/designer/pixmapcollection.cpp @@ -30,7 +30,7 @@ #include <tqmime.h> #include <tqdir.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqimage.h> PixmapCollection::PixmapCollection( Project *pro ) diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui b/kdevdesigner/designer/pixmapcollectioneditor.ui index a6ed1bd6..30f74183 100644 --- a/kdevdesigner/designer/pixmapcollectioneditor.ui +++ b/kdevdesigner/designer/pixmapcollectioneditor.ui @@ -101,7 +101,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/pixmapfunction.ui b/kdevdesigner/designer/pixmapfunction.ui index e5f13817..760abe56 100644 --- a/kdevdesigner/designer/pixmapfunction.ui +++ b/kdevdesigner/designer/pixmapfunction.ui @@ -877,7 +877,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -919,7 +919,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp index 7770dcda..ea4ffec7 100644 --- a/kdevdesigner/designer/popupmenueditor.cpp +++ b/kdevdesigner/designer/popupmenueditor.cpp @@ -80,7 +80,7 @@ bool PopupMenuEditorItemPtrDrag::canDecode( TQDragMoveEvent * e ) bool PopupMenuEditorItemPtrDrag::decode( TQDropEvent * e, PopupMenuEditorItem ** i ) { - TQByteArray data = e->tqencodedData( "qt/popupmenueditoritemptr" ); + TQByteArray data = e->encodedData( "qt/popupmenueditoritemptr" ); TQDataStream stream( data, IO_ReadOnly ); if ( !data.size() ) @@ -170,7 +170,7 @@ PopupMenuEditorItem::ItemType PopupMenuEditorItem::type() const void PopupMenuEditorItem::setVisible( bool enable ) { if ( a ) - a->tqsetVisible( enable ); + a->setVisible( enable ); } bool PopupMenuEditorItem::isVisible() const @@ -730,7 +730,7 @@ void PopupMenuEditor::paintEvent( TQPaintEvent * ) rect().width() - borderSize * 2, rect().height() - borderSize * 2 ); reg -= mid; p.setClipRegion( reg ); - tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), tqcolorGroup() ); + tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), colorGroup() ); p.restore(); drawItems( &p ); } @@ -1011,7 +1011,7 @@ void PopupMenuEditor::focusInEvent( TQFocusEvent * ) void PopupMenuEditor::focusOutEvent( TQFocusEvent * ) { - TQWidget * fw = tqApp->tqfocusWidget(); + TQWidget * fw = tqApp->focusWidget(); if ( !fw || ( !::tqqt_cast<PopupMenuEditor*>(fw) && fw != lineEdit ) ) { hideSubMenu(); if ( fw && ::tqqt_cast<MenuBarEditor*>(fw) ) @@ -1031,12 +1031,12 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i, int y = r.y(); int h = r.height(); - p->fillRect( r, tqcolorGroup().brush( TQColorGroup::Background ) ); + p->fillRect( r, colorGroup().brush( TQColorGroup::Background ) ); if ( i->isSeparator() ) { tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, p, TQRect( r.x(), r.y() + 2, r.width(), 1 ), - tqcolorGroup(), TQStyle::Style_Sunken | f ); + colorGroup(), TQStyle::Style_Sunken | f ); return; } @@ -1044,7 +1044,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i, if ( a->isToggleAction() && a->isOn() ) { tqstyle().tqdrawPrimitive( TQStyle::PE_CheckMark, p, TQRect( x , y, iconWidth, h ), - tqcolorGroup(), f ); + colorGroup(), f ); } else { TQPixmap icon = a->iconSet().pixmap( TQIconSet::Automatic, TQIconSet::Normal ); p->drawPixmap( x + ( iconWidth - icon.width() ) / 2, @@ -1066,7 +1066,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i, if ( i->count() ) // Item has submenu tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowRight, p, TQRect( r.width() - arrowWidth, r.y(), arrowWidth, r.height() ), - tqcolorGroup(), f ); + colorGroup(), f ); } void PopupMenuEditor::drawWinFocusRect( TQPainter * p, const TQRect & r ) const @@ -1092,8 +1092,8 @@ void PopupMenuEditor::drawItems( TQPainter * p ) int flags = 0; int idx = 0; - TQColorGroup enabled = tqcolorGroup(); - TQColorGroup disabled = tqpalette().disabled(); + TQColorGroup enabled = colorGroup(); + TQColorGroup disabled = palette().disabled(); TQRect focus; TQRect rect( borderSize, borderSize, width() - borderSize * 2, 0 ); diff --git a/kdevdesigner/designer/preferences.ui b/kdevdesigner/designer/preferences.ui index a4335bc7..363164ed 100644 --- a/kdevdesigner/designer/preferences.ui +++ b/kdevdesigner/designer/preferences.ui @@ -95,7 +95,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -156,7 +156,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -519,7 +519,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/previewframe.cpp b/kdevdesigner/designer/previewframe.cpp index c63e994f..c26d51fc 100644 --- a/kdevdesigner/designer/previewframe.cpp +++ b/kdevdesigner/designer/previewframe.cpp @@ -37,7 +37,7 @@ PreviewFrame::PreviewFrame( TQWidget *parent, const char *name ) setLineWidth(1); PreviewWorkspace * w = new PreviewWorkspace( this ); - w->setEraseColor(tqcolorGroup().dark()); + w->setEraseColor(colorGroup().dark()); previewWidget = new PreviewWidget( w ); previewWidget->move( 10, 10 ); } diff --git a/kdevdesigner/designer/previewwidget.ui b/kdevdesigner/designer/previewwidget.ui index 0cc680c8..3b792253 100644 --- a/kdevdesigner/designer/previewwidget.ui +++ b/kdevdesigner/designer/previewwidget.ui @@ -259,7 +259,7 @@ <property name="name"> <cstring>textView</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>50</height> @@ -288,7 +288,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/project.cpp b/kdevdesigner/designer/project.cpp index 1410361d..a250c1f8 100644 --- a/kdevdesigner/designer/project.cpp +++ b/kdevdesigner/designer/project.cpp @@ -37,11 +37,11 @@ #include "outputwindow.h" #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqurl.h> #include <tqobjectlist.h> #include <tqfeatures.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqdom.h> #include <tqmessagebox.h> #include <tqapplication.h> diff --git a/kdevdesigner/designer/projectsettings.ui b/kdevdesigner/designer/projectsettings.ui index 486ce960..4ac40534 100644 --- a/kdevdesigner/designer/projectsettings.ui +++ b/kdevdesigner/designer/projectsettings.ui @@ -161,7 +161,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>71</height> @@ -206,7 +206,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/projectsettingsimpl.cpp b/kdevdesigner/designer/projectsettingsimpl.cpp index 5cea9192..9a043e65 100644 --- a/kdevdesigner/designer/projectsettingsimpl.cpp +++ b/kdevdesigner/designer/projectsettingsimpl.cpp @@ -38,7 +38,7 @@ #include <klocale.h> #include <klineedit.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqcheckbox.h> #include <tqfiledialog.h> #include <tqcombobox.h> diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp index 01a2bb9f..a37679d4 100644 --- a/kdevdesigner/designer/propertyeditor.cpp +++ b/kdevdesigner/designer/propertyeditor.cpp @@ -50,7 +50,7 @@ #include "kdevdesigner_part.h" #include <tqpainter.h> -#include <tqpalette.h> +#include <palette.h> #include <tqapplication.h> #include <tqheader.h> #include <tqlineedit.h> @@ -68,7 +68,7 @@ #include <tqcolor.h> #include <tqcolordialog.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqsizepolicy.h> #include <tqbitmap.h> #include <tqtooltip.h> @@ -86,7 +86,7 @@ #include <tqmultilineedit.h> // FIXME: obsolete #include <tqsplitter.h> #include <tqdatatable.h> -#include <tqtextview.h> +#include <textview.h> #include <limits.h> @@ -119,7 +119,7 @@ static TQStringList getFontList() fontDataBase = new TQFontDatabase; qAddPostRoutine( cleanupFontDatabase ); } - return fontDataBase->tqfamilies(); + return fontDataBase->families(); } @@ -329,9 +329,9 @@ void PropertyItem::setOpen( bool b ) open = b; if ( !open ) { - tqchildren.setAutoDelete( TRUE ); - tqchildren.clear(); - tqchildren.setAutoDelete( FALSE ); + children.setAutoDelete( TRUE ); + children.clear(); + children.setAutoDelete( FALSE ); tqApp->processEvents(); listview->updateEditorSize(); return; @@ -387,7 +387,7 @@ void PropertyItem::setChanged( bool b, bool updateDb ) if ( changed == b ) return; changed = b; - tqrepaint(); + repaint(); if ( updateDb ) { MetaDataBase::setPropertyChanged( listview->propertyEditor()->widget(), name(), changed ); } @@ -413,8 +413,8 @@ void PropertyItem::createResetButton() resetButton = new TQPushButton( hbox ); setupStyle( resetButton ); resetButton->setPixmap( DesignerResetPix ); - resetButton->setFixedWidth( resetButton->tqsizeHint().width() ); - hbox->tqlayout()->tqsetAlignment( TQt::AlignRight ); + resetButton->setFixedWidth( resetButton->sizeHint().width() ); + hbox->layout()->setAlignment( TQt::AlignRight ); listview->addChild( hbox ); hbox->hide(); TQObject::connect( resetButton, TQT_SIGNAL( clicked() ), @@ -441,13 +441,13 @@ void PropertyItem::updateResetButtonState() void PropertyItem::placeEditor( TQWidget *w ) { createResetButton(); - TQRect r = listview->tqitemRect( this ); + TQRect r = listview->itemRect( this ); if ( !r.size().isValid() ) { listview->ensureItemVisible( this ); #if defined(TQ_WS_WIN) listview->repaintContents( FALSE ); #endif - r = listview->tqitemRect( this ); + r = listview->itemRect( this ); } r.setX( listview->header()->sectionPos( 1 ) ); r.setWidth( listview->header()->sectionSize( 1 ) - 1 ); @@ -455,7 +455,7 @@ void PropertyItem::placeEditor( TQWidget *w ) r = TQRect( listview->viewportToContents( r.topLeft() ), r.size() ); w->resize( r.size() ); listview->moveChild( w, r.x(), r.y() ); - resetButton->parentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() ); + resetButton->parentWidget()->resize( resetButton->sizeHint().width() + 10, r.height() ); listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() ); resetButton->setFixedHeight( TQMAX( 0, r.height() - 3 ) ); } @@ -491,18 +491,18 @@ void PropertyItem::childValueChanged( PropertyItem * ) void PropertyItem::addChild( PropertyItem *i ) { - tqchildren.append( i ); + children.append( i ); } int PropertyItem::childCount() const { - return tqchildren.count(); + return children.count(); } PropertyItem *PropertyItem::child( int i ) const { // ARRRRRRRRG - return ( (PropertyItem*)this )->tqchildren.at( i ); + return ( (PropertyItem*)this )->children.at( i ); } /*! If the contents of the item is not displayable with a text, but @@ -553,10 +553,10 @@ TQString PropertyItem::currentItemFromObject() const void PropertyItem::setFocus( TQWidget *w ) { - if ( !tqApp->tqfocusWidget() || + if ( !tqApp->focusWidget() || listview->propertyEditor()->formWindow() && - ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->tqfocusWidget()) ) && - !tqApp->tqfocusWidget()->inherits( "Editor" ) ) ) + ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->focusWidget()) ) && + !tqApp->focusWidget()->inherits( "Editor" ) ) ) w->setFocus(); } @@ -1635,8 +1635,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr box = new TQHBox( listview->viewport() ); box->hide(); pixPrev = new TQLabel( box ); - pixPrev->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Minimum ) ); - pixPrev->setBackgroundColor( pixPrev->tqcolorGroup().color( TQColorGroup::Base ) ); + pixPrev->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Minimum ) ); + pixPrev->setBackgroundColor( pixPrev->colorGroup().color( TQColorGroup::Base ) ); button = new TQPushButton( "...", box ); setupStyle( button ); button->setFixedWidth( 20 ); @@ -1679,7 +1679,7 @@ void PropertyPixmapItem::setValue( const TQVariant &v ) else pixPrev->setPixmap( v.toImage() ); PropertyItem::setValue( v ); - tqrepaint(); + repaint(); } void PropertyPixmapItem::getPixmap() @@ -1714,8 +1714,8 @@ void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r ) if ( !pix.isNull() ) { p->save(); - p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()), - (int)(p->tqworldMatrix().dy() + r.y()) ), + p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()), + (int)(p->worldMatrix().dy() + r.y()) ), r.size() ) ); p->drawPixmap( r.x(), r.y() + ( r.height() - pix.height() ) / 2, pix ); p->restore(); @@ -1726,8 +1726,8 @@ void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r ) // -------------------------------------------------------------- PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const TQString &propName, bool tqchildren ) - : PropertyItem( l, after, prop, propName ), withChildren( tqchildren ) + const TQString &propName, bool children ) + : PropertyItem( l, after, prop, propName ), withChildren( children ) { box = new TQHBox( listview->viewport() ); box->hide(); @@ -2224,7 +2224,7 @@ void PropertySizePolicyItem::setValue( const TQVariant &v ) return; TQString s = i18n( "%1/%2/%3/%4" ); - s = s.tqarg( size_type_to_string( v.toSizePolicy().horData() ) ). + s = s.arg( size_type_to_string( v.toSizePolicy().horData() ) ). arg( size_type_to_string( v.toSizePolicy().verData() ) ). arg( v.toSizePolicy().horStretch() ). arg( v.toSizePolicy().verStretch() ); @@ -2298,7 +2298,7 @@ void PropertyPaletteItem::setValue( const TQVariant &v ) TQString s; palettePrev->setPalette( v.toPalette() ); PropertyItem::setValue( v ); - tqrepaint(); + repaint(); } void PropertyPaletteItem::getPalette() @@ -2311,7 +2311,7 @@ void PropertyPaletteItem::getPalette() w = ( (TQScrollView*)w )->viewport(); TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(), #if defined(TQT_NON_COMMERCIAL) - w->backgroundMode(), listview->tqtopLevelWidget(), + w->backgroundMode(), listview->topLevelWidget(), #else w->backgroundMode(), listview, #endif @@ -2331,8 +2331,8 @@ void PropertyPaletteItem::drawCustomContents( TQPainter *p, const TQRect &r ) { TQPalette pal( value().toPalette() ); p->save(); - p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()), - (int)(p->tqworldMatrix().dy() + r.y()) ), + p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()), + (int)(p->worldMatrix().dy() + r.y()) ), r.size() ) ); TQRect r2( r ); r2.setX( r2.x() + 2 ); @@ -2411,7 +2411,7 @@ void PropertyCursorItem::showEditor() PropertyItem::showEditor(); if ( !comb ) { combo()->blockSignals( TRUE ); - combo()->setCurrentItem( (int)value().toCursor().tqshape() ); + combo()->setCurrentItem( (int)value().toCursor().shape() ); combo()->blockSignals( FALSE ); } placeEditor( combo() ); @@ -2434,7 +2434,7 @@ void PropertyCursorItem::setValue( const TQVariant &v ) return; combo()->blockSignals( TRUE ); - combo()->setCurrentItem( (int)v.toCursor().tqshape() ); + combo()->setCurrentItem( (int)v.toCursor().shape() ); combo()->blockSignals( FALSE ); setText( 1, combo()->currentText() ); PropertyItem::setValue( v ); @@ -2678,7 +2678,7 @@ void EnumBox::popupClosed() void EnumBox::paintEvent( TQPaintEvent * ) { TQPainter p( this ); - const TQColorGroup & g = tqcolorGroup(); + const TQColorGroup & g = colorGroup(); p.setPen(g.text()); TQStyle::SFlags flags = TQStyle::Style_Default; @@ -2692,7 +2692,7 @@ void EnumBox::paintEvent( TQPaintEvent * ) &g.brush( TQColorGroup::Button ) ); return; } - tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g, + tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g, flags, TQStyle::SC_All, (arrowDown ? TQStyle::SC_ComboBoxArrow : @@ -2700,7 +2700,7 @@ void EnumBox::paintEvent( TQPaintEvent * ) TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); - re = TQStyle::tqvisualRect(re, this); + re = TQStyle::visualRect(re, this); p.setClipRect( re ); if ( !str.isNull() ) { @@ -2730,7 +2730,7 @@ void EnumBox::popup() popupShown = FALSE; return; } - pop->move( ((TQWidget*)parent())->mapToGlobal( tqgeometry().bottomLeft() ) ); + pop->move( ((TQWidget*)parent())->mapToGlobal( geometry().bottomLeft() ) ); pop->setMinimumWidth( width() ); emit aboutToShowPopup(); pop->show(); @@ -2744,13 +2744,13 @@ void EnumBox::mousePressEvent( TQMouseEvent *e ) TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); - arrowRect = TQStyle::tqvisualRect(arrowRect, this); + arrowRect = TQStyle::visualRect(arrowRect, this); arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); if ( arrowRect.contains( e->pos() ) ) { arrowDown = TRUE; - tqrepaint( FALSE ); + repaint( FALSE ); } popup(); @@ -2770,13 +2770,13 @@ void EnumBox::keyPressEvent( TQKeyEvent *e ) void EnumBox::restoreArrow() { arrowDown = FALSE; - tqrepaint( FALSE ); + repaint( FALSE ); } void EnumBox::setText( const TQString &text ) { str = text; - tqrepaint( FALSE ); + repaint( FALSE ); } @@ -3040,7 +3040,7 @@ void PropertyList::setupProperties() if ( !editor->widget() ) return; bool allProperties = !::tqqt_cast<Spacer*>(editor->widget()); - TQStrList lst = editor->widget()->tqmetaObject()->propertyNames( allProperties ); + TQStrList lst = editor->widget()->metaObject()->propertyNames( allProperties ); PropertyItem *item = 0; TQMap<TQString, bool> unique; TQObject *w = editor->widget(); @@ -3051,11 +3051,11 @@ void PropertyList::setupProperties() WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { const TQMetaProperty* p = - editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->findProperty( it.current(), allProperties), allProperties ); + editor->widget()->metaObject()-> + property( editor->widget()->metaObject()->findProperty( it.current(), allProperties), allProperties ); if ( !p ) continue; - if ( unique.contains( TQString::tqfromLatin1( it.current() ) ) ) + if ( unique.contains( TQString::fromLatin1( it.current() ) ) ) continue; if ( ::tqqt_cast<QDesignerToolBar*>(editor->widget()) || ::tqqt_cast<MenuBarEditor*>(editor->widget()) ) { @@ -3071,12 +3071,12 @@ void PropertyList::setupProperties() continue; if ( qstrcmp( p->name(), "sizePolicy" ) == 0 ) continue; - if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 ) + if ( qstrcmp( p->name(), "minimumSize" ) == 0 ) continue; - if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 ) + if ( qstrcmp( p->name(), "maximumSize" ) == 0 ) continue; } - unique.insert( TQString::tqfromLatin1( it.current() ), TRUE ); + unique.insert( TQString::fromLatin1( it.current() ), TRUE ); if ( editor->widget()->isWidgetType() && editor->formWindow()->isMainContainer( TQT_TQOBJECT(editor->widget()) ) ) { if ( qstrcmp( p->name(), "geometry" ) == 0 ) @@ -3107,9 +3107,9 @@ void PropertyList::setupProperties() continue; if ( qstrcmp( p->name(), "geometry" ) == 0 ) continue; - if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 ) + if ( qstrcmp( p->name(), "minimumSize" ) == 0 ) continue; - if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 ) + if ( qstrcmp( p->name(), "maximumSize" ) == 0 ) continue; if ( qstrcmp( p->name(), "enabled" ) == 0 ) continue; @@ -3164,7 +3164,7 @@ void PropertyList::setupProperties() isPropertyObject && p->designable( ( (PropertyObject*)w )->widgetList().first() ) ) && ( !isPropertyObject || qstrcmp( p->name(), "name" ) != 0 ) ) { if ( p->isSetType() ) { - if ( TQString( p->name() ) == "tqalignment" ) { + if ( TQString( p->name() ) == "alignment" ) { TQStringList lst; lst << p->valueToKey( AlignAuto ) << p->valueToKey( AlignLeft ) @@ -3486,7 +3486,7 @@ void PropertyList::valueChanged( PropertyItem *i ) { if ( !editor->widget() ) return; - TQString pn( i18n( "Set '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) ); + TQString pn( i18n( "Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(), editor->widget(), editor, i->name(), WidgetFactory::property( editor->widget(), i->name() ), @@ -3500,7 +3500,7 @@ void PropertyList::layoutInitValue( PropertyItem *i, bool changed ) { if ( !editor->widget() ) return; - TQString pn( i18n( "Set '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) ); + TQString pn( i18n( "Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(), editor->widget(), editor, i->name(), WidgetFactory::property( editor->widget(), i->name() ), @@ -3692,25 +3692,25 @@ static void clearAlignList( TQStrList &l ) void PropertyList::setPropertyValue( PropertyItem *i ) { const TQMetaProperty *p = - editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->findProperty( i->name(), TRUE), TRUE ); + editor->widget()->metaObject()-> + property( editor->widget()->metaObject()->findProperty( i->name(), TRUE), TRUE ); if ( !p ) { if ( i->name() == "hAlign" ) { - int align = editor->widget()->property( "tqalignment" ).toInt(); - p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); + int align = editor->widget()->property( "alignment" ).toInt(); + p = editor->widget()->metaObject()-> + property( editor->widget()->metaObject()->findProperty( "alignment", TRUE ), TRUE ); align &= ~AlignVertical_Mask; TQStrList l = p->valueToKeys( align ); clearAlignList( l ); ( (PropertyListItem*)i )->setCurrentItem( l.last() ); } else if ( i->name() == "vAlign" ) { - int align = editor->widget()->property( "tqalignment" ).toInt(); - p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); + int align = editor->widget()->property( "alignment" ).toInt(); + p = editor->widget()->metaObject()-> + property( editor->widget()->metaObject()->findProperty( "alignment", TRUE ), TRUE ); align &= ~AlignHorizontal_Mask; ( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() ); } else if ( i->name() == "wordwrap" ) { - int align = editor->widget()->property( "tqalignment" ).toInt(); + int align = editor->widget()->property( "alignment" ).toInt(); if ( align & WordBreak ) i->setValue( TQVariant( TRUE, 0 ) ); else @@ -3769,7 +3769,7 @@ void PropertyList::resetProperty() PropertyItem *i = (PropertyItem*)currentItem(); if ( !MetaDataBase::isPropertyChanged( editor->widget(), i->PropertyItem::name() ) ) return; - TQString pn( i18n( "Reset '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) ); + TQString pn( i18n( "Reset '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(), editor->widget(), editor, i->name(), i->value(), @@ -3864,7 +3864,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i ) if ( ( (PropertyItem*)i )->propertyParent() ) i = ( (PropertyItem*)i )->propertyParent(); - const TQMetaObject *mo = editor->widget()->tqmetaObject(); + const TQMetaObject *mo = editor->widget()->metaObject(); TQString prop = ( (PropertyItem*)i )->name(); while ( mo ) { TQString s; @@ -3873,10 +3873,10 @@ TQString PropertyList::whatsThisText( TQListViewItem *i ) if ( ( it = propertyDocs.find( s ) ) != propertyDocs.end() ) { return *it; } - mo = mo->tqsuperClass(); + mo = mo->superClass(); } - return i18n( "<p><b>TQWidget::%1</b></p><p>There is no documentation available for this property.</p>" ).tqarg( prop ); + return i18n( "<p><b>TQWidget::%1</b></p><p>There is no documentation available for this property.</p>" ).arg( prop ); } void PropertyList::readPropertyDocs() @@ -4190,7 +4190,7 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw ) wid = w; formwindow = fw; - setCaption( i18n( "Property Editor (%1)" ).tqarg( formwindow->name() ) ); + setCaption( i18n( "Property Editor (%1)" ).arg( formwindow->name() ) ); listview->viewport()->setUpdatesEnabled( FALSE ); listview->setUpdatesEnabled( FALSE ); clear(); @@ -4274,21 +4274,21 @@ TQString PropertyEditor::classOfCurrentProperty() const return TQString(); TQObject *o = wid; TQString curr = currentProperty(); - TQMetaObject *mo = o->tqmetaObject(); + TQMetaObject *mo = o->metaObject(); while ( mo ) { TQStrList props = mo->propertyNames( FALSE ); if ( props.find( curr.latin1() ) != -1 ) return mo->className(); - mo = mo->tqsuperClass(); + mo = mo->superClass(); } return TQString(); } -TQMetaObject* PropertyEditor::tqmetaObjectOfCurrentProperty() const +TQMetaObject* PropertyEditor::metaObjectOfCurrentProperty() const { if ( !wid ) return 0; - return wid->tqmetaObject(); + return wid->metaObject(); } void PropertyEditor::resetFocus() diff --git a/kdevdesigner/designer/propertyeditor.h b/kdevdesigner/designer/propertyeditor.h index 1b0fcc85..c3d842aa 100644 --- a/kdevdesigner/designer/propertyeditor.h +++ b/kdevdesigner/designer/propertyeditor.h @@ -35,7 +35,7 @@ #include <tqtabwidget.h> #include <tqmodules.h> #include <tqptrlist.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqcombobox.h> #include "hierarchyview.h" @@ -129,7 +129,7 @@ private: bool open, changed; PropertyItem *property; TQString propertyName; - TQPtrList<PropertyItem> tqchildren; + TQPtrList<PropertyItem> children; TQColor backColor; TQPushButton *resetButton; @@ -376,7 +376,7 @@ class PropertyColorItem : public TQObject, public: PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const TQString &propName, bool tqchildren ); + const TQString &propName, bool children ); ~PropertyColorItem(); virtual void createChildren(); @@ -789,7 +789,7 @@ public: TQString currentProperty() const; TQString classOfCurrentProperty() const; - TQMetaObject* tqmetaObjectOfCurrentProperty() const; + TQMetaObject* metaObjectOfCurrentProperty() const; void resetFocus(); diff --git a/kdevdesigner/designer/propertyobject.cpp b/kdevdesigner/designer/propertyobject.cpp index 39d23b48..1bd1883f 100644 --- a/kdevdesigner/designer/propertyobject.cpp +++ b/kdevdesigner/designer/propertyobject.cpp @@ -39,11 +39,11 @@ PropertyObject::PropertyObject( const TQWidgetList &objs ) v.setAutoDelete( TRUE ); for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) { - const TQMetaObject *m = o->tqmetaObject(); + const TQMetaObject *m = o->metaObject(); TQPtrList<TQMetaObject> *mol = new TQPtrList<TQMetaObject>; while ( m ) { mol->insert( 0, m ); - m = m->tqsuperClass(); + m = m->superClass(); } v.insert( v.count(), mol ); } diff --git a/kdevdesigner/designer/propertyobject.h b/kdevdesigner/designer/propertyobject.h index 4cfb54fd..2590399a 100644 --- a/kdevdesigner/designer/propertyobject.h +++ b/kdevdesigner/designer/propertyobject.h @@ -8,7 +8,7 @@ class PropertyObject : public TQObject { public: - TQMetaObject *tqmetaObject() const { return (TQMetaObject*)mobj; } + TQMetaObject *metaObject() const { return (TQMetaObject*)mobj; } const char *className() const { return "PropertyObject"; } TQObject* qObject() { return (TQObject*)this; } private: diff --git a/kdevdesigner/designer/qcompletionedit.cpp b/kdevdesigner/designer/qcompletionedit.cpp index 7407370c..ed0c986e 100644 --- a/kdevdesigner/designer/qcompletionedit.cpp +++ b/kdevdesigner/designer/qcompletionedit.cpp @@ -88,8 +88,8 @@ void QCompletionEdit::placeListBox() return; } - popup->resize( TQMAX( listbox->tqsizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ), - listbox->tqsizeHint().height() + listbox->horizontalScrollBar()->height() + 4 ); + popup->resize( TQMAX( listbox->sizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ), + listbox->sizeHint().height() + listbox->horizontalScrollBar()->height() + 4 ); TQPoint p( mapToGlobal( TQPoint( 0, 0 ) ) ); if ( p.y() + height() + popup->height() <= TQApplication::desktop()->height() ) diff --git a/kdevdesigner/designer/replacedialog.ui b/kdevdesigner/designer/replacedialog.ui index 635b2315..27d01a58 100644 --- a/kdevdesigner/designer/replacedialog.ui +++ b/kdevdesigner/designer/replacedialog.ui @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp index 0d83cb1e..12b4e490 100644 --- a/kdevdesigner/designer/resource.cpp +++ b/kdevdesigner/designer/resource.cpp @@ -54,7 +54,7 @@ #include <tqheader.h> #include <tqiconview.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqlistview.h> #include <tqmenudata.h> @@ -69,8 +69,8 @@ #endif #include <tqtabwidget.h> #include <tqtabwidget.h> -#include <tqtextcodec.h> -#include <tqtextstream.h> +#include <textcodec.h> +#include <textstream.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqwidget.h> @@ -225,7 +225,7 @@ static TQString platformNeutralKeySequence(const TQKeySequence &ks) // represent, but is clearly impossible to trigger... p = TQChar(basekey & 0xffff); } else if ( basekey >= TQt::Key_F1 && basekey <= TQt::Key_F35 ) { - p = TQAccel::tr( "F%1" ).tqarg(basekey - TQt::Key_F1 + 1); + p = TQAccel::tr( "F%1" ).arg(basekey - TQt::Key_F1 + 1); } else if ( basekey > TQt::Key_Space && basekey <= TQt::Key_AsciiTilde ) { p.sprintf( "%c", basekey ); } else { @@ -238,7 +238,7 @@ static TQString platformNeutralKeySequence(const TQKeySequence &ks) ++i; } // If we can't find the actual translatable keyname, - // fall back on the tqunicode representation of it... + // fall back on the unicode representation of it... // Or else characters like Key_aring may not get displayed // ( Really depends on you locale ) if ( !keyname[i].name ) @@ -622,13 +622,13 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) if ( formwindow ) { formwindow->killAccels( TQT_TQOBJECT(formwindow) ); - if ( formwindow->tqlayout() ) - formwindow->tqlayout()->activate(); + if ( formwindow->layout() ) + formwindow->layout()->activate(); if ( hadGeometry ) - formwindow->resize( formwindow->size().expandedTo( formwindow->tqminimumSize(). - expandedTo( formwindow->tqminimumSizeHint() ) ) ); + formwindow->resize( formwindow->size().expandedTo( formwindow->minimumSize(). + expandedTo( formwindow->minimumSizeHint() ) ) ); else - formwindow->resize( formwindow->size().expandedTo( formwindow->tqsizeHint() ) ); + formwindow->resize( formwindow->size().expandedTo( formwindow->sizeHint() ) ); } return TRUE; @@ -1054,14 +1054,14 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea MetaDataBase::CustomWidget *cw = new MetaDataBase::CustomWidget; cw->className = className; cw->includeFile = WidgetDatabase::includeFile( classID ); - TQStrList lst = w->tqmetaObject()->signalNames( TRUE ); + TQStrList lst = w->metaObject()->signalNames( TRUE ); for ( TQPtrListIterator<char> it(lst); it.current(); ++it ) cw->lstSignals.append(it.current()); int i; - int total = w->tqmetaObject()->numProperties( TRUE ); + int total = w->metaObject()->numProperties( TRUE ); for ( i = 0; i < total; i++ ) { - const TQMetaProperty *p = w->tqmetaObject()->property( i, TRUE ); + const TQMetaProperty *p = w->metaObject()->property( i, TRUE ); if ( p->designable(w) ) { MetaDataBase::Property prop; prop.property = p->name(); @@ -1079,9 +1079,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea } } - total = w->tqmetaObject()->numSlots( TRUE ); + total = w->metaObject()->numSlots( TRUE ); for ( i = 0; i < total; i++ ) { - const TQMetaData *md = w->tqmetaObject()->slot( i, TRUE ); + const TQMetaData *md = w->metaObject()->slot( i, TRUE ); MetaDataBase::Function funky; // Find out if we have a return type. if ( md->method->count > 0 ) { @@ -1344,17 +1344,17 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) { const TQObjectList l = obj->childrenListObject(); if ( l.isEmpty() ) - return; // no tqchildren to save + return; // no children to save TQString closeTag; - // if the widget has a tqlayout we pretend that all widget's childs are childs of the tqlayout - makes the structure nicer - TQLayout *tqlayout = 0; + // if the widget has a layout we pretend that all widget's childs are childs of the layout - makes the structure nicer + TQLayout *layout = 0; QDesignerGridLayout* grid = 0; if ( !::tqqt_cast<TQSplitter*>(obj) && WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) && obj->isWidgetType() && - WidgetFactory::layoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) { - WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, tqlayout ); + WidgetFactory::layoutType( (TQWidget*)obj, layout ) != WidgetFactory::NoLayout ) { + WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, layout ); switch ( lay ) { case WidgetFactory::HBox: closeTag = makeIndent( indent ) + "</hbox>"; @@ -1370,15 +1370,15 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) closeTag = makeIndent( indent ) + "</grid>"; ts << makeIndent( indent ) << "<grid>" << endl; ++indent; - grid = (QDesignerGridLayout*) tqlayout; + grid = (QDesignerGridLayout*) layout; break; default: break; } - // save properties of tqlayout + // save properties of layout if ( lay != WidgetFactory::NoLayout ) - saveObjectProperties( TQT_TQOBJECT(tqlayout), ts, indent ); + saveObjectProperties( TQT_TQOBJECT(layout), ts, indent ); } @@ -1399,8 +1399,8 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) changed = MetaDataBase::changedProperties( w ); if ( w->isWidgetType() ) { if ( ::tqqt_cast<Spacer*>(w) ) { - if ( !changed.contains( "tqsizeHint" ) ) - changed << "tqsizeHint"; + if ( !changed.contains( "sizeHint" ) ) + changed << "sizeHint"; if ( !changed.contains( "geometry" ) ) changed << "geometry"; } else { @@ -1432,15 +1432,15 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() && WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; - TQStrList lst = w->tqmetaObject()->propertyNames( !::tqqt_cast<Spacer*>(w) ); + TQStrList lst = w->metaObject()->propertyNames( !::tqqt_cast<Spacer*>(w) ); for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { - if ( changed.find( TQString::tqfromLatin1( it.current() ) ) == changed.end() ) + if ( changed.find( TQString::fromLatin1( it.current() ) ) == changed.end() ) continue; - if ( saved.find( TQString::tqfromLatin1( it.current() ) ) != saved.end() ) + if ( saved.find( TQString::fromLatin1( it.current() ) ) != saved.end() ) continue; - saved << TQString::tqfromLatin1( it.current() ); - const TQMetaProperty* p = w->tqmetaObject()-> - property( w->tqmetaObject()->findProperty( it.current(), TRUE ), TRUE ); + saved << TQString::fromLatin1( it.current() ); + const TQMetaProperty* p = w->metaObject()-> + property( w->metaObject()->findProperty( it.current(), TRUE ), TRUE ); if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) ) continue; if ( ::tqqt_cast<TQLabel*>(w) && qstrcmp( p->name(), "pixmap" ) == 0 && @@ -1496,7 +1496,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, TRUE ), TRUE ); + const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, TRUE ), TRUE ); TQStrList l( p->valueToKeys( w->property( name ).toInt() ) ); TQString v; for ( uint i = 0; i < l.count(); ++i ) { @@ -1509,7 +1509,7 @@ void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Ty void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, TRUE ), TRUE ); + const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, TRUE ), TRUE ); ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name ).toInt() ) << "</enum>" << endl; } @@ -1680,7 +1680,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant ts << makeIndent( indent ) << "</palette>" << endl; } break; case TQVariant::Cursor: - ts << makeIndent( indent ) << "<cursor>" << value.toCursor().tqshape() << "</cursor>" << endl; + ts << makeIndent( indent ) << "<cursor>" << value.toCursor().shape() << "</cursor>" << endl; break; case TQVariant::StringList: { TQStringList lst = value.toStringList(); @@ -1743,7 +1743,7 @@ void Resource::saveColorGroup( TQTextStream &ts, int indent, const TQColorGroup saveColor( ts, indent, cg.color( (TQColorGroup::ColorRole)r ) ); indent--; ts << makeIndent( indent ) << "</color>" << endl; - TQPixmap* pm = cg.tqbrush( (TQColorGroup::ColorRole)r ).pixmap(); + TQPixmap* pm = cg.brush( (TQColorGroup::ColorRole)r ).pixmap(); if ( pm && !pm->isNull() ) savePixmap( *pm, ts, indent ); } @@ -1756,7 +1756,7 @@ void Resource::saveColor( TQTextStream &ts, int indent, const TQColor &c ) ts << makeIndent( indent ) << "<blue>" << TQString::number( c.blue() ) << "</blue>" << endl; } -TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout ) +TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout ) { lastItem = 0; TQDomElement n = e.firstChild().toElement(); @@ -1787,7 +1787,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay TQMessageBox::critical( MainWindow::self, i18n( "Loading File" ), i18n( "Error loading %1.\n" "The widget %2 could not be created." ). - tqarg( currFileName ).tqarg( className ) ); + arg( currFileName ).arg( className ) ); return 0; } if ( !mainContainerSet ) { @@ -1798,16 +1798,16 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay w = (TQWidget*)obj; if ( ::tqqt_cast<TQMainWindow*>(w) ) w = ( (TQMainWindow*)w )->centralWidget(); - if ( tqlayout ) { - switch ( WidgetFactory::layoutType( tqlayout ) ) { + if ( layout ) { + switch ( WidgetFactory::layoutType( layout ) ) { case WidgetFactory::HBox: - ( (TQHBoxLayout*)tqlayout )->addWidget( w ); + ( (TQHBoxLayout*)layout )->addWidget( w ); break; case WidgetFactory::VBox: - ( (TQVBoxLayout*)tqlayout )->addWidget( w ); + ( (TQVBoxLayout*)layout )->addWidget( w ); break; case WidgetFactory::Grid: - ( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1, + ( (QDesignerGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1, col, col + colspan - 1 ); break; default: @@ -1817,7 +1817,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay if ( !toplevel ) toplevel = w; - tqlayout = 0; + layout = 0; if ( w && formwindow ) { if ( !parent || @@ -1848,22 +1848,22 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay while ( !n.isNull() ) { if ( n.tagName() == "spacer" ) { - createSpacer( n, w, tqlayout, Qt::Horizontal ); + createSpacer( n, w, layout, Qt::Horizontal ); } else if ( n.tagName() == "widget" ) { - createObject( n, w, tqlayout ); + createObject( n, w, layout ); } else if ( n.tagName() == "hbox" ) { - tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::HBox ); - obj = TQT_TQOBJECT(tqlayout); + layout = WidgetFactory::createLayout( w, layout, WidgetFactory::HBox ); + obj = TQT_TQOBJECT(layout); n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "grid" ) { - tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::Grid ); - obj = TQT_TQOBJECT(tqlayout); + layout = WidgetFactory::createLayout( w, layout, WidgetFactory::Grid ); + obj = TQT_TQOBJECT(layout); n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "vbox" ) { - tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::VBox ); - obj = TQT_TQOBJECT(tqlayout); + layout = WidgetFactory::createLayout( w, layout, WidgetFactory::VBox ); + obj = TQT_TQOBJECT(layout); n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "property" && obj ) { @@ -2104,7 +2104,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt } } -TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o ) +TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o ) { TQDomElement n = e.firstChild().toElement(); int row = e.attribute( "row" ).toInt(); @@ -2128,12 +2128,12 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay spacer->setInteraciveMode( TRUE ); if ( formwindow ) formwindow->insertWidget( spacer, pasting ); - if ( tqlayout ) { - if ( ::tqqt_cast<TQBoxLayout*>(tqlayout) ) - ( (TQBoxLayout*)tqlayout )->addWidget( spacer, 0, spacer->tqalignment() ); + if ( layout ) { + if ( ::tqqt_cast<TQBoxLayout*>(layout) ) + ( (TQBoxLayout*)layout )->addWidget( spacer, 0, spacer->alignment() ); else - ( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1, - spacer->tqalignment() ); + ( (QDesignerGridLayout*)layout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1, + spacer->alignment() ); } return spacer; } @@ -2143,7 +2143,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay */ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQDomElement &e ) { - const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->findProperty( prop, TRUE ), TRUE ); + const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, TRUE ), TRUE ); if ( !::tqqt_cast<TQLayout*>(obj) ) {// no layouts in metadatabase... (RS) if ( obj->inherits( "CustomWidget" ) ) { @@ -2591,8 +2591,8 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent ) << "\">" << w->includeFile << "</header>" << endl; ts << makeIndent( indent ) << "<sizehint>" << endl; indent++; - ts << makeIndent( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl; - ts << makeIndent( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl; + ts << makeIndent( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl; + ts << makeIndent( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl; indent--; ts << makeIndent( indent ) << "</sizehint>" << endl; ts << makeIndent( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl; @@ -2648,9 +2648,9 @@ void Resource::loadCustomWidgets( const TQDomElement &e, Resource *r ) TQDomElement n3 = n2.firstChild().toElement(); while ( !n3.isNull() ) { if ( n3.tagName() == "width" ) - w->tqsizeHint.setWidth( n3.firstChild().toText().data().toInt() ); + w->sizeHint.setWidth( n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "height" ) - w->tqsizeHint.setHeight( n3.firstChild().toText().data().toInt() ); + w->sizeHint.setHeight( n3.firstChild().toText().data().toInt() ); n3 = n3.nextSibling().toElement(); } } else if ( n2.tagName() == "sizepolicy" ) { @@ -2897,9 +2897,9 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) TQString s = ""; TQString m = ""; if ( !formwindow->spacingFunction().isEmpty() ) - s = TQString( " spacing=\"%1\"" ).tqarg( formwindow->spacingFunction() ); + s = TQString( " spacing=\"%1\"" ).arg( formwindow->spacingFunction() ); if ( !formwindow->marginFunction().isEmpty() ) - m = TQString( " margin=\"%1\"" ).tqarg( formwindow->marginFunction() ); + m = TQString( " margin=\"%1\"" ).arg( formwindow->marginFunction() ); ts << makeIndent( indent ) << "<layoutfunctions" << s << m << "/>" << endl; } } diff --git a/kdevdesigner/designer/resource.h b/kdevdesigner/designer/resource.h index ddbffb07..8f362d95 100644 --- a/kdevdesigner/designer/resource.h +++ b/kdevdesigner/designer/resource.h @@ -28,7 +28,7 @@ #define RESOURCE_H #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqvariant.h> #include <tqvaluelist.h> #include <tqimage.h> @@ -111,8 +111,8 @@ private: void saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent ); void savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStream &ts, int indent ); - TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout = 0 ); - TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o ); + TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout = 0 ); + TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o ); void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 ); void createColumn( const TQDomElement &e, TQWidget *widget ); void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e); diff --git a/kdevdesigner/designer/richtextfontdialog.ui b/kdevdesigner/designer/richtextfontdialog.ui index 0eaef760..d7d6c5a7 100644 --- a/kdevdesigner/designer/richtextfontdialog.ui +++ b/kdevdesigner/designer/richtextfontdialog.ui @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -195,7 +195,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>20</height> @@ -227,7 +227,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -272,7 +272,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/richtextfontdialog.ui.h b/kdevdesigner/designer/richtextfontdialog.ui.h index 263b5f90..27a11a21 100644 --- a/kdevdesigner/designer/richtextfontdialog.ui.h +++ b/kdevdesigner/designer/richtextfontdialog.ui.h @@ -11,7 +11,7 @@ void RichTextFontDialog::init() { TQFontDatabase *db = new TQFontDatabase(); - fontCombo->insertStringList( db->tqfamilies() ); + fontCombo->insertStringList( db->families() ); } void RichTextFontDialog::selectColor() diff --git a/kdevdesigner/designer/sizehandle.cpp b/kdevdesigner/designer/sizehandle.cpp index 6ba2ba3f..f9daaefc 100644 --- a/kdevdesigner/designer/sizehandle.cpp +++ b/kdevdesigner/designer/sizehandle.cpp @@ -213,7 +213,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e ) sel->updateGeometry(); oldPressPos += ( p - pos() ); - formWindow->sizePreview()->setText( i18n( "%1/%2" ).tqarg( widget->width() ).tqarg( widget->height() ) ); + formWindow->sizePreview()->setText( i18n( "%1/%2" ).arg( widget->width() ).arg( widget->height() ) ); formWindow->sizePreview()->adjustSize(); TQRect lg( formWindow->mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ), formWindow->sizePreview()->size() ); @@ -231,19 +231,19 @@ void SizeHandle::mouseReleaseEvent( TQMouseEvent *e ) return; formWindow->sizePreview()->hide(); - if ( geom != widget->tqgeometry() ) + if ( geom != widget->geometry() ) formWindow->commandHistory()->addCommand( new ResizeCommand( i18n( "Resize" ), formWindow, widget, origGeom, - widget->tqgeometry() ) ); + widget->geometry() ) ); formWindow->emitUpdateProperties( TQT_TQOBJECT(widget) ); } void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int height ) { - int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() ); + int minw = TQMAX( w->minimumSizeHint().width(), w->minimumSize().width() ); minw = TQMAX( minw, 2 * formWindow->grid().x() ); - int minh = TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() ); + int minh = TQMAX( w->minimumSizeHint().height(), w->minimumSize().height() ); minh = TQMAX( minh, 2 * formWindow->grid().y() ); if ( TQMAX( minw, width ) > w->maximumWidth() || TQMAX( minh, height ) > w->maximumHeight() ) @@ -257,9 +257,9 @@ void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int heigh void SizeHandle::tryResize( TQWidget *w, int width, int height ) { - int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() ); + int minw = TQMAX( w->minimumSizeHint().width(), w->minimumSize().width() ); minw = TQMAX( minw, 16 ); - int minh = TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() ); + int minh = TQMAX( w->minimumSizeHint().height(), w->minimumSize().height() ); minh = TQMAX( minh, 16 ); w->resize( TQMAX( minw, width ), TQMAX( minh, height ) ); } diff --git a/kdevdesigner/designer/sourceeditor.cpp b/kdevdesigner/designer/sourceeditor.cpp index 2850e20e..206a4646 100644 --- a/kdevdesigner/designer/sourceeditor.cpp +++ b/kdevdesigner/designer/sourceeditor.cpp @@ -37,7 +37,7 @@ #include "sourcefile.h" #include "hierarchyview.h" #include <tqmessagebox.h> -#include <tqtextstream.h> +#include <textstream.h> #include "kdevdesigner_part.h" SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface ) diff --git a/kdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp index ad76e201..faf9dd10 100644 --- a/kdevdesigner/designer/sourcefile.cpp +++ b/kdevdesigner/designer/sourcefile.cpp @@ -26,7 +26,7 @@ #include "sourcefile.h" #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include "designerappiface.h" #include "sourceeditor.h" #include "metadatabase.h" @@ -138,7 +138,7 @@ bool SourceFile::saveAs( bool ignoreModified ) pro->setModified( TRUE ); timeStamp.setFileName( pro->makeAbsolute( filename ) ); if ( ed ) - ed->setCaption( i18n( "Edit %1" ).tqarg( filename ) ); + ed->setCaption( i18n( "Edit %1" ).arg( filename ) ); setModified( TRUE ); if ( pro->isDummy() ) { TQObject *o = ed->parent(); @@ -220,7 +220,7 @@ bool SourceFile::closeEvent() ed->save(); switch ( TQMessageBox::warning( MainWindow::self, i18n( "Save Code" ), - i18n( "Save changes to '%1'?" ).tqarg( filename ), + i18n( "Save changes to '%1'?" ).arg( filename ), i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) { case 0: // save if ( !save() ) @@ -265,7 +265,7 @@ void SourceFile::checkTimeStamp() timeStamp.update(); if ( TQMessageBox::information( MainWindow::self, i18n( "TQt Designer" ), i18n( "File '%1' has been changed outside TQt Designer.\n" - "Do you want to reload it?" ).tqarg( filename ), + "Do you want to reload it?" ).arg( filename ), i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) { load(); if ( ed ) @@ -279,7 +279,7 @@ bool SourceFile::checkFileName( bool allowBreak ) if ( sf ) TQMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ), i18n( "The project already contains a source file with \n" - "filename '%1'. Please choose a new filename." ).tqarg( filename ) ); + "filename '%1'. Please choose a new filename." ).arg( filename ) ); while ( sf ) { LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() ); TQString filter; diff --git a/kdevdesigner/designer/startdialog.ui b/kdevdesigner/designer/startdialog.ui index 8843ba87..383fdfda 100644 --- a/kdevdesigner/designer/startdialog.ui +++ b/kdevdesigner/designer/startdialog.ui @@ -216,7 +216,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp index 9bf43f87..3e1a4fdf 100644 --- a/kdevdesigner/designer/startdialogimpl.cpp +++ b/kdevdesigner/designer/startdialogimpl.cpp @@ -10,7 +10,7 @@ #include <tqpoint.h> #include <tqobjectlist.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqfileinfo.h> #include <tqmap.h> #include <tqdatetime.h> @@ -108,7 +108,7 @@ void StartDialog::recentItemChanged( TQIconViewItem *item ) } TQDateTime dt( f.lastModified() ); TQString date( dt.toString( "MMMM dd hh:mm" )); - msg = TQString( "%1 (%2 %3) %4" ).tqarg(msg).tqarg(s).tqarg(unit).tqarg(date); + msg = TQString( "%1 (%2 %3) %4" ).arg(msg).arg(s).arg(unit).arg(date); fileInfoLabel->setText( msg ); } diff --git a/kdevdesigner/designer/styledbutton.cpp b/kdevdesigner/designer/styledbutton.cpp index d2aea25f..d84ee135 100644 --- a/kdevdesigner/designer/styledbutton.cpp +++ b/kdevdesigner/designer/styledbutton.cpp @@ -29,7 +29,7 @@ #include "formwindow.h" #include "pixmapchooser.h" #include <tqcolordialog.h> -#include <tqpalette.h> +#include <palette.h> #include <tqlabel.h> #include <tqpainter.h> #include <tqimage.h> @@ -41,7 +41,7 @@ StyledButton::StyledButton(TQWidget* parent, const char* name) : TQButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( FALSE ) { - setMinimumSize( tqminimumSizeHint() ); + setMinimumSize( minimumSizeHint() ); setAcceptDrops( TRUE ); connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(onEditor())); @@ -54,7 +54,7 @@ StyledButton::StyledButton( const TQBrush& b, TQWidget* parent, const char* name { col = b.color(); pix = b.pixmap(); - setMinimumSize( tqminimumSizeHint() ); + setMinimumSize( minimumSizeHint() ); } StyledButton::~StyledButton() @@ -117,12 +117,12 @@ void StyledButton::setScale( bool on ) scalePixmap(); } -TQSize StyledButton::tqsizeHint() const +TQSize StyledButton::sizeHint() const { return TQSize( 50, 25 ); } -TQSize StyledButton::tqminimumSizeHint() const +TQSize StyledButton::minimumSizeHint() const { return TQSize( 50, 25 ); } @@ -151,25 +151,25 @@ void StyledButton::resizeEvent( TQResizeEvent* e ) void StyledButton::drawButton( TQPainter *paint ) { - tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), tqcolorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(), isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised); drawButtonLabel(paint); if (hasFocus()) tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, paint, tqstyle().subRect(TQStyle::SR_PushButtonFocusRect, this), - tqcolorGroup(), TQStyle::Style_Default); + colorGroup(), TQStyle::Style_Default); } void StyledButton::drawButtonLabel( TQPainter *paint ) { TQColor pen = isEnabled() ? - hasFocus() ? tqpalette().active().buttonText() : tqpalette().inactive().buttonText() - : tqpalette().disabled().buttonText(); + hasFocus() ? palette().active().buttonText() : palette().inactive().buttonText() + : palette().disabled().buttonText(); paint->setPen( pen ); if(!isEnabled()) { - paint->setBrush( TQBrush( tqcolorGroup().button() ) ); + paint->setBrush( TQBrush( colorGroup().button() ) ); } else if ( edit == PixmapEditor && spix ) { paint->setBrush( TQBrush( col, *spix ) ); @@ -184,7 +184,7 @@ void StyledButton::onEditor() { switch (edit) { case ColorEditor: { - TQColor c = TQColorDialog::getColor( tqpalette().active().background(), this ); + TQColor c = TQColorDialog::getColor( palette().active().background(), this ); if ( c.isValid() ) { setColor( c ); emit changed(); diff --git a/kdevdesigner/designer/styledbutton.h b/kdevdesigner/designer/styledbutton.h index f5a193b6..c9c582bd 100644 --- a/kdevdesigner/designer/styledbutton.h +++ b/kdevdesigner/designer/styledbutton.h @@ -65,8 +65,8 @@ public: void setScale( bool ); bool scale() const; - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; void setFormWindow( FormWindow *fw ) { formWindow = fw; } diff --git a/kdevdesigner/designer/syntaxhighlighter_html.cpp b/kdevdesigner/designer/syntaxhighlighter_html.cpp index baa6a9f5..5bb681f9 100644 --- a/kdevdesigner/designer/syntaxhighlighter_html.cpp +++ b/kdevdesigner/designer/syntaxhighlighter_html.cpp @@ -46,7 +46,7 @@ SyntaxHighlighter_HTML::~SyntaxHighlighter_HTML() { } -void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *string, int, bool tqinvalidate ) +void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *string, int, bool invalidate ) { TQTextFormat *formatStandard = format( Standard ); @@ -131,7 +131,7 @@ void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *stri string->setEndState( state ); string->setFirstPreProcess( FALSE ); - if ( tqinvalidate && string->next() && + if ( invalidate && string->next() && !string->next()->firstPreProcess() && string->next()->endState() != -1 ) { TQTextParagraph *p = string->next(); while ( p ) { diff --git a/kdevdesigner/designer/syntaxhighlighter_html.h b/kdevdesigner/designer/syntaxhighlighter_html.h index 87f94872..efd1a616 100644 --- a/kdevdesigner/designer/syntaxhighlighter_html.h +++ b/kdevdesigner/designer/syntaxhighlighter_html.h @@ -42,7 +42,7 @@ public: SyntaxHighlighter_HTML(); virtual ~SyntaxHighlighter_HTML(); - void process( TQTextDocument *doc, TQTextParagraph *string, int start, bool tqinvalidate = TRUE ); + void process( TQTextDocument *doc, TQTextParagraph *string, int start, bool invalidate = TRUE ); TQTextFormat *format( int id ); private: diff --git a/kdevdesigner/designer/tableeditor.ui b/kdevdesigner/designer/tableeditor.ui index b278019b..deacf5d4 100644 --- a/kdevdesigner/designer/tableeditor.ui +++ b/kdevdesigner/designer/tableeditor.ui @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -209,7 +209,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -314,7 +314,7 @@ <property name="name"> <cstring>buttonDeleteColPixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -337,7 +337,7 @@ <property name="name"> <cstring>buttonChooseColPixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -440,7 +440,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -496,7 +496,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -581,7 +581,7 @@ <property name="name"> <cstring>buttonDeleteRowPixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -604,7 +604,7 @@ <property name="name"> <cstring>buttonChooseRowPixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> diff --git a/kdevdesigner/designer/tableeditorimpl.cpp b/kdevdesigner/designer/tableeditorimpl.cpp index 4f549a28..0013398c 100644 --- a/kdevdesigner/designer/tableeditorimpl.cpp +++ b/kdevdesigner/designer/tableeditorimpl.cpp @@ -343,7 +343,7 @@ void TableEditor::applyClicked() row.pix = table->verticalHeader()->iconSet( i )->pixmap(); rows.append( row ); } - PopulateTableCommand *cmd = new PopulateTableCommand( i18n( "Edit the Rows and Columns of '%1' " ).tqarg( editTable->name() ), + PopulateTableCommand *cmd = new PopulateTableCommand( i18n( "Edit the Rows and Columns of '%1' " ).arg( editTable->name() ), formWindow, editTable, rows, cols ); cmd->execute(); formWindow->commandHistory()->addCommand( cmd ); diff --git a/kdevdesigner/designer/variabledialog.ui b/kdevdesigner/designer/variabledialog.ui index 4e4fbd83..0e7fe478 100644 --- a/kdevdesigner/designer/variabledialog.ui +++ b/kdevdesigner/designer/variabledialog.ui @@ -181,7 +181,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>21</height> @@ -214,7 +214,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>21</height> diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp index e31f5d82..1cf435e5 100644 --- a/kdevdesigner/designer/widgetfactory.cpp +++ b/kdevdesigner/designer/widgetfactory.cpp @@ -31,7 +31,7 @@ #include "mainwindow.h" #include "formwindow.h" #include "propertyeditor.h" -#include "tqlayout.h" +#include "layout.h" #include "listboxeditorimpl.h" #include "listvieweditorimpl.h" #include "iconvieweditorimpl.h" @@ -64,9 +64,9 @@ #include <tqlineedit.h> #include <tqspinbox.h> #include <tqmultilineedit.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidgetstack.h> #include <tqcombobox.h> #include <tqtabbar.h> @@ -77,8 +77,8 @@ #include <tqslider.h> #include <tqdial.h> #include <tqprogressbar.h> -#include <tqtextview.h> -#include <tqtextbrowser.h> +#include <textview.h> +#include <textbrowser.h> #include <tqframe.h> #include <tqmetaobject.h> #include <tqwidgetstack.h> @@ -296,11 +296,11 @@ QDesignerWidgetStack::QDesignerWidgetStack( TQWidget *parent, const char *name ) prev = new TQToolButton( TQt::LeftArrow, this, "designer_wizardstack_button" ); prev->setAutoRaise( TRUE ); prev->setAutoRepeat( TRUE ); - prev->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); + prev->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); next = new TQToolButton( TQt::RightArrow, this, "designer_wizardstack_button" ); next->setAutoRaise( TRUE ); next->setAutoRepeat( TRUE ); - next->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); + next->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); connect( prev, TQT_SIGNAL( clicked() ), this, TQT_SLOT( prevPage() ) ); connect( next, TQT_SIGNAL( clicked() ), this, TQT_SLOT( nextPage() ) ); updateButtons(); @@ -498,7 +498,7 @@ TQMap< int, TQStringList > *changedProperties = 0; void WidgetFactory::saveDefaultProperties( TQObject *w, int id ) { TQMap< TQString, TQVariant> propMap; - TQStrList lst = w->tqmetaObject()->propertyNames( TRUE ); + TQStrList lst = w->metaObject()->propertyNames( TRUE ); for ( uint i = 0; i < lst.count(); ++i ) { TQVariant var = w->property( lst.at( i ) ); if ( !var.isValid() && qstrcmp( "pixmap", lst.at( i ) ) == 0 ) @@ -553,11 +553,11 @@ TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, boo return w; } -/*! Creates a tqlayout on the widget \a widget of the type \a type +/*! Creates a layout on the widget \a widget of the type \a type which can be \c HBox, \c VBox or \c Grid. */ -TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, LayoutType type ) +TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, LayoutType type ) { int spacing = MainWindow::self->currentLayoutDefaultSpacing(); int margin = 0; @@ -570,40 +570,40 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay widget && ::tqqt_cast<FormWindow*>(widget->parentWidget()) ) ) margin = MainWindow::self->currentLayoutDefaultMargin(); - if ( !tqlayout && ::tqqt_cast<TQTabWidget*>(widget) ) + if ( !layout && ::tqqt_cast<TQTabWidget*>(widget) ) widget = ((TQTabWidget*)widget)->currentPage(); - if ( !tqlayout && ::tqqt_cast<TQWizard*>(widget) ) + if ( !layout && ::tqqt_cast<TQWizard*>(widget) ) widget = ((TQWizard*)widget)->currentPage(); - if ( !tqlayout && ::tqqt_cast<TQMainWindow*>(widget) ) + if ( !layout && ::tqqt_cast<TQMainWindow*>(widget) ) widget = ((TQMainWindow*)widget)->centralWidget(); - if ( !tqlayout && ::tqqt_cast<TQWidgetStack*>(widget) ) + if ( !layout && ::tqqt_cast<TQWidgetStack*>(widget) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); - if ( !tqlayout && ::tqqt_cast<TQToolBox*>(widget) ) + if ( !layout && ::tqqt_cast<TQToolBox*>(widget) ) widget = ((TQToolBox*)widget)->currentItem(); MetaDataBase::addEntry( TQT_TQOBJECT(widget) ); TQLayout *l = 0; int align = 0; - if ( !tqlayout && ::tqqt_cast<TQGroupBox*>(widget) ) { + if ( !layout && ::tqqt_cast<TQGroupBox*>(widget) ) { TQGroupBox *gb = (TQGroupBox*)widget; gb->setColumnLayout( 0, Qt::Vertical ); - tqlayout = gb->tqlayout(); - tqlayout->setMargin( 0 ); - tqlayout->setSpacing( 0 ); + layout = gb->layout(); + layout->setMargin( 0 ); + layout->setSpacing( 0 ); switch ( type ) { case HBox: - l = new TQHBoxLayout( tqlayout ); + l = new TQHBoxLayout( layout ); break; case VBox: - l = new TQVBoxLayout( tqlayout ); + l = new TQVBoxLayout( layout ); break; case Grid: - l = new QDesignerGridLayout( tqlayout ); + l = new QDesignerGridLayout( layout ); break; default: return 0; @@ -612,16 +612,16 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay MetaDataBase::setMargin( TQT_TQOBJECT(gb), metamargin ); MetaDataBase::setSpacing( TQT_TQOBJECT(gb), metaspacing ); } else { - if ( tqlayout ) { + if ( layout ) { switch ( type ) { case HBox: - l = new TQHBoxLayout( tqlayout ); + l = new TQHBoxLayout( layout ); break; case VBox: - l = new TQVBoxLayout( tqlayout ); + l = new TQVBoxLayout( layout ); break; case Grid: - l = new QDesignerGridLayout( tqlayout ); + l = new QDesignerGridLayout( layout ); break; default: return 0; @@ -653,7 +653,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay } } } - l->tqsetAlignment( align ); + l->setAlignment( align ); MetaDataBase::addEntry( TQT_TQOBJECT(l) ); return l; } @@ -673,7 +673,7 @@ void WidgetFactory::deleteLayout( TQWidget *widget ) widget = ((TQWidgetStack*)widget)->visibleWidget(); if ( ::tqqt_cast<TQToolBox*>(widget) ) widget = ((TQToolBox*)widget)->currentItem(); - delete widget->tqlayout(); + delete widget->layout(); } /*! Factory functions for creating a widget of the type \a className @@ -690,7 +690,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare TQPushButton *b = 0; if ( init ) { b = new QDesignerPushButton( parent, name ); - b->setText( TQString::tqfromLatin1( name ) ); + b->setText( TQString::fromLatin1( name ) ); } else { b = new QDesignerPushButton( parent, name ); } @@ -714,24 +714,24 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare } else if ( className == TQCHECKBOX_OBJECT_NAME_STRING ) { if ( init ) { QDesignerCheckBox *cb = new QDesignerCheckBox( parent, name ); - cb->setText( TQString::tqfromLatin1( name ) ); + cb->setText( TQString::fromLatin1( name ) ); return cb; } return new QDesignerCheckBox( parent, name ); } else if ( className == TQRADIOBUTTON_OBJECT_NAME_STRING ) { if ( init ) { QDesignerRadioButton *rb = new QDesignerRadioButton( parent, name ); - rb->setText( TQString::tqfromLatin1( name ) ); + rb->setText( TQString::fromLatin1( name ) ); return rb; } return new QDesignerRadioButton( parent, name ); } else if ( className == TQGROUPBOX_OBJECT_NAME_STRING ) { if ( init ) - return new TQGroupBox( TQString::tqfromLatin1( name ), parent, name ); + return new TQGroupBox( TQString::fromLatin1( name ), parent, name ); return new TQGroupBox( parent, name ); } else if ( className == TQBUTTONGROUP_OBJECT_NAME_STRING ) { if ( init ) - return new TQButtonGroup( TQString::tqfromLatin1( name ), parent, name ); + return new TQButtonGroup( TQString::fromLatin1( name ), parent, name ); return new TQButtonGroup( parent, name ); } else if ( className == TQICONVIEW_OBJECT_NAME_STRING ) { #if !defined(TQT_NO_ICONVIEW) @@ -789,7 +789,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare else if ( className == TQLABEL_OBJECT_NAME_STRING || className == "TextLabel" ) { QDesignerLabel *l = new QDesignerLabel( parent, name ); if ( init ) { - l->setText( TQString::tqfromLatin1( name ) ); + l->setText( TQString::fromLatin1( name ) ); MetaDataBase::addEntry( TQT_TQOBJECT(l) ); MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "text", TRUE ); } @@ -1001,14 +1001,14 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare -/*! Find out which type the tqlayout of the widget is. Returns \c HBox, - \c VBox, \c Grid or \c NoLayout. \a tqlayout points to this - TQWidget::tqlayout() of \a w or to 0 after the function call. +/*! Find out which type the layout of the widget is. Returns \c HBox, + \c VBox, \c Grid or \c NoLayout. \a layout points to this + TQWidget::layout() of \a w or to 0 after the function call. */ -WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tqlayout ) +WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&layout ) { - tqlayout = 0; + layout = 0; if ( ::tqqt_cast<TQTabWidget*>(w) ) w = ((TQTabWidget*)w)->currentPage(); @@ -1024,9 +1024,9 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql if ( ::tqqt_cast<TQSplitter*>(w) ) return ( (TQSplitter*)w )->orientation() ==Qt::Horizontal ? HBox : VBox; - if ( !w || !w->tqlayout() ) + if ( !w || !w->layout() ) return NoLayout; - TQLayout *lay = w->tqlayout(); + TQLayout *lay = w->layout(); if ( ::tqqt_cast<TQGroupBox*>(w) ) { TQObjectList *l = TQT_TQOBJECT(lay)->queryList( TQLAYOUT_OBJECT_NAME_STRING ); @@ -1034,7 +1034,7 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql lay = (TQLayout*)l->first(); delete l; } - tqlayout = lay; + layout = lay; if ( ::tqqt_cast<TQHBoxLayout*>(lay) ) return HBox; @@ -1048,13 +1048,13 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql /*! \overload */ -WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *tqlayout ) +WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *layout ) { - if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout) ) + if ( ::tqqt_cast<TQHBoxLayout*>(layout) ) return HBox; - else if ( ::tqqt_cast<TQVBoxLayout*>(tqlayout) ) + else if ( ::tqqt_cast<TQVBoxLayout*>(layout) ) return VBox; - else if ( ::tqqt_cast<TQGridLayout*>(tqlayout) ) + else if ( ::tqqt_cast<TQGridLayout*>(layout) ) return Grid; return NoLayout; } @@ -1069,9 +1069,9 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w ) } -TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout ) +TQWidget *WidgetFactory::layoutParent( TQLayout *layout ) { - TQObject *o = TQT_TQOBJECT(tqlayout); + TQObject *o = TQT_TQOBJECT(layout); while ( o ) { if ( o->isWidgetType() ) return (TQWidget*)o; @@ -1080,7 +1080,7 @@ TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout ) return 0; } -/*! Returns the widget into which tqchildren should be inserted when \a +/*! Returns the widget into which children should be inserted when \a w is a container known to the designer. Usually that is \a w itself, sometimes it is different (e.g. a @@ -1469,7 +1469,7 @@ bool WidgetFactory::canResetProperty( TQObject *w, const TQString &propName ) bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName ) { - const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()-> + const TQMetaProperty *p = w->metaObject()->property( w->metaObject()-> findProperty( propName, TRUE ), TRUE ); if (!p ) return FALSE; @@ -1479,10 +1479,10 @@ bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName ) TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName ) { if ( propName == "wordwrap" ) { - int v = defaultValue( w, "tqalignment" ).toInt(); + int v = defaultValue( w, "alignment" ).toInt(); return TQVariant( ( v & WordBreak ) == WordBreak, 0 ); } else if ( propName == "toolTip" || propName == "whatsThis" ) { - return TQVariant( TQString::tqfromLatin1( "" ) ); + return TQVariant( TQString::fromLatin1( "" ) ); } else if ( w->inherits( "CustomWidget" ) ) { return TQVariant(); } else if ( propName == "frameworkCode" ) { @@ -1496,10 +1496,10 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName ) TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propName ) { - const TQMetaProperty *p = w->tqmetaObject()-> - property( w->tqmetaObject()->findProperty( propName, TRUE ), TRUE ); + const TQMetaProperty *p = w->metaObject()-> + property( w->metaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { - int v = defaultValue( w, "tqalignment" ).toInt(); + int v = defaultValue( w, "alignment" ).toInt(); if ( propName == "hAlign" ) { if ( ( v & AlignAuto ) == AlignAuto ) return "AlignAuto"; @@ -1536,8 +1536,8 @@ TQWidget *WidgetFactory::createCustomWidget( TQWidget *parent, const char *name, TQVariant WidgetFactory::property( TQObject *w, const char *name ) { - int id = w->tqmetaObject()->findProperty( name, TRUE ); - const TQMetaProperty* p = w->tqmetaObject()->property( id, TRUE ); + int id = w->metaObject()->findProperty( name, TRUE ); + const TQMetaProperty* p = w->metaObject()->property( id, TRUE ); if ( !p || !p->isValid() ) return MetaDataBase::fakeProperty( w, name ); return w->property( name ); @@ -1549,7 +1549,7 @@ void QDesignerLabel::updateBuddy() if ( myBuddy.isEmpty() ) return; - TQObjectList *l = tqtopLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, FALSE, TRUE ); + TQObjectList *l = topLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, FALSE, TRUE ); if ( !l || !l->first() ) { delete l; return; @@ -1601,13 +1601,13 @@ bool TQLayoutWidget::event( TQEvent *e ) /* This function must be called on TQLayoutWidget creation and whenever - the TQLayoutWidget's parent tqlayout changes (e.g., from a TQHBoxLayout + the TQLayoutWidget's parent layout changes (e.g., from a TQHBoxLayout to a TQVBoxLayout), because of the (illogical) way layouting works. */ void TQLayoutWidget::updateSizePolicy() { if ( childrenListObject().isEmpty() || childrenListObject().count() == 0 ) { - sp = TQWidget::tqsizePolicy(); + sp = TQWidget::sizePolicy(); return; } @@ -1624,14 +1624,14 @@ void TQLayoutWidget::updateSizePolicy() int ht = (int) TQSizePolicy::Preferred; int vt = (int) TQSizePolicy::Preferred; - if ( tqlayout() ) { + if ( layout() ) { /* - parentLayout is set to the parent tqlayout if there is one and if it is + parentLayout is set to the parent layout if there is one and if it is top level, in which case layouting is illogical. */ TQLayout *parentLayout = 0; if ( parent() && parent()->isWidgetType() ) { - parentLayout = ((TQWidget *)parent())->tqlayout(); + parentLayout = ((TQWidget *)parent())->layout(); if ( parentLayout && ::tqqt_cast<TQLayoutWidget*>(parentLayout->mainWidget()) ) parentLayout = 0; @@ -1640,7 +1640,7 @@ void TQLayoutWidget::updateSizePolicy() TQObjectListIt it( childrenListObject() ); TQObject *o; - if ( ::tqqt_cast<TQVBoxLayout*>(tqlayout()) ) { + if ( ::tqqt_cast<TQVBoxLayout*>(layout()) ) { if ( ::tqqt_cast<TQHBoxLayout*>(parentLayout) ) vt = TQSizePolicy::Minimum; else @@ -1652,16 +1652,16 @@ void TQLayoutWidget::updateSizePolicy() continue; TQWidget *w = (TQWidget*)o; - if ( !w->tqsizePolicy().mayGrowHorizontally() ) + if ( !w->sizePolicy().mayGrowHorizontally() ) ht &= ~TQSizePolicy::Minimum; - if ( !w->tqsizePolicy().mayShrinkHorizontally() ) + if ( !w->sizePolicy().mayShrinkHorizontally() ) ht &= ~TQSizePolicy::Maximum; - if ( w->tqsizePolicy().mayGrowVertically() ) + if ( w->sizePolicy().mayGrowVertically() ) vt |= TQSizePolicy::Minimum; - if ( w->tqsizePolicy().mayShrinkVertically() ) + if ( w->sizePolicy().mayShrinkVertically() ) vt |= TQSizePolicy::Maximum; } - } else if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout()) ) { + } else if ( ::tqqt_cast<TQHBoxLayout*>(layout()) ) { if ( ::tqqt_cast<TQVBoxLayout*>(parentLayout) ) ht = TQSizePolicy::Minimum; else @@ -1673,16 +1673,16 @@ void TQLayoutWidget::updateSizePolicy() continue; TQWidget *w = (TQWidget*)o; - if ( w->tqsizePolicy().mayGrowHorizontally() ) + if ( w->sizePolicy().mayGrowHorizontally() ) ht |= TQSizePolicy::Minimum; - if ( w->tqsizePolicy().mayShrinkHorizontally() ) + if ( w->sizePolicy().mayShrinkHorizontally() ) ht |= TQSizePolicy::Maximum; - if ( !w->tqsizePolicy().mayGrowVertically() ) + if ( !w->sizePolicy().mayGrowVertically() ) vt &= ~TQSizePolicy::Minimum; - if ( !w->tqsizePolicy().mayShrinkVertically() ) + if ( !w->sizePolicy().mayShrinkVertically() ) vt &= ~TQSizePolicy::Maximum; } - } else if ( ::tqqt_cast<TQGridLayout*>(tqlayout()) ) { + } else if ( ::tqqt_cast<TQGridLayout*>(layout()) ) { ht = TQSizePolicy::Fixed; vt = TQSizePolicy::Fixed; if ( parentLayout ) { @@ -1698,30 +1698,30 @@ void TQLayoutWidget::updateSizePolicy() continue; TQWidget *w = (TQWidget*)o; - if ( w->tqsizePolicy().mayGrowHorizontally() ) + if ( w->sizePolicy().mayGrowHorizontally() ) ht |= TQSizePolicy::Minimum; - if ( w->tqsizePolicy().mayShrinkHorizontally() ) + if ( w->sizePolicy().mayShrinkHorizontally() ) ht |= TQSizePolicy::Maximum; - if ( w->tqsizePolicy().mayGrowVertically() ) + if ( w->sizePolicy().mayGrowVertically() ) vt |= TQSizePolicy::Minimum; - if ( w->tqsizePolicy().mayShrinkVertically() ) + if ( w->sizePolicy().mayShrinkVertically() ) vt |= TQSizePolicy::Maximum; } } #ifdef USE_QT4 - if ( tqlayout()->expandingDirections() & TQSizePolicy::Horizontally ) + if ( layout()->expanding() & TQSizePolicy::Horizontally ) #else // USE_QT4 - if ( tqlayout()->expanding() & TQSizePolicy::Horizontally ) + if ( layout()->expanding() & TQSizePolicy::Horizontally ) #endif // USE_QT4 ht = TQSizePolicy::Expanding; #ifdef USE_QT4 - if ( tqlayout()->expandingDirections() & TQSizePolicy::Vertically ) + if ( layout()->expanding() & TQSizePolicy::Vertically ) #else // USE_QT4 - if ( tqlayout()->expanding() & TQSizePolicy::Vertically ) + if ( layout()->expanding() & TQSizePolicy::Vertically ) #endif // USE_QT4 vt = TQSizePolicy::Expanding; - tqlayout()->tqinvalidate(); + layout()->invalidate(); } sp = TQSizePolicy( (TQSizePolicy::SizeType) ht, (TQSizePolicy::SizeType) vt ); @@ -1734,8 +1734,8 @@ void CustomWidget::paintEvent( TQPaintEvent *e ) ( (FormWindow*)parentWidget() )->paintGrid( this, e ); } else { TQPainter p( this ); - p.fillRect( rect(), tqcolorGroup().dark() ); - p.setPen( tqcolorGroup().light() ); + p.fillRect( rect(), colorGroup().dark() ); + p.setPen( colorGroup().light() ); p.drawText( 2, 2, width() - 4, height() - 4, TQt::AlignAuto | TQt::AlignTop, cusw->className ); p.drawPixmap( ( width() - cusw->pixmap->width() ) / 2, ( height() - cusw->pixmap->height() ) / 2, diff --git a/kdevdesigner/designer/widgetfactory.h b/kdevdesigner/designer/widgetfactory.h index 1bb1f1f3..80c43f8f 100644 --- a/kdevdesigner/designer/widgetfactory.h +++ b/kdevdesigner/designer/widgetfactory.h @@ -78,13 +78,13 @@ public: static TQWidget *create( int id, TQWidget *parent, const char *name = 0, bool init = TRUE, const TQRect *rect = 0, Qt::Orientation orient = Qt::Horizontal ); - static TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type ); + static TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type ); static void deleteLayout( TQWidget *widget ); static LayoutType layoutType( TQWidget *w ); - static LayoutType layoutType( TQWidget *w, TQLayout *&tqlayout ); - static LayoutType layoutType( TQLayout *tqlayout ); - static TQWidget *layoutParent( TQLayout *tqlayout ); + static LayoutType layoutType( TQWidget *w, TQLayout *&layout ); + static LayoutType layoutType( TQLayout *layout ); + static TQWidget *layoutParent( TQLayout *layout ); static TQWidget* containerOfWidget( TQWidget *w ); static TQWidget* widgetOfContainer( TQWidget *w ); @@ -264,16 +264,16 @@ public: CustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *cw ) : TQWidget( parent, name ), cusw( cw ) { alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" ); - tqsetSizePolicy( cw->sizePolicy ); + setSizePolicy( cw->sizePolicy ); if ( !alwaysExpand ) setBackgroundMode( PaletteDark ); } - TQSize tqsizeHint() const { - TQSize sh = cusw->tqsizeHint; + TQSize sizeHint() const { + TQSize sh = cusw->sizeHint; if ( sh.isValid() ) return sh; - return TQWidget::tqsizeHint(); + return TQWidget::sizeHint(); } TQString realClassName() { return cusw->className; } diff --git a/kdevdesigner/designer/wizardeditor.ui b/kdevdesigner/designer/wizardeditor.ui index 028a1341..84302d09 100644 --- a/kdevdesigner/designer/wizardeditor.ui +++ b/kdevdesigner/designer/wizardeditor.ui @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -201,7 +201,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdevdesigner/designer/wizardeditorimpl.cpp b/kdevdesigner/designer/wizardeditorimpl.cpp index 850cafef..5933793e 100644 --- a/kdevdesigner/designer/wizardeditorimpl.cpp +++ b/kdevdesigner/designer/wizardeditorimpl.cpp @@ -130,7 +130,7 @@ void WizardEditor::addClicked() listBox->insertItem( i18n( "Page" ), index ); // schedule add command - AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n( "Add Page to %1" ).tqarg( wizard->name() ), + AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n( "Add Page to %1" ).arg( wizard->name() ), formwindow, wizard, "Page", index, FALSE); commands.append( cmd ); @@ -149,7 +149,7 @@ void WizardEditor::removeClicked() // schedule remove command DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ) - .tqarg( listBox->text( index ) ).tqarg( wizard->name() ), + .arg( listBox->text( index ) ).arg( wizard->name() ), formwindow, wizard, index, FALSE ); commands.append( cmd ); @@ -169,8 +169,8 @@ void WizardEditor::upClicked() listBox->setCurrentItem( index2 ); // schedule swap command - SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).tqarg( index1 ).tqarg( index2 ) - .tqarg( wizard->name() ), formwindow, wizard, index1, index2); + SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).arg( index1 ).arg( index2 ) + .arg( wizard->name() ), formwindow, wizard, index1, index2); commands.append( cmd ); // update buttons @@ -189,7 +189,7 @@ void WizardEditor::downClicked() listBox->setCurrentItem( index2 ); // schedule swap command - SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).tqarg( index1 ).tqarg( index2 ).tqarg( wizard->name() ), formwindow, wizard, index2, index1); + SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).arg( index1 ).arg( index2 ).arg( wizard->name() ), formwindow, wizard, index2, index1); commands.append( cmd ); // update buttons @@ -217,7 +217,7 @@ void WizardEditor::itemSelected( int index ) if ( index < 0 ) return; // Called when TQt::Key_Enter was pressed. // ListBoxRename has renamed the list item, so we only need to rename the page to the same name. - TQString pn( i18n( "Rename page %1 of %2" ).tqarg( wizard->title( wizard->page( index ) ) ).tqarg( wizard->name() ) ); + TQString pn( i18n( "Rename page %1 of %2" ).arg( wizard->title( wizard->page( index ) ) ).arg( wizard->name() ) ); RenameWizardPageCommand *cmd = new RenameWizardPageCommand( pn, formwindow, wizard, index, listBox->text( index ) ); commands.append( cmd ); } @@ -248,6 +248,6 @@ void WizardEditor::itemDropped( TQListBoxItem * i ) int droppedItem = listBox->index( i ); //qDebug( "Moving page %d -> %d", draggedItem, droppedItem ); - MoveWizardPageCommand *cmd = new MoveWizardPageCommand( i18n( "Move Page %1 to %2 in %3" ).tqarg( draggedItem ).tqarg( droppedItem ).tqarg( wizard->name() ), formwindow, wizard, draggedItem, droppedItem ); + MoveWizardPageCommand *cmd = new MoveWizardPageCommand( i18n( "Move Page %1 to %2 in %3" ).arg( draggedItem ).arg( droppedItem ).arg( wizard->name() ), formwindow, wizard, draggedItem, droppedItem ); commands.append( cmd ); } diff --git a/kdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp index 5f92b691..9e948107 100644 --- a/kdevdesigner/designer/workspace.cpp +++ b/kdevdesigner/designer/workspace.cpp @@ -48,7 +48,7 @@ #include <tqobjectlist.h> #include <tqworkspace.h> #include <tqpopupmenu.h> -#include <tqtextstream.h> +#include <textstream.h> #include "qcompletionedit.h" #include <klocale.h> @@ -121,8 +121,8 @@ void WorkspaceItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, ( !formFile->hasFormCode() || ( formFile->codeFileState() == FormFile::Deleted && formFile->formWindow() ) ) && parent() && parent()->parent() && ( (WorkspaceItem*)parent()->parent() )->project && ( (WorkspaceItem*)parent()->parent() )->project->isCpp() ) { - g.setColor( TQColorGroup::Text, listView()->tqpalette().disabled().color( TQColorGroup::Text) ); - g.setColor( TQColorGroup::HighlightedText, listView()->tqpalette().disabled().color( TQColorGroup::Text) ); + g.setColor( TQColorGroup::Text, listView()->palette().disabled().color( TQColorGroup::Text) ); + g.setColor( TQColorGroup::HighlightedText, listView()->palette().disabled().color( TQColorGroup::Text) ); } else { g.setColor( TQColorGroup::Text, TQt::black ); } @@ -419,9 +419,9 @@ void Workspace::update( FormFile* ff ) { TQListViewItem* i = findItem( ff ); if ( i ) { - i->tqrepaint(); + i->repaint(); if ( (i = i->firstChild()) ) - i->tqrepaint(); + i->repaint(); } } diff --git a/kdevdesigner/plugins/languageinterfaceimpl.cpp b/kdevdesigner/plugins/languageinterfaceimpl.cpp index d761a9e7..2e4f9f20 100644 --- a/kdevdesigner/plugins/languageinterfaceimpl.cpp +++ b/kdevdesigner/plugins/languageinterfaceimpl.cpp @@ -231,7 +231,7 @@ void LanguageInterfaceImpl::preferedExtensions( TQMap<TQString, TQString> &exten TQStrList LanguageInterfaceImpl::signalNames( TQObject *obj ) const { TQStrList sigs; - sigs = obj->tqmetaObject()->signalNames( TRUE ); + sigs = obj->metaObject()->signalNames( TRUE ); sigs.remove( "destroyed()" ); return sigs; } diff --git a/kdevdesigner/shared/parser.cpp b/kdevdesigner/shared/parser.cpp index 1ba246bd..1fb2c5a7 100644 --- a/kdevdesigner/shared/parser.cpp +++ b/kdevdesigner/shared/parser.cpp @@ -68,5 +68,5 @@ TQString Parser::cleanArgs( const TQString &func ) } res += ")"; - return TQString::tqfromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) ); + return TQString::fromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) ); } diff --git a/kdevdesigner/shared/ui2uib.cpp b/kdevdesigner/shared/ui2uib.cpp index d4645eaa..5cff46e0 100644 --- a/kdevdesigner/shared/ui2uib.cpp +++ b/kdevdesigner/shared/ui2uib.cpp @@ -470,11 +470,11 @@ static void outputLayoutWidgetsSubLayout( TQMap<int, TQStringList>& buddies, if ( subLayoutNo != -1 ) { /* - Remove the sub-tqlayout's Object_End marker, append the grid + Remove the sub-layout's Object_End marker, append the grid cell and the correct name property, and put the Object_End marker back. */ - out.tqdevice()->at( out.tqdevice()->at() - 1 ); + out.device()->at( out.device()->at() - 1 ); outputGridCell( out, elem ); outputProperty( buddies, subLayoutNo, strings, out, nameElem ); out << (TQ_UINT8) Object_End; diff --git a/kdevdesigner/shared/uib.cpp b/kdevdesigner/shared/uib.cpp index 443df331..7072626a 100644 --- a/kdevdesigner/shared/uib.cpp +++ b/kdevdesigner/shared/uib.cpp @@ -31,8 +31,8 @@ static const char commonStrings[] = "TQComboBox\0TQDialog\0TQFrame\0TQGridLayout\0TQGroupBox\0TQHBoxLayout\0TQLabel\0" "TQLineEdit\0TQListView\0TQPushButton\0TQRadioButton\0TQVBoxLayout\0TQWidget\0" "TextLabel1\0XPM.GZ\0accept\0autoDefault\0buddy\0caption\0clicked\0" - "default\0destroy\0frameShadow\0frameShape\0tqgeometry\0init\0margin\0" - "tqmaximumSize\0tqminimumSize\0name\0reject\0sizePolicy\0spacing\0text\0title\0" + "default\0destroy\0frameShadow\0frameShape\0geometry\0init\0margin\0" + "maximumSize\0minimumSize\0name\0reject\0sizePolicy\0spacing\0text\0title\0" "toolTip\0unnamed\0whatsThis"; UibStrTable::UibStrTable() diff --git a/kdevdesigner/shared/uib.h b/kdevdesigner/shared/uib.h index 9f2090f7..e6a6b05f 100644 --- a/kdevdesigner/shared/uib.h +++ b/kdevdesigner/shared/uib.h @@ -128,7 +128,7 @@ inline TQString UibStrTable::asString( int offset ) const { if ( table[offset] == 0x7f ) { TQDataStream in( table, IO_ReadOnly ); - in.tqdevice()->at( offset + 1 ); + in.device()->at( offset + 1 ); TQString str; in >> str; return str; diff --git a/kdevdesigner/shared/widgetdatabase.cpp b/kdevdesigner/shared/widgetdatabase.cpp index 80e8c131..a37f5260 100644 --- a/kdevdesigner/shared/widgetdatabase.cpp +++ b/kdevdesigner/shared/widgetdatabase.cpp @@ -38,7 +38,7 @@ #include <tqstrlist.h> #include <tqdict.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqcleanuphandler.h> #include <tqfeatures.h> @@ -735,7 +735,7 @@ bool WidgetDatabase::isForm( int id ) return r->isForm; } -/*! Returns whether the widget registered as \a id can have tqchildren. +/*! Returns whether the widget registered as \a id can have children. */ bool WidgetDatabase::isContainer( int id ) diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp index c61584a7..3dc55c01 100644 --- a/kdevdesigner/uilib/qwidgetfactory.cpp +++ b/kdevdesigner/uilib/qwidgetfactory.cpp @@ -33,7 +33,7 @@ #include "database2.h" #include <tqdom.h> #include <tqdir.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmetaobject.h> #include <domtool.h> #include <uib.h> @@ -76,14 +76,14 @@ #include <tqwizard.h> #include <tqlcdnumber.h> #include <tqprogressbar.h> -#include <tqtextview.h> -#include <tqtextbrowser.h> +#include <textview.h> +#include <textbrowser.h> #include <tqdial.h> #include <tqslider.h> #include <tqframe.h> #include <tqwidgetstack.h> #include <tqtoolbox.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqscrollbar.h> #include <tqmainwindow.h> #include <tqsplitter.h> @@ -682,7 +682,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, if ( name == "orientation" ) { vertical = ( value == "Vertical" ); - } else if ( name == "tqsizeHint" ) { + } else if ( name == "sizeHint" ) { w = value.toSize().width(); h = value.toSize().height(); } else if ( name == "sizeType" ) { @@ -907,7 +907,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, { TQObject *obj = 0; TQWidget *widget = 0; - TQLayout *tqlayout = 0; + TQLayout *layout = 0; TQWidget *parentWidget = 0; TQLayout *parentLayout = 0; @@ -942,11 +942,11 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, type = VBox; } if ( parentLayout != 0 && parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) { - tqlayout = createLayout( 0, 0, type ); + layout = createLayout( 0, 0, type ); } else { - tqlayout = createLayout( parentWidget, parentLayout, type ); + layout = createLayout( parentWidget, parentLayout, type ); } - obj = TQT_TQOBJECT(tqlayout); + obj = TQT_TQOBJECT(layout); } else if ( className == TQMENUBAR_OBJECT_NAME_STRING ) { unpackCString( strings, in, className ); widget = ((TQMainWindow *) parent)->menuBar(); @@ -1047,7 +1047,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, case Object_PaletteProperty: { TQPalette palette; - TQColorGroup tqcolorGroup; + TQColorGroup colorGroup; TQColor color; int role = -1; @@ -1057,26 +1057,26 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, while ( !in.atEnd() && paletteTag != Palette_End ) { switch ( paletteTag ) { case Palette_Active: - palette.setActive( tqcolorGroup ); + palette.setActive( colorGroup ); role = -1; break; case Palette_Inactive: - palette.setInactive( tqcolorGroup ); + palette.setInactive( colorGroup ); role = -1; break; case Palette_Disabled: - palette.setDisabled( tqcolorGroup ); + palette.setDisabled( colorGroup ); role = -1; break; case Palette_Color: role++; in >> color; - tqcolorGroup.setColor( (TQColorGroup::ColorRole) role, + colorGroup.setColor( (TQColorGroup::ColorRole) role, color ); break; case Palette_Pixmap: unpackVariant( strings, in, value ); - tqcolorGroup.setBrush( (TQColorGroup::ColorRole) role, + colorGroup.setBrush( (TQColorGroup::ColorRole) role, TQBrush(color, value.asPixmap()) ); break; default: @@ -1092,7 +1092,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, inputColumnOrRow( strings, in, obj, TRUE ); break; case Object_Spacer: - inputSpacer( strings, in, tqlayout ); + inputSpacer( strings, in, layout ); break; case Object_Separator: ((TQToolBar *) widget)->addSeparator(); @@ -1160,10 +1160,10 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, } else { ((TQBoxLayout *) parentLayout)->addWidget( widget ); } - } else if ( tqlayout != 0 ) { + } else if ( layout != 0 ) { if ( parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) { ((TQGridLayout *) parentLayout)->addMultiCellLayout( - tqlayout, row, row + rowspan - 1, column, + layout, row, row + rowspan - 1, column, column + colspan - 1 ); } } @@ -1175,7 +1175,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, TQObject * /* connector */ , TQWidget *parent, const char *name ) { #define END_OF_BLOCK() \ - ( in.atEnd() || in.tqdevice()->at() >= nextBlock ) + ( in.atEnd() || in.device()->at() >= nextBlock ) TQ_UINT8 lf; TQ_UINT8 cr; @@ -1204,7 +1204,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, in >> blockType; while ( !in.atEnd() && blockType != Block_End ) { unpackUInt32( in, blockSize ); - TQIODevice::Offset nextBlock = in.tqdevice()->at() + blockSize; + TQIODevice::Offset nextBlock = in.device()->at() + blockSize; switch ( blockType ) { case Block_Actions: @@ -1258,7 +1258,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, case Block_Functions: // ### qWarning( "Block_Functions not supported" ); - in.tqdevice()->at( nextBlock ); + in.device()->at( nextBlock ); break; case Block_Images: { @@ -1340,7 +1340,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, case Block_Variables: // ### qWarning( "Block_Variables not supported" ); - in.tqdevice()->at( nextBlock ); + in.device()->at( nextBlock ); break; case Block_Widget: toplevel = (TQWidget *) @@ -1568,7 +1568,7 @@ bool TQWidgetFactory::supportsWidget( const TQString &widget ) } TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *parent, - TQLayout* tqlayout, const TQString &classNameArg ) + TQLayout* layout, const TQString &classNameArg ) { d->lastItem = 0; TQDomElement n = e.firstChild().toElement(); @@ -1589,12 +1589,12 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget bool isTQLayoutWidget = FALSE; if ( !className.isEmpty() ) { - if ( !tqlayout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) { + if ( !layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) { className = TQWIDGET_OBJECT_NAME_STRING; isTQLayoutWidget = TRUE; } - if ( tqlayout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) { - // hide tqlayout widgets + if ( layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) { + // hide layout widgets w = parent; } else { obj = TQT_TQOBJECT(TQWidgetFactory::createWidget( className, parent, 0 )); @@ -1605,16 +1605,16 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget toplevel = w; if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) w = ( (TQMainWindow*)w )->centralWidget(); - if ( tqlayout ) { - switch( layoutType( tqlayout ) ) { + if ( layout ) { + switch( layoutType( layout ) ) { case HBox: - ( (TQHBoxLayout*)tqlayout )->addWidget( w ); + ( (TQHBoxLayout*)layout )->addWidget( w ); break; case VBox: - ( (TQVBoxLayout*)tqlayout )->addWidget( w ); + ( (TQVBoxLayout*)layout )->addWidget( w ); break; case Grid: - ( (TQGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1, + ( (TQGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1, col, col + colspan - 1 ); break; default: @@ -1622,7 +1622,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget } } - tqlayout = 0; + layout = 0; } } #ifdef TQT_CONTAINER_CUSTOM_WIDGETS @@ -1636,45 +1636,45 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget int idx = 0; while ( !n.isNull() ) { if ( n.tagName() == "spacer" ) { - createSpacer( n, tqlayout ); + createSpacer( n, layout ); } else if ( n.tagName() == "widget" ) { TQMap< TQString, TQString> *oldDbControls = dbControls; - createWidgetInternal( n, w, tqlayout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) ); + createWidgetInternal( n, w, layout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) ); dbControls = oldDbControls; } else if ( n.tagName() == "hbox" ) { - TQLayout *parentLayout = tqlayout; - if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) - tqlayout = createLayout( 0, 0, TQWidgetFactory::HBox, isTQLayoutWidget ); + TQLayout *parentLayout = layout; + if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + layout = createLayout( 0, 0, TQWidgetFactory::HBox, isTQLayoutWidget ); else - tqlayout = createLayout( w, tqlayout, TQWidgetFactory::HBox, isTQLayoutWidget ); - obj = TQT_TQOBJECT(tqlayout); + layout = createLayout( w, layout, TQWidgetFactory::HBox, isTQLayoutWidget ); + obj = TQT_TQOBJECT(layout); n = n.firstChild().toElement(); if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) - ( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, + ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "grid" ) { - TQLayout *parentLayout = tqlayout; - if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) - tqlayout = createLayout( 0, 0, TQWidgetFactory::Grid, isTQLayoutWidget ); + TQLayout *parentLayout = layout; + if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + layout = createLayout( 0, 0, TQWidgetFactory::Grid, isTQLayoutWidget ); else - tqlayout = createLayout( w, tqlayout, TQWidgetFactory::Grid, isTQLayoutWidget ); - obj = TQT_TQOBJECT(tqlayout); + layout = createLayout( w, layout, TQWidgetFactory::Grid, isTQLayoutWidget ); + obj = TQT_TQOBJECT(layout); n = n.firstChild().toElement(); if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) - ( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, + ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "vbox" ) { - TQLayout *parentLayout = tqlayout; - if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) - tqlayout = createLayout( 0, 0, TQWidgetFactory::VBox, isTQLayoutWidget ); + TQLayout *parentLayout = layout; + if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + layout = createLayout( 0, 0, TQWidgetFactory::VBox, isTQLayoutWidget ); else - tqlayout = createLayout( w, tqlayout, TQWidgetFactory::VBox, isTQLayoutWidget ); - obj = TQT_TQOBJECT(tqlayout); + layout = createLayout( w, layout, TQWidgetFactory::VBox, isTQLayoutWidget ); + obj = TQT_TQOBJECT(layout); n = n.firstChild().toElement(); if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) - ( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, + ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "property" && obj ) { @@ -1728,47 +1728,47 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget return w; } -TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* tqlayout, +TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* layout, LayoutType type, bool isTQLayoutWidget ) { int spacing = defSpacing; int margin = defMargin; - if ( tqlayout || !widget || isTQLayoutWidget ) + if ( layout || !widget || isTQLayoutWidget ) margin = 0; - if ( !tqlayout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) widget = ((TQTabWidget*)widget)->currentPage(); - if ( !tqlayout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) widget = ((TQWizard*)widget)->currentPage(); - if ( !tqlayout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); - if ( !tqlayout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) widget = ((TQToolBox*)widget)->currentItem(); TQLayout *l = 0; int align = 0; - if ( !tqlayout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { + if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { TQGroupBox *gb = (TQGroupBox*)widget; gb->setColumnLayout( 0, Qt::Vertical ); - tqlayout = gb->tqlayout(); - tqlayout->setMargin( 0 ); - tqlayout->setSpacing( 0 ); + layout = gb->layout(); + layout->setMargin( 0 ); + layout->setSpacing( 0 ); align = TQt::AlignTop; } - if ( tqlayout ) { + if ( layout ) { switch ( type ) { case HBox: - l = new TQHBoxLayout( tqlayout ); + l = new TQHBoxLayout( layout ); break; case VBox: - l = new TQVBoxLayout( tqlayout ); + l = new TQVBoxLayout( layout ); break; case Grid: - l = new TQGridLayout( tqlayout ); + l = new TQGridLayout( layout ); break; default: return 0; @@ -1788,19 +1788,19 @@ TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* tqlayout, return 0; } } - l->tqsetAlignment( align ); + l->setAlignment( align ); l->setMargin( margin ); l->setSpacing( spacing ); return l; } -TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *tqlayout ) const +TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *layout ) const { - if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) return HBox; - else if ( tqlayout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) + else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) return VBox; - else if ( tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) return Grid; return NoLayout; } @@ -1808,7 +1808,7 @@ TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *tqlayout ) co void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop, TQVariant value ) { - int offset = obj->tqmetaObject()->findProperty( prop.ascii(), TRUE ); + int offset = obj->metaObject()->findProperty( prop.ascii(), TRUE ); if ( offset != -1 ) { if ( prop == "geometry" && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) { @@ -1819,7 +1819,7 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop, if ( value.type() == TQVariant::String || value.type() == TQVariant::CString ) { const TQMetaProperty *metaProp = - obj->tqmetaObject()->property( offset, TRUE ); + obj->metaObject()->property( offset, TRUE ); if ( metaProp != 0 && metaProp->isEnumType() ) { if ( metaProp->isSetType() ) { TQStrList flagsCStr; @@ -1917,7 +1917,7 @@ void TQWidgetFactory::setProperty( TQObject* widget, const TQString &prop, const setProperty( widget, prop, value ); } -void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout ) +void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) { TQDomElement n = e.firstChild().toElement(); int row = e.attribute( "row" ).toInt(); @@ -1938,7 +1938,7 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout ) orient = Qt::Vertical; } else if ( prop == "sizeType" ) { sizeType = stringToSizeType( n.firstChild().firstChild().toText().data() ); - } else if ( prop == "tqsizeHint" ) { + } else if ( prop == "sizeHint" ) { w = n.firstChild().firstChild().firstChild().toText().data().toInt(); h = n.firstChild().firstChild().nextSibling().firstChild().toText().data().toInt(); } @@ -1952,11 +1952,11 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout ) colspan = 1; TQSpacerItem *item = new TQSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : TQSizePolicy::Minimum, orient == Qt::Vertical ? sizeType : TQSizePolicy::Minimum ); - if ( tqlayout ) { - if ( tqlayout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) ) - ( (TQBoxLayout*)tqlayout )->addItem( item ); + if ( layout ) { + if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) ) + ( (TQBoxLayout*)layout )->addItem( item ); else - ( (TQGridLayout*)tqlayout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1, + ( (TQGridLayout*)layout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1, orient == Qt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter ); } } @@ -2140,16 +2140,16 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto } TQString s = "2""%1"; - s = s.tqarg( conn.signal.data() ); + s = s.arg( conn.signal.data() ); TQString s2 = "1""%1"; - s2 = s2.tqarg( conn.slot.data() ); + s2 = s2.arg( conn.slot.data() ); - TQStrList signalList = sender->tqmetaObject()->signalNames( TRUE ); - TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE ); + TQStrList signalList = sender->metaObject()->signalNames( TRUE ); + TQStrList slotList = receiver->metaObject()->slotNames( TRUE ); // if this is a connection to a custom slot and we have a connector, try this as receiver if ( slotList.find( conn.slot ) == -1 && (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel)) && connector ) { - slotList = connector->tqmetaObject()->slotNames( TRUE ); + slotList = connector->metaObject()->slotNames( TRUE ); receiver = connector; } diff --git a/kdevdesigner/uilib/qwidgetfactory.h b/kdevdesigner/uilib/qwidgetfactory.h index c6770341..8f2b1427 100644 --- a/kdevdesigner/uilib/qwidgetfactory.h +++ b/kdevdesigner/uilib/qwidgetfactory.h @@ -66,12 +66,12 @@ private: void loadImageCollection( const TQDomElement &e ); void loadConnections( const TQDomElement &e, TQObject *connector ); void loadTabOrder( const TQDomElement &e ); - TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg ); - TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type, bool isTQLayoutWidget = FALSE ); + TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* layout, const TQString &classNameArg ); + TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type, bool isTQLayoutWidget = FALSE ); LayoutType layoutType( TQLayout *l ) const; void setProperty( TQObject* widget, const TQString &prop, TQVariant value ); void setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e ); - void createSpacer( const TQDomElement &e, TQLayout *tqlayout ); + void createSpacer( const TQDomElement &e, TQLayout *layout ); TQImage loadFromCollection( const TQString &name ); TQPixmap loadPixmap( const TQString &name ); TQPixmap loadPixmap( const TQDomElement &e ); diff --git a/languages/ada/README.dox b/languages/ada/README.dox index d9cd67bd..d4bd3352 100644 --- a/languages/ada/README.dox +++ b/languages/ada/README.dox @@ -24,7 +24,7 @@ with the one from <a href="ftp://fara.cs.uni-potsdam.de/incoming/CppCodeGenerato \authors <a href="mailto:roberto AT tdevelop.org">Roberto Raggi</a> \authors <a href="mailto:cloudtemple AT mksat.net">Alexander Dymo</a> -\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. \requirement Ada compiler diff --git a/languages/ada/ada.g b/languages/ada/ada.g index 8c073e23..5f97952b 100644 --- a/languages/ada/ada.g +++ b/languages/ada/ada.g @@ -1773,7 +1773,7 @@ tokens { // part 3: Non-RM synthetic tokens. // They exist mainly to normalize the node structure with respect to // optional items. (Without them, the presence or absence of an optional - // item would change the node tqlayout, but we want a fixed tqlayout.) + // item would change the node layout, but we want a fixed layout.) ABSTRACT_FUNCTION_DECLARATION; ABSTRACT_PROCEDURE_DECLARATION; ACCESS_TO_FUNCTION_DECLARATION; diff --git a/languages/ada/ada_utils.cpp b/languages/ada/ada_utils.cpp index 43b94fa7..d7b8bbf7 100644 --- a/languages/ada/ada_utils.cpp +++ b/languages/ada/ada_utils.cpp @@ -16,7 +16,7 @@ TQString qtext (const RefAdaAST& n) { - return TQString::tqfromLatin1 (text (n).c_str ()); + return TQString::fromLatin1 (text (n).c_str ()); } TQStringList qnamelist (const RefAdaAST& n) diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp index 85374ee4..4c035cb2 100644 --- a/languages/ada/adasupportpart.cpp +++ b/languages/ada/adasupportpart.cpp @@ -143,7 +143,7 @@ void AdaSupportPart::initialParse () TQString fn = project ()->projectDirectory () + "/" + *it; maybeParse (fn); - kapp->tqprocessEvents (500); + kapp->processEvents (500); } emit updatedSourceInfo(); @@ -250,7 +250,7 @@ void AdaSupportPart::parse (const TQString &fileName) } } catch (antlr::ANTLRException& ex) { kdDebug () << "*exception*: " << ex.toString ().c_str () << endl; - d->problemReporter->reportError (TQString::tqfromLatin1( ex.getMessage ().c_str() ), + d->problemReporter->reportError (TQString::fromLatin1( ex.getMessage ().c_str() ), fileName, lexer.getLine (), lexer.getColumn ()); @@ -285,7 +285,7 @@ void AdaSupportPart::parseContents (const TQString& contents, const TQString& fi } catch (antlr::ANTLRException& ex) { kdDebug () << "*exception*: " << ex.toString ().c_str () << endl; - d->problemReporter->reportError (TQString::tqfromLatin1( ex.getMessage().c_str() ), + d->problemReporter->reportError (TQString::fromLatin1( ex.getMessage().c_str() ), fileName, lexer.getLine (), lexer.getColumn ()); diff --git a/languages/ada/addclass.cpp b/languages/ada/addclass.cpp index 725d6dc9..4fd8b2d9 100644 --- a/languages/ada/addclass.cpp +++ b/languages/ada/addclass.cpp @@ -4,8 +4,8 @@ #include <tqcheckbox.h> #include <tqradiobutton.h> -#include <tqtextedit.h> -#include <tqtextstream.h> +#include <textedit.h> +#include <textstream.h> #include <tqregexp.h> #include <tqfile.h> #include <tqfileinfo.h> diff --git a/languages/ada/backgroundparser.cpp b/languages/ada/backgroundparser.cpp index f38491b9..22d959b0 100644 --- a/languages/ada/backgroundparser.cpp +++ b/languages/ada/backgroundparser.cpp @@ -25,7 +25,7 @@ BackgroundParser::BackgroundParser( ProblemReporter* reporter, const TQString& source, const TQString& filename ) : m_reporter( reporter ), - m_source( source.tqunicode(), source.length() ), + m_source( source.unicode(), source.length() ), m_fileName( filename ) { } @@ -64,7 +64,7 @@ void BackgroundParser::run() } catch( antlr::ANTLRException& ex ){ kdDebug() << "*exception*: " << ex.toString().c_str() << endl; - m_reporter->reportError( TQString::tqfromLatin1( ex.getMessage().c_str() ), + m_reporter->reportError( TQString::fromLatin1( ex.getMessage().c_str() ), m_fileName, lexer.getLine(), lexer.getColumn() ); diff --git a/languages/ada/configproblemreporter.ui b/languages/ada/configproblemreporter.ui index 32ca9e54..f2e03383 100644 --- a/languages/ada/configproblemreporter.ui +++ b/languages/ada/configproblemreporter.ui @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>101</height> diff --git a/languages/bash/README.dox b/languages/bash/README.dox index af38febf..95765f0a 100644 --- a/languages/bash/README.dox +++ b/languages/bash/README.dox @@ -10,6 +10,6 @@ Supports bash language \feature runs bash script in external terminal \feature syntax highlighting and code folding via katepart \feature Code completion works for variables -\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. */ diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp index a36761a8..9daa4294 100644 --- a/languages/bash/bashsupport_part.cpp +++ b/languages/bash/bashsupport_part.cpp @@ -7,7 +7,7 @@ #include <tqfileinfo.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtimer.h> #include <kapplication.h> #include <tqregexp.h> diff --git a/languages/cpp/README.dox b/languages/cpp/README.dox index 04c7fe30..4ac19153 100644 --- a/languages/cpp/README.dox +++ b/languages/cpp/README.dox @@ -16,7 +16,7 @@ and if you want play with the c++ parser go to lib/cppparser/, the best is to st \feature can do code completion \feature has presistent class store \feature code highlight -\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. \bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=tdevelop&component=cppsupport&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">cppsupport component at Bugzilla database</a> diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp index 69d373fd..95e33970 100644 --- a/languages/cpp/addattributedialog.cpp +++ b/languages/cpp/addattributedialog.cpp @@ -38,7 +38,7 @@ #include <tqcheckbox.h> #include <tqpushbutton.h> #include <tqtoolbutton.h> -#include <tqtextstream.h> +#include <textstream.h> AddAttributeDialog::AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass, TQWidget* parent, const char* name, bool modal, WFlags fl ) @@ -194,7 +194,7 @@ void AddAttributeDialog::updateGUI() void AddAttributeDialog::addAttribute() { TQListViewItem * item = new TQListViewItem( attributes, "Protected", "Normal", - "int", TQString( "attribute_%1" ).tqarg( ++m_count ) ); + "int", TQString( "attribute_%1" ).arg( ++m_count ) ); attributes->setCurrentItem( item ); attributes->setSelected( item, true ); @@ -248,13 +248,13 @@ TQString AddAttributeDialog::accessID( VariableDom var ) const switch ( var->access() ) { case CodeModelItem::Public: - return TQString::tqfromLatin1( "Public" ); + return TQString::fromLatin1( "Public" ); case CodeModelItem::Protected: - return TQString::tqfromLatin1( "Protected" ); + return TQString::fromLatin1( "Protected" ); case CodeModelItem::Private: - return TQString::tqfromLatin1( "Private" ); + return TQString::fromLatin1( "Private" ); } return TQString(); diff --git a/languages/cpp/addattributedialogbase.ui b/languages/cpp/addattributedialogbase.ui index 0ad0f62e..4e42f714 100644 --- a/languages/cpp/addattributedialogbase.ui +++ b/languages/cpp/addattributedialogbase.ui @@ -79,7 +79,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>20</height> @@ -133,7 +133,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -178,7 +178,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -244,7 +244,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp index 6f13ed91..dfb6c314 100644 --- a/languages/cpp/addmethoddialog.cpp +++ b/languages/cpp/addmethoddialog.cpp @@ -41,7 +41,7 @@ #include <tqcheckbox.h> #include <tqpushbutton.h> #include <tqtoolbutton.h> -#include <tqtextstream.h> +#include <textstream.h> AddMethodDialog::AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, TQWidget* parent, const char* name, bool modal, WFlags fl ) @@ -119,24 +119,24 @@ void AddMethodDialog::reject() TQString AddMethodDialog::accessID( FunctionDom fun ) const { if ( fun->isSignal() ) - return TQString::tqfromLatin1( "Signals" ); + return TQString::fromLatin1( "Signals" ); switch ( fun->access() ) { case CodeModelItem::Public: if ( fun->isSlot() ) - return TQString::tqfromLatin1( "Public Slots" ); - return TQString::tqfromLatin1( "Public" ); + return TQString::fromLatin1( "Public Slots" ); + return TQString::fromLatin1( "Public" ); case CodeModelItem::Protected: if ( fun->isSlot() ) - return TQString::tqfromLatin1( "Protected Slots" ); - return TQString::tqfromLatin1( "Protected" ); + return TQString::fromLatin1( "Protected Slots" ); + return TQString::fromLatin1( "Protected" ); case CodeModelItem::Private: if ( fun->isSlot() ) - return TQString::tqfromLatin1( "Private Slots" ); - return TQString::tqfromLatin1( "Private" ); + return TQString::fromLatin1( "Private Slots" ); + return TQString::fromLatin1( "Private" ); } return TQString(); @@ -248,7 +248,7 @@ void AddMethodDialog::accept() bool isInline = currentItem->text( 0 ) == "True"; if ( !isInline ) { - editIface->insertLine( editIface->numLines(), TQString::tqfromLatin1( "" ) ); + editIface->insertLine( editIface->numLines(), TQString::fromLatin1( "" ) ); editIface->insertText( editIface->numLines() - 1, 0, str ); m_cppSupport->backgroundParser() ->addFile( implementationFile ); } @@ -293,7 +293,7 @@ void AddMethodDialog::updateGUI() void AddMethodDialog::addMethod() { TQListViewItem * item = new TQListViewItem( methods, "False", "Public", "Normal", - "void", TQString( "method_%1()" ).tqarg( ++m_count ), + "void", TQString( "method_%1()" ).arg( ++m_count ), sourceFile->currentText() ); methods->setCurrentItem( item ); methods->setSelected( item, true ); @@ -387,7 +387,7 @@ TQString AddMethodDialog::functionDefinition( TQListViewItem* item ) const << ind << " */\n"; stream - << ind << item->text( 3 ) << " " << ( isInline ? TQString::tqfromLatin1( "" ) : fullName + "::" ) + << ind << item->text( 3 ) << " " << ( isInline ? TQString::fromLatin1( "" ) : fullName + "::" ) << item->text( 4 ) << "\n" << ind << "{\n" << ind << " /// @todo implement me\n" diff --git a/languages/cpp/addmethoddialogbase.ui b/languages/cpp/addmethoddialogbase.ui index a3887be6..a8048708 100644 --- a/languages/cpp/addmethoddialogbase.ui +++ b/languages/cpp/addmethoddialogbase.ui @@ -90,7 +90,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>20</height> @@ -144,7 +144,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -189,7 +189,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -300,7 +300,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp index 4b78645a..9666125e 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.cpp @@ -8,7 +8,7 @@ #include <tqtoolbutton.h> #include <tqpopupmenu.h> #include <tqmenubar.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqfile.h> #include <tqfiledialog.h> #include <statusbar.h> @@ -16,7 +16,7 @@ #include <tqprinter.h> #include <tqapplication.h> #include <tqaccel.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqpainter.h> #include <tqpaintdevicemetrics.h> #include <tqwhatsthis.h> @@ -159,7 +159,7 @@ void %{APPNAME}::load( const TQString &fileName ) e->setText( ts.read() ); e->setModified( FALSE ); setCaption( fileName ); - statusBar()->message( tr("Loaded document %1").tqarg(fileName), 2000 ); + statusBar()->message( tr("Loaded document %1").arg(fileName), 2000 ); } @@ -173,7 +173,7 @@ void %{APPNAME}::save() TQString text = e->text(); TQFile f( filename ); if ( !f.open( IO_WriteOnly ) ) { - statusBar()->message( tr("Could not write to %1").tqarg(filename), + statusBar()->message( tr("Could not write to %1").arg(filename), 2000 ); return; } @@ -186,7 +186,7 @@ void %{APPNAME}::save() setCaption( filename ); - statusBar()->message( tr( "File %1 saved" ).tqarg( filename ), 2000 ); + statusBar()->message( tr( "File %1 saved" ).arg( filename ), 2000 ); } diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp index 5f9d906a..9cc3cec3 100644 --- a/languages/cpp/app_templates/kapp/appview.cpp +++ b/languages/cpp/app_templates/kapp/appview.cpp @@ -3,7 +3,7 @@ #include "%{APPNAMELC}view.h" #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <kurl.h> @@ -17,7 +17,7 @@ : TQWidget(parent), DCOPObject("%{APPNAME}Iface") { - // setup our tqlayout manager to automatically add our widgets + // setup our layout manager to automatically add our widgets TQHBoxLayout *top_layout = new TQHBoxLayout(this); top_layout->setAutoAdd(true); diff --git a/languages/cpp/app_templates/kapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp index 673df14e..87951c76 100644 --- a/languages/cpp/app_templates/kapp/pref.cpp +++ b/languages/cpp/app_templates/kapp/pref.cpp @@ -4,7 +4,7 @@ #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> %{APPNAME}Preferences::%{APPNAME}Preferences() @@ -25,8 +25,8 @@ %{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *parent) : TQFrame(parent) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this); + layout->setAutoAdd(true); new TQLabel(i18n("Add something here"), this); } @@ -34,8 +34,8 @@ %{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *parent) : TQFrame(parent) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this); + layout->setAutoAdd(true); new TQLabel(i18n("Add something here"), this); } diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 18595d10..d159d8f4 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -7,7 +7,7 @@ #include <kstandarddirs.h> #include <kfiledialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> class PluginView : public KXMLGUIClient diff --git a/languages/cpp/app_templates/kcmodule/module.cpp b/languages/cpp/app_templates/kcmodule/module.cpp index bb15b923..3e0c0512 100644 --- a/languages/cpp/app_templates/kcmodule/module.cpp +++ b/languages/cpp/app_templates/kcmodule/module.cpp @@ -1,6 +1,6 @@ %{CPP_TEMPLATE} -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kglobal.h> diff --git a/languages/cpp/app_templates/kconfig35/appview.cpp b/languages/cpp/app_templates/kconfig35/appview.cpp index 6123db0b..30d627fe 100644 --- a/languages/cpp/app_templates/kconfig35/appview.cpp +++ b/languages/cpp/app_templates/kconfig35/appview.cpp @@ -33,7 +33,7 @@ void %{APPNAMELC}View::settingsChanged() sillyLabel->setPaletteForegroundColor( Settings::col_foreground() ); // i18n : internationalization - sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) ); + sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) ); emit signalChangeStatusbar( i18n("Settings changed") ); } diff --git a/languages/cpp/app_templates/kconfig35/prefs-base.ui b/languages/cpp/app_templates/kconfig35/prefs-base.ui index 46a35473..03af967a 100644 --- a/languages/cpp/app_templates/kconfig35/prefs-base.ui +++ b/languages/cpp/app_templates/kconfig35/prefs-base.ui @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> diff --git a/languages/cpp/app_templates/kde4app/kapp4view_base.ui b/languages/cpp/app_templates/kde4app/kapp4view_base.ui index c3780092..6738a789 100644 --- a/languages/cpp/app_templates/kde4app/kapp4view_base.ui +++ b/languages/cpp/app_templates/kde4app/kapp4view_base.ui @@ -15,7 +15,7 @@ <property name="autoFillBackground" > <bool>true</bool> </property> - <tqlayout class="TQGridLayout" > + <layout class="TQGridLayout" > <property name="leftMargin" > <number>11</number> </property> @@ -196,7 +196,7 @@ <property name="scaledContents" > <bool>true</bool> </property> - <property name="tqalignment" > + <property name="alignment" > <set>Qt::AlignCenter</set> </property> <property name="wordWrap" > @@ -204,7 +204,7 @@ </property> </widget> </item> - </tqlayout> + </layout> </widget> <layoutdefault spacing="6" margin="11" /> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> diff --git a/languages/cpp/app_templates/kde4app/prefs_base.ui b/languages/cpp/app_templates/kde4app/prefs_base.ui index f1e5fdfb..87a191f1 100644 --- a/languages/cpp/app_templates/kde4app/prefs_base.ui +++ b/languages/cpp/app_templates/kde4app/prefs_base.ui @@ -9,7 +9,7 @@ <height>156</height> </rect> </property> - <tqlayout class="TQGridLayout" > + <layout class="TQGridLayout" > <item row="0" column="0" > <widget class="TQLabel" name="textLabel2_2" > <property name="text" > @@ -80,7 +80,7 @@ p, li { white-space: pre-wrap; } <property name="sizeType" > <enum>QSizePolicy::Expanding</enum> </property> - <property name="tqsizeHint" > + <property name="sizeHint" > <size> <width>41</width> <height>20</height> @@ -96,7 +96,7 @@ p, li { white-space: pre-wrap; } <property name="sizeType" > <enum>QSizePolicy::Expanding</enum> </property> - <property name="tqsizeHint" > + <property name="sizeHint" > <size> <width>41</width> <height>20</height> @@ -128,7 +128,7 @@ p, li { white-space: pre-wrap; } <property name="sizeType" > <enum>QSizePolicy::Expanding</enum> </property> - <property name="tqsizeHint" > + <property name="sizeHint" > <size> <width>41</width> <height>20</height> @@ -136,7 +136,7 @@ p, li { white-space: pre-wrap; } </property> </spacer> </item> - </tqlayout> + </layout> </widget> <layoutdefault spacing="6" margin="11" /> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> diff --git a/languages/cpp/app_templates/kioslave/slave.cpp b/languages/cpp/app_templates/kioslave/slave.cpp index ad5d7991..c8dc5d81 100644 --- a/languages/cpp/app_templates/kioslave/slave.cpp +++ b/languages/cpp/app_templates/kioslave/slave.cpp @@ -48,7 +48,7 @@ void kio_%{APPNAMELC}Protocol::get(const KURL& url ) int remotePort = url.port(); kdDebug() << "myURL: " << url.prettyURL() << endl; - infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) ); + infoMessage(i18n("Looking for %1...").arg( remoteServer ) ); // Send the mimeType as soon as it is known mimeType("text/plain"); // Send the data diff --git a/languages/cpp/app_templates/kmake/mainview.ui b/languages/cpp/app_templates/kmake/mainview.ui index 94fb52fa..194d8ffe 100644 --- a/languages/cpp/app_templates/kmake/mainview.ui +++ b/languages/cpp/app_templates/kmake/mainview.ui @@ -45,7 +45,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index 1f3992af..6d9bf7ac 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -9,7 +9,7 @@ #include <klocale.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqmultilineedit.h> %{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp index 06a6409c..0094f5dd 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp @@ -11,7 +11,7 @@ #include <klocale.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqmultilineedit.h> typedef KParts::GenericFactory<%{APPNAMELC}Part> %{APPNAMELC}PartFactory; diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp index 006b844e..a1cfb9f0 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp @@ -1,7 +1,7 @@ %{CPP_TEMPLATE} #include <tqpixmap.h> -#include <tqlayout.h> +#include <layout.h> #include <kiconloader.h> #include <klocale.h> @@ -35,9 +35,9 @@ part()->widget()->setFocus(); setFocusProxy(part()->widget()); - TQBoxLayout* tqlayout = new TQHBoxLayout(this, 0, -1, "kdissertviewtqlayout" ); + TQBoxLayout* layout = new TQHBoxLayout(this, 0, -1, "kdissertviewlayout" ); part()->widget()->reparent( this, TQPoint(0, 0) ); - tqlayout->addWidget( part()->widget() ); + layout->addWidget( part()->widget() ); // connect( m_part, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(updateCaption()) ); } diff --git a/languages/cpp/app_templates/kscons_kxt/appview.cpp b/languages/cpp/app_templates/kscons_kxt/appview.cpp index f2dd28a3..2bcc9c6a 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview.cpp +++ b/languages/cpp/app_templates/kscons_kxt/appview.cpp @@ -33,7 +33,7 @@ void %{APPNAME}View::settingsChanged() sillyLabel->setPaletteForegroundColor( Settings::col_foreground() ); // i18n : internationalization - sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) ); + sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) ); emit signalChangeStatusbar( i18n("Settings changed") ); } diff --git a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui index a343c6cf..b1115e6f 100644 --- a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui +++ b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui @@ -68,7 +68,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -113,7 +113,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> diff --git a/languages/cpp/app_templates/kxt/appview.cpp b/languages/cpp/app_templates/kxt/appview.cpp index 6123db0b..30d627fe 100644 --- a/languages/cpp/app_templates/kxt/appview.cpp +++ b/languages/cpp/app_templates/kxt/appview.cpp @@ -33,7 +33,7 @@ void %{APPNAMELC}View::settingsChanged() sillyLabel->setPaletteForegroundColor( Settings::col_foreground() ); // i18n : internationalization - sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) ); + sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) ); emit signalChangeStatusbar( i18n("Settings changed") ); } diff --git a/languages/cpp/app_templates/kxt/prefs-base.ui b/languages/cpp/app_templates/kxt/prefs-base.ui index 46a35473..03af967a 100644 --- a/languages/cpp/app_templates/kxt/prefs-base.ui +++ b/languages/cpp/app_templates/kxt/prefs-base.ui @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp index 508f7cc9..b8654693 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp +++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp @@ -11,7 +11,7 @@ #include <tqpushbutton.h> #include <tqdragobject.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqobjectlist.h> #include <tqobjectdict.h> @@ -124,7 +124,7 @@ connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden())); // Event Filter for the RMB - for (TQPtrListIterator<TQObject> i(*tqchildren()); i.current(); ++i) + for (TQPtrListIterator<TQObject> i(*children()); i.current(); ++i) (*i)->installEventFilter(this); setCaption("Noatun"); @@ -132,7 +132,7 @@ show(); // What it is now, stay. - setFixedSize(tqminimumSize()); + setFixedSize(minimumSize()); } %{APPNAME}UI::~%{APPNAME}UI() @@ -189,7 +189,7 @@ void %{APPNAME}UI::changeCaption(const TQString& text) void %{APPNAME}UI::popup() { NoatunStdAction::ContextMenu::showContextMenu( - mapToGlobal(mPopup->tqgeometry().bottomLeft()) ); + mapToGlobal(mPopup->geometry().bottomLeft()) ); } void %{APPNAME}UI::slotPlaying() diff --git a/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp b/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp index f84a4fd3..5a5df025 100644 --- a/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp +++ b/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp @@ -117,7 +117,7 @@ void Bitmap<Type>::fadeStar() d++; x++; } - tqrepaint(); + repaint(); } } @@ -220,7 +220,7 @@ void %{APPNAME}View::checkInput() #define output2 ((unsigned char*)outputBmp.data) -void %{APPNAME}View::tqrepaint() +void %{APPNAME}View::repaint() { SDL_LockSurface(surface); TEST(); diff --git a/languages/cpp/app_templates/noatunvisual/plugin_impl.h b/languages/cpp/app_templates/noatunvisual/plugin_impl.h index a95845c9..2a7de7b1 100644 --- a/languages/cpp/app_templates/noatunvisual/plugin_impl.h +++ b/languages/cpp/app_templates/noatunvisual/plugin_impl.h @@ -58,7 +58,7 @@ protected: void setupPalette(double dummy=0.0); /** Draw everything. */ - void tqrepaint(); + void repaint(); private: /** used for pipelining */ diff --git a/languages/cpp/app_templates/opieapp/example.h b/languages/cpp/app_templates/opieapp/example.h index 7da09f5a..92a4019f 100644 --- a/languages/cpp/app_templates/opieapp/example.h +++ b/languages/cpp/app_templates/opieapp/example.h @@ -9,7 +9,7 @@ class %{APPNAME} : public %{APPNAME}Base public: static TQString appName() { - return TQString::tqfromLatin1("%{APPNAMELC}" ); + return TQString::fromLatin1("%{APPNAMELC}" ); } %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}(); diff --git a/languages/cpp/app_templates/opieapp/examplebase.ui b/languages/cpp/app_templates/opieapp/examplebase.ui index 90d39d17..b6b81b11 100644 --- a/languages/cpp/app_templates/opieapp/examplebase.ui +++ b/languages/cpp/app_templates/opieapp/examplebase.ui @@ -7,7 +7,7 @@ <cstring>%{APPNAME}Base</cstring> </property> <property stdset="1"> - <name>tqgeometry</name> + <name>geometry</name> <rect> <x>0</x> <y>0</y> diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp index 6a7bef4f..a4c2e177 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp @@ -58,7 +58,7 @@ void %{APPNAME}::slotKey(int _ke){ /* * Send the key - * ke is the tqunicode + * ke is the unicode * _ke + 0x41 is the keycode * m_state Normally the state * down/up diff --git a/languages/cpp/app_templates/opienet/simmplemodule.h b/languages/cpp/app_templates/opienet/simmplemodule.h index 5c928ec9..b19152b6 100644 --- a/languages/cpp/app_templates/opienet/simmplemodule.h +++ b/languages/cpp/app_templates/opienet/simmplemodule.h @@ -12,7 +12,7 @@ public: VirtualModule(); ~VirtualModule(); - const TQString type() {return TQString::tqfromLatin1("vpn" );} + const TQString type() {return TQString::fromLatin1("vpn" );} void setProfile( const TQString& ) {} bool isOwner( Interface* ); TQWidget *configure( Interface* ); @@ -21,7 +21,7 @@ public: void possibleNewInterfaces( TQMap<TQString, TQString>& ); Interface *addNewInterface( const TQString& ); bool remove( Interface* iface ); - TQString getPixmapName( Interface* ) {return TQString::tqfromLatin1("Tux"); } + TQString getPixmapName( Interface* ) {return TQString::fromLatin1("Tux"); } void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen private: TQList<Interface> m_interfaces; diff --git a/languages/cpp/app_templates/opienet/simpleiface.cpp b/languages/cpp/app_templates/opienet/simpleiface.cpp index e98148d2..bbabcbda 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.cpp +++ b/languages/cpp/app_templates/opienet/simpleiface.cpp @@ -31,13 +31,13 @@ bool %{APPNAME}Interface::refresh() { void %{APPNAME}Interface::start() { // call pptp - settqStatus(true); + setStatus(true); refresh(); emit updateMessage("VPN started"); } void %{APPNAME}Interface::stop() { - settqStatus(false ); + setStatus(false ); refresh(); emit updateMessage("VPN halted"); } diff --git a/languages/cpp/app_templates/opienet/simplemodule.h b/languages/cpp/app_templates/opienet/simplemodule.h index 327c1d43..6fce8b10 100644 --- a/languages/cpp/app_templates/opienet/simplemodule.h +++ b/languages/cpp/app_templates/opienet/simplemodule.h @@ -12,7 +12,7 @@ public: %{APPNAME}Module(); ~%{APPNAME}Module(); - const TQString type() {return TQString::tqfromLatin1("vpn" );} + const TQString type() {return TQString::fromLatin1("vpn" );} void setProfile( const TQString& ) {} bool isOwner( Interface* ); TQWidget *configure( Interface* ); @@ -21,7 +21,7 @@ public: void possibleNewInterfaces( TQMap<TQString, TQString>& ); Interface *addNewInterface( const TQString& ); bool remove( Interface* iface ); - TQString getPixmapName( Interface* ) {return TQString::tqfromLatin1("Tux"); } + TQString getPixmapName( Interface* ) {return TQString::fromLatin1("Tux"); } void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen private: TQList<Interface> m_interfaces; diff --git a/languages/cpp/app_templates/opietoday/exampleplugin.cpp b/languages/cpp/app_templates/opietoday/exampleplugin.cpp index 12d702b6..3606927f 100644 --- a/languages/cpp/app_templates/opietoday/exampleplugin.cpp +++ b/languages/cpp/app_templates/opietoday/exampleplugin.cpp @@ -19,7 +19,7 @@ double %{APPNAME}::versionNumber() const { // this sets the image that will be shown on the left side of the plugin TQString %{APPNAME}::pixmapNameWidget() const { - return TQString::tqfromLatin1("%{APPNAMELC}/%{APPNAMELC}"); + return TQString::fromLatin1("%{APPNAMELC}/%{APPNAMELC}"); } TQWidget* %{APPNAME}::widget( TQWidget * wid ) { diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.h b/languages/cpp/app_templates/opietoday/examplepluginwidget.h index f079013e..ddb38793 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.h +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.h @@ -1,7 +1,7 @@ #ifndef %{APPNAME}_PLUGIN_WIDGET_H #define %{APPNAME}_PLUGIN_WIDGET_H -#include <tqlayout.h> +#include <layout.h> #include <opie/oclickablelabel.h> diff --git a/languages/cpp/app_templates/prc-tool/palmhello.c b/languages/cpp/app_templates/prc-tool/palmhello.c index e0317932..0a34b6c4 100644 --- a/languages/cpp/app_templates/prc-tool/palmhello.c +++ b/languages/cpp/app_templates/prc-tool/palmhello.c @@ -22,7 +22,7 @@ static Boolean MainFormHandleEvent (EventPtr e) break; case menuEvent: - MenuErasetqStatus(NULL); + MenuEraseStatus(NULL); switch(e->data.menu.itemID) { } diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp index 4b78645a..9666125e 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp @@ -8,7 +8,7 @@ #include <tqtoolbutton.h> #include <tqpopupmenu.h> #include <tqmenubar.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqfile.h> #include <tqfiledialog.h> #include <statusbar.h> @@ -16,7 +16,7 @@ #include <tqprinter.h> #include <tqapplication.h> #include <tqaccel.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqpainter.h> #include <tqpaintdevicemetrics.h> #include <tqwhatsthis.h> @@ -159,7 +159,7 @@ void %{APPNAME}::load( const TQString &fileName ) e->setText( ts.read() ); e->setModified( FALSE ); setCaption( fileName ); - statusBar()->message( tr("Loaded document %1").tqarg(fileName), 2000 ); + statusBar()->message( tr("Loaded document %1").arg(fileName), 2000 ); } @@ -173,7 +173,7 @@ void %{APPNAME}::save() TQString text = e->text(); TQFile f( filename ); if ( !f.open( IO_WriteOnly ) ) { - statusBar()->message( tr("Could not write to %1").tqarg(filename), + statusBar()->message( tr("Could not write to %1").arg(filename), 2000 ); return; } @@ -186,7 +186,7 @@ void %{APPNAME}::save() setCaption( filename ); - statusBar()->message( tr( "File %1 saved" ).tqarg( filename ), 2000 ); + statusBar()->message( tr( "File %1 saved" ).arg( filename ), 2000 ); } diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp index f2178d9d..c3a8964f 100644 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp +++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.cpp @@ -223,8 +223,8 @@ void %{APPNAME}::loadFile(const TQString &fileName) if (!file.open(TQFile::ReadOnly | TQFile::Text)) { TQMessageBox::warning(this, tr("Application"), tr("Cannot read file %1:\n%2.") - .tqarg(fileName) - .tqarg(file.errorString())); + .arg(fileName) + .arg(file.errorString())); return; } @@ -243,8 +243,8 @@ bool %{APPNAME}::saveFile(const TQString &fileName) if (!file.open(TQFile::WriteOnly | TQFile::Text)) { TQMessageBox::warning(this, tr("Application"), tr("Cannot write file %1:\n%2.") - .tqarg(fileName) - .tqarg(file.errorString())); + .arg(fileName) + .arg(file.errorString())); return false; } @@ -270,7 +270,7 @@ void %{APPNAME}::setCurrentFile(const TQString &fileName) else shownName = strippedName(curFile); - setWindowTitle(tr("%1[*] - %2").tqarg(shownName).tqarg(tr("Application"))); + setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Application"))); } TQString %{APPNAME}::strippedName(const TQString &fullFileName) diff --git a/languages/cpp/app_templates/qtopia4app/examplebase.ui b/languages/cpp/app_templates/qtopia4app/examplebase.ui index 76e7d49f..107d4e96 100644 --- a/languages/cpp/app_templates/qtopia4app/examplebase.ui +++ b/languages/cpp/app_templates/qtopia4app/examplebase.ui @@ -15,7 +15,7 @@ <property name="windowTitle" > <string>%{APPNAME}</string> </property> - <tqlayout class="TQVBoxLayout" > + <layout class="TQVBoxLayout" > <property name="margin" > <number>11</number> </property> @@ -39,6 +39,6 @@ </property> </widget> </item> - </tqlayout> + </layout> </widget> </ui> diff --git a/languages/cpp/app_templates/qtopiaapp/examplebase.ui b/languages/cpp/app_templates/qtopiaapp/examplebase.ui index 90d39d17..b6b81b11 100644 --- a/languages/cpp/app_templates/qtopiaapp/examplebase.ui +++ b/languages/cpp/app_templates/qtopiaapp/examplebase.ui @@ -7,7 +7,7 @@ <cstring>%{APPNAME}Base</cstring> </property> <property stdset="1"> - <name>tqgeometry</name> + <name>geometry</name> <rect> <x>0</x> <y>0</y> diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp index 9fded09c..f6d19c2a 100644 --- a/languages/cpp/ast_utils.cpp +++ b/languages/cpp/ast_utils.cpp @@ -40,8 +40,8 @@ AST* findNodeAt( AST* node, int line, int column ) ( line < endLine || ( line == endLine && column < endColumn ) ) ) { - TQPtrList<AST> tqchildren = node->tqchildren(); - TQPtrListIterator<AST> it( tqchildren ); + TQPtrList<AST> children = node->children(); + TQPtrListIterator<AST> it( children ); while ( it.current() ) { AST * a = it.current(); @@ -73,7 +73,7 @@ void scopeOfNode( AST* ast, TQStringList& scope ) if ( ( ( ClassSpecifierAST* ) ast ) ->name() ) { s = ( ( ClassSpecifierAST* ) ast ) ->name() ->text(); - s = s.isEmpty() ? TQString::tqfromLatin1( "<unnamed>" ) : s; + s = s.isEmpty() ? TQString::fromLatin1( "<unnamed>" ) : s; scope.push_back( s ); } break; @@ -81,7 +81,7 @@ void scopeOfNode( AST* ast, TQStringList& scope ) case NodeType_Namespace: { AST* namespaceName = ( ( NamespaceAST* ) ast ) ->namespaceName(); - s = namespaceName ? namespaceName->text() : TQString::tqfromLatin1( "<unnamed>" ); + s = namespaceName ? namespaceName->text() : TQString::fromLatin1( "<unnamed>" ); scope.push_back( s ); } break; @@ -141,7 +141,7 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b text += scope; if ( declarator->subDeclarator() ) - text += TQString::tqfromLatin1( "(" ) + declaratorToString( declarator->subDeclarator() ) + TQString::tqfromLatin1( ")" ); + text += TQString::fromLatin1( "(" ) + declaratorToString( declarator->subDeclarator() ) + TQString::fromLatin1( ")" ); if ( declarator->declaratorId() ) text += declarator->declaratorId() ->text(); diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp index 668c5599..df9a2383 100644 --- a/languages/cpp/backgroundparser.cpp +++ b/languages/cpp/backgroundparser.cpp @@ -34,7 +34,7 @@ #include <tqfile.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <list> #include <tqdatastream.h> diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index 445940e6..196c4d16 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -22,7 +22,7 @@ #include <tqheader.h> #include <tqcolor.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> // kde includes #include <kdevproject.h> @@ -230,7 +230,7 @@ void CCConfigWidget::slotRemovePCS() return ; TQString db = advancedOptions->selectedItem() ->text( 0 ); - TQString question = i18n( "Are you sure you want to delete the \"%1\" database?" ).tqarg( db ); + TQString question = i18n( "Are you sure you want to delete the \"%1\" database?" ).arg( db ); KStandardDirs *dirs = m_pPart->instance() ->dirs(); TQString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + KURL::encode_string_no_slash( db ) + ".db"; @@ -561,7 +561,7 @@ void CCConfigWidget::openPluginPaths() kdDebug(9024) << "Plugin paths opened" << endl; QtBuildConfig* c = m_pPart->qtBuildConfig(); KDialog d( this ); - TQVBoxLayout* maintqlayout = new TQVBoxLayout( &d ); + TQVBoxLayout* mainlayout = new TQVBoxLayout( &d ); KPushButton* ok = new KPushButton( KStdGuiItem::ok(), &d ); connect( ok, TQT_SIGNAL(clicked()), &d, TQT_SLOT(accept())); KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), &d ); @@ -576,8 +576,8 @@ void CCConfigWidget::openPluginPaths() req->setMode( KFile::Directory ); KEditListBox* p = new KEditListBox( i18n( "Plugin Paths" ), req->customEditor(), &d ); p->insertStringList( c->designerPluginPaths() ); - maintqlayout->addWidget( p ); - maintqlayout->addLayout( btns ); + mainlayout->addWidget( p ); + mainlayout->addLayout( btns ); d.resize( 450, 250 ); if( d.exec() == TQDialog::Accepted) { diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui index 441d1bb1..dae89168 100644 --- a/languages/cpp/ccconfigwidgetbase.ui +++ b/languages/cpp/ccconfigwidgetbase.ui @@ -36,7 +36,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -77,7 +77,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -93,7 +93,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -227,7 +227,7 @@ completion-box.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -243,7 +243,7 @@ completion-box.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -299,7 +299,7 @@ argument hint</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -397,7 +397,7 @@ Note: Parsing may become very slow when this is enabled </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -413,7 +413,7 @@ Note: Parsing may become very slow when this is enabled <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -449,7 +449,7 @@ Note: Parsing may become very slow when this is enabled <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -558,7 +558,7 @@ if they were one("a=b" is equivalent to "a<<b;b<<a")</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -605,7 +605,7 @@ if they were one("a=b" is equivalent to "a<<b;b<<a")</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -691,7 +691,7 @@ navigate the header and vice versa</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>400</height> @@ -853,7 +853,7 @@ plugin enabled to have use all options.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>337</height> @@ -905,7 +905,7 @@ This option only applies to QMake projects.</string> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -949,7 +949,7 @@ This option only applies to QMake projects.</string> <property name="text"> <string>(After changing the project needs to be re-opened)</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -963,7 +963,7 @@ This option only applies to QMake projects.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>470</width> <height>20</height> @@ -974,7 +974,7 @@ This option only applies to QMake projects.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -1006,7 +1006,7 @@ This option only applies to QMake projects.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -1149,7 +1149,7 @@ This option only applies to QMake projects.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -1178,7 +1178,7 @@ This option only applies to QMake projects.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -1217,7 +1217,7 @@ This option only applies to QMake projects.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>70</height> @@ -1250,7 +1250,7 @@ This option only applies to QMake projects.</string> </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout5_2</cstring> + <cstring>layout5_2</cstring> </property> <hbox> <property name="name"> @@ -1282,7 +1282,7 @@ This option only applies to QMake projects.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -1435,7 +1435,7 @@ you right click on a variable in a header file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>87</width> <height>20</height> @@ -1460,7 +1460,7 @@ you right click on a variable in a header file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>87</width> <height>20</height> @@ -1477,7 +1477,7 @@ you right click on a variable in a header file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>92</width> <height>20</height> @@ -1494,7 +1494,7 @@ you right click on a variable in a header file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>92</width> <height>20</height> @@ -1513,7 +1513,7 @@ you right click on a variable in a header file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>91</height> diff --git a/languages/cpp/classgeneratorconfig.cpp b/languages/cpp/classgeneratorconfig.cpp index 70ad5d10..eab8beac 100644 --- a/languages/cpp/classgeneratorconfig.cpp +++ b/languages/cpp/classgeneratorconfig.cpp @@ -11,7 +11,7 @@ #include <tqcheckbox.h> #include <tqcombobox.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqfile.h> #include <tqfileinfo.h> diff --git a/languages/cpp/codeinformationrepository.cpp b/languages/cpp/codeinformationrepository.cpp index 7498ad23..cf255601 100644 --- a/languages/cpp/codeinformationrepository.cpp +++ b/languages/cpp/codeinformationrepository.cpp @@ -265,7 +265,7 @@ KTextEditor::CompletionEntry CodeInformationRepository::toEntry( Tag & tag, CppC { TQString argName = argumentNames[ i ]; if ( !argName.isEmpty() ) - signature += TQString::tqfromLatin1( " " ) + argName; + signature += TQString::fromLatin1( " " ) + argName; } diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp index ca2d8fa5..30f0b7ac 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp @@ -15,7 +15,7 @@ #include <tqradiobutton.h> #include <tqvaluelist.h> #include <tqtabwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <kdialog.h> #include <klocale.h> @@ -101,9 +101,9 @@ private: GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { - TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - tqlayout->setAutoAdd( true ); - tqlayout->addSpacing( 10 ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + layout->setAutoAdd( true ); + layout->addSpacing( 10 ); TQVButtonGroup *output_group = new TQVButtonGroup( i18n( "Output" ), this ); new FlagCheckBox( output_group, controller, @@ -114,7 +114,7 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const cha "-save-temps", i18n( "Do not delete intermediate output like assembler files" ) ); TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); - tqlayout->addSpacing( 10 ); + layout->addSpacing( 10 ); TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this ); if ( type != GccOptionsPlugin::GPP ) @@ -142,7 +142,7 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const cha "-short-double", i18n( "Make 'double' the same as 'float'" ) ); TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); - tqlayout->addStretch(); + layout->addStretch(); } @@ -167,8 +167,8 @@ void GeneralTab::writeFlags( TQStringList *list ) OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - tqlayout->setAutoAdd( true ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + layout->setAutoAdd( true ); TQVButtonGroup *group = new TQVButtonGroup( i18n( "Optimization Level" ), this ); Odefault = new TQRadioButton( i18n( "Default" ), group ); @@ -211,7 +211,7 @@ OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent, } TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); - tqlayout->addStretch(); + layout->addStretch(); } @@ -264,9 +264,9 @@ void OptimizationTab::writeFlags( TQStringList *list ) G77Tab::G77Tab( TQWidget *parent, const char *name ) : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { - TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - tqlayout->setAutoAdd( true ); - tqlayout->addSpacing( 10 ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + layout->setAutoAdd( true ); + layout->addSpacing( 10 ); TQVButtonGroup *dialect_group = new TQVButtonGroup( i18n( "Dialect" ), this ); new FlagCheckBox( dialect_group, controller, @@ -283,7 +283,7 @@ G77Tab::G77Tab( TQWidget *parent, const char *name ) "-fonetrip", i18n( "DO loops are executed at least once" ) ); TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); - tqlayout->addSpacing( 10 ); + layout->addSpacing( 10 ); TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this ); new FlagCheckBox( codegen_group, controller, @@ -294,7 +294,7 @@ G77Tab::G77Tab( TQWidget *parent, const char *name ) "-fbounds-check", i18n( "Generate run-time checks for array subscripts" ) ); TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); - tqlayout->addStretch(); + layout->addStretch(); } @@ -319,8 +319,8 @@ void G77Tab::writeFlags( TQStringList *list ) Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { - TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - tqlayout->setAutoAdd( true ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + layout->setAutoAdd( true ); new FlagCheckBox( this, controller, "-w", i18n( "Inhibit all warnings" ) ); @@ -417,8 +417,8 @@ void Warnings1Tab::writeFlags( TQStringList *list ) Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - tqlayout->setAutoAdd( true ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + layout->setAutoAdd( true ); wrestBox = new FlagListBox( this ); @@ -438,7 +438,7 @@ Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const "qualifier from the target type</qt>" ) ); new FlagListItem( wrestBox, "-Wcast-align", i18n( "<qt>Warn whenever a pointer is cast such that the required\n" - "tqalignment of the target is increased</qt>" ) ); + "alignment of the target is increased</qt>" ) ); new FlagListItem( wrestBox, "-Wwrite-strings", i18n( "<qt>Warn when the address of a string constant is cast\n" "into a non-const <i>char *</i> pointer</qt>" ) ); @@ -463,7 +463,7 @@ Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const "deprecated by using the 'deprecated' attribute</qt>" ) ); new FlagListItem( wrestBox, "-Wpacked", i18n( "<qt>Warn if a structure is given the packed attribute, but the packed\n" - "attribute has no effect on the tqlayout or size of the structure</qt>" ) ); + "attribute has no effect on the layout or size of the structure</qt>" ) ); new FlagListItem( wrestBox, "-Wpadded", i18n( "<qt>Warn if padding is included in a structure, either to align an\n" "element of the structure or to align the whole structure</qt>" ) ); diff --git a/languages/cpp/configproblemreporter.ui b/languages/cpp/configproblemreporter.ui index fc47d3b2..d752d715 100644 --- a/languages/cpp/configproblemreporter.ui +++ b/languages/cpp/configproblemreporter.ui @@ -62,7 +62,7 @@ If disabled, the parser will typically only run when the file is saved.</string> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -91,7 +91,7 @@ If disabled, the parser will typically only run when the file is saved.</string> <property name="text"> <string>msec</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h index 1931c66f..01d30c25 100644 --- a/languages/cpp/configproblemreporter.ui.h +++ b/languages/cpp/configproblemreporter.ui.h @@ -16,7 +16,7 @@ #include <kdebug.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> void ConfigureProblemReporter::init() { @@ -92,7 +92,7 @@ void ConfigureProblemReporter::bgParserCheckbox_toggled( bool b ) void ConfigureProblemReporter::setDelayLabel( int delay ) { - delayLabel->setText( i18n( "delay: %1 msec" ).tqarg( delay ) ); + delayLabel->setText( i18n( "delay: %1 msec" ).arg( delay ) ); } // kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index 9796bd17..9fe4b073 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -356,7 +356,7 @@ struct PopupFillerHelpStruct { if ( d.memberType == SimpleTypeImpl::MemberInfo::Typedef && d.type->fullName() == "const int" ) memType = "enum"; - TQString txt = i18n( "Jump to %1 %2" ).tqarg( memType ).tqarg( cleanForMenu( d.name ) ); + TQString txt = i18n( "Jump to %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); int id = parent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) ); receiver->m_popupActions.insert( id, d.decl ); @@ -423,7 +423,7 @@ struct PopupFillerHelpStruct { int sLine, sCol, eLine, eCol; i->getStartPosition( &sLine, &sCol ); i->getEndPosition( &eLine, &eCol ); - insertItem( parent, (new SimpleTypeCodeModel( i ))->desc(), prefix + " " + (*it)->name() + TQString(" (%1 Lines): ").tqarg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion. + insertItem( parent, (new SimpleTypeCodeModel( i ))->desc(), prefix + " " + (*it)->name() + TQString(" (%1 Lines): ").arg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion. } } @@ -434,10 +434,10 @@ struct PopupFillerHelpStruct { if ( d.resolved() ) { if ( d.resolved() ->asFunction() ) { - txt1 = prefix + i18n( "Jump to declaration of %1(...)" ).tqarg( d.resolved() ->scope().join( "::" ) ); - txt2 = prefix + i18n( "Jump to definition of %1(...)" ).tqarg( d.resolved() ->scope().join( "::" ) ); + txt1 = prefix + i18n( "Jump to declaration of %1(...)" ).arg( d.resolved() ->scope().join( "::" ) ); + txt2 = prefix + i18n( "Jump to definition of %1(...)" ).arg( d.resolved() ->scope().join( "::" ) ); } else { - txt1 = prefix + i18n( "Jump to %1" ).tqarg( cleanForMenu( d.resolved() ->scope().join( "::" ) ) ); + txt1 = prefix + i18n( "Jump to %1" ).arg( cleanForMenu( d.resolved() ->scope().join( "::" ) ) ); } } else { if( !BuiltinTypes::isBuiltin( d ) ) { @@ -536,7 +536,7 @@ struct PopupClassViewFillerHelpStruct { if ( d.memberType == SimpleTypeImpl::MemberInfo::Typedef && d.type->fullName() == "const int" ) memType = "enum"; - TQString txt = i18n( "Show %1 %2" ).tqarg( memType ).tqarg( cleanForMenu( d.name ) ); + TQString txt = i18n( "Show %1 %2" ).arg( memType ).arg( cleanForMenu( d.name ) ); int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); receiver->m_popupClassViewActions.insert( id, dom ); @@ -583,7 +583,7 @@ struct PopupClassViewFillerHelpStruct { if ( d.resolved() ->asFunction() ) { n = buildSignature( d.resolved() ); } - txt = prefix + i18n( "Show %1" ).tqarg( cleanForMenu( n ) ); + txt = prefix + i18n( "Show %1" ).arg( cleanForMenu( n ) ); } else { txt = prefix + d.name() + " not in code-model"; } @@ -644,7 +644,7 @@ class PopupFiller { //kdDebug( 9007 ) << "found include-file \"" << includeFile << "\"" << endl; } - int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).tqarg ( includeFile ).tqarg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).arg ( includeFile ).arg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) ); DeclarationInfo fakeDec; fakeDec.name = decl.name; fakeDec.file = includeFile; @@ -670,7 +670,7 @@ class PopupFiller { f.type = d.desc(); f.memberType = SimpleTypeImpl::MemberInfo::Variable; - /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").tqarg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); + /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); m_popupActions.insert( id, type.sourceVariable );*/ struk.insertItem( parent, f, prefix ); @@ -679,7 +679,7 @@ class PopupFiller { if ( !sourceVariable.comment.isEmpty() ) { TQPopupMenu * m = PopupTracker::createPopup( parent ); - parent->insertItem( i18n( "Comment on %1" ).tqarg( sourceVariable.name ), m ); + parent->insertItem( i18n( "Comment on %1" ).arg( sourceVariable.name ), m ); TQStringList ls = prepareTextForMenu( sourceVariable.comment, 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); @@ -695,7 +695,7 @@ class PopupFiller { LocateResult r = p->locateDecType( d->name() ); if( r ) { TQPopupMenu * m = PopupTracker::createPopup( parent ); - parent->insertItem( i18n( "Specialized from \"%1\"" ).tqarg( cleanForMenu( r->fullNameChain() ) ), m ); + parent->insertItem( i18n( "Specialized from \"%1\"" ).arg( cleanForMenu( r->fullNameChain() ) ), m ); fill( m, r ); } } @@ -704,7 +704,7 @@ class PopupFiller { for ( TypeDesc::TemplateParams::iterator it = p.begin(); it != p.end(); ++it ) { //if( (*it)->resolved() ) { TQPopupMenu * m = PopupTracker::createPopup( parent ); - parent->insertItem( i18n( "Template-param \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); + parent->insertItem( i18n( "Template-param \"%1\"" ).arg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); fill( m, **it ); /*} else { fill( parent, **it, prefix + depthAdd ); @@ -716,7 +716,7 @@ class PopupFiller { LocateResult rt = d->resolved() ->locateDecType( d->resolved() ->asFunction() ->getReturnType() ); if ( rt ) { TQPopupMenu * m = PopupTracker::createPopup( parent ); - parent->insertItem( i18n( "Return-type \"%1\"" ).tqarg( cleanForMenu( rt->fullNameChain() ) ), m ); + parent->insertItem( i18n( "Return-type \"%1\"" ).arg( cleanForMenu( rt->fullNameChain() ) ), m ); fill( m, rt ); } @@ -734,7 +734,7 @@ class PopupFiller { ++it2; } TQPopupMenu * mo = PopupTracker::createPopup( m ); - m->insertItem( i18n( "Argument \"%1\"" ).tqarg( cleanForMenu( at->fullNameChain() + " " + name ) ), mo ); + m->insertItem( i18n( "Argument \"%1\"" ).arg( cleanForMenu( at->fullNameChain() + " " + name ) ), mo ); fill( mo, at ); } @@ -753,7 +753,7 @@ class PopupFiller { TQString tail = ( *it ).second.fullNameChain(); if ( !tail.isEmpty() ) tail = "::" + tail; - m->insertItem( i18n( "%1 -> %2" ).tqarg( cleanForMenu( ( *it ).first.name + tail ) ).tqarg( cleanForMenu( ( *it ).first.type->fullNameChain() + tail ) ), mo ); + m->insertItem( i18n( "%1 -> %2" ).arg( cleanForMenu( ( *it ).first.name + tail ) ).arg( cleanForMenu( ( *it ).first.type->fullNameChain() + tail ) ), mo ); struk.insertItem( mo, ( *it ).first, prefix ); @@ -779,20 +779,20 @@ class PopupFiller { TQValueList<LocateResult> bases = d->resolved() ->getBases(); for ( TQValueList<LocateResult>::iterator it = bases.begin(); it != bases.end(); ++it ) { TQPopupMenu * m = PopupTracker::createPopup( parent ); - parent->insertItem( i18n( "Base-class \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); + parent->insertItem( i18n( "Base-class \"%1\"" ).arg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); fill( m, *it ); } if ( d->resolved() ->parent() && d->resolved() ->parent() ->desc() ) { TQPopupMenu * m = PopupTracker::createPopup( parent ); - parent->insertItem( i18n( "Nested in \"%1\"" ).tqarg( cleanForMenu( d->resolved() ->parent() ->fullTypeResolved() ) ), m ); + parent->insertItem( i18n( "Nested in \"%1\"" ).arg( cleanForMenu( d->resolved() ->parent() ->fullTypeResolved() ) ), m ); fill( m, d->resolved() ->parent() ->desc() ); } if ( !d->resolved() ->comment().isEmpty() ) { parent->insertSeparator(); TQPopupMenu * m = PopupTracker::createPopup( parent ); - parent->insertItem( i18n( "Comment on %1" ).tqarg( cleanForMenu( d->name() ) ), m ); + parent->insertItem( i18n( "Comment on %1" ).arg( cleanForMenu( d->name() ) ), m ); TQStringList ls = prepareTextForMenu( d->resolved() ->comment(), 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); @@ -1449,7 +1449,7 @@ void CppCodeCompletion::popupAction( int number ) { TQString fileName = ( *it ).file == "current_file" ? m_activeFileName : ( *it ).file.operator TQString(); if( (*it).startLine == -1 ) { //startLine -1 indicates that the file should be added to the include-files - m_activeEditor->insertLine( 0, TQString("#include \"%1\" /* defines %2 */").tqarg( fileName ).tqarg( (*it).name ) ); + m_activeEditor->insertLine( 0, TQString("#include \"%1\" /* defines %2 */").arg( fileName ).arg( (*it).name ) ); } else { m_pSupport->partController() ->editDocument( fileName, ( *it ).startLine ); } @@ -1532,11 +1532,11 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte TQPopupMenu * m = PopupTracker::createPopup( popup ); int gid; if ( contextMenuEntriesAtTop ) - gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).tqarg( cleanForMenu( type.macro.name() ) ), m, 5, cpos++ ); + gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).arg( cleanForMenu( type.macro.name() ) ), m, 5, cpos++ ); else - gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).tqarg( cleanForMenu( type.macro.name() ) ), m ); + gid = popup->insertItem( i18n( "Navigate by Macro \"%1\"" ).arg( cleanForMenu( type.macro.name() ) ), m ); - int id = m->insertItem( i18n( "Jump to %1" ).tqarg( cleanForMenu( type.macro.name() ) ), this, TQT_SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( type.macro.name() ) ), this, TQT_SLOT( popupAction( int ) ) ); TQPopupMenu * b = PopupTracker::createPopup( m ); m->insertItem( i18n( "Body" ), b ); @@ -1564,11 +1564,11 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte int gid; TQPopupMenu * m = PopupTracker::createPopup( popup ); if ( contextMenuEntriesAtTop ) - gid = popup->insertItem( i18n( "Goto Include File: %1" ).tqarg( cleanForMenu( includeFileName ) ), m, 5, cpos++ ); + gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m, 5, cpos++ ); else - gid = popup->insertItem( i18n( "Goto Include File: %1" ).tqarg( cleanForMenu( includeFileName ) ), m ); + gid = popup->insertItem( i18n( "Goto Include File: %1" ).arg( cleanForMenu( includeFileName ) ), m ); - int id = m->insertItem( i18n( "Jump to %1" ).tqarg( cleanForMenu( includeFilePath ) ), this, TQT_SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n( "Jump to %1" ).arg( cleanForMenu( includeFilePath ) ), this, TQT_SLOT( popupAction( int ) ) ); DeclarationInfo i; i.file = includeFilePath; @@ -1585,9 +1585,9 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte } else { ///Could not find include-file if ( contextMenuEntriesAtTop ) - popup->insertItem( i18n( "Not Found: \"%1\"" ).tqarg( includeFileName ), 5, cpos++ ); + popup->insertItem( i18n( "Not Found: \"%1\"" ).arg( includeFileName ), 5, cpos++ ); else - popup->insertItem( i18n( "Not Found: \"%1\"" ).tqarg( includeFileName ) ); + popup->insertItem( i18n( "Not Found: \"%1\"" ).arg( includeFileName ) ); } } @@ -1609,14 +1609,14 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte TQPopupMenu * m = PopupTracker::createPopup( popup ); int gid; if ( contextMenuEntriesAtTop ) - gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).tqarg( cleanForMenu( name ) ), m, 5, cpos++ ); + gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).arg( cleanForMenu( name ) ), m, 5, cpos++ ); else - gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).tqarg( cleanForMenu( name ) ), m ); + gid = popup->insertItem( i18n( "Navigate by \"%1\"" ).arg( cleanForMenu( name ) ), m ); - popup->tqsetWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to navigate to positions of items that are involved in this expression" ) ); + popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to navigate to positions of items that are involved in this expression" ) ); /*if( type.sourceVariable && type.sourceVariable.name != "this" ) { - int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").tqarg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); + int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").arg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); m_popupActions.insert( id, type.sourceVariable ); }*/ @@ -1629,11 +1629,11 @@ void CppCodeCompletion::contextEvaluationMenus ( TQPopupMenu *popup, const Conte TQPopupMenu * m = PopupTracker::createPopup( popup ); int gid; if ( contextMenuEntriesAtTop ) - gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).tqarg( cleanForMenu( name ) ), m, 6, cpos++ ); + gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).arg( cleanForMenu( name ) ), m, 6, cpos++ ); else - gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).tqarg( cleanForMenu( name ) ), m ); + gid = popup->insertItem( i18n( "Navigate Class-View by \"%1\"" ).arg( cleanForMenu( name ) ), m ); - popup->tqsetWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to show involved items in the class-view " ) ); + popup->setWhatsThis( gid, i18n( "<b>Navigation</b><p>Provides a menu to show involved items in the class-view " ) ); PopupClassViewFillerHelpStruct h( this ); PopupFiller<PopupClassViewFillerHelpStruct> filler( h, "" ); @@ -1703,27 +1703,27 @@ void CppCodeCompletion::slotTextHint( int line, int column, TQString &text ) { const int timeout = 2000; if ( type->resolved() ) { - addStatusText( i18n( "Type of \"%1\" is \"%2\"" ).tqarg( type.expr.expr() ).tqarg( type->fullNameChain() ), timeout ); + addStatusText( i18n( "Type of \"%1\" is \"%2\"" ).arg( type.expr.expr() ).arg( type->fullNameChain() ), timeout ); if ( type.sourceVariable && !type.sourceVariable.comment.isEmpty() ) { - addStatusText( i18n( "Comment on variable \"%1\": \"%2\"" ).tqarg( type.sourceVariable.name ).tqarg( type.sourceVariable.comment ) , 10000 ); + addStatusText( i18n( "Comment on variable \"%1\": \"%2\"" ).arg( type.sourceVariable.name ).arg( type.sourceVariable.comment ) , 10000 ); } if ( !type->resolved() ->comment().isEmpty() ) { - addStatusText( i18n( "Comment on \"%1\": \"%2\"" ).tqarg( type->name() ).tqarg( type->resolved() ->comment() ) , 10000 ); + addStatusText( i18n( "Comment on \"%1\": \"%2\"" ).arg( type->name() ).arg( type->resolved() ->comment() ) , 10000 ); } if ( type->resolved() ->comment().isEmpty() ) { - addStatusText( i18n( "\"%1\" has no comment" ).tqarg( type->name() ) , timeout ); + addStatusText( i18n( "\"%1\" has no comment" ).arg( type->name() ) , timeout ); } } else { if ( type ) { if( !BuiltinTypes::isBuiltin( type.resultType ) ) { - addStatusText( i18n( "Type of \"%1\" is unresolved, name: \"%2\"" ).tqarg( type.expr.expr() ).tqarg( type->fullNameChain() ), 2 * timeout ); + addStatusText( i18n( "Type of \"%1\" is unresolved, name: \"%2\"" ).arg( type.expr.expr() ).arg( type->fullNameChain() ), 2 * timeout ); } else { - addStatusText( i18n( "\"%1\" is of builtin type \"%2\", a %3" ).tqarg( type.expr.expr() ).tqarg( type->fullNameChain() ).tqarg(BuiltinTypes::comment( type.resultType )), 2 * timeout ); + addStatusText( i18n( "\"%1\" is of builtin type \"%2\", a %3" ).arg( type.expr.expr() ).arg( type->fullNameChain() ).arg(BuiltinTypes::comment( type.resultType )), 2 * timeout ); } } else { - addStatusText( i18n( "Type of \"%1\" could not be evaluated: tried to evaluate expression as \"%2\"" ).tqarg( type.expr.expr() ).tqarg( type.expr.typeAsString() ), 2 * timeout ); + addStatusText( i18n( "Type of \"%1\" could not be evaluated: tried to evaluate expression as \"%2\"" ).arg( type.expr.expr() ).arg( type.expr.typeAsString() ), 2 * timeout ); } } @@ -2059,14 +2059,14 @@ void CppCodeCompletion::needRecoveryPoints() { if ( !ast ) { kdDebug( 9007 ) << "background-parser is missing the translation-unit. The file needs to be reparsed." << endl; m_pSupport->parseFileAndDependencies( m_activeFileName, true ); -// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Background-parser is missing the necessary translation-unit. It will be computed, but this completion will fail." ).tqarg( m_activeFileName ), 2000 ); +// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Background-parser is missing the necessary translation-unit. It will be computed, but this completion will fail." ).arg( m_activeFileName ), 2000 ); return; } else { computeRecoveryPointsLocked(); } if ( this->d->recoveryPoints.isEmpty() ) { kdDebug( 9007 ) << "Failed to compute recovery-points for " << m_activeFileName << endl; -// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Failed to compute recovery-points for %1" ).tqarg( m_activeFileName ), 1000 ); +// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Failed to compute recovery-points for %1" ).arg( m_activeFileName ), 1000 ); } else { kdDebug( 9007 ) << "successfully computed recovery-points for " << m_activeFileName << endl; } @@ -2080,7 +2080,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column FileDom file = m_pSupport->codeModel() ->fileByName( m_activeFileName ); if ( !file ) { -// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).tqarg( m_activeFileName ), 1000 ); +// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).arg( m_activeFileName ), 1000 ); kdDebug( 9007 ) << "Error: file " << m_activeFileName << " could not be located in the code-model, code-completion stopped\n"; return SimpleType(); } @@ -2113,7 +2113,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column c = strCurLine[ --pos ]; if ( !( c.isLetterOrNumber() || c == '_' || c == ')' || c == ']' || c == '>' ) ) { - conf.tqinvalidate(); + conf.invalidate(); return SimpleType(); } } @@ -2280,7 +2280,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionType( int line, int column CppCodeCompletionConfig * cfg = m_pSupport->codeCompletionConfig(); if( cfg->usePermanentCaching() && contextItem ) { - conf.tqinvalidate(); + conf.invalidate(); m_cachedFromContext = contextItem; } @@ -2323,7 +2323,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { FileDom file = m_pSupport->codeModel() ->fileByName( m_activeFileName ); if ( !file ) { -// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).tqarg( m_activeFileName ), 1000 ); +// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "File %1 does not exist in the code-model" ).arg( m_activeFileName ), 1000 ); kdDebug( 9007 ) << "Error: file " << m_activeFileName << " could not be located in the code-model, code-completion stopped\n"; return ; } @@ -2905,7 +2905,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { ctx = 0; if ( cfg->usePermanentCaching() ) { - conf.tqinvalidate(); + conf.invalidate(); m_cachedFromContext = contextItem; } } @@ -2972,7 +2972,7 @@ void CppCodeCompletion::slotCodeModelUpdated( const TQString& fileName ) { if ( fileName != m_activeFileName || !m_pSupport || !m_activeEditor ) return ; -// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file updated %1" ).tqarg( m_activeFileName ), 1000 ); +// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file updated %1" ).arg( m_activeFileName ), 1000 ); computeRecoveryPointsLocked(); } @@ -2981,7 +2981,7 @@ void CppCodeCompletion::slotFileParsed( const TQString& fileName ) { if ( fileName != m_activeFileName || !m_pSupport || !m_activeEditor ) return ; -// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file parsed %1 (cache emptied)" ).tqarg( m_activeFileName ), 1000 ); +// m_pSupport->mainWindow() ->statusBar() ->message( i18n( "Current file parsed %1 (cache emptied)" ).arg( m_activeFileName ), 1000 ); emptyCache(); ///The cache has to be emptied, because the code-model changed. @todo Better: Only refresh the code-model(tell all code-model-types to refresh themselves on demand) @@ -3463,7 +3463,7 @@ TQString CppCodeCompletion::commentFromItem( const SimpleType& parent, const Ite ret += "\nKind: Class"; } - ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).tqarg( prepareTextForMenu( item->fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).tqarg( line ).tqarg( col ); + ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).arg( prepareTextForMenu( item->fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).arg( line ).arg( col ); if ( !item->comment().isEmpty() ) ret += "\n\n" + prepareTextForMenu( item->comment(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ); return ret; @@ -3585,7 +3585,7 @@ TQString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag ) ret += "\nKind: Struct"; } - ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).tqarg( prepareTextForMenu( tag.fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).tqarg( line ).tqarg( col ); + ret += TQString( "\nFile: %1\nLine: %2 Column: %3" ).arg( prepareTextForMenu( tag.fileName(), 3, MAXCOMMENTCOLUMNS ).join( "\n" ) ).arg( line ).arg( col ); if ( !tag.comment().isEmpty() ) { ret += "\n\n" + prepareTextForMenu( tag.comment(), 20, MAXCOMMENTCOLUMNS ).join( "\n" ); } @@ -3807,7 +3807,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList break; } - e.userdata = TQString( "%1%2%3%4%5" ).tqarg( num ).tqarg( depth ).tqarg( className ).tqarg( sortPosition ).tqarg( subSorting ); + e.userdata = TQString( "%1%2%3%4%5" ).arg( num ).arg( depth ).arg( className ).arg( sortPosition ).arg( subSorting ); if ( m_completionMode != SignalCompletion ) { if ( !type->isNamespace() ) { @@ -3981,7 +3981,7 @@ void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType if ( isInstance ) continue; - entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( parent ).tqarg( 6 ); + entry.userdata = TQString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 6 ); entryList << entry; @@ -4015,7 +4015,7 @@ void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType entry.prefix = stringMult( depth, " " ) + entry.prefix.stripWhiteSpace(); entry.text = klass->name(); entry.comment = commentFromItem( type, klass.data() ); - entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( parent ).tqarg( 5 ); + entry.userdata = TQString( "%1%2%3%4%5" ).arg( CodeModelItem::Public ).arg( depth ).arg( parent ).arg( 5 ); entryList << entry; } } @@ -4136,7 +4136,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList if ( meth->isStatic() ) subSorting = 5; - entry.userdata += TQString( "%1%2%3%4%5" ).tqarg( meth->access() ).tqarg( depth ).tqarg( className ).tqarg( 1 ).tqarg( subSorting ); + entry.userdata += TQString( "%1%2%3%4%5" ).arg( meth->access() ).arg( depth ).arg( className ).arg( 1 ).arg( subSorting ); if ( m_completionMode == VirtualDeclCompletion ) entry.text += text + ";"; @@ -4187,7 +4187,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList CodeCompletionEntry entry; entry.text = attr->name(); entry.comment = commentFromItem( type, model_cast<ItemDom>( attr ) ); - entry.userdata += TQString( "%1%2%3%4" ).tqarg( attr->access() ).tqarg( depth ).tqarg( className ).tqarg( 2 ); + entry.userdata += TQString( "%1%2%3%4" ).arg( attr->access() ).arg( depth ).arg( className ).arg( 2 ); if ( !attr->isEnumeratorVariable() ) { @@ -4261,7 +4261,7 @@ EvaluationResult CppCodeCompletion::evaluateExpression( ExpressionInfo expr, Sim } } - addStatusText( i18n( "Type of \"%1\" is \"%2\", %3" ).tqarg( expr.expr() ).tqarg( res->fullNameChain() ).tqarg( resolutionType ), 5000 ); + addStatusText( i18n( "Type of \"%1\" is \"%2\", %3" ).arg( expr.expr() ).arg( res->fullNameChain() ).arg( resolutionType ), 5000 ); return res; } @@ -4467,7 +4467,7 @@ bool CppCodeCompletion::getIncludeInfo( int line, TQString& includeFileName, TQS //It is an include-directive. The regular expression captures the string, and the closing sign('"' or '>'). isIncludeDirective = true; usedProjectFiles = false; - TQStringList captured = includeRx.tqcapturedTexts(); + TQStringList captured = includeRx.capturedTexts(); if( captured.size() == 3 ) { Dependence d; d.first = captured[1]; diff --git a/languages/cpp/cppcodecompletionconfig.cpp b/languages/cpp/cppcodecompletionconfig.cpp index 1bcc6ace..8372efeb 100644 --- a/languages/cpp/cppcodecompletionconfig.cpp +++ b/languages/cpp/cppcodecompletionconfig.cpp @@ -18,7 +18,7 @@ #include <kdebug.h> #include <tqdom.h> -TQString CppCodeCompletionConfig::defaultPath = TQString::tqfromLatin1( "/kdevcppsupport/codecompletion" ); +TQString CppCodeCompletionConfig::defaultPath = TQString::fromLatin1( "/kdevcppsupport/codecompletion" ); CppCodeCompletionConfig::CppCodeCompletionConfig( CppSupportPart * part, TQDomDocument* dom ) : TQObject( part ), m_part( part ), m_dom( dom ) diff --git a/languages/cpp/cppevaluation.cpp b/languages/cpp/cppevaluation.cpp index 3338b97a..7a4f9406 100644 --- a/languages/cpp/cppevaluation.cpp +++ b/languages/cpp/cppevaluation.cpp @@ -102,7 +102,7 @@ OperatorIdentification UnaryOperator::identify( TQString& str ) { EvaluationResult UnaryOperator::apply( TQValueList<EvaluationResult> params, TQValueList<EvaluationResult> innerParams ) { if( !checkParams( params ) ) { - log( TQString("parameter-check failed: %1 params: ").tqarg( params.size() ) + printTypeList( params ) ); + log( TQString("parameter-check failed: %1 params: ").arg( params.size() ) + printTypeList( params ) ); return EvaluationResult(); } else { EvaluationResult t = unaryApply( params.front(), innerParams ); diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp index 14294fe0..ed8a2308 100644 --- a/languages/cpp/cppimplementationwidget.cpp +++ b/languages/cpp/cppimplementationwidget.cpp @@ -20,7 +20,7 @@ #include "cppimplementationwidget.h" #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <tqdir.h> #include <tqregexp.h> diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index dd4d278b..96e10a9b 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -24,7 +24,7 @@ #include <tqfileinfo.h> #include <tqradiobutton.h> #include <tqregexp.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqrect.h> #include <tqstyle.h> @@ -461,7 +461,7 @@ void CppNewClassDialog::addBaseClass() if ( baseclasses_view->selectedItem() ) baseclasses_view->selectedItem() ->setSelected( false ); TQListViewItem* it = new TQListViewItem( baseclasses_view, baseclasses_view->lastItem(), - TQString(), "public", TQString( "%1" ).tqarg( scope_box->currentItem() ), TQString(), "false" ); + TQString(), "public", TQString( "%1" ).arg( scope_box->currentItem() ), TQString(), "false" ); setStateOfInheritanceEditors( true ); public_button->setChecked( true ); virtual_box->setChecked( false ); @@ -589,7 +589,7 @@ void CppNewClassDialog::scopeboxActivated( int value ) { if ( baseclasses_view->selectedItem() ) { - baseclasses_view->selectedItem() ->setText( 2, TQString( "%1" ).tqarg( value ) ); + baseclasses_view->selectedItem() ->setText( 2, TQString( "%1" ).arg( value ) ); } } @@ -1268,8 +1268,8 @@ void CppNewClassDialog::to_constructors_list_clicked() cparams += ( *argIt ) ->type() + " "; if ( ( *argIt ) ->name().isEmpty() ) { - cparams += TQString( "arg%1" ).tqarg( unnamed ); - bparams += TQString( "arg%1" ).tqarg( unnamed++ ); + cparams += TQString( "arg%1" ).arg( unnamed ); + bparams += TQString( "arg%1" ).arg( unnamed++ ); } else { @@ -1455,7 +1455,7 @@ void CppNewClassDialog::ClassGenerator::common_text() TQString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" ); TQString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" ); if( !email.isEmpty() ) - author += TQString( " <%1>" ).tqarg( email ); + author += TQString( " <%1>" ).arg( email ); if ( dlg.gen_config->author_box->isChecked() ) doc.append( "\t@author " + author + "\n" ); @@ -1618,8 +1618,8 @@ void CppNewClassDialog::ClassGenerator::genMethodDeclaration( FunctionDom method cparams += ( *argIt ) ->type() + " "; if ( ( *argIt ) ->name().isEmpty() ) { - cparams += TQString( "arg%1" ).tqarg( unnamed ); - bparams += TQString( "arg%1" ).tqarg( unnamed++ ); + cparams += TQString( "arg%1" ).arg( unnamed ); + bparams += TQString( "arg%1" ).arg( unnamed++ ); } else { @@ -1896,11 +1896,11 @@ void CppNewClassDialog::ClassGenerator::gen_interface() + ( advConstructorsHeader.isEmpty() ? TQString(" $CLASSNAME$($ARGS$);\n") : advConstructorsHeader ) + TQString("\n ~$CLASSNAME$();\n") + advH_public - + (advH_public_slots.isEmpty() ? TQString::tqfromLatin1("") : ("\n\npublic slots:" + advH_public_slots)) - + (advH_protected.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprotected:" + advH_protected)) - + (advH_protected_slots.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprotected slots:" + advH_protected_slots)) - + (advH_private.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprivate:" + advH_private)) - + (advH_private_slots.isEmpty() ? TQString::tqfromLatin1("") : ("\n\nprivate slots:" + advH_private_slots)) + + (advH_public_slots.isEmpty() ? TQString::fromLatin1("") : ("\n\npublic slots:" + advH_public_slots)) + + (advH_protected.isEmpty() ? TQString::fromLatin1("") : ("\n\nprotected:" + advH_protected)) + + (advH_protected_slots.isEmpty() ? TQString::fromLatin1("") : ("\n\nprotected slots:" + advH_protected_slots)) + + (advH_private.isEmpty() ? TQString::fromLatin1("") : ("\n\nprivate:" + advH_private)) + + (advH_private_slots.isEmpty() ? TQString::fromLatin1("") : ("\n\nprivate slots:" + advH_private_slots)) + TQString("};\n" "\n") + namespaceEnd @@ -1963,7 +1963,7 @@ void CppNewClassDialog::ClassGenerator::gen_interface() if ( !it.current() ->text( 0 ).isEmpty() ) if ( !it.current() ->text( 3 ).isEmpty() ) // if ((!childClass) || (it.current()->text(0) != TQWIDGET_OBJECT_NAME_STRING)) - includeBaseHeader += ( includeBaseHeader.isEmpty() ? TQString( "" ) : TQString( "\n" ) ) + TQString::tqfromLatin1( "#include " ) + + includeBaseHeader += ( includeBaseHeader.isEmpty() ? TQString( "" ) : TQString( "\n" ) ) + TQString::fromLatin1( "#include " ) + ( it.current() ->text( 2 ).toInt() == 0 ? TQString( "<" ) : TQString( "\"" ) ) + it.current() ->text( 3 ) + ( it.current() ->text( 2 ).toInt() == 0 ? TQString( ">" ) : TQString( "\"" ) ); @@ -1974,7 +1974,7 @@ void CppNewClassDialog::ClassGenerator::gen_interface() TQString author = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/author" ); TQString email = DomUtil::readEntry( *dlg.m_part->projectDom(), "/general/email" ); if( !email.isEmpty() ) - author += TQString( " <%1>" ).tqarg( email ); + author += TQString( " <%1>" ).arg( email ); TQString inheritance; if ( dlg.baseclasses_view->childCount() > 0 ) diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui index a5405690..3e61701b 100644 --- a/languages/cpp/cppnewclassdlgbase.ui +++ b/languages/cpp/cppnewclassdlgbase.ui @@ -47,7 +47,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>10</width> <height>20</height> @@ -270,7 +270,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -320,7 +320,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -403,7 +403,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -431,7 +431,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -446,7 +446,7 @@ Namespace1::Namespace2::...::NamespaceN</string> </widget> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -640,7 +640,7 @@ Namespace1::Namespace2::...::NamespaceN</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -658,7 +658,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>125</width> <height>0</height> @@ -680,7 +680,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>125</width> <height>0</height> @@ -700,7 +700,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>150</width> <height>20</height> @@ -958,7 +958,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/languages/cpp/cppsplitheadersourceconfig.cpp b/languages/cpp/cppsplitheadersourceconfig.cpp index a9edc315..7298354b 100644 --- a/languages/cpp/cppsplitheadersourceconfig.cpp +++ b/languages/cpp/cppsplitheadersourceconfig.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tqdom.h> -TQString CppSplitHeaderSourceConfig::defaultPath = TQString::tqfromLatin1( "/kdevcppsupport/splitheadersource" ); +TQString CppSplitHeaderSourceConfig::defaultPath = TQString::fromLatin1( "/kdevcppsupport/splitheadersource" ); CppSplitHeaderSourceConfig::CppSplitHeaderSourceConfig( CppSupportPart * part, TQDomDocument* dom ) : TQObject( part ), m_part( part ), m_dom( dom ) diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index ac9d52ba..747a7e0a 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -688,7 +688,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) if ( !text.isEmpty() ) { id = popup->insertItem( i18n( "Make Member" ), this, TQT_SLOT( slotMakeMember() ) ); - popup->tqsetWhatsThis( id, i18n( "<b>Make member</b><p>Creates a class member function in implementation file " + popup->setWhatsThis( id, i18n( "<b>Make member</b><p>Creates a class member function in implementation file " "based on the member declaration at the current line." ) ); } @@ -737,7 +737,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) { TQPopupMenu * m2 = new TQPopupMenu( popup ); id = popup->insertItem( i18n( "Go to Declaration" ), m2 ); - popup->tqsetWhatsThis( id, i18n( "<b>Go to declaration</b><p>Provides a menu to select available function declarations " + popup->setWhatsThis( id, i18n( "<b>Go to declaration</b><p>Provides a menu to select available function declarations " "in the current file and in the corresponding header (if the current file is an implementation) or source (if the current file is a header) file." ) ); FileDom file2 = codeModel() ->fileByName( candidate ); @@ -753,7 +753,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) text += "::"; } text += formatModelItem( *it, true ); - text = text.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&&" ) ); + text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) ); int id = m2->insertItem( text, this, TQT_SLOT( gotoDeclarationLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); @@ -781,7 +781,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) { TQPopupMenu * m = new TQPopupMenu( popup ); id = popup->insertItem( i18n( "Go to Definition" ), m ); - popup->tqsetWhatsThis( id, i18n( "<b>Go to definition</b><p>Provides a menu to select available function definitions " + popup->setWhatsThis( id, i18n( "<b>Go to definition</b><p>Provides a menu to select available function definitions " "in the current file and in the corresponding header (if the current file is an implementation) or source (if the current file is a header) file." ) ); const FileDom file = codeModel() ->fileByName( candidate1 ); @@ -794,7 +794,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) text += "::"; } text += formatModelItem( *it, true ); - text = text.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&&" ) ); + text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) ); int id = m->insertItem( text, this, TQT_SLOT( gotoLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); @@ -822,7 +822,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) { m_activeClass = ( ClassModel* ) mcontext->item(); int id = popup->insertItem( i18n( "Extract Interface..." ), this, TQT_SLOT( slotExtractInterface() ) ); - popup->tqsetWhatsThis( id, i18n( "<b>Extract interface</b><p>Extracts interface from the selected class and creates a new class with this interface. " + popup->setWhatsThis( id, i18n( "<b>Extract interface</b><p>Extracts interface from the selected class and creates a new class with this interface. " "No implementation code is extracted and no implementation code is created." ) ); } else if ( mcontext->item() ->isFunction() ) @@ -840,7 +840,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) { m_contextFileName = url.path(); int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQT_SLOT( slotCreateSubclass() ) ); - popup->tqsetWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) ); + popup->setWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) ); } } } @@ -1558,7 +1558,7 @@ void CppSupportPart::slotParseFiles() { if ( _jd->pcs.contains( absFilePath ) ) { - _jd->stream.tqdevice() ->at( _jd->pcs[ absFilePath ].second ); + _jd->stream.device() ->at( _jd->pcs[ absFilePath ].second ); FileDom file = codeModel() ->create<FileModel>(); file->read( _jd->stream ); codeModel() ->addFile( file ); @@ -1777,7 +1777,7 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum TQString declStr = declaratorToString( declarator, scopeStr ).simplifyWhiteSpace(); if ( declarator->exceptionSpecification() ) { - declStr += TQString::tqfromLatin1( " throw( " ); + declStr += TQString::fromLatin1( " throw( " ); TQPtrList<AST> l = declarator->exceptionSpecification() ->nodeList(); TQPtrListIterator<AST> type_it( l ); while ( type_it.current() ) @@ -1786,10 +1786,10 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum ++type_it; if ( type_it.current() ) - declStr += TQString::tqfromLatin1( ", " ); + declStr += TQString::fromLatin1( ", " ); } - declStr += TQString::tqfromLatin1( " )" ); + declStr += TQString::fromLatin1( " )" ); } text += "\n\n"; @@ -2034,10 +2034,10 @@ TQString CppSupportPart::formatTag( const Tag & inputTag ) switch ( tag.kind() ) { case Tag::Kind_Namespace: - return TQString::tqfromLatin1( "namespace " ) + tag.name(); + return TQString::fromLatin1( "namespace " ) + tag.name(); case Tag::Kind_Class: - return TQString::tqfromLatin1( "class " ) + tag.name(); + return TQString::fromLatin1( "class " ) + tag.name(); case Tag::Kind_Function: case Tag::Kind_FunctionDeclaration: @@ -2182,22 +2182,22 @@ void CppSupportPart::saveProjectSourceInfo() if( m_timestamp.find( dom->name() ) == m_timestamp.end() ) { kdDebug( 9007 ) << dom->name() << ": timestamp is missing " << endl; } - offsets.insert( dom->name(), stream.tqdevice() ->at() ); + offsets.insert( dom->name(), stream.device() ->at() ); stream << ( uint ) 0; // dummy offset } for ( FileList::ConstIterator it = fileList.begin(); it != fileList.end(); ++it ) { const FileDom dom = ( *it ); - int offset = stream.tqdevice() ->at(); + int offset = stream.device() ->at(); dom->write( stream ); - int end = stream.tqdevice() ->at(); + int end = stream.device() ->at(); - stream.tqdevice() ->at( offsets[ dom->name() ] ); + stream.device() ->at( offsets[ dom->name() ] ); stream << offset; - stream.tqdevice() ->at( end ); + stream.device() ->at( end ); } TQFile::remove( project() ->projectDirectory() + "/" @@ -2259,7 +2259,7 @@ void CppSupportPart::slotExtractInterface( ) TQString ifaceFileName = fileInfo.dirPath( true ) + "/" + m_activeClass->name().lower() + "_interface.h"; if ( TQFile::exists( ifaceFileName ) ) { - KMessageBox::error( mainWindow() ->main(), i18n( "File %1 already exists" ).tqarg( ifaceFileName ), + KMessageBox::error( mainWindow() ->main(), i18n( "File %1 already exists" ).arg( ifaceFileName ), i18n( "C++ Support" ) ); } else @@ -2856,7 +2856,7 @@ void CppSupportPart::addMethod( ClassDom aClass, const TQString& name, const TQS if ( !editIface ) return ; //@fixme errorverdoedelung - editIface->insertLine( editIface->numLines(), TQString::tqfromLatin1( "" ) ); + editIface->insertLine( editIface->numLines(), TQString::fromLatin1( "" ) ); editIface->insertText( editIface->numLines() - 1, 0, definitionString ); backgroundParser() ->addFile( implementationFile ); } @@ -3118,7 +3118,7 @@ void CppSupportPart::addToRepository( ParsedFilePointer file ) { w.parseTranslationUnit( *file ); codeRepository()->touchCatalog( catalog ); - m_safeProjectFiles.insert( file->fileName() + "||" + TQString("%1").tqarg(file->usedMacros().valueHash()) + "||" + TQString("%1").tqarg(file->usedMacros().idHash()) ); + m_safeProjectFiles.insert( file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash()) ); } TQString CppSupportPart::findHeaderSimple( const TQString &header ) @@ -3143,7 +3143,7 @@ void UIBlockTester::UIBlockTesterThread::run() { while(!m_stop) { msleep( m_parent.m_msecs / 10 ); m_parent.m_timeMutex.lock(); - TQDateTime t = TQDateTime::tqcurrentDateTime(); + TQDateTime t = TQDateTime::currentDateTime(); uint msecs = m_parent.m_lastTime.time().msecsTo( t.time() ); if( msecs > m_parent.m_msecs ) { m_parent.lockup(); @@ -3171,7 +3171,7 @@ UIBlockTester::~UIBlockTester() { void UIBlockTester::timer() { m_timeMutex.lock(); - m_lastTime = TQDateTime::tqcurrentDateTime(); + m_lastTime = TQDateTime::currentDateTime(); m_timeMutex.unlock(); } diff --git a/languages/cpp/creategettersetter.ui b/languages/cpp/creategettersetter.ui index fd4feaf6..81edebf0 100644 --- a/languages/cpp/creategettersetter.ui +++ b/languages/cpp/creategettersetter.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> diff --git a/languages/cpp/creategettersetterconfiguration.cpp b/languages/cpp/creategettersetterconfiguration.cpp index 3bee7f16..7190e796 100644 --- a/languages/cpp/creategettersetterconfiguration.cpp +++ b/languages/cpp/creategettersetterconfiguration.cpp @@ -17,7 +17,7 @@ #include <tqdom.h> #include <kmessagebox.h> -TQString CreateGetterSetterConfiguration::defaultPath = TQString::tqfromLatin1( "/kdevcppsupport/creategettersetter" ); +TQString CreateGetterSetterConfiguration::defaultPath = TQString::fromLatin1( "/kdevcppsupport/creategettersetter" ); CreateGetterSetterConfiguration::CreateGetterSetterConfiguration( CppSupportPart * part ) : TQObject(part), m_part(part), m_settings(0) diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index e237d683..a53ebe35 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -39,7 +39,7 @@ #include <tqheader.h> #include <tqlabel.h> #include <tqregexp.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <tqpushbutton.h> diff --git a/languages/cpp/createpcsdialogbase.ui b/languages/cpp/createpcsdialogbase.ui index f40f7c94..eafbc184 100644 --- a/languages/cpp/createpcsdialogbase.ui +++ b/languages/cpp/createpcsdialogbase.ui @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>111</height> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>81</height> diff --git a/languages/cpp/debugger/TODO.txt b/languages/cpp/debugger/TODO.txt index 563cf85c..38aca109 100644 --- a/languages/cpp/debugger/TODO.txt +++ b/languages/cpp/debugger/TODO.txt @@ -69,7 +69,7 @@ TODO: - Add icons - - tqStatus display column is just ugly + - Status display column is just ugly - Handle "out of breakpoints" message. diff --git a/languages/cpp/debugger/breakpoint.cpp b/languages/cpp/debugger/breakpoint.cpp index c42f32c9..1b6efdaf 100644 --- a/languages/cpp/debugger/breakpoint.cpp +++ b/languages/cpp/debugger/breakpoint.cpp @@ -213,7 +213,7 @@ bool Breakpoint::match(const Breakpoint* breakpoint) const TQString Breakpoint::dbgRemoveCommand() const { if (dbgId_>0) - return TQString("-break-delete %1").tqarg(dbgId_); // gdb command - not translatable + return TQString("-break-delete %1").arg(dbgId_); // gdb command - not translatable return TQString(); } @@ -386,7 +386,7 @@ FilePosBreakpoint::FilePosBreakpoint(const TQString &fileName, int lineNum, : Breakpoint(temporary, enabled) { // Sets 'subtype' - setLocation(TQString("%1:%2").tqarg(fileName).tqarg(lineNum)); + setLocation(TQString("%1:%2").arg(fileName).arg(lineNum)); } FilePosBreakpoint::~FilePosBreakpoint() @@ -482,7 +482,7 @@ void FilePosBreakpoint::setLocation(const TQString& location) line_ = regExp1.cap(2).toInt(); - location_ = TQString("%1:%2").tqarg(fileName_).tqarg(regExp1.cap(2)); + location_ = TQString("%1:%2").arg(fileName_).arg(regExp1.cap(2)); } else { @@ -536,7 +536,7 @@ void Watchpoint::setBreakpoint(GDBController* controller) controller->addCommandBeforeRun( new GDBCommand( - TQString("-data-evaluate-expression &%1").tqarg(varName_), + TQString("-data-evaluate-expression &%1").arg(varName_), this, &Watchpoint::handleAddressComputed)); } @@ -547,7 +547,7 @@ void Watchpoint::handleAddressComputed(const GDBMI::ResultRecord& r) address_ = r["value"].literal().toULongLong(0, 16); controller()->addCommandBeforeRun( new GDBCommand( - TQString("-break-watch *%1").tqarg(r["value"].literal()), + TQString("-break-watch *%1").arg(r["value"].literal()), static_cast<Breakpoint*>(this), &Watchpoint::handleSet)); } diff --git a/languages/cpp/debugger/dbgcontroller.h b/languages/cpp/debugger/dbgcontroller.h index c87a333f..f8103ab2 100644 --- a/languages/cpp/debugger/dbgcontroller.h +++ b/languages/cpp/debugger/dbgcontroller.h @@ -118,7 +118,7 @@ signals: void gdbUserCommandStdout (const char *output); void gdbStderr (const char *output); void showStepInSource (const TQString &fileName, int lineNum, const TQString &address); - void dbgtqStatus (const TQString &status, int statusFlag); + void dbgStatus (const TQString &status, int statusFlag); protected: KProcess *dbgProcess_; diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index c31f4a4c..22c85502 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -28,7 +28,7 @@ #include <tqframe.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbutton.h> #include <tqpushbutton.h> @@ -77,7 +77,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) buttonbox->addStretch(); TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); - buttonbox->tqlayout(); + buttonbox->layout(); topLayout->addWidget(buttonbox); connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); @@ -172,7 +172,7 @@ void Dbg_PS_Dialog::slotProcessExited() // to 'arg'. i18n("<b>Could not parse output from the <tt>ps</tt> command.</b>" "<p>The following line could not be parsed:" - "<b><tt>%1</tt>").tqarg(item), + "<b><tt>%1</tt>").arg(item), i18n("Internal error"), "gdb_error" ); break; } diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index e8bb0c90..435591a3 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -28,7 +28,7 @@ #include <tqapplication.h> #include <tqcursor.h> #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqpushbutton.h> #include <tqtooltip.h> @@ -120,8 +120,8 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) offset_ = parentWidget()->pos() - e->globalPos(); setFrameStyle(TQFrame::Panel|TQFrame::Sunken); TQApplication::setOverrideCursor(TQCursor(sizeAllCursor)); - setPalette(TQPalette(tqcolorGroup().background())); - tqrepaint(); + setPalette(TQPalette(colorGroup().background())); + repaint(); } } @@ -134,8 +134,8 @@ void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e) offset_ = TQPoint(0,0); setFrameStyle(TQFrame::Panel|TQFrame::Raised); TQApplication::restoreOverrideCursor(); - setPalette(TQPalette(tqcolorGroup().background())); - tqrepaint(); + setPalette(TQPalette(colorGroup().background())); + repaint(); } // ************************************************************************** @@ -162,7 +162,7 @@ public: DbgToolBar *parent, const char *name=0); virtual ~DbgButton() {}; void drawButtonLabel(TQPainter *painter); - TQSize tqsizeHint() const; + TQSize sizeHint() const; private: TQPixmap pixmap_; @@ -191,21 +191,21 @@ void DbgButton::drawButtonLabel(TQPainter *painter) painter->drawPixmap(x, y, pixmap_); if (hasText) { - painter->setPen(tqcolorGroup().text()); + painter->setPen(colorGroup().text()); painter->drawText(height()+2, 0, width()-(height()+2), height(), AlignLeft|AlignVCenter, text()); } } // ************************************************************************** -TQSize DbgButton::tqsizeHint() const +TQSize DbgButton::sizeHint() const { if (text().isEmpty()) return pixmap_.size(); else { TQSize ps = pixmap_.size(); - TQSize bs = TQPushButton::tqsizeHint(); + TQSize bs = TQPushButton::sizeHint(); TQSize result; result.setWidth( ps.width() + bs.width()+10 ); result.setHeight( ps.height() > bs.height() ? ps.height() : bs.height() ); @@ -365,12 +365,12 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, nextLayout->addWidget(bNext); nextLayout->addWidget(bNexti); -// int w = TQMAX(bRun->tqsizeHint().width(), bFinish->tqsizeHint().width()); -// w = TQMAX(w, bInterrupt->tqsizeHint().width()); -// w = TQMAX(w, bView->tqsizeHint().width()); +// int w = TQMAX(bRun->sizeHint().width(), bFinish->sizeHint().width()); +// w = TQMAX(w, bInterrupt->sizeHint().width()); +// w = TQMAX(w, bView->sizeHint().width()); // they should have the same height, so don't be too fussy -// int h = bFinish->tqsizeHint().height(); +// int h = bFinish->sizeHint().height(); // // bNext->setMinimumHeight(h); // bNexti->setMinimumHeight(h); @@ -404,10 +404,10 @@ void DbgToolBar::slotKdevFocus() // If anyone has a way of determining what window the app is _actually_ running on // then please fix and send a patch. - if (winModule_->activeWindow() != tqtopLevelWidget()->winId()) + if (winModule_->activeWindow() != topLevelWidget()->winId()) activeWindow_ = winModule_->activeWindow(); - KWin::activateWindow(tqtopLevelWidget()->winId()); + KWin::activateWindow(topLevelWidget()->winId()); } // ************************************************************************** @@ -421,7 +421,7 @@ void DbgToolBar::slotPrevFocus() // If the app is active then the app button is highlighted, otherwise // kdev button is highlighted. -void DbgToolBar::slotDbgtqStatus(const TQString&, int state) +void DbgToolBar::slotDbgStatus(const TQString&, int state) { bool appIndicator = state & s_dbgBusy; if (appIndicator != appIsActive_) { @@ -435,11 +435,11 @@ void DbgToolBar::slotDbgtqStatus(const TQString&, int state) void DbgToolBar::setAppIndicator(bool appIndicator) { if (appIndicator) { - bPrevFocus_->setPalette(TQPalette(tqcolorGroup().mid())); - bKDevFocus_->setPalette(TQPalette(tqcolorGroup().background())); + bPrevFocus_->setPalette(TQPalette(colorGroup().mid())); + bKDevFocus_->setPalette(TQPalette(colorGroup().background())); } else { - bPrevFocus_->setPalette(TQPalette(tqcolorGroup().background())); - bKDevFocus_->setPalette(TQPalette(tqcolorGroup().mid())); + bPrevFocus_->setPalette(TQPalette(colorGroup().background())); + bKDevFocus_->setPalette(TQPalette(colorGroup().mid())); } } @@ -487,7 +487,7 @@ void DbgToolBar::slotActivateAndUndock() if (!docked_) return; - KWin::activateWindow(tqtopLevelWidget()->winId()); + KWin::activateWindow(topLevelWidget()->winId()); slotUndock(); } diff --git a/languages/cpp/debugger/dbgtoolbar.h b/languages/cpp/debugger/dbgtoolbar.h index 5e1424d7..7f124c6c 100644 --- a/languages/cpp/debugger/dbgtoolbar.h +++ b/languages/cpp/debugger/dbgtoolbar.h @@ -58,7 +58,7 @@ public: virtual ~DbgToolBar(); private slots: - void slotDbgtqStatus(const TQString&, int); + void slotDbgStatus(const TQString&, int); void slotDock(); void slotUndock(); void slotIconifyAndDock(); diff --git a/languages/cpp/debugger/debuggerconfigwidget.cpp b/languages/cpp/debugger/debuggerconfigwidget.cpp index d4c97957..05a8cf78 100644 --- a/languages/cpp/debugger/debuggerconfigwidget.cpp +++ b/languages/cpp/debugger/debuggerconfigwidget.cpp @@ -78,7 +78,7 @@ DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *parent, // ??? DomUtil::readEntry(dom, "/kdevdebugger/general/allowforcedbpset"); - resize(tqsizeHint()); + resize(sizeHint()); } diff --git a/languages/cpp/debugger/debuggerconfigwidgetbase.ui b/languages/cpp/debugger/debuggerconfigwidgetbase.ui index a3a1e321..72bb4c93 100644 --- a/languages/cpp/debugger/debuggerconfigwidgetbase.ui +++ b/languages/cpp/debugger/debuggerconfigwidgetbase.ui @@ -102,7 +102,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -208,7 +208,7 @@ check this option.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -303,7 +303,7 @@ check this option.</string> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <grid> <property name="name"> @@ -404,7 +404,7 @@ or if your executable contains the gdb stub <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index 59294487..fb1577d4 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -92,7 +92,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi statusBarIndicator = new LabelWithDoubleClick( " ", mainWindow()->statusBar()); statusBarIndicator->setFixedWidth(15); - statusBarIndicator->tqsetAlignment(TQt::AlignCenter); + statusBarIndicator->setAlignment(TQt::AlignCenter); mainWindow()->statusBar()->addWidget(statusBarIndicator, 0, true); statusBarIndicator->show(); @@ -500,7 +500,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) this, TQT_SLOT(slotRunToCursor()), 0, -1, index); - popup->tqsetWhatsThis(id, act->whatsThis()); + popup->setWhatsThis(id, act->whatsThis()); index += running; } } @@ -510,21 +510,21 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) this, TQT_SLOT(toggleBreakpoint()), 0, -1, index); index += running; - popup->tqsetWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line.")); + popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line.")); } if (!m_contextIdent.isEmpty()) { TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); - int id = popup->insertItem( i18n("Evaluate: %1").tqarg(squeezed), + int id = popup->insertItem( i18n("Evaluate: %1").arg(squeezed), this, TQT_SLOT(contextEvaluate()), 0, -1, index); index += running; - popup->tqsetWhatsThis(id, i18n("<b>Evaluate expression</b><p>Shows the value of the expression under the cursor.")); - int id2 = popup->insertItem( i18n("Watch: %1").tqarg(squeezed), + popup->setWhatsThis(id, i18n("<b>Evaluate expression</b><p>Shows the value of the expression under the cursor.")); + int id2 = popup->insertItem( i18n("Watch: %1").arg(squeezed), this, TQT_SLOT(contextWatch()), 0, -1, index); index += running; - popup->tqsetWhatsThis(id2, i18n("<b>Watch expression</b><p>Adds an expression under the cursor to the Variables/Watch list.")); + popup->setWhatsThis(id2, i18n("<b>Watch expression</b><p>Adds an expression under the cursor to the Variables/Watch list.")); } if (running) popup->insertSeparator(index); @@ -589,8 +589,8 @@ void DebuggerPart::setupController() disassembleWidget, TQT_SLOT(slotShowStepInSource(const TQString&, int, const TQString&))); // controller -> this - connect( controller, TQT_SIGNAL(dbgtqStatus(const TQString&, int)), - this, TQT_SLOT(slottqStatus(const TQString&, int))); + connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), + this, TQT_SLOT(slotStatus(const TQString&, int))); connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), this, TQT_SLOT(slotShowStep(const TQString&, int))); connect( controller, TQT_SIGNAL(debuggerAbnormalExit()), @@ -613,16 +613,16 @@ void DebuggerPart::setupController() connect( controller, TQT_SIGNAL(gdbStderr(const char*)), gdbOutputWidget, TQT_SLOT(slotReceivedStderr(const char*)) ); - connect( controller, TQT_SIGNAL(dbgtqStatus(const TQString&, int)), - gdbOutputWidget, TQT_SLOT(slotDbgtqStatus(const TQString&, int))); + connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), + gdbOutputWidget, TQT_SLOT(slotDbgStatus(const TQString&, int))); // controller -> viewerWidget - connect( controller, TQT_SIGNAL(dbgtqStatus(const TQString&, int)), + connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), viewerWidget, TQT_SLOT(slotDebuggerState(const TQString&, int))); connect(statusBarIndicator, TQT_SIGNAL(doubleClicked()), - controller, TQT_SLOT(explainDebuggertqStatus())); + controller, TQT_SLOT(explainDebuggerStatus())); } @@ -659,7 +659,7 @@ bool DebuggerPart::startDebugger() { KMessageBox::information( mainWindow()->main(), - i18n("Could not locate the debugging shell '%1'.").tqarg( shell_without_args ), + i18n("Could not locate the debugging shell '%1'.").arg( shell_without_args ), i18n("Debugging Shell Not Found"), "gdb_error" ); return false; } @@ -955,7 +955,7 @@ void DebuggerPart::slotExamineCore() if (coreFile.isNull()) return; - mainWindow()->statusBar()->message(i18n("Examining core file %1").tqarg(coreFile), 1000); + mainWindow()->statusBar()->message(i18n("Examining core file %1").arg(coreFile), 1000); startDebugger(); controller->slotCoreFile(coreFile); @@ -976,7 +976,7 @@ void DebuggerPart::slotAttachProcess() bool DebuggerPart::attachProcess(int pid) { - mainWindow()->statusBar()->message(i18n("Attaching to process %1").tqarg(pid), 1000); + mainWindow()->statusBar()->message(i18n("Attaching to process %1").arg(pid), 1000); bool ret = startDebugger(); controller->slotAttachTo(pid); @@ -1092,7 +1092,7 @@ void DebuggerPart::slotRefreshBPState( const Breakpoint& BP) } } -void DebuggerPart::slottqStatus(const TQString &msg, int state) +void DebuggerPart::slotStatus(const TQString &msg, int state) { TQString stateIndicator, stateIndicatorFull; diff --git a/languages/cpp/debugger/debuggerpart.h b/languages/cpp/debugger/debuggerpart.h index b201b15a..40877e29 100644 --- a/languages/cpp/debugger/debuggerpart.h +++ b/languages/cpp/debugger/debuggerpart.h @@ -95,7 +95,7 @@ private slots: void slotRefreshBPState(const Breakpoint&); - void slottqStatus(const TQString &msg, int state); + void slotStatus(const TQString &msg, int state); void slotShowStep(const TQString &fileName, int lineNum); void slotGotoSource(const TQString &fileName, int lineNum); diff --git a/languages/cpp/debugger/debuggertracingdialogbase.ui b/languages/cpp/debugger/debuggertracingdialogbase.ui index 51cfe410..faa68cd7 100644 --- a/languages/cpp/debugger/debuggertracingdialogbase.ui +++ b/languages/cpp/debugger/debuggertracingdialogbase.ui @@ -71,7 +71,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/languages/cpp/debugger/disassemblewidget.cpp b/languages/cpp/debugger/disassemblewidget.cpp index 705185fd..dcb9ab6b 100644 --- a/languages/cpp/debugger/disassemblewidget.cpp +++ b/languages/cpp/debugger/disassemblewidget.cpp @@ -24,7 +24,7 @@ #include <tqdict.h> #include <tqheader.h> -#include <tqtextedit.h> +#include <textedit.h> #include <stdlib.h> diff --git a/languages/cpp/debugger/disassemblewidget.h b/languages/cpp/debugger/disassemblewidget.h index 73e743f7..93d3f44d 100644 --- a/languages/cpp/debugger/disassemblewidget.h +++ b/languages/cpp/debugger/disassemblewidget.h @@ -18,7 +18,7 @@ #include "mi/gdbmi.h" -#include <tqtextedit.h> +#include <textedit.h> /***************************************************************************/ /***************************************************************************/ diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp index 2b8ae5a6..d7f50778 100644 --- a/languages/cpp/debugger/framestackwidget.cpp +++ b/languages/cpp/debugger/framestackwidget.cpp @@ -111,7 +111,7 @@ void FramestackWidget::slotSelectionChanged(TQListViewItem *thisItem) if (frame->threadNo() != -1) controller_->addCommand( new GDBCommand(TQString("-thread-select %1") - .tqarg(frame->threadNo()).ascii())); + .arg(frame->threadNo()).ascii())); viewedThread_ = findThread(frame->threadNo()); getBacktrace(frame->frameNo(), frame->frameNo() + frameChunk_); @@ -208,7 +208,7 @@ void FramestackWidget::getBacktrace(int min_frame, int max_frame) maxFrame_ = max_frame; controller_->addCommand( - new GDBCommand(TQString("-stack-info-depth %1").tqarg(max_frame+1), + new GDBCommand(TQString("-stack-info-depth %1").arg(max_frame+1), this, &FramestackWidget::handleStackDepth)); } @@ -224,7 +224,7 @@ void FramestackWidget::handleStackDepth(const GDBMI::ResultRecord& r) //add the following command to the front, so noone switches threads in between controller_->addCommandToFront( new GDBCommand(TQString("-stack-list-frames %1 %2") - .tqarg(minFrame_).tqarg(maxFrame_), + .arg(minFrame_).arg(maxFrame_), this, &FramestackWidget::parseGDBBacktraceList)); } @@ -236,7 +236,7 @@ void FramestackWidget::getBacktraceForThread(int threadNo) // Switch to the target thread. controller_->addCommand( new GDBCommand(TQString("-thread-select %1") - .tqarg(threadNo).ascii())); + .arg(threadNo).ascii())); viewedThread_ = findThread(threadNo); } @@ -248,7 +248,7 @@ void FramestackWidget::getBacktraceForThread(int threadNo) // Switch back to the original thread. controller_->addCommand( new GDBCommand(TQString("-thread-select %1") - .tqarg(currentThread).ascii())); + .arg(currentThread).ascii())); } } @@ -274,13 +274,13 @@ void FramestackWidget::handleThreadList(const GDBMI::ResultRecord& r) TQString id = ids.results[i]->value->literal(); controller_->addCommand( - new GDBCommand(TQString("-thread-select %1").tqarg(id).ascii(), + new GDBCommand(TQString("-thread-select %1").arg(id).ascii(), this, &FramestackWidget::handleThread)); } controller_->addCommand( new GDBCommand(TQString("-thread-select %1") - .tqarg(controller_->currentThread()).ascii())); + .arg(controller_->currentThread()).ascii())); } // Get backtrace for the current thread. We need to do this @@ -558,7 +558,7 @@ ThreadStackItem::ThreadStackItem(FramestackWidget *parent, unsigned threadNo) : TQListViewItem(parent), threadNo_(threadNo) { - setText(0, i18n("Thread %1").tqarg(threadNo_)); + setText(0, i18n("Thread %1").arg(threadNo_)); setExpandable(true); } diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp index 8626a3e1..146ed57b 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.cpp +++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp @@ -37,7 +37,7 @@ #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpushbutton.h> #include <tqcheckbox.h> @@ -56,7 +56,7 @@ enum Column { Control = 0, Enable = 1, Type = 2, - tqStatus = 3, + Status = 3, Location = 4, Condition = 5, IgnoreCount = 6, @@ -161,7 +161,7 @@ void BreakpointTableRow::setRow() TQString status=m_breakpoint->statusDisplay(m_activeFlag); - table()->setText(row(), tqStatus, status); + table()->setText(row(), Status, status); table()->setText(row(), Condition, m_breakpoint->conditional()); table()->setText(row(), IgnoreCount, TQString::number(m_breakpoint->ignoreCount() )); table()->setText(row(), Hits, TQString::number(m_breakpoint->hits() )); @@ -183,7 +183,7 @@ void BreakpointTableRow::setRow() table()->setText(row(), Type, displayType); table()->adjustColumn(Type); - table()->adjustColumn(tqStatus); + table()->adjustColumn(Status); table()->adjustColumn(Location); table()->adjustColumn(Hits); table()->adjustColumn(IgnoreCount); @@ -208,7 +208,7 @@ controller_(controller) m_table->hideColumn(Control); m_table->setColumnReadOnly(Type, true); - m_table->setColumnReadOnly(tqStatus, true); + m_table->setColumnReadOnly(Status, true); m_table->setColumnReadOnly(Hits, true); m_table->setColumnWidth( Enable, 20); @@ -216,7 +216,7 @@ controller_(controller) header->setLabel( Enable, "" ); header->setLabel( Type, i18n("Type") ); - header->setLabel( tqStatus, i18n("Status") ); + header->setLabel( Status, i18n("Status") ); header->setLabel( Location, i18n("Location") ); header->setLabel( Condition, i18n("Condition") ); header->setLabel( IgnoreCount, i18n("Ignore Count") ); @@ -377,10 +377,10 @@ void GDBBreakpointWidget::slotWatchpointHit(int id, "Address: 0x%2<br>" "Old value: %3<br>" "New value: %4") - .tqarg(b->varName()) - .tqarg(b->address(), 0, 16) - .tqarg(oldValue) - .tqarg(newValue)); + .arg(b->varName()) + .arg(b->address(), 0, 16) + .arg(oldValue) + .arg(newValue)); } /***************************************************************************/ @@ -1213,7 +1213,7 @@ TQWidget* ComplexEditCell::createEditor() const { TQHBox* box = new TQHBox( table()->viewport() ); box->setPaletteBackgroundColor( - table()->tqpalette().active().highlight()); + table()->palette().active().highlight()); label_ = new TQLabel(text(), box, "label"); label_->setBackgroundMode(TQt::PaletteHighlight); @@ -1225,16 +1225,16 @@ TQWidget* ComplexEditCell::createEditor() const TQPalette p = label_->palette(); p.setColor(TQPalette::Active, TQColorGroup::Foreground, - table()->tqpalette().active().highlightedText()); + table()->palette().active().highlightedText()); p.setColor(TQPalette::Inactive, TQColorGroup::Foreground, - table()->tqpalette().active().highlightedText()); + table()->palette().active().highlightedText()); label_->setPalette(p); TQPushButton* b = new TQPushButton("...", box); // This is exactly what is done in TQDesigner source in the // similar context. Haven't had any success making the good look - // with tqlayout, I suppose that tqsizeHint for button is always larger + // with layout, I suppose that sizeHint for button is always larger // than 20. b->setFixedWidth( 20 ); diff --git a/languages/cpp/debugger/gdbcommand.cpp b/languages/cpp/debugger/gdbcommand.cpp index c6c4bbc3..b5412dc0 100644 --- a/languages/cpp/debugger/gdbcommand.cpp +++ b/languages/cpp/debugger/gdbcommand.cpp @@ -105,7 +105,7 @@ ModifyBreakpointCommand::cmdToSend() if (bp_->dbgId() > 0) { TQString s(initialString()); - s = s.tqarg(bp_->dbgId()) + "\n"; + s = s.arg(bp_->dbgId()) + "\n"; return s.local8Bit(); } else diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp index ab7ffe69..b0c3171e 100644 --- a/languages/cpp/debugger/gdbcontroller.cpp +++ b/languages/cpp/debugger/gdbcontroller.cpp @@ -294,7 +294,7 @@ void GDBController::queueCmd(GDBCommand *cmd, enum queue_where queue_where) KMessageBox::information( 0, i18n("<b>Gdb command sent when debugger is not running</b><br>" - "The command was:<br> %1").tqarg(cmd->initialString()), + "The command was:<br> %1").arg(cmd->initialString()), i18n("Internal error"), "gdb_error"); return; } @@ -320,7 +320,7 @@ void GDBController::queueCmd(GDBCommand *cmd, enum queue_where queue_where) << (stateReloadInProgress_ ? " (state reloading)\n" : "\n"); setStateOn(s_dbgBusy); - emit dbgtqStatus("", state_); + emit dbgStatus("", state_); raiseEvent(debugger_busy); executeCmd(); @@ -409,7 +409,7 @@ void GDBController::executeCmd() else emit gdbInternalCommandStdout( prettyCmd.latin1() ); - emit dbgtqStatus ("", state_); + emit dbgStatus ("", state_); } // ************************************************************************** @@ -500,7 +500,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r) if (reason == "exited-signalled") { programNoApp(i18n("Exited on signal %1") - .tqarg(r["signal-name"].literal()), false); + .arg(r["signal-name"].literal()), false); // FIXME: figure out why this variable is needed. programHasExited_ = true; state_reload_needed = false; @@ -540,7 +540,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r) // or whatever). setStateOff(s_explicitBreakInto); - emit dbgtqStatus("Application interrupted", state_); + emit dbgStatus("Application interrupted", state_); // Will show the source line in the code // handling non-special stop kinds, below. } @@ -554,7 +554,7 @@ void GDBController::actOnProgramPauseMI(const GDBMI::ResultRecord& r) // that'll end the program. KMessageBox::information(0, i18n("Program received signal %1 (%2)") - .tqarg(name).tqarg(user_name), + .arg(name).arg(user_name), i18n("Received signal")); } } @@ -592,7 +592,7 @@ void GDBController::reloadProgramState() maybeAnnounceWatchpointHit(); } - emit dbgtqStatus ("", state_); + emit dbgStatus ("", state_); // We're always at frame zero when the program stops // and we must reset the active flag @@ -648,7 +648,7 @@ void GDBController::programNoApp(const TQString &msg, bool msgBox) if (msgBox) KMessageBox::information(0, i18n("gdb message:\n")+msg,"Warning", "gdb_error"); - emit dbgtqStatus (msg, state_); + emit dbgStatus (msg, state_); /* Also show message in gdb window, so that users who prefer to look at gdb window know what's up. */ emit gdbUserCommandStdout(msg.ascii()); @@ -716,9 +716,9 @@ void GDBController::handleMiFileListExecSourceFile(const GDBMI::ResultRecord& r) "Command was: %1\n" "Response is: %2\n" "Invalid response kind: \"%3\"") - .tqarg(currentCmd_->rawDbgCommand()) - .tqarg(buf) - .tqarg(r.reason), + .arg(currentCmd_->rawDbgCommand()) + .arg(buf) + .arg(r.reason), i18n("Invalid gdb reply"), "gdb_error"); #endif } @@ -755,7 +755,7 @@ void GDBController::maybeAnnounceWatchpointHit() } else if (last_stop_reason == "read-watchpoint-trigger") { - emit dbgtqStatus ("Read watchpoint triggered", state_); + emit dbgStatus ("Read watchpoint triggered", state_); } } } @@ -846,14 +846,14 @@ bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_en i18n("<b>Could not start debugger.</b>" "<p>Could not run '%1'. " "Make sure that the path name is specified correctly." - ).tqarg(dbgProcess_->args()[0].data()), + ).arg(dbgProcess_->args()[0].data()), i18n("Could not start debugger"), "gdb_error"); return false; } setStateOff(s_dbgNotStarted); - emit dbgtqStatus ("", state_); + emit dbgStatus ("", state_); saw_gdb_prompt_ = false; @@ -1043,7 +1043,7 @@ void GDBController::slotStopDebugger() gdbOutput_ = ""; setState(s_dbgNotStarted | s_appNotStarted); - emit dbgtqStatus (i18n("Debugger stopped"), state_); + emit dbgStatus (i18n("Debugger stopped"), state_); raiseEvent(debugger_exited); } @@ -1159,7 +1159,7 @@ void GDBController::slotRun() " %1\n" "<br>does not exist. Check that you have specified " "the right application in the debugger configuration." - ).tqarg(app.fileName()), + ).arg(app.fileName()), i18n("Application does not exist")); // FIXME: after this, KDevelop will still show that debugger @@ -1176,7 +1176,7 @@ void GDBController::slotRun() "<p>The application does not have the executable bit set. " "Try rebuilding the project, or change permissions " "manually." - ).tqarg(app.fileName()), + ).arg(app.fileName()), i18n("Could not run application")); slotStopDebugger(); } @@ -1324,11 +1324,11 @@ void GDBController::selectFrame(int frameNo, int threadNo) { if (viewedThread_ != threadNo) queueCmd(new GDBCommand( - TQString("-thread-select %1").tqarg(threadNo).ascii())); + TQString("-thread-select %1").arg(threadNo).ascii())); } queueCmd(new GDBCommand( - TQString("-stack-select-frame %1").tqarg(frameNo).ascii())); + TQString("-stack-select-frame %1").arg(frameNo).ascii())); // Will emit the 'thread_or_frame_changed' event. queueCmd(new GDBCommand("-stack-info-frame", @@ -1352,7 +1352,7 @@ void GDBController::defaultErrorHandler(const GDBMI::ResultRecord& result) if (msg.contains("No such process")) { setState(s_appNotStarted|s_programExited); - emit dbgtqStatus (i18n("Process exited"), state_); + emit dbgStatus (i18n("Process exited"), state_); raiseEvent(program_exited); return; } @@ -1590,7 +1590,7 @@ void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen) "<p>The debugger component encountered an internal error while " "processing a reply from gdb. Please submit a bug report."), i18n("The exception is: %1\n" - "The MI response is: %2").tqarg(e.what()).tqarg(reply.data()), + "The MI response is: %2").arg(e.what()).arg(reply.data()), i18n("Internal debugger error")); destroyCurrentCommand(); @@ -1629,7 +1629,7 @@ void GDBController::commandDone() { kdDebug(9012) << "No more commands\n"; setStateOff(s_dbgBusy); - emit dbgtqStatus("", state_); + emit dbgStatus("", state_); raiseEvent(debugger_ready); } } @@ -1688,7 +1688,7 @@ void GDBController::raiseEvent(event_t e) void GDBController::slotDbgStderr(KProcess *proc, char *buf, int buflen) { // At the moment, just drop a message out and redirect - kdDebug(9012) << "STDERR: " << TQString::tqfromLatin1(buf, buflen+1) << endl; + kdDebug(9012) << "STDERR: " << TQString::fromLatin1(buf, buflen+1) << endl; slotDbgStdout(proc, buf, buflen); } @@ -1722,7 +1722,7 @@ void GDBController::slotDbgProcessExited(KProcess* process) destroyCmds(); setState(s_dbgNotStarted|s_appNotStarted|s_programExited); - emit dbgtqStatus (i18n("Process exited"), state_); + emit dbgStatus (i18n("Process exited"), state_); emit gdbUserCommandStdout("(gdb) Process exited\n"); } @@ -1743,14 +1743,14 @@ void GDBController::slotUserGDBCmd(const TQString& cmd) // raiseEvent(program_state_changed); } -void GDBController::explainDebuggertqStatus() +void GDBController::explainDebuggerStatus() { TQString information("%1 commands in queue\n" "%2 commands being processed by gdb\n" "Debugger state: %3\n"); information = - information.tqarg(cmdList_.count()).tqarg(currentCmd_ ? 1 : 0) - .tqarg(state_); + information.arg(cmdList_.count()).arg(currentCmd_ ? 1 : 0) + .arg(state_); if (currentCmd_) { @@ -1758,8 +1758,8 @@ void GDBController::explainDebuggertqStatus() "Current command text: '%2'\n" "Current command origianl text: '%3'\n"); - extra = extra.tqarg( - typeid(*currentCmd_).name()).tqarg(currentCmd_->cmdToSend()). + extra = extra.arg( + typeid(*currentCmd_).name()).arg(currentCmd_->cmdToSend()). arg(currentCmd_->initialString()); information += extra; } diff --git a/languages/cpp/debugger/gdbcontroller.h b/languages/cpp/debugger/gdbcontroller.h index 6ea27f41..3bc0020d 100644 --- a/languages/cpp/debugger/gdbcontroller.h +++ b/languages/cpp/debugger/gdbcontroller.h @@ -250,7 +250,7 @@ public slots: // Pops up a dialog box with some hopefully // detailed information about which state debugger // is in, which commands were sent and so on. - void explainDebuggertqStatus(); + void explainDebuggerStatus(); protected slots: diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp index c0157463..82385c72 100644 --- a/languages/cpp/debugger/gdboutputwidget.cpp +++ b/languages/cpp/debugger/gdboutputwidget.cpp @@ -25,12 +25,12 @@ #include <kpopupmenu.h> #include <tqlabel.h> -#include <tqlayout.h> -#include <tqtextedit.h> +#include <layout.h> +#include <textedit.h> #include <tqtoolbutton.h> #include <tqtooltip.h> #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdom.h> @@ -62,7 +62,7 @@ GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) : userGDBCmdEntry->setStretchFactor(m_userGDBCmdEditor, 1); m_Interrupt = new TQToolButton( this, "add breakpoint" ); - m_Interrupt->tqsetSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0, + m_Interrupt->setSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0, ( TQSizePolicy::SizeType)0, 0, 0, @@ -76,7 +76,7 @@ GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) : topLayout->addWidget(m_gdbView, 10); topLayout->addLayout(userGDBCmdEntry); - slotDbgtqStatus( "", s_dbgNotStarted); + slotDbgStatus( "", s_dbgNotStarted); connect( m_userGDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotGDBCmd()) ); connect( m_Interrupt, TQT_SIGNAL(clicked()), TQT_SIGNAL(breakInto())); @@ -257,7 +257,7 @@ void GDBOutputWidget::flushPending() /***************************************************************************/ -void GDBOutputWidget::slotDbgtqStatus(const TQString &, int statusFlag) +void GDBOutputWidget::slotDbgStatus(const TQString &, int statusFlag) { if (statusFlag & s_dbgNotStarted) { @@ -328,7 +328,7 @@ TQPopupMenu* OutputText::createPopupMenu(const TQPoint&) TQT_SLOT(toggleShowInternalCommands())); popup->setItemChecked(id, parent_->showInternalCommands_); - popup->tqsetWhatsThis( + popup->setWhatsThis( id, i18n( "Controls if commands issued internally by KDevelop " @@ -356,8 +356,8 @@ void OutputText::copyAll() // Make sure the text is pastable both with Ctrl-C and with // middle click. - TQApplication::tqclipboard()->setText(text, TQClipboard::Clipboard); - TQApplication::tqclipboard()->setText(text, TQClipboard::Selection); + TQApplication::clipboard()->setText(text, TQClipboard::Clipboard); + TQApplication::clipboard()->setText(text, TQClipboard::Selection); } void OutputText::toggleShowInternalCommands() diff --git a/languages/cpp/debugger/gdboutputwidget.h b/languages/cpp/debugger/gdboutputwidget.h index 28ffb8bc..de7704f1 100644 --- a/languages/cpp/debugger/gdboutputwidget.h +++ b/languages/cpp/debugger/gdboutputwidget.h @@ -19,7 +19,7 @@ #define _GDBOUTPUTWIDGET_H_ #include <tqwidget.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqtimer.h> #include <tqstringlist.h> @@ -50,7 +50,7 @@ public slots: void slotInternalCommandStdout(const char* line); void slotUserCommandStdout(const char* line); void slotReceivedStderr(const char* line); - void slotDbgtqStatus (const TQString &status, int statusFlag); + void slotDbgStatus (const TQString &status, int statusFlag); void slotGDBCmd(); diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp index 3b69c206..217f09fe 100644 --- a/languages/cpp/debugger/memviewdlg.cpp +++ b/languages/cpp/debugger/memviewdlg.cpp @@ -27,14 +27,14 @@ #include <kiconloader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmultilineedit.h> #include <tqpushbutton.h> #include <tqvariant.h> #include <tqpopupmenu.h> #include <tqhbox.h> #include <tqtoolbox.h> -#include <tqtextedit.h> +#include <textedit.h> #include <kmessagebox.h> @@ -84,7 +84,7 @@ namespace GDBDebugger { TQVBoxLayout* l = new TQVBoxLayout(this); - // Grid tqlayout: labels + address field + // Grid layout: labels + address field TQGridLayout* gl = new TQGridLayout(l); gl->setColSpacing(0, 2); @@ -263,8 +263,8 @@ namespace GDBDebugger new GDBCommand( TQString("-data-read-memory %1 x 1 1 %2") - .tqarg(rangeSelector_->startAddressLineEdit->text()) - .tqarg(size).ascii(), + .arg(rangeSelector_->startAddressLineEdit->text()) + .arg(size).ascii(), this, &MemoryView::memoryRead)); } @@ -280,7 +280,7 @@ namespace GDBDebugger start_ = startAsString_.toUInt(0, 0); setCaption(TQString("%1 (%2 bytes)") - .tqarg(startAsString_).tqarg(amount_)); + .arg(startAsString_).arg(amount_)); emit captionChanged(caption()); KHE::BytesEditInterface* bytesEditor @@ -328,9 +328,9 @@ namespace GDBDebugger controller_->addCommand( new GDBCommand( TQString("set *(char*)(%1 + %2) = %3") - .tqarg(start_) - .tqarg(i) - .tqarg(TQString::number(data_[i])))); + .arg(start_) + .arg(i) + .arg(TQString::number(data_[i])))); } } @@ -374,7 +374,7 @@ namespace GDBDebugger new GDBCommand( TQString("-data-read-memory %1 x 1 1 %2") - .tqarg(start_).tqarg(amount_).ascii(), + .arg(start_).arg(amount_).ascii(), this, &MemoryView::memoryRead)); } diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index a8c9f594..4adf33c2 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -26,7 +26,7 @@ #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqhbox.h> #include <tqpainter.h> #include <tqpushbutton.h> @@ -36,7 +36,7 @@ #include <klocale.h> #include <tqpoint.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <kapplication.h> #include <kmessagebox.h> @@ -47,14 +47,14 @@ /** The variables widget is passive, and is invoked by the rest of the code via two main slots: - - slotDbgtqStatus + - slotDbgStatus - slotCurrentFrame The first is received the program status changes and the second is recieved after current frame in the debugger can possibly changes. The widget has a list item for each frame/thread combination, with - variables as tqchildren. However, at each moment only one item is shown. + variables as children. However, at each moment only one item is shown. When handling the slotCurrentFrame, we check if variables for the current frame are available. If yes, we simply show the corresponding item. Otherwise, we fetch the new data from debugger. @@ -338,7 +338,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) controller_->addCommand( new GDBCommand( TQString("-data-evaluate-expression &%1") - .tqarg(var->gdbExpression()), + .arg(var->gdbExpression()), this, &VariableTree::handleAddressComputed, true /*handles error*/)); @@ -505,8 +505,8 @@ void VariableTree::updateCurrentFrame() controller_->addCommand( new GDBCommand(TQString("-stack-list-arguments 0 %1 %2") - .tqarg(controller_->currentFrame()) - .tqarg(controller_->currentFrame()) + .arg(controller_->currentFrame()) + .arg(controller_->currentFrame()) .ascii(), this, &VariableTree::argumentsReady)); @@ -607,7 +607,7 @@ void VariableTree::maybeTip(const TQPoint &p) VarItem * item = dynamic_cast<VarItem*>( itemAt( p ) ); if ( item ) { - TQRect r = tqitemRect( item ); + TQRect r = itemRect( item ); if ( r.isValid() ) tip( r, item->tipText() ); } @@ -882,8 +882,8 @@ void VarItem::handleCliPrint(const TQValueVector<TQString>& lines) { controller_->addCommand( new GDBCommand(TQString("-var-create %1 * \"%2\"") - .tqarg(varobjName_) - .tqarg(r.cap(1)), + .arg(varobjName_) + .arg(r.cap(1)), this, &VarItem::varobjCreated, // On initial create, errors get reported @@ -988,7 +988,7 @@ void VariableTree::keyPressEvent(TQKeyEvent* e) void VariableTree::copyToClipboard(TQListViewItem* item) { - TQClipboard *qb = KApplication::tqclipboard(); + TQClipboard *qb = KApplication::clipboard(); TQString text = item->text( 1 ); qb->setText( text, TQClipboard::Clipboard ); @@ -1078,7 +1078,7 @@ VarItem::VarItem(TrimmableItem *parent, oldSpecialRepresentationSet_(false), format_(natural), numChildren_(0), - tqchildrenFetched_(false), + childrenFetched_(false), updateUnconditionally_(false), frozen_(frozen), initialCreation_(true), @@ -1123,7 +1123,7 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj, oldSpecialRepresentationSet_(false), format_(format), numChildren_(0), - tqchildrenFetched_(false), + childrenFetched_(false), updateUnconditionally_(false), frozen_(false), initialCreation_(false), @@ -1146,7 +1146,7 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj, controller_ = varTree()->controller(); - // Set type and tqchildren. + // Set type and children. originalValueType_ = varobj["type"].literal(); numChildren_ = varobj["numchild"].literal().toInt(); setExpandable(numChildren_ != 0); @@ -1159,7 +1159,7 @@ VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj, void VarItem::createVarobj() { TQString old = varobjName_; - varobjName_ = TQString("KDEV%1").tqarg(varobjIndex++); + varobjName_ = TQString("KDEV%1").arg(varobjIndex++); emit varobjNameChange(old, varobjName_); if (frozen_) @@ -1169,7 +1169,7 @@ void VarItem::createVarobj() // variable and we create variable object from that. controller_->addCommand( new CliCommand( - TQString("print %1").tqarg(expression_), + TQString("print %1").arg(expression_), this, &VarItem::handleCliPrint)); } @@ -1177,7 +1177,7 @@ void VarItem::createVarobj() { controller_->addCommand( new CliCommand( - TQString("print /x &%1").tqarg(expression_), + TQString("print /x &%1").arg(expression_), this, &VarItem::handleCurrentAddress, true)); @@ -1186,8 +1186,8 @@ void VarItem::createVarobj() // Need to quote expression, otherwise gdb won't like // spaces inside it. new GDBCommand(TQString("-var-create %1 * \"%2\"") - .tqarg(varobjName_) - .tqarg(expression_), + .arg(varobjName_) + .arg(expression_), this, &VarItem::varobjCreated, initialCreation_ ? false : true)); @@ -1209,7 +1209,7 @@ void VarItem::varobjCreated(const GDBMI::ResultRecord& r) originalValueType_ = r["type"].literal(); if (!oldType.isEmpty() && oldType != originalValueType_) { - // Type changed, the tqchildren might be no longer valid, + // Type changed, the children might be no longer valid, // so delete them. for(TQListViewItem* child = firstChild(); child; ) { @@ -1239,7 +1239,7 @@ void VarItem::setVarobjName(const TQString& name) { controller_->addCommand( new GDBCommand(TQString("-var-set-format \"%1\" %2") - .tqarg(varobjName_).tqarg(varobjFormatName()))); + .arg(varobjName_).arg(varobjFormatName()))); } // Get the initial value. @@ -1247,7 +1247,7 @@ void VarItem::setVarobjName(const TQString& name) if (isOpen()) { - // This regets tqchildren list. + // This regets children list. setOpen(true); } } @@ -1333,18 +1333,18 @@ void VarItem::valueDone(const GDBMI::ResultRecord& r) } void VarItem::createChildren(const GDBMI::ResultRecord& r, - bool tqchildren_of_fake) + bool children_of_fake) { - const GDBMI::Value& tqchildren = r["tqchildren"]; + const GDBMI::Value& children = r["children"]; /* In order to figure out which variable objects correspond to base class subobject, we first must detect if *this is a structure type. We use present of 'public'/'private'/'protected' fake child as an indicator. */ bool structureType = false; - if (!tqchildren_of_fake && tqchildren.size() > 0) + if (!children_of_fake && children.size() > 0) { - TQString exp = tqchildren[0]["exp"].literal(); + TQString exp = children[0]["exp"].literal(); bool ok = false; exp.toInt(&ok); if (!ok || exp[0] != '*') @@ -1353,23 +1353,23 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r, } } - for (unsigned i = 0; i < tqchildren.size(); ++i) + for (unsigned i = 0; i < children.size(); ++i) { - TQString exp = tqchildren[i]["exp"].literal(); + TQString exp = children[i]["exp"].literal(); // For artificial accessibility nodes, - // fetch their tqchildren. + // fetch their children. if (exp == "public" || exp == "protected" || exp == "private") { - TQString name = tqchildren[i]["name"].literal(); + TQString name = children[i]["name"].literal(); controller_->addCommand(new GDBCommand( - "-var-list-tqchildren \"" + + "-var-list-children \"" + name + "\"", this, - &VarItem::tqchildrenOfFakesDone)); + &VarItem::childrenOfFakesDone)); } else { - /* All tqchildren of structures that are not artifical + /* All children of structures that are not artifical are base subobjects. */ bool baseObject = structureType; @@ -1388,7 +1388,7 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r, } if (existing) { - existing->setVarobjName(tqchildren[i]["name"].literal()); + existing->setVarobjName(children[i]["name"].literal()); } else { @@ -1396,20 +1396,20 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r, << exp << " " << baseObject << "\n"; // Propagate format from parent. VarItem* v = 0; - v = new VarItem(this, tqchildren[i], format_, baseObject); + v = new VarItem(this, children[i], format_, baseObject); } } } } -void VarItem::tqchildrenDone(const GDBMI::ResultRecord& r) +void VarItem::childrenDone(const GDBMI::ResultRecord& r) { createChildren(r, false); - tqchildrenFetched_ = true; + childrenFetched_ = true; } -void VarItem::tqchildrenOfFakesDone(const GDBMI::ResultRecord& r) +void VarItem::childrenOfFakesDone(const GDBMI::ResultRecord& r) { createChildren(r, true); } @@ -1603,8 +1603,8 @@ void VarItem::updateValue() void VarItem::setValue(const TQString& new_value) { controller_->addCommand( - new GDBCommand(TQString("-var-assign \"%1\" %2").tqarg(varobjName_) - .tqarg(new_value))); + new GDBCommand(TQString("-var-assign \"%1\" %2").arg(varobjName_) + .arg(new_value))); // And immediately reload it from gdb, // so that it's display format is the one gdb uses, @@ -1624,7 +1624,7 @@ void VarItem::updateSpecialRepresentation(const TQString& xs) s = s.mid(i+2); } - // A hack to nicely display TQStrings. The content of TQString is tqunicode + // A hack to nicely display TQStrings. The content of TQString is unicode // for for ASCII only strings we get ascii character mixed with \000. // Remove those \000 now. @@ -1661,14 +1661,14 @@ void VarItem::recreateLocallyMaybe() { controller_->addCommand( new CliCommand( - TQString("print /x &%1").tqarg(expression_), + TQString("print /x &%1").arg(expression_), this, &VarItem::handleCurrentAddress, true)); controller_->addCommand( new CliCommand( - TQString("whatis %1").tqarg(expression_), + TQString("whatis %1").arg(expression_), this, &VarItem::handleType)); } @@ -1688,12 +1688,12 @@ void VarItem::setOpen(bool open) { TQListViewItem::setOpen(open); - if (open && !tqchildrenFetched_) + if (open && !childrenFetched_) { controller_->addCommand(new GDBCommand( - "-var-list-tqchildren \"" + varobjName_ + "\"", + "-var-list-children \"" + varobjName_ + "\"", this, - &VarItem::tqchildrenDone)); + &VarItem::childrenDone)); } } @@ -1712,7 +1712,7 @@ bool VarItem::handleSpecialTypes() return false; varTree->controller()->addCommand( new ResultlessCommand(TQString("print $kdev_d=%1.d") - .tqarg(gdbExpression()), + .arg(gdbExpression()), true /* ignore error */)); if (varTree->controller()->qtVersion() >= 4) @@ -1736,7 +1736,7 @@ bool VarItem::handleSpecialTypes() else varTree->controller()->addCommand( new ValueSpecialRepresentationCommand( - this, "print ($kdev_s>0) ? (*((char*)&$kdev_d.tqunicode[0])@$kdev_s) : \"\"")); + this, "print ($kdev_s>0) ? (*((char*)&$kdev_d.unicode[0])@$kdev_s) : \"\"")); return true; } @@ -1760,7 +1760,7 @@ void VarItem::setFormat(format_t f) if (numChildren_) { - // If variable has tqchildren, change format for tqchildren. + // If variable has children, change format for children. // - for structures, that's clearly right // - for arrays, that's clearly right // - for pointers, this can be confusing, but nobody ever wants to @@ -1775,7 +1775,7 @@ void VarItem::setFormat(format_t f) { controller_->addCommand( new GDBCommand(TQString("-var-set-format \"%1\" %2") - .tqarg(varobjName_).tqarg(varobjFormatName()))); + .arg(varobjName_).arg(varobjFormatName()))); updateValue(); } @@ -1853,7 +1853,7 @@ void VarItem::paintCell(TQPainter *p, const TQColorGroup &cg, if (!alive_) { /* Draw this as disabled. */ - TQListViewItem::paintCell(p, varTree()->TQWidget::tqpalette().disabled(), + TQListViewItem::paintCell(p, varTree()->TQWidget::palette().disabled(), column, width, align); } else @@ -1876,7 +1876,7 @@ VariableTree* VarItem::varTree() const void VarItem::unhookFromGdb() { - // Unhook tqchildren first, so that child varitems are deleted + // Unhook children first, so that child varitems are deleted // before parent. Strictly speaking, we can avoid calling // -var-delete on child varitems, but that's a bit cheesy, for(TQListViewItem* child = firstChild(); @@ -1886,7 +1886,7 @@ void VarItem::unhookFromGdb() } alive_ = false; - tqchildrenFetched_ = false; + childrenFetched_ = false; emit varobjNameChange(varobjName_, ""); @@ -1894,7 +1894,7 @@ void VarItem::unhookFromGdb() { controller_->addCommand( new GDBCommand( - TQString("-var-delete \"%1\"").tqarg(varobjName_))); + TQString("-var-delete \"%1\"").arg(varobjName_))); } varobjName_ = ""; diff --git a/languages/cpp/debugger/variablewidget.h b/languages/cpp/debugger/variablewidget.h index cb8ffb0f..da885216 100644 --- a/languages/cpp/debugger/variablewidget.h +++ b/languages/cpp/debugger/variablewidget.h @@ -186,16 +186,16 @@ private: /***************************************************************************/ /***************************************************************************/ -/** List view item that can 'trim' outdated tqchildren. +/** List view item that can 'trim' outdated children. - The instances of this class hold a number of tqchildren corresponding + The instances of this class hold a number of children corresponding to variables. When program state changes, such as after a step in source, some variable values can change, and some variables can go out of scope. We need - highlight modified variables - remove gone variables - We could just remove all tqchildren and repopulate the list from + We could just remove all children and repopulate the list from the data from debugger, but then we'd loose information about previous variable values. @@ -286,7 +286,7 @@ public: /** Recursively clears the varobjName_ field, making *this completely disconnected from gdb. - Automatically makes *this and tqchildren disables, + Automatically makes *this and children disables, since there's no possible interaction with unhooked object. */ @@ -300,7 +300,7 @@ public: format_t formatFromGdbModifier(char c) const; /** Clears highliting for this variable and - all its tqchildren. */ + all its children. */ void clearHighlight(); /** Sets new top-level textual value of this variable. @@ -333,7 +333,7 @@ private: - sets varobjName_ to 'name' - sets format, if it's not default one - gets initial value - - if item is open, gets tqchildren. + - if item is open, gets children. */ void setVarobjName(const TQString& name); @@ -348,12 +348,12 @@ private: int column, int width, int align ); void varobjCreated(const GDBMI::ResultRecord& r); void valueDone(const GDBMI::ResultRecord& r); - void tqchildrenDone(const GDBMI::ResultRecord& r); - void tqchildrenOfFakesDone(const GDBMI::ResultRecord& r); + void childrenDone(const GDBMI::ResultRecord& r); + void childrenOfFakesDone(const GDBMI::ResultRecord& r); void handleCurrentAddress(const TQValueVector<TQString>& lines); void handleType(const TQValueVector<TQString>& lines); - void createChildren(const GDBMI::ResultRecord& r, bool tqchildren_of_fake); + void createChildren(const GDBMI::ResultRecord& r, bool children_of_fake); /** Called to handle the output of the cli print command. */ @@ -391,7 +391,7 @@ private: static int varobjIndex; int numChildren_; - bool tqchildrenFetched_; + bool childrenFetched_; TQString currentAddress_; TQString lastObtainedAddress_; diff --git a/languages/cpp/declarationinfo.h b/languages/cpp/declarationinfo.h index 413e8ded..1e31a01f 100644 --- a/languages/cpp/declarationinfo.h +++ b/languages/cpp/declarationinfo.h @@ -44,7 +44,7 @@ struct DeclarationInfo { } TQString locationToText() const { - return TQString("line %1 col %2 - line %3 col %4\nfile: %5").tqarg(startLine).tqarg(startCol).tqarg(endLine).tqarg(endCol).tqarg(file); + return TQString("line %1 col %2 - line %3 col %4\nfile: %5").arg(startLine).arg(startCol).arg(endLine).arg(endCol).arg(file); } TQString toText() const { diff --git a/languages/cpp/doc/cppannotations.toc b/languages/cpp/doc/cppannotations.toc index 81f7f04d..e4d538c5 100644 --- a/languages/cpp/doc/cppannotations.toc +++ b/languages/cpp/doc/cppannotations.toc @@ -427,7 +427,7 @@ <tocsect3 name="19.7.1: The `Daemon' program" url="cplusplus19.html#l349"/> <tocsect3 name="19.7.2: The `Pipe' class" url="cplusplus19.html#l350"/> <tocsect3 name="19.7.3: The `ParentSlurp' class" url="cplusplus19.html#l351"/> - <tocsect3 name="19.7.4: Communicating with multiple tqchildren" url="cplusplus19.html#l352"> + <tocsect3 name="19.7.4: Communicating with multiple children" url="cplusplus19.html#l352"> <tocsect4 name="19.7.4.1: The `Select' class" url="cplusplus19.html#l353"/> <tocsect4 name="19.7.4.2: The `Child' class" url="cplusplus19.html#l354"/> <tocsect4 name="19.7.4.3: The `Monitor' class" url="cplusplus19.html#l355"/> diff --git a/languages/cpp/doc/gnome1.toc b/languages/cpp/doc/gnome1.toc index bbab9265..577d61af 100644 --- a/languages/cpp/doc/gnome1.toc +++ b/languages/cpp/doc/gnome1.toc @@ -135,7 +135,7 @@ <tocsect2 name="GTK+ Widgets and Objects" url="gtk/gtkobjects.html"> <tocsect3 name="GtkAccelLabel" url="gtk/gtkaccellabel.html"/> <tocsect3 name="GtkAdjustment" url="gtk/gtkadjustment.html"/> - <tocsect3 name="GtkAlignment" url="gtk/gtktqalignment.html"/> + <tocsect3 name="GtkAlignment" url="gtk/gtkalignment.html"/> <tocsect3 name="GtkArrow" url="gtk/gtkarrow.html"/> <tocsect3 name="GtkAspectFrame" url="gtk/gtkaspectframe.html"/> <tocsect3 name="GtkButtonBox" url="gtk/gtkbuttonbox.html"/> @@ -261,7 +261,7 @@ <tocsect3 name="gnome-canvas-util" url="gnomeui/gnomeui-gnome-canvas-util.html"/> <tocsect3 name="gnome-dialog-util" url="gnomeui/gnomeui-gnome-dialog-util.html"/> <tocsect3 name="gnome-dns" url="gnomeui/gnomeui-gnome-dns.html"/> - <tocsect3 name="gnome-tqgeometry" url="gnomeui/gnomeui-gnome-tqgeometry.html"/> + <tocsect3 name="gnome-geometry" url="gnomeui/gnomeui-gnome-geometry.html"/> <tocsect3 name="gnome-ice" url="gnomeui/gnomeui-gnome-ice.html"/> <tocsect3 name="gnome-icon-text" url="gnomeui/gnomeui-gnome-icon-text.html"/> <tocsect3 name="gnome-init" url="gnomeui/gnomeui-gnome-init.html"/> diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc index 2f7dd1f4..e10972d4 100644 --- a/languages/cpp/doc/kde2book.toc +++ b/languages/cpp/doc/kde2book.toc @@ -405,7 +405,7 @@ <entry name="CDE (Common Desktop Environment)" url="ch01.html"/> <entry name="cgi resource type" url="ch07lev1sec4.html"/> <entry name="CGotoDialog class, modeless dialog box" url="ch08lev1sec3.html"/> -<entry name="CGotoDialog example, tqlayout" url="ch08lev1sec2.html"/> +<entry name="CGotoDialog example, layout" url="ch08lev1sec2.html"/> <entry name="Chapter tag (DocBook)" url="ch15lev1sec2.html"/> <entry name="checking out, applications (CVS)" url="ch17lev1sec5.html"/> <entry name="checking spelling" url="ch10lev1sec3.html"/> @@ -413,11 +413,11 @@ <entry name="check() method" url="ch10lev1sec3.html"/> <entry name="checkWord() method" url="ch10lev1sec3.html"/> <entry name="Child Classes command (Classbrowser pop-up menu)" url="ch18lev1sec4.html"/> -<entry name="child widgets, tqgeometry management, QBoxLayout manager" url="ch04lev1sec3.html"/> -<entry name="child widgets, tqgeometry management, QGridLayout manager" url="ch04lev1sec3.html"/> -<entry name="child widgets, tqgeometry management" url="ch04lev1sec3.html"/> -<entry name="child widgets, KChildren example, ktqchildren.cpp class definition" url="ch04lev1sec3.html"/> -<entry name="child widgets, KChildren example, ktqchildren.h class declaration" url="ch04lev1sec3.html"/> +<entry name="child widgets, geometry management, QBoxLayout manager" url="ch04lev1sec3.html"/> +<entry name="child widgets, geometry management, QGridLayout manager" url="ch04lev1sec3.html"/> +<entry name="child widgets, geometry management" url="ch04lev1sec3.html"/> +<entry name="child widgets, KChildren example, kchildren.cpp class definition" url="ch04lev1sec3.html"/> +<entry name="child widgets, KChildren example, kchildren.h class declaration" url="ch04lev1sec3.html"/> <entry name="child widgets, KChildren example, main() method" url="ch04lev1sec3.html"/> <entry name="child widgets, KChildren example" url="ch04lev1sec3.html"/> <entry name="child widgets" url="ch04lev1sec3.html"/> @@ -729,7 +729,7 @@ <entry name="deleting, CVS (Concurrent Version System) directories" url="ch17lev1sec5.html"/> <entry name="deleting, CVS (Concurrent Version System) files" url="ch17lev1sec5.html"/> <entry name="deprecated (" url="ch15.html"/> -<entry name="design guidelines, dialog boxes, tqlayout issues" url="ch08lev1sec2.html"/> +<entry name="design guidelines, dialog boxes, layout issues" url="ch08lev1sec2.html"/> <entry name="design guidelines, dialog boxes" url="ch08lev1sec7.html"/> <entry name="designing, icons" url="ch06lev1sec3.html"/> <entry name="Desktop Communication Protocol. See DCOP" url="ch13.html"/> @@ -760,13 +760,13 @@ <entry name="dialog boxes, KDialogBase class" url="ch08lev1sec5.html"/> <entry name="dialog boxes, KEdit Option dialog example" url="ch08lev1sec6.html"/> <entry name="dialog boxes, KSpellConfig configuration dialog" url="ch10lev1sec3.html"/> -<entry name="dialog boxes, tqlayout, CGotoDialog example" url="ch08lev1sec2.html"/> -<entry name="dialog boxes, tqlayout, design issues" url="ch08lev1sec2.html"/> -<entry name="dialog boxes, tqlayout, hierarchies of layouts" url="ch08lev1sec2.html"/> -<entry name="dialog boxes, tqlayout, manual placement" url="ch08lev1sec2.html"/> -<entry name="dialog boxes, tqlayout, nested layouts" url="ch08lev1sec2.html"/> -<entry name="dialog boxes, tqlayout, QLayout classes" url="ch08lev1sec2.html"/> -<entry name="dialog boxes, tqlayout, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> +<entry name="dialog boxes, layout, CGotoDialog example" url="ch08lev1sec2.html"/> +<entry name="dialog boxes, layout, design issues" url="ch08lev1sec2.html"/> +<entry name="dialog boxes, layout, hierarchies of layouts" url="ch08lev1sec2.html"/> +<entry name="dialog boxes, layout, manual placement" url="ch08lev1sec2.html"/> +<entry name="dialog boxes, layout, nested layouts" url="ch08lev1sec2.html"/> +<entry name="dialog boxes, layout, QLayout classes" url="ch08lev1sec2.html"/> +<entry name="dialog boxes, layout, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> <entry name="dialog boxes, modal, advantages/disadvantages" url="ch08lev1sec3.html"/> <entry name="dialog boxes, modal, modal dialog allocated from the heap" url="ch08lev1sec3.html"/> <entry name="dialog boxes, modal, modal dialog located on the stack" url="ch08lev1sec3.html"/> @@ -1080,16 +1080,16 @@ <entry name="gdb debugger, running" url="ch18lev1sec6.html"/> <entry name="gdb debugger" url="ch18lev1sec6.html"/> <entry name="gdb (GNU debugger)" url="ch02.html"/> -<entry name="tqgeometry management (widgets), dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/> -<entry name="tqgeometry management (widgets), dialog boxes, design issues" url="ch08lev1sec2.html"/> -<entry name="tqgeometry management (widgets), dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/> -<entry name="tqgeometry management (widgets), dialog boxes, manual placement" url="ch08lev1sec2.html"/> -<entry name="tqgeometry management (widgets), dialog boxes, nested layouts" url="ch08lev1sec2.html"/> -<entry name="tqgeometry management (widgets), dialog boxes, QLayout classes" url="ch08lev1sec2.html"/> -<entry name="tqgeometry management (widgets), dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> -<entry name="tqgeometry management (widgets), QBoxLayout manager" url="ch04lev1sec3.html"/> -<entry name="tqgeometry management (widgets), QGridLayout manager" url="ch04lev1sec3.html"/> -<entry name="tqgeometry management (widgets)" url="ch04lev1sec3.html"/> +<entry name="geometry management (widgets), dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/> +<entry name="geometry management (widgets), dialog boxes, design issues" url="ch08lev1sec2.html"/> +<entry name="geometry management (widgets), dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/> +<entry name="geometry management (widgets), dialog boxes, manual placement" url="ch08lev1sec2.html"/> +<entry name="geometry management (widgets), dialog boxes, nested layouts" url="ch08lev1sec2.html"/> +<entry name="geometry management (widgets), dialog boxes, QLayout classes" url="ch08lev1sec2.html"/> +<entry name="geometry management (widgets), dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> +<entry name="geometry management (widgets), QBoxLayout manager" url="ch04lev1sec3.html"/> +<entry name="geometry management (widgets), QGridLayout manager" url="ch04lev1sec3.html"/> +<entry name="geometry management (widgets)" url="ch04lev1sec3.html"/> <entry name="getColor() function" url="ch05lev1sec3.html"/> <entry name="getExistingDirectory() function" url="ch05lev1sec3.html"/> <entry name="getFont() function" url="ch05lev1sec3.html"/> @@ -1130,7 +1130,7 @@ <entry name="GUIs, dialog boxes, tdeui (KDE user-interface library)" url="ch08lev1sec4.html"/> <entry name="GUIs, dialog boxes, KDialogBase class" url="ch08lev1sec5.html"/> <entry name="GUIs, dialog boxes, KEdit Option dialog example" url="ch08lev1sec6.html"/> -<entry name="GUIs, dialog boxes, tqlayout" url="ch08lev1sec2.html"/> +<entry name="GUIs, dialog boxes, layout" url="ch08lev1sec2.html"/> <entry name="GUIs, dialog boxes, modal" url="ch08lev1sec3.html"/> <entry name="GUIs, dialog boxes, modeless" url="ch08lev1sec3.html"/> <entry name="GUIs, dialog boxes, simple example" url="ch08.html"/> @@ -1278,10 +1278,10 @@ <entry name="KApplication class" url="ch02lev1sec3.html"/> <entry name="KAudioPlayer class" url="ch14lev1sec6.html"/> <entry name="KButtonBox manager widget" url="ch08lev1sec4.html"/> -<entry name="ktqchildren.cpp class definition (KChildren widget)" url="ch04lev1sec3.html"/> -<entry name="ktqchildren.h class declaration (KChildren widget)" url="ch04lev1sec3.html"/> -<entry name="KChildren sample widget (child widget), ktqchildren.cpp class definition" url="ch04lev1sec3.html"/> -<entry name="KChildren sample widget (child widget), ktqchildren.h class declaration" url="ch04lev1sec3.html"/> +<entry name="kchildren.cpp class definition (KChildren widget)" url="ch04lev1sec3.html"/> +<entry name="kchildren.h class declaration (KChildren widget)" url="ch04lev1sec3.html"/> +<entry name="KChildren sample widget (child widget), kchildren.cpp class definition" url="ch04lev1sec3.html"/> +<entry name="KChildren sample widget (child widget), kchildren.h class declaration" url="ch04lev1sec3.html"/> <entry name="KChildren sample widget (child widget), main() method" url="ch04lev1sec3.html"/> <entry name="KChildren sample widget (child widget)" url="ch04lev1sec3.html"/> <entry name="kconfigdemo.cpp file (KConfigDemo widget)" url="ch07lev1sec2.html"/> @@ -1558,9 +1558,9 @@ <entry name="KStdActionsDemo widget" url="ch05.html"/> <entry name="ktictactoe.cpp class definition (KTicTacToe widget)" url="ch04lev1sec3.html"/> <entry name="ktictactoe.h class declaration (KTicTacToe widget)" url="ch04lev1sec3.html"/> -<entry name="KTicTacToe widget (tqgeometry management example), ktictactoe.cpp class definition" url="ch04lev1sec3.html"/> -<entry name="KTicTacToe widget (tqgeometry management example), ktictactoe.h class declaration" url="ch04lev1sec3.html"/> -<entry name="KTicTacToe widget (tqgeometry management example), playing the game" url="ch04lev1sec3.html"/> +<entry name="KTicTacToe widget (geometry management example), ktictactoe.cpp class definition" url="ch04lev1sec3.html"/> +<entry name="KTicTacToe widget (geometry management example), ktictactoe.h class declaration" url="ch04lev1sec3.html"/> +<entry name="KTicTacToe widget (geometry management example), playing the game" url="ch04lev1sec3.html"/> <entry name="KTMainWindow class" url="ch02lev1sec3.html"/> <entry name="Kulow, Stephen" url="ch16.html"/> <entry name="KUniqueApplication class, passing command-line parameters" url="ch13lev1sec7.html"/> @@ -1591,15 +1591,15 @@ <entry name="languages, i18n() function" url="ch06lev1sec4.html"/> <entry name="languages, translator files" url="ch06lev1sec4.html"/> <entry name="lastPage action" url="ch06.html"/> -<entry name="tqlayout, dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/> -<entry name="tqlayout, dialog boxes, design guidelines" url="ch08lev1sec7.html"/> -<entry name="tqlayout, dialog boxes, design issues" url="ch08lev1sec2.html"/> -<entry name="tqlayout, dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/> -<entry name="tqlayout, dialog boxes, manual placement" url="ch08lev1sec2.html"/> -<entry name="tqlayout, dialog boxes, nested layouts" url="ch08lev1sec2.html"/> -<entry name="tqlayout, dialog boxes, QLayout classes" url="ch08lev1sec2.html"/> -<entry name="tqlayout, dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> -<entry name="tqlayout managers, creating internally, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> +<entry name="layout, dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/> +<entry name="layout, dialog boxes, design guidelines" url="ch08lev1sec7.html"/> +<entry name="layout, dialog boxes, design issues" url="ch08lev1sec2.html"/> +<entry name="layout, dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/> +<entry name="layout, dialog boxes, manual placement" url="ch08lev1sec2.html"/> +<entry name="layout, dialog boxes, nested layouts" url="ch08lev1sec2.html"/> +<entry name="layout, dialog boxes, QLayout classes" url="ch08lev1sec2.html"/> +<entry name="layout, dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> +<entry name="layout managers, creating internally, QVBox/QHBox widgets" url="ch08lev1sec2.html"/> <entry name="leaveEvent() event handler, widgets" url="ch04.html"/> <entry name="legal issues" url="ch01lev1sec6.html"/> <entry name="legal issues" url="ch19.html"/> @@ -1656,12 +1656,12 @@ <entry name="listings, dialog boxes, dialog from tdeui library" url="ch08lev1sec4.html"/> <entry name="listings, dialog boxes, KButtonBox in a dialog" url="ch08lev1sec4.html"/> <entry name="listings, dialog boxes, KEdit dialog code" url="ch08lev1sec6.html"/> -<entry name="listings, dialog boxes, manual tqgeometry strategy and QLayouts classes" url="ch08lev1sec2.html"/> +<entry name="listings, dialog boxes, manual geometry strategy and QLayouts classes" url="ch08lev1sec2.html"/> <entry name="listings, dialog boxes, modal dialog allocated from the heap" url="ch08lev1sec3.html"/> <entry name="listings, dialog boxes, modal dialog located on the stack" url="ch08lev1sec3.html"/> <entry name="listings, dialog boxes, modeless dialog example" url="ch08lev1sec3.html"/> <entry name="listings, dialog boxes, modeless dialogs, removing from memory" url="ch08lev1sec3.html"/> -<entry name="listings, dialog boxes, QVBox widget for tqgeometry management" url="ch08lev1sec2.html"/> +<entry name="listings, dialog boxes, QVBox widget for geometry management" url="ch08lev1sec2.html"/> <entry name="listings, dialog boxes, SelectDialog class" url="ch08.html"/> <entry name="listings, Example_ADD interface" url="ch14lev1sec2.html"/> <entry name="listings, Example_ADD module" url="ch14lev1sec2.html"/> @@ -1672,8 +1672,8 @@ <entry name="listings, KabDemo application (address book dialog), kabdemo.cpp class definition" url="ch10lev1sec4.html"/> <entry name="listings, KabDemo application (address book dialog), kabdemo.h class declaration" url="ch10lev1sec4.html"/> <entry name="listings, KabDemo application (address book dialog), main() method" url="ch10lev1sec4.html"/> -<entry name="listings, KChildren widget, ktqchildren.cpp class definition" url="ch04lev1sec3.html"/> -<entry name="listings, KChildren widget, ktqchildren.h class declaration" url="ch04lev1sec3.html"/> +<entry name="listings, KChildren widget, kchildren.cpp class definition" url="ch04lev1sec3.html"/> +<entry name="listings, KChildren widget, kchildren.h class declaration" url="ch04lev1sec3.html"/> <entry name="listings, KChildren widget, main() method" url="ch04lev1sec3.html"/> <entry name="listings, KConfigDemo widget, kconfigdemo.cpp class definition" url="ch07lev1sec2.html"/> <entry name="listings, KConfigDemo widget, kconfigdemo.h class declaration" url="ch07lev1sec2.html"/> @@ -1829,7 +1829,7 @@ <entry name="managing, sessions, source file example" url="ch06lev1sec2.html"/> <entry name="managing, sessions" url="ch06lev1sec2.html"/> <entry name="managing, sessions" url="ch07lev1sec3.html"/> -<entry name="manual tqgeometry strategy (dialog boxes)" url="ch08lev1sec2.html"/> +<entry name="manual geometry strategy (dialog boxes)" url="ch08lev1sec2.html"/> <entry name="mcopclass files" url="ch14lev1sec2.html"/> <entry name="MCOP, future of, composition/RAD" url="ch14lev1sec7.html"/> <entry name="MCOP, future of, GUIs" url="ch14lev1sec7.html"/> @@ -1937,7 +1937,7 @@ <entry name="methods, remoteFunctions()" url="ch13lev1sec6.html"/> <entry name="methods, remoteInterfaces()" url="ch13lev1sec6.html"/> <entry name="methods, remoteObjects()" url="ch13lev1sec6.html"/> -<entry name="methods, tqrepaint(), QPainter class" url="ch04lev1sec2.html"/> +<entry name="methods, repaint(), QPainter class" url="ch04lev1sec2.html"/> <entry name="methods, resume()" url="ch13lev1sec5.html"/> <entry name="methods, senderId()" url="ch13lev1sec6.html"/> <entry name="methods, send()" url="ch13lev1sec5.html"/> @@ -2264,11 +2264,11 @@ <entry name="protocols, DCOP" url="ch13.html"/> <entry name="protocols, FTP, snapshots" url="ch17lev1sec3.html"/> <entry name="protocols, XDND" url="ch07.html"/> -<entry name="QBoxLayout tqgeometry manager" url="ch04lev1sec3.html"/> +<entry name="QBoxLayout geometry manager" url="ch04lev1sec3.html"/> <entry name="QDataStream objects" url="ch13lev1sec3.html"/> <entry name="QGL widget" url="ch03lev1sec6.html"/> -<entry name="QGridLayout tqgeometry manager" url="ch04lev1sec3.html"/> -<entry name="QHBox widget, tqlayout managers, creating" url="ch08lev1sec2.html"/> +<entry name="QGridLayout geometry manager" url="ch04lev1sec3.html"/> +<entry name="QHBox widget, layout managers, creating" url="ch08lev1sec2.html"/> <entry name="QImage class" url="ch10lev1sec2.html"/> <entry name="QLayout classes, code example" url="ch08lev1sec2.html"/> <entry name="QLayout classes, design issues" url="ch08lev1sec2.html"/> @@ -2278,7 +2278,7 @@ <entry name="QPainter class, example usage (listing)" url="ch03lev1sec2.html"/> <entry name="QPainter class, member function" url="ch03lev1sec2.html"/> <entry name="QPainter class, methods, paintEvent()" url="ch04lev1sec2.html"/> -<entry name="QPainter class, methods, tqrepaint()" url="ch04lev1sec2.html"/> +<entry name="QPainter class, methods, repaint()" url="ch04lev1sec2.html"/> <entry name="QPainter class, methods, update()" url="ch04lev1sec2.html"/> <entry name="QPainter class" url="ch03lev1sec2.html"/> <entry name="QPainter class" url="ch04lev1sec2.html"/> @@ -2327,7 +2327,7 @@ <entry name="Qt, utility classes" url="ch03lev1sec5.html"/> <entry name="queryClose() function" url="ch07lev1sec3.html"/> <entry name="quit action" url="ch06.html"/> -<entry name="QVBox widget, tqlayout managers, creating" url="ch08lev1sec2.html"/> +<entry name="QVBox widget, layout managers, creating" url="ch08lev1sec2.html"/> <entry name="QWidget class, attributes" url="ch04.html"/> <entry name="QWidget class, documentation" url="ch04.html"/> <entry name="QWidget class, event handlers, closeEvent()" url="ch04.html"/> @@ -2386,7 +2386,7 @@ <entry name="removing, modeless dialog boxes" url="ch08lev1sec3.html"/> <entry name="rendering, HTML files" url="ch10.html"/> <entry name="repainting, widgets" url="ch04lev1sec2.html"/> -<entry name="tqrepaint() method, QPainter class" url="ch04lev1sec2.html"/> +<entry name="repaint() method, QPainter class" url="ch04lev1sec2.html"/> <entry name="replace action" url="ch06.html"/> <entry name="reportBug action" url="ch06.html"/> <entry name="resiceGL(int width, int height) function (QGL widget)" url="ch03lev1sec6.html"/> @@ -2789,7 +2789,7 @@ <entry name="widets, KImageView (image viewer/converter), main() method" url="ch10lev1sec2.html"/> <entry name="widets, KImageView (image viewer/converter)" url="ch10lev1sec2.html"/> <entry name="widgets, attributes" url="ch04.html"/> -<entry name="widgets, child widgets, tqgeometry management" url="ch04lev1sec3.html"/> +<entry name="widgets, child widgets, geometry management" url="ch04lev1sec3.html"/> <entry name="widgets, child widgets, KChildren example" url="ch04lev1sec3.html"/> <entry name="widgets, child widgets" url="ch04lev1sec3.html"/> <entry name="widgets, compared to parts" url="ch12.html"/> diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp index d6b6dd02..964ff233 100644 --- a/languages/cpp/includepathresolver.cpp +++ b/languages/cpp/includepathresolver.cpp @@ -257,7 +257,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi dir = TQDir( dir.absPath() ); TQFileInfo makeFile( dir, "Makefile" ); if( !makeFile.exists() ) - return PathResolutionResult(false, i18n("Makefile is missing in folder \"%1\"").tqarg(dir.absPath()), i18n("problem while trying to resolve include-paths for %1").tqarg(file) ); + return PathResolutionResult(false, i18n("Makefile is missing in folder \"%1\"").arg(dir.absPath()), i18n("problem while trying to resolve include-paths for %1").arg(file) ); TQStringList cachedPath; //If the call doesn't succeed, use the cached not up-to-date version TQDateTime makeFileModification = makeFile.lastModified(); @@ -272,7 +272,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi return ret; } else { //We have a cached failed result. We should use that for some time but then try again. Return the failed result if: ( there were too many tries within this folder OR this file was already tried ) AND The last tries have not expired yet - if( /*((*it).failedFiles.size() > 3 || (*it).failedFiles.find( file ) != (*it).failedFiles.end()) &&*/ (*it).failTime.secsTo( TQDateTime::tqcurrentDateTime() ) < CACHE_FAIL_FOR_SECONDS ) { + if( /*((*it).failedFiles.size() > 3 || (*it).failedFiles.find( file ) != (*it).failedFiles.end()) &&*/ (*it).failTime.secsTo( TQDateTime::currentDateTime() ) < CACHE_FAIL_FOR_SECONDS ) { PathResolutionResult ret(false); //Fake that the result is ok ret.errorMessage = i18n("Cached: ") + (*it).errorMessage; ret.longErrorMessage = (*it).longErrorMessage; @@ -298,7 +298,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi int dot; if( (dot = file.findRev( '.' )) == -1 ) - return PathResolutionResult( false, i18n( "Filename %1 seems to be malformed" ).tqarg(file) ); + return PathResolutionResult( false, i18n( "Filename %1 seems to be malformed" ).arg(file) ); targetName = file.left( dot ); @@ -365,7 +365,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi ce.failed = true; ce.errorMessage = res.errorMessage; ce.longErrorMessage = res.longErrorMessage; - ce.failTime = TQDateTime::tqcurrentDateTime(); + ce.failTime = TQDateTime::currentDateTime(); ce.failedFiles[file] = true; } else { ce.failed = false; @@ -387,12 +387,12 @@ PathResolutionResult IncludePathResolver::getFullOutput( const TQString& command output = proc.stdOut(); if( proc.exitStatus() != 0 ) - return PathResolutionResult( false, i18n("make-process finished with nonzero exit-status"), i18n("output: %1").tqarg( output ) ); + return PathResolutionResult( false, i18n("make-process finished with nonzero exit-status"), i18n("output: %1").arg( output ) ); } else { bool ret = executeCommandPopen(command, workingDirectory, output); if( !ret ) - return PathResolutionResult( false, i18n("make-process failed"), i18n("output: %1").tqarg( output ) ); + return PathResolutionResult( false, i18n("make-process failed"), i18n("output: %1").arg( output ) ); } return PathResolutionResult(true); } @@ -471,14 +471,14 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt return res; return resolveIncludePathInternal( KURL::relativePath(newWorkingDirectory,u.path()), newWorkingDirectory, makeParams , newSource ); }else{ - return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The parameter-string \"%1\" does not seem to be valid. Output was: %2").tqarg(makeParams).tqarg(fullOutput) ); + return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The parameter-string \"%1\" does not seem to be valid. Output was: %2").arg(makeParams).arg(fullOutput) ); } } else { - return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The directory \"%1\" does not exist. Output was: %2").tqarg(newWorkingDirectory).tqarg(fullOutput) ); + return PathResolutionResult( false, i18n("Recursive make-call failed"), i18n("The directory \"%1\" does not exist. Output was: %2").arg(newWorkingDirectory).arg(fullOutput) ); } } else { - return PathResolutionResult( false, i18n("Recursive make-call malformed"), i18n("Output was: %2").tqarg(fullOutput) ); + return PathResolutionResult( false, i18n("Recursive make-call malformed"), i18n("Output was: %2").arg(fullOutput) ); } ++offset; @@ -488,7 +488,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt ///STEP 2: Search the output for include-paths TQRegExp validRx( "\\b([cg]\\+\\+|gcc)" ); if( validRx.search( fullOutput ) == -1 ) - return PathResolutionResult( false, i18n("Output seems not to be a valid gcc or g++ call"), i18n("Folder: \"%1\" Command: \"%2\" Output: \"%3\"").tqarg(workingDirectory).tqarg( source.getCommand(file, makeParameters) ).tqarg(fullOutput) ); + return PathResolutionResult( false, i18n("Output seems not to be a valid gcc or g++ call"), i18n("Folder: \"%1\" Command: \"%2\" Output: \"%3\"").arg(workingDirectory).arg( source.getCommand(file, makeParameters) ).arg(fullOutput) ); PathResolutionResult ret( true ); ret.longErrorMessage = fullOutput; @@ -497,7 +497,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt TQString quotedRx( "(\\').*(\\')|(\\\").*(\\\")" ); //Matches "hello", 'hello', 'hello"hallo"', etc. TQString escapedPathRx( "(([^)(\"'\\s]*)(\\\\\\s)?)*" ); //Matches /usr/I\ am \ a\ strange\ path/include - TQRegExp includeRx( TQString( "%1(%2|%3)(?=\\s)" ).tqarg( includeParameterRx ).tqarg( quotedRx ).tqarg( escapedPathRx ) ); + TQRegExp includeRx( TQString( "%1(%2|%3)(?=\\s)" ).arg( includeParameterRx ).arg( quotedRx ).arg( escapedPathRx ) ); includeRx.setMinimal( true ); includeRx.setCaseSensitive( true ); offset = 0; diff --git a/languages/cpp/kdevdriver.cpp b/languages/cpp/kdevdriver.cpp index 35d0a3ee..4ea75fca 100644 --- a/languages/cpp/kdevdriver.cpp +++ b/languages/cpp/kdevdriver.cpp @@ -175,7 +175,7 @@ TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) { CppTools::PathResolutionResult res = m_includePathResolver->resolveIncludePath( file ); if( !res.success ) { - Problem p( i18n( "%1. Message: %2" ).tqarg( res.errorMessage ).tqarg( res.longErrorMessage ), 0, 0, Problem::Level_Warning ); + Problem p( i18n( "%1. Message: %2" ).arg( res.errorMessage ).arg( res.longErrorMessage ), 0, 0, Problem::Level_Warning ); p.setFileName( file ); addProblem( file, p ); } @@ -184,7 +184,7 @@ TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) { } bool KDevDriver::shouldParseIncludedFile( const ParsedFilePointer& file ) { - TQString compoundString = file->fileName() + "||" + TQString("%1").tqarg(file->usedMacros().valueHash()) + "||" + TQString("%1").tqarg(file->usedMacros().idHash()); + TQString compoundString = file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash()); if( !m_shouldParseIncludedFiles ) return false; diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp index d2ad2d94..7474112c 100644 --- a/languages/cpp/main.cpp +++ b/languages/cpp/main.cpp @@ -10,7 +10,7 @@ #include <tqdir.h> #include <tqfileinfo.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqregexp.h> #include <catalog.h> diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp index def22f97..0d78624d 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp @@ -29,7 +29,7 @@ #include <tqfile.h> #include <tqregexp.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <cstdlib> @@ -93,7 +93,7 @@ void SettingsDialog::validateDirectory( const TQString & dir ) elb->listBox() ->removeItem( elb->listBox() ->index( item ) ); } - TQString errormsg = TQString( "<qt><b>%1</b> is not a directory</qt>" ).tqarg( dir ); + TQString errormsg = TQString( "<qt><b>%1</b> is not a directory</qt>" ).arg( dir ); KMessageBox::error( 0, errormsg, "Couldn't find directory" ); } emit enabled( elb->listBox()->count() > 0 ); diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp index 5a38e464..84a93b85 100644 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp @@ -18,7 +18,7 @@ #include <kprocess.h> #include <kdebug.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqlabel.h> #include <tqdir.h> diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h index 77546f8d..b95c825b 100644 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h @@ -26,7 +26,7 @@ public: KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevQt4Importer(); - virtual TQString dbName() const { return TQString::tqfromLatin1("TQt4"); } + virtual TQString dbName() const { return TQString::fromLatin1("TQt4"); } virtual TQStringList fileList(); virtual TQStringList includePaths(); diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h index d69e5b0b..6d1c85b6 100644 --- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h @@ -25,7 +25,7 @@ public: KDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevQtImporter(); - virtual TQString dbName() const { return TQString::tqfromLatin1("TQt"); } + virtual TQString dbName() const { return TQString::fromLatin1("TQt"); } virtual TQStringList fileList(); virtual TQStringList includePaths(); diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui index 3e085845..19fd0db1 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui @@ -26,7 +26,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>161</width> <height>21</height> @@ -35,7 +35,7 @@ </spacer> <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h index 06782a37..ccace71a 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h +++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h @@ -25,7 +25,7 @@ public: KDevKDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevKDELibsImporter(); - virtual TQString dbName() const { return TQString::tqfromLatin1("KDElibs"); } + virtual TQString dbName() const { return TQString::fromLatin1("KDElibs"); } virtual TQStringList fileList(); virtual TQStringList includePaths(); diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui index 1f967edc..5e2604d3 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui @@ -96,7 +96,7 @@ Only the selected entry will be used</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>220</width> <height>20</height> diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index 7508e1df..c5abd730 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -51,7 +51,7 @@ #include <tqwhatsthis.h> #include <tqtabbar.h> #include <tqwidgetstack.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> class ProblemItem: public KListViewItem @@ -175,7 +175,7 @@ void ProblemReporter::slotFilter() if(!m_tabBar->isTabEnabled(5)) m_tabBar->setTabEnabled(5,true); - m_tabBar->tab(5)->setText(i18n("Filtered: %1").tqarg( m_filterEdit->text() )); + m_tabBar->tab(5)->setText(i18n("Filtered: %1").arg( m_filterEdit->text() )); m_tabBar->setCurrentTab(5); m_filteredList->clear(); diff --git a/languages/cpp/qtbuildconfig.cpp b/languages/cpp/qtbuildconfig.cpp index 7a14ff2b..c5c87b1c 100644 --- a/languages/cpp/qtbuildconfig.cpp +++ b/languages/cpp/qtbuildconfig.cpp @@ -141,9 +141,9 @@ void QtBuildConfig::findTQtDir() TQStringList qtdirs; if( m_version == 3 ) qtdirs.push_back( ::getenv("QTDIR") ); - qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( m_version ) ); - qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").tqarg( m_version ) ); - qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( m_version ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( m_version ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( m_version ) ); + qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( m_version ) ); 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/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp index 3742c0f6..0705f03c 100644 --- a/languages/cpp/qtdesignercppintegration.cpp +++ b/languages/cpp/qtdesignercppintegration.cpp @@ -167,7 +167,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function atColumn = 0; } - // editIface->insertLine( atLine + 1, TQString::tqfromLatin1("") ); + // editIface->insertLine( atLine + 1, TQString::fromLatin1("") ); kdDebug() << "at line in intg: " << atLine << " atCol: " << atColumn << endl; kdDebug() << "text: " << stri << endl; editIface->insertText( atLine, atColumn, stri ); @@ -185,24 +185,24 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function TQString QtDesignerCppIntegration::accessID( FunctionDom fun ) const { if ( fun->isSignal() ) - return TQString::tqfromLatin1( "signals" ); + return TQString::fromLatin1( "signals" ); switch ( fun->access() ) { case CodeModelItem::Public: if ( fun->isSlot() ) - return TQString::tqfromLatin1( "public slots" ); - return TQString::tqfromLatin1( "public" ); + return TQString::fromLatin1( "public slots" ); + return TQString::fromLatin1( "public" ); case CodeModelItem::Protected: if ( fun->isSlot() ) - return TQString::tqfromLatin1( "protected slots" ); - return TQString::tqfromLatin1( "protected" ); + return TQString::fromLatin1( "protected slots" ); + return TQString::fromLatin1( "protected" ); case CodeModelItem::Private: if ( fun->isSlot() ) - return TQString::tqfromLatin1( "private slots" ); - return TQString::tqfromLatin1( "private" ); + return TQString::fromLatin1( "private slots" ); + return TQString::fromLatin1( "private" ); } return TQString(); diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp index 2254fb35..b1d9087c 100644 --- a/languages/cpp/simpletype.cpp +++ b/languages/cpp/simpletype.cpp @@ -301,7 +301,7 @@ TQString SimpleTypeImpl::operatorToString( Operator op ) { case ParenOp: return "paren-operator"; default: - return TQString( "%1" ).tqarg( ( long ) op ); + return TQString( "%1" ).arg( ( long ) op ); }; } diff --git a/languages/cpp/simpletype.h b/languages/cpp/simpletype.h index c6ca1031..bf90a4e7 100644 --- a/languages/cpp/simpletype.h +++ b/languages/cpp/simpletype.h @@ -214,7 +214,7 @@ class SimpleTypeConfiguration { SimpleType::destroyStore(); } } - void tqinvalidate() { + void invalidate() { m_invalid = true; } }; diff --git a/languages/cpp/subclassingdlgbase.ui b/languages/cpp/subclassingdlgbase.ui index 6984dcf6..f6170896 100644 --- a/languages/cpp/subclassingdlgbase.ui +++ b/languages/cpp/subclassingdlgbase.ui @@ -204,7 +204,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>20</height> diff --git a/languages/cpp/tag_creator.cpp b/languages/cpp/tag_creator.cpp index 1b95b4cd..011b9f95 100644 --- a/languages/cpp/tag_creator.cpp +++ b/languages/cpp/tag_creator.cpp @@ -78,9 +78,9 @@ void TagCreator::parseTranslationUnit( const ParsedFile& ast ) ast.write( stream ); tag.setAttribute( "cppparsedfile", data ); tag.setAttribute( "includedFrom", ast.includedFrom() ); - tag.setAttribute( "skippedLines", TQString("%1").tqarg( ast.skippedLines()) ); - tag.setAttribute( "macroValueHash", TQString("%1").tqarg( ast.usedMacros().valueHash()) ); - tag.setAttribute( "macroIdHash", TQString("%1").tqarg( ast.usedMacros().idHash() ) ); + tag.setAttribute( "skippedLines", TQString("%1").arg( ast.skippedLines()) ); + tag.setAttribute( "macroValueHash", TQString("%1").arg( ast.usedMacros().valueHash()) ); + tag.setAttribute( "macroIdHash", TQString("%1").arg( ast.usedMacros().idHash() ) ); tag.setScope( m_currentScope ); if( !ast->comment().isEmpty() ) diff --git a/languages/cpp/typedesc.cpp b/languages/cpp/typedesc.cpp index 1150f8fb..f9785604 100644 --- a/languages/cpp/typedesc.cpp +++ b/languages/cpp/typedesc.cpp @@ -21,7 +21,7 @@ #include "driver.h" #include "lexer.h" #include "parser.h" -#include <tqtextstream.h> +#include <textstream.h> #include <kglobal.h> @@ -238,7 +238,7 @@ size_t TypeDescData::hashKey() { int len = m_cleanName.length(); for ( int a = 0; a < len; a++ ) - ret += m_cleanName[ a ].tqunicode() * 3 * (11*(a+1)); + ret += m_cleanName[ a ].unicode() * 3 * (11*(a+1)); int n = 1; @@ -266,7 +266,7 @@ size_t TypeDescData::hashKey2() { int len = m_cleanName.length(); for ( int a = 0; a < len; a++ ) - ret += m_cleanName[ a ].tqunicode() * 19 * (7*(a+1)); + ret += m_cleanName[ a ].unicode() * 19 * (7*(a+1)); int n = 1; diff --git a/languages/csharp/README.dox b/languages/csharp/README.dox index e3a47947..130d7104 100644 --- a/languages/csharp/README.dox +++ b/languages/csharp/README.dox @@ -12,7 +12,7 @@ and images. \maintainer <a href="mailto:willems.luc AT pandora.be">Luc Willems</a> \feature csharp programming language support -\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet. .. diff --git a/languages/csharp/csharpdoc.cpp b/languages/csharp/csharpdoc.cpp index 154301a4..bfa924da 100644 --- a/languages/csharp/csharpdoc.cpp +++ b/languages/csharp/csharpdoc.cpp @@ -5,7 +5,7 @@ #include <sys/stat.h> #include <unistd.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <klocale.h> #include <kstandarddirs.h> diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp index 9746a190..2da0baab 100644 --- a/languages/csharp/csharpsupportpart.cpp +++ b/languages/csharp/csharpsupportpart.cpp @@ -14,7 +14,7 @@ #include <tqfileinfo.h> #include <tqpopupmenu.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtimer.h> #include <kaction.h> #include <kapplication.h> diff --git a/languages/fortran/README.dox b/languages/fortran/README.dox index 5eeb52a4..0566587c 100644 --- a/languages/fortran/README.dox +++ b/languages/fortran/README.dox @@ -14,7 +14,7 @@ and images. \maintainer <a href="mailto:nth maintainer AT provider.com">nth maintainer full name</a> \feature Fortran language support -\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet. .. diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp index 305288ab..5a2fe78f 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp +++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp @@ -11,7 +11,7 @@ #include <tqapplication.h> #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqradiobutton.h> #include <tqvbox.h> @@ -115,8 +115,8 @@ private: OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *parent, const char *name) : TQWidget(parent, name) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + layout->setAutoAdd(true); TQVButtonGroup *group = new TQVButtonGroup(i18n("Optimization Level"), this); Odefault = new TQRadioButton(i18n("Default"), group); @@ -137,7 +137,7 @@ OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *parent, optBox = 0; TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addStretch(); + layout->addStretch(); } @@ -198,8 +198,8 @@ void OptimizationTab::writeFlags(TQStringList *list) HpfTab::HpfTab(TQWidget *parent, const char *name) : TQWidget(parent, name) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + layout->setAutoAdd(true); hpfBox = new TQListView(this); hpfBox->addColumn(TQString()); @@ -208,7 +208,7 @@ HpfTab::HpfTab(TQWidget *parent, const char *name) new TQCheckListItem(hpfBox, *p, TQCheckListItem::CheckBox); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addStretch(); + layout->addStretch(); } diff --git a/languages/fortran/fixedformparser.cpp b/languages/fortran/fixedformparser.cpp index 3ae94319..f26b6e61 100644 --- a/languages/fortran/fixedformparser.cpp +++ b/languages/fortran/fixedformparser.cpp @@ -12,7 +12,7 @@ #include "fixedformparser.h" #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <codemodel.h> diff --git a/languages/fortran/fixedformparser.h b/languages/fortran/fixedformparser.h index 84d1e16b..acfb8b80 100644 --- a/languages/fortran/fixedformparser.h +++ b/languages/fortran/fixedformparser.h @@ -13,7 +13,7 @@ #define _FIXEDFORMPARSER_H_ #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqregexp.h> #include <codemodel.h> diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp index 180a3965..9211191a 100644 --- a/languages/fortran/fortransupportpart.cpp +++ b/languages/fortran/fortransupportpart.cpp @@ -21,7 +21,7 @@ #include <tqfileinfo.h> #include <tqpopupmenu.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtimer.h> #include <tqvbox.h> #include <kapplication.h> diff --git a/languages/fortran/ftnchekconfigwidget.cpp b/languages/fortran/ftnchekconfigwidget.cpp index c7b9ccb4..8acc9985 100644 --- a/languages/fortran/ftnchekconfigwidget.cpp +++ b/languages/fortran/ftnchekconfigwidget.cpp @@ -84,7 +84,7 @@ protected: FtnchekItem *flitem = static_cast<FtnchekItem*>(item); if (item) - tip(listview->tqitemRect(item), flitem->desc); + tip(listview->itemRect(item), flitem->desc); } }; @@ -141,7 +141,7 @@ const char *f77_flags[] = { const char *portability_flags[] = { "backslash", I18N_NOOP("Backslash characters in strings"), - "common-tqalignment", I18N_NOOP("COMMON block variables not in descending order of storage sizes"), + "common-alignment", I18N_NOOP("COMMON block variables not in descending order of storage sizes"), "hollerith", I18N_NOOP("Hollerith constants"), 0, 0 }; diff --git a/languages/fortran/ftnchekconfigwidgetbase.ui b/languages/fortran/ftnchekconfigwidgetbase.ui index ca20da82..f01271af 100644 --- a/languages/fortran/ftnchekconfigwidgetbase.ui +++ b/languages/fortran/ftnchekconfigwidgetbase.ui @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -498,7 +498,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/languages/java/JavaRecognizer.hpp b/languages/java/JavaRecognizer.hpp index 4dafc60e..fab59972 100644 --- a/languages/java/JavaRecognizer.hpp +++ b/languages/java/JavaRecognizer.hpp @@ -103,7 +103,7 @@ * o supports UNICODE? * Using Unicode charVocabulay makes code file big, but only * in the bitsets at the end. I need to make ANTLR generate - * tqunicode bitsets more efficiently. + * unicode bitsets more efficiently. * Version 1.19 (April 25, 2002) * Terence added in nice fixes by John Pybus concerning floating * constants and problems with super() calls. John did a nice diff --git a/languages/java/README.dox b/languages/java/README.dox index 0cb5898b..7050482e 100644 --- a/languages/java/README.dox +++ b/languages/java/README.dox @@ -13,7 +13,7 @@ and images. \maintainer <a href="mailto:roberto AT tdevelop.org">Roberto Raggi</a> Copyright (C) 2002-2003 \feature Java language support -\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. \bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=tdevelop&component=javasupport&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">javasupport component at Bugzilla database</a> \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet. diff --git a/languages/java/app_templates/kappjava/appview.java b/languages/java/app_templates/kappjava/appview.java index fc25a273..1ead5458 100644 --- a/languages/java/app_templates/kappjava/appview.java +++ b/languages/java/app_templates/kappjava/appview.java @@ -25,7 +25,7 @@ public class %{APPNAME}View extends QWidget public %{APPNAME}View(QWidget parent) { super(parent, null); - // setup our tqlayout manager to automatically add our widgets + // setup our layout manager to automatically add our widgets top_layout = new QHBoxLayout(this); top_layout.setAutoAdd(true); diff --git a/languages/java/app_templates/kappjava/pref.java b/languages/java/app_templates/kappjava/pref.java index 48e1ca6a..a50fdb31 100644 --- a/languages/java/app_templates/kappjava/pref.java +++ b/languages/java/app_templates/kappjava/pref.java @@ -31,8 +31,8 @@ public class %{APPNAME}PrefPageOne extends QFrame { public %{APPNAME}PrefPageOne(QWidget parent) { super(parent); - QHBoxLayout tqlayout = new QHBoxLayout(this); - tqlayout.setAutoAdd(true); + QHBoxLayout layout = new QHBoxLayout(this); + layout.setAutoAdd(true); new QLabel("Add something here", this); } @@ -42,8 +42,8 @@ public class %{APPNAME}PrefPageTwo extends QFrame { public %{APPNAME}PrefPageTwo(QWidget parent) { super(parent); - QHBoxLayout tqlayout = new QHBoxLayout(this); - tqlayout.setAutoAdd(true); + QHBoxLayout layout = new QHBoxLayout(this); + layout.setAutoAdd(true); new QLabel("Add something here", this); } diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp index 14471290..20195d8b 100644 --- a/languages/java/backgroundparser.cpp +++ b/languages/java/backgroundparser.cpp @@ -32,7 +32,7 @@ #include <tqfile.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> class KDevSourceProvider: public SourceProvider { diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui index bf0333ef..a4852fd5 100644 --- a/languages/java/configproblemreporter.ui +++ b/languages/java/configproblemreporter.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -61,7 +61,7 @@ <property name="text"> <string>msec</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>61</height> diff --git a/languages/java/configproblemreporter.ui.h b/languages/java/configproblemreporter.ui.h index 1da526ca..6d289931 100644 --- a/languages/java/configproblemreporter.ui.h +++ b/languages/java/configproblemreporter.ui.h @@ -46,7 +46,7 @@ void ConfigureProblemReporter::bgParserCheckbox_toggled( bool b ) void ConfigureProblemReporter::setDelayLabel( int delay ) { - delayLabel->setText( i18n( "delay: %1 msec" ).tqarg( delay ) ); + delayLabel->setText( i18n( "delay: %1 msec" ).arg( delay ) ); } diff --git a/languages/java/java.g b/languages/java/java.g index 64902409..1f825ec5 100644 --- a/languages/java/java.g +++ b/languages/java/java.g @@ -97,7 +97,7 @@ options { * o supports UNICODE? * Using Unicode charVocabulay makes code file big, but only * in the bitsets at the end. I need to make ANTLR generate - * tqunicode bitsets more efficiently. + * unicode bitsets more efficiently. * Version 1.19 (April 25, 2002) * Terence added in nice fixes by John Pybus concerning floating * constants and problems with super() calls. John did a nice @@ -1050,7 +1050,7 @@ options { k=4; // four characters of lookahead // charVocabulary='\u0003'..'\uFFFF'; charVocabulary='\u0003'..'\u00FF'; - // without inlining some bitset tests, couldn't do tqunicode; + // without inlining some bitset tests, couldn't do unicode; // I need to make ANTLR generate smaller bitsets; see // bottom of JavaLexer.java codeGenBitsetTestThreshold=20; diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index e4aeb27f..5e936422 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -560,7 +560,7 @@ JavaSupportPart::parseProject( ) continue; if( pcs.contains(absFilePath) && t.toTime_t() == pcs[absFilePath].first ){ - stream.tqdevice()->at( pcs[absFilePath].second ); + stream.device()->at( pcs[absFilePath].second ); FileDom file = codeModel()->create<FileModel>(); file->read( stream ); codeModel()->addFile( file ); @@ -860,21 +860,21 @@ void JavaSupportPart::saveProjectSourceInfo( ) for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ){ const FileDom dom = (*it); stream << dom->name() << m_timestamp[ dom->name() ].toTime_t(); - offsets.insert( dom->name(), stream.tqdevice()->at() ); + offsets.insert( dom->name(), stream.device()->at() ); stream << (uint)0; // dummy offset } for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ){ const FileDom dom = (*it); - int offset = stream.tqdevice()->at(); + int offset = stream.device()->at(); dom->write( stream ); - int end = stream.tqdevice()->at(); + int end = stream.device()->at(); - stream.tqdevice()->at( offsets[dom->name()] ); + stream.device()->at( offsets[dom->name()] ); stream << offset; - stream.tqdevice()->at( end ); + stream.device()->at( end ); } } diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp index 53517ced..a3206595 100644 --- a/languages/java/problemreporter.cpp +++ b/languages/java/problemreporter.cpp @@ -267,13 +267,13 @@ TQString ProblemReporter::levelToString( int level ) const switch( level ) { case Problem::Level_Error: - return TQString::tqfromLatin1( "Error" ); + return TQString::fromLatin1( "Error" ); case Problem::Level_Warning: - return TQString::tqfromLatin1( "Warning" ); + return TQString::fromLatin1( "Warning" ); case Problem::Level_Todo: - return TQString::tqfromLatin1( "Todo" ); + return TQString::fromLatin1( "Todo" ); case Problem::Level_Fixme: - return TQString::tqfromLatin1( "Fixme" ); + return TQString::fromLatin1( "Fixme" ); default: return TQString(); } diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp index 24eeda70..3148eb0f 100644 --- a/languages/kjssupport/jscodecompletion.cpp +++ b/languages/kjssupport/jscodecompletion.cpp @@ -14,7 +14,7 @@ #include <tqfileinfo.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtimer.h> #include <kapplication.h> #include <tqregexp.h> diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp index 44a3659b..a803e80d 100644 --- a/languages/kjssupport/kjssupport_part.cpp +++ b/languages/kjssupport/kjssupport_part.cpp @@ -19,7 +19,7 @@ #include <tqwhatsthis.h> #include <tqtimer.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqregexp.h> #include <tqpopupmenu.h> diff --git a/languages/kjssupport/subclassingdlgbase.ui b/languages/kjssupport/subclassingdlgbase.ui index 4ac1d94b..de17ef5b 100644 --- a/languages/kjssupport/subclassingdlgbase.ui +++ b/languages/kjssupport/subclassingdlgbase.ui @@ -204,7 +204,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>20</height> diff --git a/languages/lib/designer_integration/implementationwidget.cpp b/languages/lib/designer_integration/implementationwidget.cpp index 68782e60..6c7a51c0 100644 --- a/languages/lib/designer_integration/implementationwidget.cpp +++ b/languages/lib/designer_integration/implementationwidget.cpp @@ -20,7 +20,7 @@ #include "implementationwidget.h" #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <tqdir.h> #include <tqregexp.h> @@ -77,7 +77,7 @@ void ImplementationWidget::init(const TQString &formName) TQDomDocument doc; DomUtil::openDOMFile(doc, m_formName); m_baseClassName = DomUtil::elementByPathExt(doc, "class").text(); - setCaption(i18n("Create or Select Implementation Class for: %1").tqarg(m_baseClassName)); + setCaption(i18n("Create or Select Implementation Class for: %1").arg(m_baseClassName)); KListViewItem *item = new KListViewItem(classView, i18n("Namespaces && Classes")); item->setOpen(true); diff --git a/languages/lib/designer_integration/implementationwidgetbase.ui b/languages/lib/designer_integration/implementationwidgetbase.ui index 7f4148a9..6118902c 100644 --- a/languages/lib/designer_integration/implementationwidgetbase.ui +++ b/languages/lib/designer_integration/implementationwidgetbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -135,7 +135,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -169,7 +169,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout2_2</cstring> + <cstring>layout2_2</cstring> </property> <vbox> <property name="name"> diff --git a/languages/lib/designer_integration/qtdesignerintegration.cpp b/languages/lib/designer_integration/qtdesignerintegration.cpp index 6cd22927..d798ba77 100644 --- a/languages/lib/designer_integration/qtdesignerintegration.cpp +++ b/languages/lib/designer_integration/qtdesignerintegration.cpp @@ -60,7 +60,7 @@ void QtDesignerIntegration::addFunction(const TQString& formName, KInterfaceDesi ClassDom klass = m_implementations[formName]; if (!klass) { - KMessageBox::error(0, i18n("Cannot find implementation class for form: %1").tqarg(formName)); + KMessageBox::error(0, i18n("Cannot find implementation class for form: %1").arg(formName)); return; } diff --git a/languages/pascal/README.dox b/languages/pascal/README.dox index 8360d27c..52ef50b1 100644 --- a/languages/pascal/README.dox +++ b/languages/pascal/README.dox @@ -15,7 +15,7 @@ with the one from <a href="ftp://fara.cs.uni-potsdam.de/incoming/CppCodeGenerato \maintainer <a href="mailto:cloudtemple AT mksat.net">Alexander Dymo</a> \feature Pascal language support -\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. \bug Language parser can sometimes treat correct lines as errors. Please send sample code to maintainer if you have this problem. diff --git a/languages/pascal/backgroundparser.cpp b/languages/pascal/backgroundparser.cpp index d29fd1be..f5f159a6 100644 --- a/languages/pascal/backgroundparser.cpp +++ b/languages/pascal/backgroundparser.cpp @@ -24,7 +24,7 @@ BackgroundParser::BackgroundParser( ProblemReporter* reporter, const TQString& source, const TQString& filename ) : m_reporter( reporter ), - m_source( source.tqunicode(), source.length() ), + m_source( source.unicode(), source.length() ), m_fileName( filename ) { } diff --git a/languages/pascal/compiler/dccoptions/optiontabs.cpp b/languages/pascal/compiler/dccoptions/optiontabs.cpp index 58025ad6..f9af2892 100644 --- a/languages/pascal/compiler/dccoptions/optiontabs.cpp +++ b/languages/pascal/compiler/dccoptions/optiontabs.cpp @@ -12,7 +12,7 @@ #include <tqspinbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbuttongroup.h> #include <tqapplication.h> #include <tqpushbutton.h> @@ -26,8 +26,8 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name ) pathController(new FlagPathEditController()), editController(new FlagEditController()) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + layout->setAutoAdd(true); TQVButtonGroup *map_group = new TQVButtonGroup(i18n("Map File"), this); TQRadioButton *m_defaultMap = new TQRadioButton(i18n("Off"), map_group); @@ -39,19 +39,19 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name ) new FlagRadioButton(map_group, radioController, "-GD", i18n("Detailed")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); new FlagPathEdit(this, "", pathController, "--dynamicloader=", i18n("Default dynamic loader:"), KFile::File); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); new FlagSpinEdit(this, 0, 2147483647, 1024, 1048576, editController, "-$M", i18n("Reserved address space:")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); - tqlayout->addStretch(); + layout->addStretch(); } LinkerTab::~LinkerTab( ) @@ -80,8 +80,8 @@ void LinkerTab::writeFlags( TQStringList * str ) LocationsTab::LocationsTab( TQWidget * parent, const char * name ) :TQWidget(parent, name), pathController(new FlagPathEditController()) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + layout->setAutoAdd(true); new FlagPathEdit(this, ":", pathController, "-I", i18n("Include search path (delimited by \":\"):")); @@ -92,7 +92,7 @@ LocationsTab::LocationsTab( TQWidget * parent, const char * name ) new FlagPathEdit(this, ":", pathController, "-O", i18n("Object search path (delimited by \":\"):")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addStretch(); + layout->addStretch(); } LocationsTab::~LocationsTab( ) @@ -115,8 +115,8 @@ void LocationsTab::writeFlags( TQStringList * str ) Locations2Tab::Locations2Tab( TQWidget * parent, const char * name ) :TQWidget(parent, name), pathController(new FlagPathEditController()) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + layout->setAutoAdd(true); new FlagPathEdit(this, "", pathController, "-E", i18n("Executable output directory:")); @@ -127,7 +127,7 @@ Locations2Tab::Locations2Tab( TQWidget * parent, const char * name ) new FlagPathEdit(this, "", pathController, "-LN", i18n("Package source code directory:")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addStretch(); + layout->addStretch(); } Locations2Tab::~Locations2Tab( ) @@ -151,8 +151,8 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name ) :TQWidget(parent, name), controller(new FlagCheckBoxController()), editController(new FlagEditController()) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + layout->setAutoAdd(true); TQVButtonGroup *build_group = new TQVButtonGroup(i18n("Build"), this); new FlagCheckBox(build_group, controller, @@ -165,7 +165,7 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name ) "-Z", i18n("Disable implicit package compilation")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); new FlagListEdit(this, ":", editController, "-D", i18n("Conditional defines (delimited by \":\"):")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); @@ -173,7 +173,7 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name ) new FlagListEdit(this, ":", editController, "-A", i18n("Unit aliases in form unit=alias (delimited by \":\"):")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); TQVButtonGroup *message_group = new TQVButtonGroup(i18n("Messages"), this); new FlagCheckBox(message_group, controller, @@ -182,12 +182,12 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name ) "-W", i18n("Output warning messages")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); TQVButtonGroup *package_group = new TQVButtonGroup(i18n("Packages"), this); new FlagListEdit(package_group, ":", editController, "-LU", i18n("Build with packages (delimited by \":\"):")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addStretch(); + layout->addStretch(); } GeneralTab::~GeneralTab( ) @@ -215,10 +215,10 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name ) listController(new FlagEditController()), radioController(new FlagRadioButtonController()) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); -// tqlayout->setAutoAdd(true); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); +// layout->setAutoAdd(true); - TQGridLayout *tqlayout2 = new TQGridLayout(tqlayout, 2, 2, KDialog::spacingHint()); + TQGridLayout *layout2 = new TQGridLayout(layout, 2, 2, KDialog::spacingHint()); TQVButtonGroup *align_group = new TQVButtonGroup(i18n("Code Alignment && Stack Frames"), this); TQRadioButton *align_def = new TQRadioButton(i18n("Default (-$A8)"), align_group); @@ -234,7 +234,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name ) new FlagCheckBox(align_group, controller, "'-$W+'", i18n("Generate stack frames"), "'-$W-'"); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout2->addWidget(align_group, 0, 0); + layout2->addWidget(align_group, 0, 0); TQVButtonGroup *enum_group = new TQVButtonGroup(i18n("Enumeration Size"), this); TQRadioButton *enum_def = new TQRadioButton(i18n("Default (-$Z1)"), enum_group); @@ -246,7 +246,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name ) new FlagRadioButton(enum_group, radioController, "'-$Z4'", i18n("Unsigned double word (4096M values)")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout2->addWidget(enum_group, 0, 1); + layout2->addWidget(enum_group, 0, 1); TQVButtonGroup *compile_group = new TQVButtonGroup(i18n("Compile Time Checks"), this); new FlagCheckBox(compile_group, controller, @@ -266,7 +266,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name ) new FlagCheckBox(compile_group, controller, "'-$J+'", i18n("Writable typed constants"), "'-$J-'"); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout2->addWidget(compile_group, 1, 0); + layout2->addWidget(compile_group, 1, 0); TQVButtonGroup *run_group = new TQVButtonGroup(i18n("Run Time Checks"), this); new FlagCheckBox(run_group, controller, @@ -280,9 +280,9 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name ) new FlagCheckBox(run_group, controller, "'-$R+'", i18n("Range checking"), "'-$R-'"); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout2->addWidget(run_group, 1, 1); + layout2->addWidget(run_group, 1, 1); - tqlayout->addStretch(); + layout->addStretch(); } CodegenTab::~CodegenTab( ) @@ -312,17 +312,17 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) : TQWidget(parent, name), controller(new FlagCheckBoxController()), radioController(new FlagRadioButtonController) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); -// tqlayout->setAutoAdd(true); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); +// layout->setAutoAdd(true); TQVButtonGroup *optim_group = new TQVButtonGroup(i18n("Optimization"), this); new FlagCheckBox(optim_group, controller, "'-$O+'", i18n("Enable optimizations"), "'-$O-'", "'-$O+'"); - tqlayout->addWidget(optim_group); + layout->addWidget(optim_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); - TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint()); TQVButtonGroup *debug_group = new TQVButtonGroup(i18n("Debugging"), this); new FlagCheckBox(debug_group, controller, @@ -335,7 +335,7 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) "-VN", i18n("Namespace debug info")); symboldb = new FlagCheckBox(debug_group, controller, "-VR", i18n("Write symbol info in an .rsm file")); - tqlayout2->addWidget(debug_group); + layout2->addWidget(debug_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); TQVButtonGroup *debug_add = new TQVButtonGroup(i18n("Symbol Reference Information"), this); @@ -347,20 +347,20 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) "'-$YD'", i18n("Definition information")); new FlagRadioButton(debug_add, radioController, "'-$Y+'", i18n("Full reference information")); - tqlayout2->addWidget(debug_add); + layout2->addWidget(debug_add); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); - TQHBoxLayout *tqlayout3 = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + TQHBoxLayout *layout3 = new TQHBoxLayout(layout, KDialog::spacingHint()); TQPushButton *release = new TQPushButton(i18n("Release"), this); TQPushButton *debug = new TQPushButton(i18n("Debug"), this); - tqlayout3->addWidget(release); - tqlayout3->addWidget(debug); + layout3->addWidget(release); + layout3->addWidget(debug); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions())); connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions())); - tqlayout->addStretch(); + layout->addStretch(); } DebugOptimTab::~ DebugOptimTab( ) diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.cpp b/languages/pascal/compiler/fpcoptions/optiontabs.cpp index 5dd69349..9ff3ea3c 100644 --- a/languages/pascal/compiler/fpcoptions/optiontabs.cpp +++ b/languages/pascal/compiler/fpcoptions/optiontabs.cpp @@ -13,7 +13,7 @@ #include <tqspinbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbuttongroup.h> #include <tqapplication.h> #include <tqframe.h> @@ -26,14 +26,14 @@ FeedbackTab::FeedbackTab(TQWidget *parent, const char *name) : TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v"))) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + layout->setAutoAdd(true); TQVButtonGroup *output_group = new TQVButtonGroup(i18n("Output"), this); new FlagCheckBox(output_group, controller, "-vr", i18n("Format errors like GCC does")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); TQVButtonGroup *verbose_group = new TQVButtonGroup(i18n("Verbose"), this); new FlagCheckBox(verbose_group, controller, @@ -54,7 +54,7 @@ FeedbackTab::FeedbackTab(TQWidget *parent, const char *name) "-vd", i18n("Write other debugging info")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); TQVButtonGroup *other_group = new TQVButtonGroup(i18n("Other Information"), this); new FlagCheckBox(other_group, controller, @@ -74,7 +74,7 @@ FeedbackTab::FeedbackTab(TQWidget *parent, const char *name) TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addStretch(); + layout->addStretch(); } FeedbackTab::~FeedbackTab() @@ -98,8 +98,8 @@ FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * parent, const char * :TQWidget(parent, name), controller(new FlagCheckBoxController()), pathController(new FlagPathEditController()) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + layout->setAutoAdd(true); new FlagPathEdit(this, ":", pathController, "-Fu", i18n("Unit search path (delimited by \":\"):")); @@ -110,7 +110,7 @@ FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * parent, const char * new FlagPathEdit(this, ":", pathController, "-Fl", i18n("Library search path (delimited by \":\"):")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addStretch(); + layout->addStretch(); } FilesAndDirectoriesTab::~FilesAndDirectoriesTab( ) @@ -135,8 +135,8 @@ FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char :TQWidget(parent, name), controller(new FlagCheckBoxController()), pathController(new FlagPathEditController()) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + layout->setAutoAdd(true); new FlagPathEdit(this, "", pathController, "-FE", i18n("Write executables and units in:")); @@ -145,14 +145,14 @@ FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char new FlagPathEdit(this, "", pathController, "-o", i18n("Executable name:"), KFile::File); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(20); + layout->addSpacing(20); new FlagPathEdit(this, "", pathController, "-e", i18n("Location of as and ld programs:")); new FlagPathEdit(this, "", pathController, "-FL", i18n("Dynamic linker executable:"), KFile::File); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(20); + layout->addSpacing(20); new FlagPathEdit(this, "", pathController, "-Fr", i18n("Compiler messages file:"), KFile::File); @@ -160,7 +160,7 @@ FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char "-Fe", i18n("Write compiler messages to file:"), KFile::File); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addStretch(); + layout->addStretch(); } FilesAndDirectoriesTab2::~FilesAndDirectoriesTab2( ) @@ -185,8 +185,8 @@ void FilesAndDirectoriesTab2::writeFlags( TQStringList * str ) LanguageTab::LanguageTab( TQWidget * parent, const char * name ) : TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v"))) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + layout->setAutoAdd(true); TQVButtonGroup *compat_group = new TQVButtonGroup(i18n("Pascal Compatibility"), this); new FlagCheckBox(compat_group, controller, @@ -198,7 +198,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name ) new FlagCheckBox(compat_group, controller, "-Sp", i18n("GNU Pascal compatibility mode")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); TQVButtonGroup *ccompat_group = new TQVButtonGroup(i18n("C/C++ Compatibility"), this); new FlagCheckBox(ccompat_group, controller, @@ -208,7 +208,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name ) new FlagCheckBox(ccompat_group, controller, "-Sm", i18n("Support C style macros")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); TQVButtonGroup *lang_group = new TQVButtonGroup(i18n("Language"), this); new FlagCheckBox(lang_group, controller, @@ -221,7 +221,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name ) "-St", i18n("Allow the static keyword in objects")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addStretch(); + layout->addStretch(); } LanguageTab::~ LanguageTab( ) @@ -243,10 +243,10 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name ) : TQWidget(parent, name), controller(new FlagCheckBoxController()), asmController(new FlagRadioButtonController) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); -// tqlayout->setAutoAdd(true); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); +// layout->setAutoAdd(true); - TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint()); TQVButtonGroup *info_group = new TQVButtonGroup(i18n("Assembler Info"), this); new FlagCheckBox(info_group, controller, @@ -257,9 +257,9 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name ) "-ar", i18n("List register allocation and release info")); new FlagCheckBox(info_group, controller, "-at", i18n("List temporary allocations and deallocations")); - tqlayout2->addWidget(info_group); + layout2->addWidget(info_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - //tqlayout->addSpacing(10); + //layout->addSpacing(10); TQVButtonGroup *asmkind_group = new TQVButtonGroup(i18n("Assembler Reader"), this); TQRadioButton *m_defaultkind = new TQRadioButton(i18n("Use default reader"), asmkind_group); @@ -270,9 +270,9 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name ) "-Rintel", i18n("Intel style assembler")); new FlagRadioButton(asmkind_group, asmController, "-Rdirect", i18n("Direct assembler")); - tqlayout2->addWidget(asmkind_group); + layout2->addWidget(asmkind_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); TQVButtonGroup *asm_group = new TQVButtonGroup(i18n("Assembler Output"), this); @@ -298,10 +298,10 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name ) "-Acoff", i18n("Use coff")); new FlagRadioButton(asm_group, asmController, "-Apecoff", i18n("Use pecoff")); - tqlayout->addWidget(asm_group); + layout->addWidget(asm_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addStretch(); + layout->addStretch(); } AssemblerTab::~ AssemblerTab( ) @@ -328,12 +328,12 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) : TQWidget(parent, name), controller(new FlagCheckBoxController()), optimController(new FlagRadioButtonController) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); -// tqlayout->setAutoAdd(true); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); +// layout->setAutoAdd(true); - TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint()); - TQBoxLayout *tqlayout3 = new TQVBoxLayout(tqlayout2, KDialog::spacingHint()); + TQBoxLayout *layout3 = new TQVBoxLayout(layout2, KDialog::spacingHint()); TQVButtonGroup *debug_group = new TQVButtonGroup(i18n("Debugging"), this); new FlagCheckBox(debug_group, controller, @@ -346,18 +346,18 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) "-gh", i18n("Use heaptrc unit"), "-!gh"); new FlagCheckBox(debug_group, controller, "-gc", i18n("Generate checks for pointers"), "-!gc"); - tqlayout3->addWidget(debug_group); + layout3->addWidget(debug_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout3->addSpacing(10); + layout3->addSpacing(10); TQVButtonGroup *profile_group = new TQVButtonGroup(i18n("Profiling"), this); new FlagCheckBox(profile_group, controller, "-pg", i18n("Generate profiler code for gprof"), "-!pg"); - tqlayout3->addWidget(profile_group); + layout3->addWidget(profile_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout3->addSpacing(10); + layout3->addSpacing(10); - TQBoxLayout *tqlayout4 = new TQVBoxLayout(tqlayout2, KDialog::spacingHint()); + TQBoxLayout *layout4 = new TQVBoxLayout(layout2, KDialog::spacingHint()); TQVButtonGroup *optim_group1 = new TQVButtonGroup(i18n("General Optimization"), this); m_default = new TQRadioButton(i18n("Default"), optim_group1); @@ -366,9 +366,9 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) "-Og", i18n("Generate smaller code")); optim1 = new FlagRadioButton(optim_group1, optimController, "-OG", i18n("Generate faster code")); - tqlayout4->addWidget(optim_group1); + layout4->addWidget(optim_group1); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout4->addSpacing(10); + layout4->addSpacing(10); TQVButtonGroup *optim_group2 = new TQVButtonGroup(i18n("Optimization Levels"), this); m_default2 = new TQRadioButton(i18n("Default"), optim_group2); @@ -379,11 +379,11 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) "-O2", i18n("Level 2")); optim2 = new FlagRadioButton(optim_group2, optimController, "-O3", i18n("Level 3")); - tqlayout4->addWidget(optim_group2); + layout4->addWidget(optim_group2); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout4->addSpacing(10); + layout4->addSpacing(10); - TQHBoxLayout *tqlayout5 = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + TQHBoxLayout *layout5 = new TQHBoxLayout(layout, KDialog::spacingHint()); TQVButtonGroup *optim_group3 = new TQVButtonGroup(i18n("Architecture"), this); m_default3 = new TQRadioButton(i18n("Default"), optim_group3); @@ -394,7 +394,7 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) "-Op2", i18n("Pentium/PentiumMMX")); new FlagRadioButton(optim_group3, optimController, "-Op2", i18n("PentiumPro/PII/Cyrix 6x86/K6")); - tqlayout5->addWidget(optim_group3); + layout5->addWidget(optim_group3); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); TQVButtonGroup *optim_group4 = new TQVButtonGroup(i18n("Another Optimization"), this); @@ -402,18 +402,18 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) "-Or", i18n("Use register variables"), "-!Or"); new FlagCheckBox(optim_group4, controller, "-Ou", i18n("Uncertain optimizations"), "-!Ou"); - tqlayout5->addWidget(optim_group4); + layout5->addWidget(optim_group4); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - TQHBoxLayout *tqlayout6 = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + TQHBoxLayout *layout6 = new TQHBoxLayout(layout, KDialog::spacingHint()); TQPushButton *release = new TQPushButton(i18n("Release"), this); TQPushButton *debug = new TQPushButton(i18n("Debug"), this); - tqlayout6->addWidget(release); - tqlayout6->addWidget(debug); + layout6->addWidget(release); + layout6->addWidget(debug); connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions())); connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions())); - tqlayout->addStretch(); + layout->addStretch(); } DebugOptimTab::~ DebugOptimTab( ) @@ -458,8 +458,8 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name ) : TQWidget(parent, name), controller(new FlagCheckBoxController()), listController(new FlagEditController()) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + layout->setAutoAdd(true); TQVButtonGroup *compile_group = new TQVButtonGroup(i18n("Compile Time Checks"), this); new FlagCheckBox(compile_group, controller, @@ -467,7 +467,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name ) new FlagCheckBox(compile_group, controller, "-Un", i18n("Do not check the unit name for being the same as the file name")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); TQVButtonGroup *run_group = new TQVButtonGroup(i18n("Run Time Checks"), this); new FlagCheckBox(run_group, controller, @@ -479,14 +479,14 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name ) new FlagCheckBox(run_group, controller, "-Co", i18n("Integer overflow checking")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); new FlagListEdit(this, ":", listController, "-d", i18n("Conditional defines (delimited by \":\"):")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); new FlagListEdit(this, ":", listController, "-u", i18n("Undefine conditional defines (delimited by \":\"):")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); new FlagSpinEdit(this, 1024, 67107840, 1, 131072, listController, "-Cs", i18n("Stack size:")); @@ -494,7 +494,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name ) "-Ch", i18n("Heap size:")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addStretch(); + layout->addStretch(); } CodegenTab::~ CodegenTab( ) @@ -519,9 +519,9 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name ) : TQWidget(parent, name), controller(new FlagCheckBoxController()), listController(new FlagEditController()) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint()); TQVButtonGroup *link_group = new TQVButtonGroup(i18n("Linking Stage"), this); new FlagCheckBox(link_group, controller, @@ -534,7 +534,7 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name ) "-Cn", i18n("Omit the linking stage")); new FlagCheckBox(link_group, controller, "-s", i18n("Create assembling and linking script")); - tqlayout2->addWidget(link_group); + layout2->addWidget(link_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); TQVButtonGroup *exec_group = new TQVButtonGroup(i18n("Executable Generation"), this); @@ -548,15 +548,15 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name ) "-XD", i18n("Link with dynamic libraries")); new FlagCheckBox(exec_group, controller, "-Xc", i18n("Link with the C library")); - tqlayout2->addWidget(exec_group); + layout2->addWidget(exec_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); FlagListEdit *led = new FlagListEdit(this, ":", listController, "-k", i18n("Options passed to the linker (delimited by \":\"):")); - tqlayout->addWidget(led); + layout->addWidget(led); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addStretch(); + layout->addStretch(); } LinkerTab::~LinkerTab( ) @@ -583,8 +583,8 @@ MiscTab::MiscTab( TQWidget * parent, const char * name ) pathController(new FlagPathEditController()), editController(new FlagEditController()) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + layout->setAutoAdd(true); new FlagCheckBox(this, controller, "-B", i18n("Recompile all used units")); @@ -595,7 +595,7 @@ MiscTab::MiscTab( TQWidget * parent, const char * name ) new FlagSpinEdit(this, 1, 1000, 1, 50, editController, "-Se", i18n("Stop after the error:")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); TQVButtonGroup *browser_group = new TQVButtonGroup(i18n("Browser Info"), this); TQRadioButton *m_defaultBrowser = new TQRadioButton(i18n("No browser info"), browser_group); @@ -605,7 +605,7 @@ MiscTab::MiscTab( TQWidget * parent, const char * name ) new FlagRadioButton(browser_group, radioController, "-bl", i18n("Global and local browser info")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); TQVButtonGroup *target_group = new TQVButtonGroup(i18n("Target OS"), this); TQRadioButton *m_defaultTarget = new TQRadioButton(i18n("Default"), target_group); @@ -625,9 +625,9 @@ MiscTab::MiscTab( TQWidget * parent, const char * name ) new FlagRadioButton(target_group, radioController, "-TBEOS", i18n("BeOS")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - tqlayout->addSpacing(10); + layout->addSpacing(10); - tqlayout->addStretch(); + layout->addStretch(); } MiscTab::~ MiscTab( ) diff --git a/languages/pascal/configproblemreporter.ui b/languages/pascal/configproblemreporter.ui index b7c62665..020557a1 100644 --- a/languages/pascal/configproblemreporter.ui +++ b/languages/pascal/configproblemreporter.ui @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>101</height> diff --git a/languages/pascal/pascal.g b/languages/pascal/pascal.g index 1c1209b5..fde5dcb8 100644 --- a/languages/pascal/pascal.g +++ b/languages/pascal/pascal.g @@ -59,7 +59,7 @@ options { * * One of the principles here is that any time you have a list of * stuff, you usually want to treat it like one thing (a list) a some - * point in the grammar. You want trees to have a fixed number of tqchildren + * point in the grammar. You want trees to have a fixed number of children * as much as possible. For example, the definition of a procedure should * be something like #(PROCEDURE ID #(ARGDECLS ARG1 ARG2...)) not * #(PROCEDURE ID ARG1 ARG2 ... ) since this is harder to parse and diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp index 2b1edd31..0d8c049b 100644 --- a/languages/pascal/pascalsupport_part.cpp +++ b/languages/pascal/pascalsupport_part.cpp @@ -138,7 +138,7 @@ void PascalSupportPart::addedFilesToProject(const TQStringList &fileList) { TQString fn = project()->projectDirectory() + "/" + *it; maybeParse( fn ); - kapp->tqprocessEvents( 500 ); + kapp->processEvents( 500 ); emit addedSourceInfo(fn); } } @@ -173,7 +173,7 @@ void PascalSupportPart::initialParse( ) for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it){ TQString fn = project()->projectDirectory() + "/" + *it; maybeParse( fn ); - kapp->tqprocessEvents( 500 ); + kapp->processEvents( 500 ); } emit updatedSourceInfo(); @@ -191,7 +191,7 @@ void PascalSupportPart::maybeParse( const TQString & fileName ) if( !mime || mime->name() != "text/x-pascal" ) return; - mainWindow()->statusBar()->message( i18n("Parsing file: %1").tqarg(fileName) ); + mainWindow()->statusBar()->message( i18n("Parsing file: %1").arg(fileName) ); parse( fileName ); } @@ -256,10 +256,10 @@ TQString PascalSupportPart::formatTag( const Tag & inputTag ) switch( tag.kind() ) { case Tag::Kind_Namespace: - return TQString::tqfromLatin1("unit ") + tag.name(); + return TQString::fromLatin1("unit ") + tag.name(); case Tag::Kind_Class: - return TQString::tqfromLatin1("class ") + tag.name(); + return TQString::fromLatin1("class ") + tag.name(); case Tag::Kind_Function: case Tag::Kind_FunctionDeclaration: @@ -271,7 +271,7 @@ TQString PascalSupportPart::formatTag( const Tag & inputTag ) case Tag::Kind_Variable: case Tag::Kind_VariableDeclaration: { - return TQString::tqfromLatin1("var ") + tag.name(); + return TQString::fromLatin1("var ") + tag.name(); } break; } diff --git a/languages/perl/README.dox b/languages/perl/README.dox index fc637af6..33020853 100644 --- a/languages/perl/README.dox +++ b/languages/perl/README.dox @@ -12,7 +12,7 @@ and images. \maintainer <a href="mailto:willems.luc AT pandora.be">Luc Willems</a> \feature perl programming language support -\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet. .. diff --git a/languages/perl/doc/perl.toc b/languages/perl/doc/perl.toc index 108cb6ae..bb3219e2 100644 --- a/languages/perl/doc/perl.toc +++ b/languages/perl/doc/perl.toc @@ -14,7 +14,7 @@ <tocsect1 name="Modules: how to write and use" url="man:perlmodlib"/> <tocsect1 name="Modules: how to install from CPAN" url="man:perlmodinstall"/> <tocsect1 name="Formats" url="man:perlform"/> -<tocsect1 name="Unicode Support" url="man:perltqunicode"/> +<tocsect1 name="Unicode Support" url="man:perlunicode"/> <tocsect1 name="Locale Support" url="man:perllocale"/> <tocsect1 name="References Introduction" url="man:perlreftut"/> <tocsect1 name="References, the rest of the story" url="man:perlref"/> diff --git a/languages/perl/perldoc.cpp b/languages/perl/perldoc.cpp index 51a8f774..c651ac72 100644 --- a/languages/perl/perldoc.cpp +++ b/languages/perl/perldoc.cpp @@ -5,7 +5,7 @@ #include <sys/stat.h> #include <unistd.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <klocale.h> #include <kstandarddirs.h> diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp index 8cf62ca9..671b9902 100644 --- a/languages/perl/perlsupportpart.cpp +++ b/languages/perl/perlsupportpart.cpp @@ -14,7 +14,7 @@ #include <tqfileinfo.h> #include <tqpopupmenu.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtimer.h> #include <kaction.h> #include <kapplication.h> diff --git a/languages/php/README.dox b/languages/php/README.dox index 4db52ea9..f388a3c6 100644 --- a/languages/php/README.dox +++ b/languages/php/README.dox @@ -14,7 +14,7 @@ all include files from your script. \maintainer <a href="mailto:n.escuder AT intra-links.com">Escuder Nicolas</a> \feature PHP language support -\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. \bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=tdevelop&component=php+support&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">php support component at Bugzilla database</a> diff --git a/languages/php/data/phpfunctions b/languages/php/data/phpfunctions index 946dfaea..d0897bd5 100644 --- a/languages/php/data/phpfunctions +++ b/languages/php/data/phpfunctions @@ -184,7 +184,7 @@ domxml:string domxml_attrname([int dir_handle]) domxml:class domxml_node(string name) domxml:string domxml_lastchild([int node]) domxml:string domxml_parent([int node]) -domxml:string domxml_tqchildren([int node]) +domxml:string domxml_children([int node]) domxml:string domxml_getattr([int node,] string attrname) domxml:bool domxml_setattr([int node,] string attrname, string value) domxml:array domxml_attributes([int node]) @@ -199,7 +199,7 @@ domxml:string domxml_add_root([int doc_handle,] string name) domxml:class domxml_new_xmldoc(string version) domxml:string node_namespace([int node]) domxml:string node_attributes([int node]) -domxml:string node_tqchildren([int node]) +domxml:string node_children([int node]) domxml:class xmltree(string xmldoc) dotnet:int dotnet_load(string module_name) exif:string read_exif_data(string filename) @@ -341,7 +341,7 @@ hw:hwdoc hw_gettext(int link, int objid [, int rootid]) hw:void hw_edittext(int link, hwdoc doc) hw:hwdoc hw_getcgi(int link, int objid) hw:int hw_getremote(int link, int objid) -hw:[array|int] hw_getremotetqchildren(int link, string objrec) +hw:[array|int] hw_getremotechildren(int link, string objrec) hw:void hw_setlinkroot(int link, int rootid) hw:hwdoc hw_pipedocument(int link, int objid) hw:hwdoc hw_pipecgi(int link, int objid) @@ -360,8 +360,8 @@ hw:string hw_documentattributes(hwdoc doc) hw:string hw_document_attributes(hwdoc doc) hw:array hw_getparentsobj(int link, int objid) hw:array hw_getparents(int link, int objid) -hw:array hw_tqchildren(int link, int objid) -hw:array hw_tqchildrenobj(int link, int objid) +hw:array hw_children(int link, int objid) +hw:array hw_childrenobj(int link, int objid) hw:array hw_getchildcoll(int link, int objid) hw:array hw_getchildcollobj(int link, int objid) hw:int hw_docbyanchor(int link, int anchorid) @@ -1501,18 +1501,18 @@ swf:void swf_actiongotolabel(string label) swf:void swf_defineline(int objid, double x1, double y1, double x2, double y2, double width) swf:void swf_definerect(int objid, double x1, double y1, double x2, double y2, double width) swf:void swf_definepoly(int obj_id, array coords, int npoints, double width) -swf:void swf_starttqshape(int objid) -swf:void swf_tqshapelinesolid(double r, double g, double b, double a, double width) -swf:void swf_tqshapefilloff(void) -swf:void swf_tqshapefillsolid(double r, double g, double b, double a) -swf:void swf_tqshapefillbitmapclip(int bitmapid) -swf:void swf_tqshapefillbitmaptile(int bitmapid) -swf:void swf_tqshapemoveto(double x, double y) -swf:void swf_tqshapelineto(double x, double y) -swf:void swf_tqshapecurveto(double x1, double y1, double x2, double y2) -swf:void swf_tqshapecurveto3(double x1, double y1, double x2, double y2, double x3, double y3) -swf:void swf_tqshapearc(double x, double y, double r, double ang1, double ang2) -swf:void swf_endtqshape(void) +swf:void swf_startshape(int objid) +swf:void swf_shapelinesolid(double r, double g, double b, double a, double width) +swf:void swf_shapefilloff(void) +swf:void swf_shapefillsolid(double r, double g, double b, double a) +swf:void swf_shapefillbitmapclip(int bitmapid) +swf:void swf_shapefillbitmaptile(int bitmapid) +swf:void swf_shapemoveto(double x, double y) +swf:void swf_shapelineto(double x, double y) +swf:void swf_shapecurveto(double x1, double y1, double x2, double y2) +swf:void swf_shapecurveto3(double x1, double y1, double x2, double y2, double x3, double y3) +swf:void swf_shapearc(double x, double y, double r, double ang1, double ang2) +swf:void swf_endshape(void) swf:void swf_definefont(int fontid, string name) swf:void swf_setfont(int fontid) swf:void swf_fontsize(double height) diff --git a/languages/php/doc/php.toc b/languages/php/doc/php.toc index 1c3e6db3..9e2035a7 100644 --- a/languages/php/doc/php.toc +++ b/languages/php/doc/php.toc @@ -557,11 +557,11 @@ <tocsect2 name="Predefined Constants" url="recode.constants.php"/> <tocsect2 name="Recode Functions" url="ref.recode.php"/> </tocsect1> -<tocsect1 name="Unicode" url="book.tqunicode.php"> - <tocsect2 name="Introduction" url="intro.tqunicode.php"/> - <tocsect2 name="Installing/Configuring" url="tqunicode.setup.php"/> - <tocsect2 name="Predefined Constants" url="tqunicode.constants.php"/> - <tocsect2 name="Unicode Functions" url="ref.tqunicode.php"/> +<tocsect1 name="Unicode" url="book.unicode.php"> + <tocsect2 name="Introduction" url="intro.unicode.php"/> + <tocsect2 name="Installing/Configuring" url="unicode.setup.php"/> + <tocsect2 name="Predefined Constants" url="unicode.constants.php"/> + <tocsect2 name="Unicode Functions" url="ref.unicode.php"/> </tocsect1> <tocsect1 name="Exif" url="book.exif.php"> <tocsect2 name="Introduction" url="intro.exif.php"/> @@ -688,7 +688,7 @@ <tocsect2 name="SWFMorph" url="class.swfmorph.php"/> <tocsect2 name="SWFMovie" url="class.swfmovie.php"/> <tocsect2 name="SWFPrebuiltClip" url="class.swfprebuiltclip.php"/> - <tocsect2 name="SWFShape" url="class.swftqshape.php"/> + <tocsect2 name="SWFShape" url="class.swfshape.php"/> <tocsect2 name="SWFSound" url="class.swfsound.php"/> <tocsect2 name="SWFSoundInstance" url="class.swfsoundinstance.php"/> <tocsect2 name="SWFSprite" url="class.swfsprite.php"/> @@ -3644,12 +3644,12 @@ <entry name="recode_file" url="function.recode-file.php"/> <entry name="recode_string" url="function.recode-string.php"/> <entry name="recode" url="function.recode.php"/> -<entry name="tqunicode_decode" url="function.tqunicode-decode.php"/> -<entry name="tqunicode_encode" url="function.tqunicode-encode.php"/> -<entry name="tqunicode_get_error_mode" url="function.tqunicode-get-error-mode.php"/> -<entry name="tqunicode_get_subst_char" url="function.tqunicode-get-subst-char.php"/> -<entry name="tqunicode_set_error_mode" url="function.tqunicode-set-error-mode.php"/> -<entry name="tqunicode_set_subst_char" url="function.tqunicode-set-subst-char.php"/> +<entry name="unicode_decode" url="function.unicode-decode.php"/> +<entry name="unicode_encode" url="function.unicode-encode.php"/> +<entry name="unicode_get_error_mode" url="function.unicode-get-error-mode.php"/> +<entry name="unicode_get_subst_char" url="function.unicode-get-subst-char.php"/> +<entry name="unicode_set_error_mode" url="function.unicode-set-error-mode.php"/> +<entry name="unicode_set_subst_char" url="function.unicode-set-subst-char.php"/> <entry name="exif_imagetype" url="function.exif-imagetype.php"/> <entry name="exif_read_data" url="function.exif-read-data.php"/> <entry name="exif_tagname" url="function.exif-tagname.php"/> @@ -3841,7 +3841,7 @@ <entry name="Imagick::getImageFilename" url="function.imagick-getimagefilename.php"/> <entry name="Imagick::getImageFormat" url="function.imagick-getimageformat.php"/> <entry name="Imagick::getImageGamma" url="function.imagick-getimagegamma.php"/> -<entry name="Imagick::getImageGeometry" url="function.imagick-getimagetqgeometry.php"/> +<entry name="Imagick::getImageGeometry" url="function.imagick-getimagegeometry.php"/> <entry name="Imagick::getImageGreenPrimary" url="function.imagick-getimagegreenprimary.php"/> <entry name="Imagick::getImageHeight" url="function.imagick-getimageheight.php"/> <entry name="Imagick::getImageHistogram" url="function.imagick-getimagehistogram.php"/> @@ -4067,7 +4067,7 @@ <entry name="ImagickDraw::getStrokeMiterLimit" url="function.imagickdraw-getstrokemiterlimit.php"/> <entry name="ImagickDraw::getStrokeOpacity" url="function.imagickdraw-getstrokeopacity.php"/> <entry name="ImagickDraw::getStrokeWidth" url="function.imagickdraw-getstrokewidth.php"/> -<entry name="ImagickDraw::getTextAlignment" url="function.imagickdraw-gettexttqalignment.php"/> +<entry name="ImagickDraw::getTextAlignment" url="function.imagickdraw-gettextalignment.php"/> <entry name="ImagickDraw::getTextAntialias" url="function.imagickdraw-gettextantialias.php"/> <entry name="ImagickDraw::getTextDecoration" url="function.imagickdraw-gettextdecoration.php"/> <entry name="ImagickDraw::getTextEncoding" url="function.imagickdraw-gettextencoding.php"/> @@ -4138,7 +4138,7 @@ <entry name="ImagickDraw::setStrokeOpacity" url="function.imagickdraw-setstrokeopacity.php"/> <entry name="ImagickDraw::setStrokePatternURL" url="function.imagickdraw-setstrokepatternurl.php"/> <entry name="ImagickDraw::setStrokeWidth" url="function.imagickdraw-setstrokewidth.php"/> -<entry name="ImagickDraw::setTextAlignment" url="function.imagickdraw-settexttqalignment.php"/> +<entry name="ImagickDraw::setTextAlignment" url="function.imagickdraw-settextalignment.php"/> <entry name="ImagickDraw::setTextAntialias" url="function.imagickdraw-settextantialias.php"/> <entry name="ImagickDraw::setTextDecoration" url="function.imagickdraw-settextdecoration.php"/> <entry name="ImagickDraw::setTextEncoding" url="function.imagickdraw-settextencoding.php"/> @@ -4512,7 +4512,7 @@ <entry name="HaruDoc::getEncoder" url="function.harudoc-getencoder.php"/> <entry name="HaruDoc::getFont" url="function.harudoc-getfont.php"/> <entry name="HaruDoc::getInfoAttr" url="function.harudoc-getinfoattr.php"/> -<entry name="HaruDoc::getPageLayout" url="function.harudoc-getpagetqlayout.php"/> +<entry name="HaruDoc::getPageLayout" url="function.harudoc-getpagelayout.php"/> <entry name="HaruDoc::getPageMode" url="function.harudoc-getpagemode.php"/> <entry name="HaruDoc::getStreamSize" url="function.harudoc-getstreamsize.php"/> <entry name="HaruDoc::insertPage" url="function.harudoc-insertpage.php"/> @@ -4534,7 +4534,7 @@ <entry name="HaruDoc::setInfoAttr" url="function.harudoc-setinfoattr.php"/> <entry name="HaruDoc::setInfoDateAttr" url="function.harudoc-setinfodateattr.php"/> <entry name="HaruDoc::setOpenAction" url="function.harudoc-setopenaction.php"/> -<entry name="HaruDoc::setPageLayout" url="function.harudoc-setpagetqlayout.php"/> +<entry name="HaruDoc::setPageLayout" url="function.harudoc-setpagelayout.php"/> <entry name="HaruDoc::setPageMode" url="function.harudoc-setpagemode.php"/> <entry name="HaruDoc::setPagesConfiguration" url="function.harudoc-setpagesconfiguration.php"/> <entry name="HaruDoc::setPassword" url="function.harudoc-setpassword.php"/> @@ -4639,7 +4639,7 @@ <entry name="HaruFont::getEncodingName" url="function.harufont-getencodingname.php"/> <entry name="HaruFont::getFontName" url="function.harufont-getfontname.php"/> <entry name="HaruFont::getTextWidth" url="function.harufont-gettextwidth.php"/> -<entry name="HaruFont::getUnicodeWidth" url="function.harufont-gettqunicodewidth.php"/> +<entry name="HaruFont::getUnicodeWidth" url="function.harufont-getunicodewidth.php"/> <entry name="HaruFont::getXHeight" url="function.harufont-getxheight.php"/> <entry name="HaruFont::measureText" url="function.harufont-measuretext.php"/> <entry name="HaruImage::getBitsPerComponent" url="function.haruimage-getbitspercomponent.php"/> @@ -4651,7 +4651,7 @@ <entry name="HaruImage::setMaskImage" url="function.haruimage-setmaskimage.php"/> <entry name="HaruEncoder::getByteType" url="function.haruencoder-getbytetype.php"/> <entry name="HaruEncoder::getType" url="function.haruencoder-gettype.php"/> -<entry name="HaruEncoder::getUnicode" url="function.haruencoder-gettqunicode.php"/> +<entry name="HaruEncoder::getUnicode" url="function.haruencoder-getunicode.php"/> <entry name="HaruEncoder::getWritingMode" url="function.haruencoder-getwritingmode.php"/> <entry name="HaruOutline::setDestination" url="function.haruoutline-setdestination.php"/> <entry name="HaruOutline::setOpened" url="function.haruoutline-setopened.php"/> @@ -4679,7 +4679,7 @@ <entry name="SWFBitmap->getWidth()" url="function.swfbitmap.getwidth.php"/> <entry name="SWFButton->addAction()" url="function.swfbutton.addaction.php"/> <entry name="SWFButton->addASound()" url="function.swfbutton.addasound.php"/> -<entry name="SWFButton->addShape()" url="function.swfbutton.addtqshape.php"/> +<entry name="SWFButton->addShape()" url="function.swfbutton.addshape.php"/> <entry name="SWFButton->__construct()" url="function.swfbutton.construct.php"/> <entry name="SWFButton->setAction()" url="function.swfbutton.setaction.php"/> <entry name="SWFButton->setDown()" url="function.swfbutton.setdown.php"/> @@ -4723,7 +4723,7 @@ <entry name="SWFFont->getAscent()" url="function.swffont.getascent.php"/> <entry name="SWFFont->getDescent()" url="function.swffont.getdescent.php"/> <entry name="SWFFont->getLeading()" url="function.swffont.getleading.php"/> -<entry name="SWFFont->getShape()" url="function.swffont.gettqshape.php"/> +<entry name="SWFFont->getShape()" url="function.swffont.getshape.php"/> <entry name="SWFFont->getUTF8Width()" url="function.swffont.getutf8width.php"/> <entry name="SWFFont->getWidth()" url="function.swffont.getwidth.php"/> <entry name="SWFFontChar->addChars()" url="function.swffontchar.addchars.php"/> @@ -4731,8 +4731,8 @@ <entry name="SWFGradient->addEntry()" url="function.swfgradient.addentry.php"/> <entry name="SWFGradient->__construct()" url="function.swfgradient.construct.php"/> <entry name="SWFMorph->__construct()" url="function.swfmorph.construct.php"/> -<entry name="SWFMorph->getShape1()" url="function.swfmorph.gettqshape1.php"/> -<entry name="SWFMorph->getShape2()" url="function.swfmorph.gettqshape2.php"/> +<entry name="SWFMorph->getShape1()" url="function.swfmorph.getshape1.php"/> +<entry name="SWFMorph->getShape2()" url="function.swfmorph.getshape2.php"/> <entry name="SWFMovie->add()" url="function.swfmovie.add.php"/> <entry name="SWFMovie->addExport()" url="function.swfmovie.addexport.php"/> <entry name="SWFMovie->addFont()" url="function.swfmovie.addfont.php"/> @@ -4754,22 +4754,22 @@ <entry name="SWFMovie->streamMP3()" url="function.swfmovie.streammp3.php"/> <entry name="SWFMovie->writeExports()" url="function.swfmovie.writeexports.php"/> <entry name="SWFPrebuiltClip->__construct()" url="function.swfprebuiltclip.construct.php"/> -<entry name="SWFShape->addFill()" url="function.swftqshape.addfill.php"/> -<entry name="SWFShape->__construct()" url="function.swftqshape.construct.php"/> -<entry name="SWFShape->drawArc()" url="function.swftqshape.drawarc.php"/> -<entry name="SWFShape->drawCircle()" url="function.swftqshape.drawcircle.php"/> -<entry name="SWFShape->drawCubic()" url="function.swftqshape.drawcubic.php"/> -<entry name="SWFShape->drawCubicTo()" url="function.swftqshape.drawcubicto.php"/> -<entry name="SWFShape->drawCurve()" url="function.swftqshape.drawcurve.php"/> -<entry name="SWFShape->drawCurveTo()" url="function.swftqshape.drawcurveto.php"/> -<entry name="SWFShape->drawGlyph()" url="function.swftqshape.drawglyph.php"/> -<entry name="SWFShape->drawLine()" url="function.swftqshape.drawline.php"/> -<entry name="SWFShape->drawLineTo()" url="function.swftqshape.drawlineto.php"/> -<entry name="SWFShape->movePen()" url="function.swftqshape.movepen.php"/> -<entry name="SWFShape->movePenTo()" url="function.swftqshape.movepento.php"/> -<entry name="SWFShape->setLeftFill()" url="function.swftqshape.setleftfill.php"/> -<entry name="SWFShape->setLine()" url="function.swftqshape.setline.php"/> -<entry name="SWFShape->setRightFill()" url="function.swftqshape.setrightfill.php"/> +<entry name="SWFShape->addFill()" url="function.swfshape.addfill.php"/> +<entry name="SWFShape->__construct()" url="function.swfshape.construct.php"/> +<entry name="SWFShape->drawArc()" url="function.swfshape.drawarc.php"/> +<entry name="SWFShape->drawCircle()" url="function.swfshape.drawcircle.php"/> +<entry name="SWFShape->drawCubic()" url="function.swfshape.drawcubic.php"/> +<entry name="SWFShape->drawCubicTo()" url="function.swfshape.drawcubicto.php"/> +<entry name="SWFShape->drawCurve()" url="function.swfshape.drawcurve.php"/> +<entry name="SWFShape->drawCurveTo()" url="function.swfshape.drawcurveto.php"/> +<entry name="SWFShape->drawGlyph()" url="function.swfshape.drawglyph.php"/> +<entry name="SWFShape->drawLine()" url="function.swfshape.drawline.php"/> +<entry name="SWFShape->drawLineTo()" url="function.swfshape.drawlineto.php"/> +<entry name="SWFShape->movePen()" url="function.swfshape.movepen.php"/> +<entry name="SWFShape->movePenTo()" url="function.swfshape.movepento.php"/> +<entry name="SWFShape->setLeftFill()" url="function.swfshape.setleftfill.php"/> +<entry name="SWFShape->setLine()" url="function.swfshape.setline.php"/> +<entry name="SWFShape->setRightFill()" url="function.swfshape.setrightfill.php"/> <entry name="SWFSound" url="function.swfsound.construct.php"/> <entry name="SWFSoundInstance->loopCount()" url="function.swfsoundinstance.loopcount.php"/> <entry name="SWFSoundInstance->loopInPoint()" url="function.swfsoundinstance.loopinpoint.php"/> @@ -5063,7 +5063,7 @@ <entry name="ps_show_xy" url="function.ps-show-xy.php"/> <entry name="ps_show2" url="function.ps-show2.php"/> <entry name="ps_show" url="function.ps-show.php"/> -<entry name="ps_string_tqgeometry" url="function.ps-string-tqgeometry.php"/> +<entry name="ps_string_geometry" url="function.ps-string-geometry.php"/> <entry name="ps_stringwidth" url="function.ps-stringwidth.php"/> <entry name="ps_stroke" url="function.ps-stroke.php"/> <entry name="ps_symbol_name" url="function.ps-symbol-name.php"/> @@ -5096,7 +5096,7 @@ <entry name="swf_definetext" url="function.swf-definetext.php"/> <entry name="swf_endbutton" url="function.swf-endbutton.php"/> <entry name="swf_enddoaction" url="function.swf-enddoaction.php"/> -<entry name="swf_endtqshape" url="function.swf-endtqshape.php"/> +<entry name="swf_endshape" url="function.swf-endshape.php"/> <entry name="swf_endsymbol" url="function.swf-endsymbol.php"/> <entry name="swf_fontsize" url="function.swf-fontsize.php"/> <entry name="swf_fontslant" url="function.swf-fontslant.php"/> @@ -5124,20 +5124,20 @@ <entry name="swf_scale" url="function.swf-scale.php"/> <entry name="swf_setfont" url="function.swf-setfont.php"/> <entry name="swf_setframe" url="function.swf-setframe.php"/> -<entry name="swf_tqshapearc" url="function.swf-tqshapearc.php"/> -<entry name="swf_tqshapecurveto3" url="function.swf-tqshapecurveto3.php"/> -<entry name="swf_tqshapecurveto" url="function.swf-tqshapecurveto.php"/> -<entry name="swf_tqshapefillbitmapclip" url="function.swf-tqshapefillbitmapclip.php"/> -<entry name="swf_tqshapefillbitmaptile" url="function.swf-tqshapefillbitmaptile.php"/> -<entry name="swf_tqshapefilloff" url="function.swf-tqshapefilloff.php"/> -<entry name="swf_tqshapefillsolid" url="function.swf-tqshapefillsolid.php"/> -<entry name="swf_tqshapelinesolid" url="function.swf-tqshapelinesolid.php"/> -<entry name="swf_tqshapelineto" url="function.swf-tqshapelineto.php"/> -<entry name="swf_tqshapemoveto" url="function.swf-tqshapemoveto.php"/> +<entry name="swf_shapearc" url="function.swf-shapearc.php"/> +<entry name="swf_shapecurveto3" url="function.swf-shapecurveto3.php"/> +<entry name="swf_shapecurveto" url="function.swf-shapecurveto.php"/> +<entry name="swf_shapefillbitmapclip" url="function.swf-shapefillbitmapclip.php"/> +<entry name="swf_shapefillbitmaptile" url="function.swf-shapefillbitmaptile.php"/> +<entry name="swf_shapefilloff" url="function.swf-shapefilloff.php"/> +<entry name="swf_shapefillsolid" url="function.swf-shapefillsolid.php"/> +<entry name="swf_shapelinesolid" url="function.swf-shapelinesolid.php"/> +<entry name="swf_shapelineto" url="function.swf-shapelineto.php"/> +<entry name="swf_shapemoveto" url="function.swf-shapemoveto.php"/> <entry name="swf_showframe" url="function.swf-showframe.php"/> <entry name="swf_startbutton" url="function.swf-startbutton.php"/> <entry name="swf_startdoaction" url="function.swf-startdoaction.php"/> -<entry name="swf_starttqshape" url="function.swf-starttqshape.php"/> +<entry name="swf_startshape" url="function.swf-startshape.php"/> <entry name="swf_startsymbol" url="function.swf-startsymbol.php"/> <entry name="swf_textwidth" url="function.swf-textwidth.php"/> <entry name="swf_translate" url="function.swf-translate.php"/> @@ -5318,8 +5318,8 @@ <entry name="CachingIterator::rewind" url="cachingiterator.rewind.php"/> <entry name="CachingIterator::__toString" url="cachingiterator.tostring.php"/> <entry name="CachingIterator::valid" url="cachingiterator.valid.php"/> -<entry name="RecursiveCachingIterator::getChildren" url="recursivecachingiterator.gettqchildren.php"/> -<entry name="RecursiveCachingIterator::hasChildren" url="recursivecachingiterator.hastqchildren.php"/> +<entry name="RecursiveCachingIterator::getChildren" url="recursivecachingiterator.getchildren.php"/> +<entry name="RecursiveCachingIterator::hasChildren" url="recursivecachingiterator.haschildren.php"/> <entry name="DirectoryIterator::__construct" url="directoryiterator.construct.php"/> <entry name="DirectoryIterator::current" url="directoryiterator.current.php"/> <entry name="DirectoryIterator::getATime" url="directoryiterator.getatime.php"/> @@ -5356,12 +5356,12 @@ <entry name="LimitIterator::rewind" url="limititerator.rewind.php"/> <entry name="LimitIterator::seek" url="limititerator.seek.php"/> <entry name="LimitIterator::valid" url="limititerator.valid.php"/> -<entry name="ParentIterator::getChildren" url="parentiterator.gettqchildren.php"/> -<entry name="ParentIterator::hasChildren" url="parentiterator.hastqchildren.php"/> +<entry name="ParentIterator::getChildren" url="parentiterator.getchildren.php"/> +<entry name="ParentIterator::hasChildren" url="parentiterator.haschildren.php"/> <entry name="ParentIterator::next" url="parentiterator.next.php"/> <entry name="ParentIterator::rewind" url="parentiterator.rewind.php"/> -<entry name="RecursiveDirectoryIterator::getChildren" url="recursivedirectoryiterator.gettqchildren.php"/> -<entry name="RecursiveDirectoryIterator::hasChildren" url="recursivedirectoryiterator.hastqchildren.php"/> +<entry name="RecursiveDirectoryIterator::getChildren" url="recursivedirectoryiterator.getchildren.php"/> +<entry name="RecursiveDirectoryIterator::hasChildren" url="recursivedirectoryiterator.haschildren.php"/> <entry name="RecursiveDirectoryIterator::key" url="recursivedirectoryiterator.key.php"/> <entry name="RecursiveDirectoryIterator::next" url="recursivedirectoryiterator.next.php"/> <entry name="RecursiveDirectoryIterator::rewind" url="recursivedirectoryiterator.rewind.php"/> @@ -5373,8 +5373,8 @@ <entry name="RecursiveIteratorIterator::rewind" url="recursiveiteratoriterator.rewind.php"/> <entry name="RecursiveIteratorIterator::valid" url="recursiveiteratoriterator.valid.php"/> <entry name="SimpleXMLIterator::current" url="simplexmliterator.current.php"/> -<entry name="SimpleXMLIterator::getChildren" url="simplexmliterator.gettqchildren.php"/> -<entry name="SimpleXMLIterator::hasChildren" url="simplexmliterator.hastqchildren.php"/> +<entry name="SimpleXMLIterator::getChildren" url="simplexmliterator.getchildren.php"/> +<entry name="SimpleXMLIterator::hasChildren" url="simplexmliterator.haschildren.php"/> <entry name="SimpleXMLIterator::key" url="simplexmliterator.key.php"/> <entry name="SimpleXMLIterator::next" url="simplexmliterator.next.php"/> <entry name="SimpleXMLIterator::rewind" url="simplexmliterator.rewind.php"/> @@ -5509,7 +5509,7 @@ <entry name="tidy_set_encoding" url="function.tidy-set-encoding.php"/> <entry name="tidy_setopt" url="function.tidy-setopt.php"/> <entry name="tidy_warning_count" url="function.tidy-warning-count.php"/> -<entry name="tidyNode->hasChildren" url="function.tidynode-hastqchildren.php"/> +<entry name="tidyNode->hasChildren" url="function.tidynode-haschildren.php"/> <entry name="tidyNode->hasSiblings" url="function.tidynode-hassiblings.php"/> <entry name="tidyNode->isAsp" url="function.tidynode-isasp.php"/> <entry name="tidyNode->isComment" url="function.tidynode-iscomment.php"/> @@ -5594,8 +5594,8 @@ <entry name="ftp_systype" url="function.ftp-systype.php"/> <entry name="hw_Array2Objrec" url="function.hw-array2objrec.php"/> <entry name="hw_changeobject" url="function.hw-changeobject.php"/> -<entry name="hw_Children" url="function.hw-tqchildren.php"/> -<entry name="hw_ChildrenObj" url="function.hw-tqchildrenobj.php"/> +<entry name="hw_Children" url="function.hw-children.php"/> +<entry name="hw_ChildrenObj" url="function.hw-childrenobj.php"/> <entry name="hw_Close" url="function.hw-close.php"/> <entry name="hw_Connect" url="function.hw-connect.php"/> <entry name="hw_connection_info" url="function.hw-connection-info.php"/> @@ -5629,7 +5629,7 @@ <entry name="hw_GetParentsObj" url="function.hw-getparentsobj.php"/> <entry name="hw_getrellink" url="function.hw-getrellink.php"/> <entry name="hw_GetRemote" url="function.hw-getremote.php"/> -<entry name="hw_getremotetqchildren" url="function.hw-getremotetqchildren.php"/> +<entry name="hw_getremotechildren" url="function.hw-getremotechildren.php"/> <entry name="hw_GetSrcByDestObj" url="function.hw-getsrcbydestobj.php"/> <entry name="hw_GetText" url="function.hw-gettext.php"/> <entry name="hw_getusername" url="function.hw-getusername.php"/> @@ -5661,7 +5661,7 @@ <entry name="hw_api_attribute" url="function.hwapi-attribute.php"/> <entry name="hw_api->checkin" url="function.hwapi-checkin.php"/> <entry name="hw_api->checkout" url="function.hwapi-checkout.php"/> -<entry name="hw_api->tqchildren" url="function.hwapi-tqchildren.php"/> +<entry name="hw_api->children" url="function.hwapi-children.php"/> <entry name="hw_api_content->mimetype" url="function.hwapi-content-mimetype.php"/> <entry name="hw_api_content->read" url="function.hwapi-content-read.php"/> <entry name="hw_api->content" url="function.hwapi-content.php"/> @@ -6571,7 +6571,7 @@ <entry name="is_resource" url="function.is-resource.php"/> <entry name="is_scalar" url="function.is-scalar.php"/> <entry name="is_string" url="function.is-string.php"/> -<entry name="is_tqunicode" url="function.is-tqunicode.php"/> +<entry name="is_unicode" url="function.is-unicode.php"/> <entry name="isset" url="function.isset.php"/> <entry name="print_r" url="function.print-r.php"/> <entry name="serialize" url="function.serialize.php"/> @@ -6916,7 +6916,7 @@ <entry name="SimpleXMLElement->addChild()" url="function.simplexml-element-addChild.php"/> <entry name="SimpleXMLElement->asXML()" url="function.simplexml-element-asXML.php"/> <entry name="SimpleXMLElement->attributes()" url="function.simplexml-element-attributes.php"/> -<entry name="SimpleXMLElement->tqchildren()" url="function.simplexml-element-tqchildren.php"/> +<entry name="SimpleXMLElement->children()" url="function.simplexml-element-children.php"/> <entry name="SimpleXMLElement->__construct()" url="function.simplexml-element-construct.php"/> <entry name="SimpleXMLElement->getDocNamespaces()" url="function.simplexml-element-getDocNamespaces.php"/> <entry name="SimpleXMLElement->getName()" url="function.simplexml-element-getName.php"/> diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp index 60c9877b..81c3b742 100644 --- a/languages/php/phpcodecompletion.cpp +++ b/languages/php/phpcodecompletion.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqregexp.h> #include <iostream> @@ -234,7 +234,7 @@ bool PHPCodeCompletion::checkForStaticFunction(TQString line, int col) { for (funcIt = funcList.begin(); funcIt != funcList.end(); ++funcIt) { FunctionDom nFunc = *funcIt; - if ((function.isEmpty() || nFunc->name().tqstartsWith(function, FALSE)) && nFunc->isStatic()) { + if ((function.isEmpty() || nFunc->name().startsWith(function, FALSE)) && nFunc->isStatic()) { KTextEditor::CompletionEntry e; e.prefix = nClass->name() + " ::"; e.text = nFunc->name(); @@ -362,7 +362,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getClasses(TQString ClassList::Iterator classIt; for (classIt = classList.begin(); classIt != classList.end(); ++classIt) { ClassDom nClass = *classIt; - if (name == NULL || name.isEmpty() || nClass->name().tqstartsWith(name, FALSE)) { + if (name == NULL || name.isEmpty() || nClass->name().startsWith(name, FALSE)) { KTextEditor::CompletionEntry e; TQStringList::Iterator it = added.find(nClass->name()); @@ -383,7 +383,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars if (classname.isEmpty()) { TQValueList<FunctionCompletionEntry>::Iterator it; for( it = m_globalFunctions.begin(); it != m_globalFunctions.end(); ++it ) { - if((*it).text.tqstartsWith(function, FALSE)){ + if((*it).text.startsWith(function, FALSE)){ KTextEditor::CompletionEntry e; e = (*it); list.append(e); @@ -393,7 +393,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars FunctionList methodList = m_model->globalNamespace()->functionList(); FunctionList::Iterator methodIt; for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) { - if ((*methodIt)->name().tqstartsWith(function, FALSE)){ + if ((*methodIt)->name().startsWith(function, FALSE)){ KTextEditor::CompletionEntry e; e.text = (*methodIt)->name(); ArgumentDom pArg = (*methodIt)->argumentList().first(); @@ -416,7 +416,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars FunctionList::Iterator methodIt; for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) { FunctionDom pMethod = *methodIt; - if (function.isEmpty() || pMethod->name().tqstartsWith(function, FALSE)) { + if (function.isEmpty() || pMethod->name().startsWith(function, FALSE)) { KTextEditor::CompletionEntry e; ArgumentDom arg = pMethod->argumentList().first(); @@ -430,7 +430,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars VariableList::Iterator attrIt; for (attrIt = attrList.begin(); attrIt != attrList.end(); ++attrIt) { VariableDom pVar = *attrIt; - if (function.isEmpty() || pVar->name().tqstartsWith(function, FALSE)) { + if (function.isEmpty() || pVar->name().startsWith(function, FALSE)) { KTextEditor::CompletionEntry e; e.prefix = nClass->name() + " ::"; e.text = pVar->name(); @@ -706,7 +706,7 @@ kdDebug(9018) << "checkForArgHint 0 " << line << endl; } void PHPCodeCompletion::setStatusBar(TQString expr, TQString type) { - m_phpSupport->mainWindow()->statusBar()->message( i18n("Type of %1 is %2").tqarg(expr).tqarg(type), 1000 ); + m_phpSupport->mainWindow()->statusBar()->message( i18n("Type of %1 is %2").arg(expr).arg(type), 1000 ); } #include "phpcodecompletion.moc" diff --git a/languages/php/phpconfigwidgetbase.ui b/languages/php/phpconfigwidgetbase.ui index 962ac2a9..a1da7ee1 100644 --- a/languages/php/phpconfigwidgetbase.ui +++ b/languages/php/phpconfigwidgetbase.ui @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>170</height> @@ -230,7 +230,7 @@ <string><font size="+1">The php executable is called directly. Ideal for developers who want to develop terminal or graphical applications in PHP. You need a correctly installed php cgi version.</font></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -254,7 +254,7 @@ You need a correctly installed php cgi version.</font></string> <string><font size="+1">Uses an existing webserver. The pages are previewed in the internal web browser. Please make sure that the webserver was compiled with PHP support.</font></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -272,7 +272,7 @@ the internal web browser. Please make sure that the webserver was compiled with <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>171</height> @@ -318,7 +318,7 @@ the internal web browser. Please make sure that the webserver was compiled with <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -351,7 +351,7 @@ the internal web browser. Please make sure that the webserver was compiled with </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -366,7 +366,7 @@ the internal web browser. Please make sure that the webserver was compiled with <property name="name"> <cstring>exe_button</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>0</height> @@ -405,7 +405,7 @@ the internal web browser. Please make sure that the webserver was compiled with </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -426,7 +426,7 @@ the internal web browser. Please make sure that the webserver was compiled with <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -451,7 +451,7 @@ the internal web browser. Please make sure that the webserver was compiled with </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -472,7 +472,7 @@ the internal web browser. Please make sure that the webserver was compiled with <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -497,7 +497,7 @@ the internal web browser. Please make sure that the webserver was compiled with <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>343</height> diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp index 11e3066f..cec0b4fb 100644 --- a/languages/php/phperrorview.cpp +++ b/languages/php/phperrorview.cpp @@ -50,7 +50,7 @@ #include <tqwhatsthis.h> #include <tqtabbar.h> #include <tqwidgetstack.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> class ProblemItem: public KListViewItem @@ -151,7 +151,7 @@ void PHPErrorView::slotFilter() if(!m_tabBar->isTabEnabled(4)) m_tabBar->setTabEnabled(4,true); - m_tabBar->tab(4)->setText(i18n("Filtered: %1").tqarg( m_filterEdit->text() )); + m_tabBar->tab(4)->setText(i18n("Filtered: %1").arg( m_filterEdit->text() )); m_tabBar->setCurrentTab(4); m_filteredList->clear(); diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp index 974698d3..d54028da 100644 --- a/languages/php/phpfile.cpp +++ b/languages/php/phpfile.cpp @@ -418,7 +418,7 @@ void PHPFile::ParseSource() { include_path.append(URLUtil::directory(fileName()) + "/"); include_path.append(""); - TQStringList list = includere.tqcapturedTexts(); + TQStringList list = includere.capturedTexts(); for ( TQStringList::Iterator it = include_path.begin(); it != include_path.end(); ++it ) { TQString abso = URLUtil::canonicalPath(*it + "/" + list[3]); diff --git a/languages/php/phpinfodlg.ui b/languages/php/phpinfodlg.ui index c4f26dfb..ea40dbf3 100644 --- a/languages/php/phpinfodlg.ui +++ b/languages/php/phpinfodlg.ui @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp index 314dfcf6..a95a9151 100644 --- a/languages/php/phpnewclassdlg.cpp +++ b/languages/php/phpnewclassdlg.cpp @@ -22,7 +22,7 @@ #include <tqtoolbutton.h> #include <iostream> #include <tqregexp.h> -#include <tqtextedit.h> +#include <textedit.h> #include <kglobal.h> #include <kstandarddirs.h> #include <kinstance.h> diff --git a/languages/php/phpnewclassdlgbase.ui b/languages/php/phpnewclassdlgbase.ui index 5ddb336a..94c18baa 100644 --- a/languages/php/phpnewclassdlgbase.ui +++ b/languages/php/phpnewclassdlgbase.ui @@ -40,7 +40,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/languages/php/phpparser.cpp b/languages/php/phpparser.cpp index a0f1179e..cafd1a49 100644 --- a/languages/php/phpparser.cpp +++ b/languages/php/phpparser.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <iostream> diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index 52c9f109..85c70c00 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -26,7 +26,7 @@ #include <tqpopupmenu.h> #include <tqprogressbar.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtimer.h> #include <tqvbox.h> #include <tqwhatsthis.h> diff --git a/languages/python/README.dox b/languages/python/README.dox index 339976a3..1d5f55c9 100644 --- a/languages/python/README.dox +++ b/languages/python/README.dox @@ -14,7 +14,7 @@ and images. \maintainer <a href="mailto:nth maintainer AT provider.com">nth maintainer full name</a> \feature Python support -\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet. .. diff --git a/languages/python/doc/python.toc b/languages/python/doc/python.toc index 342e213c..a0352dcc 100644 --- a/languages/python/doc/python.toc +++ b/languages/python/doc/python.toc @@ -293,7 +293,7 @@ </tocsect3> <tocsect3 name="7.2 Sequence Objects " url="api/sequenceObjects.html"> <tocsect4 name="7.2.1 String Objects " url="api/stringObjects.html"/> -<tocsect4 name="7.2.2 Unicode Objects " url="api/tqunicodeObjects.html"/> +<tocsect4 name="7.2.2 Unicode Objects " url="api/unicodeObjects.html"/> <tocsect4 name="7.2.3 Buffer Objects " url="api/bufferObjects.html"/> <tocsect4 name="7.2.4 Tuple Objects " url="api/tupleObjects.html"/> <tocsect4 name="7.2.5 List Objects " url="api/listObjects.html"/> @@ -410,7 +410,7 @@ <tocsect3 name="4.7 codecs -- Codec registry and base classes" url="lib/module-codecs.html"> <tocsect4 name="4.7.1 Codec Base Classes" url="lib/node80.html"/> </tocsect3> -<tocsect3 name="4.8 tqunicodedata -- Unicode Database" url="lib/module-tqunicodedata.html"/> +<tocsect3 name="4.8 unicodedata -- Unicode Database" url="lib/module-unicodedata.html"/> </tocsect2> <tocsect2 name="5. Miscellaneous Services" url="lib/misc.html"> <tocsect3 name="5.1 math -- Mathematical functions" url="lib/module-math.html"/> @@ -1362,7 +1362,7 @@ <entry name="string" url="ref/types.html#l2h-85"/> <entry name="object (continued), traceback" url="ref/types.html#l2h-127"/> <entry name="object (continued), tuple" url="ref/types.html#l2h-91"/> -<entry name="object (continued), tqunicode" url="ref/types.html#l2h-90"/> +<entry name="object (continued), unicode" url="ref/types.html#l2h-90"/> <entry name="object (continued), user-defined function" url="ref/types.html#l2h-103"/> <entry name="object (continued), user-defined method" url="ref/types.html#l2h-105"/> <entry name="oct() (built-in function)" url="ref/numeric-types.html#l2h-229"/> @@ -1544,8 +1544,8 @@ <entry name="unbinding, name" url="ref/execframes.html#l2h-243"/> <entry name="unichr() (built-in function)" url="ref/types.html#l2h-87"/> <entry name="Unicode" url="ref/types.html#l2h-90"/> -<entry name="tqunicode() (built-in function)" url="ref/types.html#l2h-89"/> -<entry name="tqunicode object" url="ref/types.html#l2h-90"/> +<entry name="unicode() (built-in function)" url="ref/types.html#l2h-89"/> +<entry name="unicode object" url="ref/types.html#l2h-90"/> <entry name="UNIX" url="ref/programs.html#l2h-439"/> <entry name="unreachable object" url="ref/objects.html#l2h-28"/> <entry name="unrecognized escape sequence" url="ref/strings.html#l2h-19"/> diff --git a/languages/python/pydoc.cpp b/languages/python/pydoc.cpp index afe3ce74..32732fa2 100644 --- a/languages/python/pydoc.cpp +++ b/languages/python/pydoc.cpp @@ -5,7 +5,7 @@ #include <sys/stat.h> #include <unistd.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kstandarddirs.h> #include <kinstance.h> #include <kprocess.h> diff --git a/languages/python/pythonconfigwidgetbase.ui b/languages/python/pythonconfigwidgetbase.ui index af04041b..7c70ed62 100644 --- a/languages/python/pythonconfigwidgetbase.ui +++ b/languages/python/pythonconfigwidgetbase.ui @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -76,7 +76,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -101,7 +101,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/languages/python/pythonimplementationwidget.cpp b/languages/python/pythonimplementationwidget.cpp index 94835226..08e65f4c 100644 --- a/languages/python/pythonimplementationwidget.cpp +++ b/languages/python/pythonimplementationwidget.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> #include <tqregexp.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <klineedit.h> #include <klocale.h> diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp index 39e635b3..edc2ca8f 100644 --- a/languages/python/pythonsupportpart.cpp +++ b/languages/python/pythonsupportpart.cpp @@ -22,7 +22,7 @@ #include <tqfileinfo.h> #include <tqpopupmenu.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtimer.h> #include <tqvbox.h> #include <kaction.h> @@ -100,7 +100,7 @@ void PythonSupportPart::contextMenu(TQPopupMenu *popup, const Context *context) { m_contextFileName = url.fileName(); int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQT_SLOT(slotCreateSubclass())); - popup->tqsetWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner.")); + popup->setWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner.")); } } } diff --git a/languages/ruby/README.dox b/languages/ruby/README.dox index 89dd9058..aaa8823b 100644 --- a/languages/ruby/README.dox +++ b/languages/ruby/README.dox @@ -9,7 +9,7 @@ This is a Ruby support plugin \feature .rb template for New File \feature Ruby project template for Application Wizard \feature "Run" option in menu -\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet. .. diff --git a/languages/ruby/app_templates/dcopservice/app.cpp b/languages/ruby/app_templates/dcopservice/app.cpp index b659dbfb..46086a9e 100644 --- a/languages/ruby/app_templates/dcopservice/app.cpp +++ b/languages/ruby/app_templates/dcopservice/app.cpp @@ -17,8 +17,8 @@ int main(int argc, char **argv) { char ** rubyargs = (char **) calloc(argc+4, sizeof(char *)); rubyargs[0] = strdup(argv[0]); rubyargs[1] = strdup("-KU"); - rubyargs[2] = strdup(TQString("-C%1").tqarg(program.dirPath()).latin1()); - rubyargs[3] = strdup(TQString("-I%1").tqarg(program.dirPath()).latin1()); + rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1()); + rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1()); rubyargs[4] = strdup(program.fileName().latin1()); for (int i = 1; i < argc; i++) { rubyargs[i+4] = argv[i]; diff --git a/languages/ruby/app_templates/kapp/app.cpp b/languages/ruby/app_templates/kapp/app.cpp index b659dbfb..46086a9e 100644 --- a/languages/ruby/app_templates/kapp/app.cpp +++ b/languages/ruby/app_templates/kapp/app.cpp @@ -17,8 +17,8 @@ int main(int argc, char **argv) { char ** rubyargs = (char **) calloc(argc+4, sizeof(char *)); rubyargs[0] = strdup(argv[0]); rubyargs[1] = strdup("-KU"); - rubyargs[2] = strdup(TQString("-C%1").tqarg(program.dirPath()).latin1()); - rubyargs[3] = strdup(TQString("-I%1").tqarg(program.dirPath()).latin1()); + rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1()); + rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1()); rubyargs[4] = strdup(program.fileName().latin1()); for (int i = 1; i < argc; i++) { rubyargs[i+4] = argv[i]; diff --git a/languages/ruby/app_templates/kapp/appview.rb b/languages/ruby/app_templates/kapp/appview.rb index 6a49bdab..e7aabe3c 100644 --- a/languages/ruby/app_templates/kapp/appview.rb +++ b/languages/ruby/app_templates/kapp/appview.rb @@ -31,7 +31,7 @@ class %{APPNAMESC}View < Qt::Widget # keep a reference to the DCOP Interface so it doesn't get gc'd @dcop = %{APPNAMESC}Iface.new(self) - # setup our tqlayout manager to automatically add our widgets + # setup our layout manager to automatically add our widgets top_layout = Qt::HBoxLayout.new(self) top_layout.setAutoAdd(true) diff --git a/languages/ruby/app_templates/kapp/pref.rb b/languages/ruby/app_templates/kapp/pref.rb index f7f2e312..98669ad2 100644 --- a/languages/ruby/app_templates/kapp/pref.rb +++ b/languages/ruby/app_templates/kapp/pref.rb @@ -19,8 +19,8 @@ class %{APPNAMESC}PrefPageOne < Qt::Frame def initialize(parent) super(parent) - tqlayout = Qt::HBoxLayout.new(self) - tqlayout.setAutoAdd(true) + layout = Qt::HBoxLayout.new(self) + layout.setAutoAdd(true) Qt::Label.new(i18n("Add something here"), self) end @@ -30,8 +30,8 @@ class %{APPNAMESC}PrefPageTwo < Qt::Frame def initialize(parent) super(parent) - tqlayout = Qt::HBoxLayout.new(self) - tqlayout.setAutoAdd(true) + layout = Qt::HBoxLayout.new(self) + layout.setAutoAdd(true) Qt::Label.new(i18n("Add something here"), self) end diff --git a/languages/ruby/app_templates/kxt/app.cpp b/languages/ruby/app_templates/kxt/app.cpp index b659dbfb..46086a9e 100644 --- a/languages/ruby/app_templates/kxt/app.cpp +++ b/languages/ruby/app_templates/kxt/app.cpp @@ -17,8 +17,8 @@ int main(int argc, char **argv) { char ** rubyargs = (char **) calloc(argc+4, sizeof(char *)); rubyargs[0] = strdup(argv[0]); rubyargs[1] = strdup("-KU"); - rubyargs[2] = strdup(TQString("-C%1").tqarg(program.dirPath()).latin1()); - rubyargs[3] = strdup(TQString("-I%1").tqarg(program.dirPath()).latin1()); + rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1()); + rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1()); rubyargs[4] = strdup(program.fileName().latin1()); for (int i = 1; i < argc; i++) { rubyargs[i+4] = argv[i]; diff --git a/languages/ruby/app_templates/kxt/prefs-base.ui b/languages/ruby/app_templates/kxt/prefs-base.ui index 46a35473..03af967a 100644 --- a/languages/ruby/app_templates/kxt/prefs-base.ui +++ b/languages/ruby/app_templates/kxt/prefs-base.ui @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> diff --git a/languages/ruby/debugger/breakpoint.cpp b/languages/ruby/debugger/breakpoint.cpp index 9b3ed18d..8504ce93 100644 --- a/languages/ruby/debugger/breakpoint.cpp +++ b/languages/ruby/debugger/breakpoint.cpp @@ -70,7 +70,7 @@ Breakpoint::~Breakpoint() TQString Breakpoint::dbgRemoveCommand() const { // if (dbgId_>0) -// return TQString("delete %1").tqarg(dbgId_); // gdb command - not translatable +// return TQString("delete %1").arg(dbgId_); // gdb command - not translatable return TQString(); } @@ -161,9 +161,9 @@ TQString FilePosBreakpoint::dbgSetCommand() const { TQString cmdStr; if (fileName_.isEmpty()) - cmdStr = TQString("break %1").tqarg(lineNo_); // gdb command - not translatable + cmdStr = TQString("break %1").arg(lineNo_); // gdb command - not translatable else { - cmdStr = TQString("break %1:%2").tqarg(fileName_).tqarg(lineNo_); + cmdStr = TQString("break %1:%2").arg(fileName_).arg(lineNo_); } if (isTemporary()) diff --git a/languages/ruby/debugger/dbgcontroller.h b/languages/ruby/debugger/dbgcontroller.h index 9f3a79fc..953eaca8 100644 --- a/languages/ruby/debugger/dbgcontroller.h +++ b/languages/ruby/debugger/dbgcontroller.h @@ -151,7 +151,7 @@ signals: void rdbStdout (const char *output); void rdbStderr (const char *output); void showStepInSource (const TQString &fileName, int lineNum, const TQString &address); - void dbgtqStatus (const TQString &status, int statusFlag); + void dbgStatus (const TQString &status, int statusFlag); protected: KProcess *dbgProcess_; diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp index bc02d7aa..e74759f8 100644 --- a/languages/ruby/debugger/dbgpsdlg.cpp +++ b/languages/ruby/debugger/dbgpsdlg.cpp @@ -31,7 +31,7 @@ #include <tqframe.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqtoolbutton.h> #include <tqpushbutton.h> @@ -64,8 +64,8 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) heading_->setFont(KGlobalSettings::fixedFont()); heading_->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); - heading_->setMaximumHeight(heading_->tqsizeHint().height()); -// heading_->setMinimumSize(heading_->tqsizeHint()); + heading_->setMaximumHeight(heading_->sizeHint().height()); +// heading_->setMinimumSize(heading_->sizeHint()); topLayout->addWidget(heading_, 5); topLayout->addWidget(pids_, 5); @@ -75,7 +75,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); buttonbox->addStretch(); TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); - buttonbox->tqlayout(); + buttonbox->layout(); topLayout->addWidget(buttonbox); connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp index 3b13b148..b49c9af8 100644 --- a/languages/ruby/debugger/dbgtoolbar.cpp +++ b/languages/ruby/debugger/dbgtoolbar.cpp @@ -34,7 +34,7 @@ #include <tqapplication.h> #include <tqcursor.h> #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqpushbutton.h> #include <tqtooltip.h> @@ -126,8 +126,8 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) offset_ = parentWidget()->pos() - e->globalPos(); setFrameStyle(TQFrame::Panel|TQFrame::Sunken); TQApplication::setOverrideCursor(TQCursor(sizeAllCursor)); - setPalette(TQPalette(tqcolorGroup().background())); - tqrepaint(); + setPalette(TQPalette(colorGroup().background())); + repaint(); } } @@ -140,8 +140,8 @@ void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e) offset_ = TQPoint(0,0); setFrameStyle(TQFrame::Panel|TQFrame::Raised); TQApplication::restoreOverrideCursor(); - setPalette(TQPalette(tqcolorGroup().background())); - tqrepaint(); + setPalette(TQPalette(colorGroup().background())); + repaint(); } // ************************************************************************** @@ -168,7 +168,7 @@ public: DbgToolBar *parent, const char *name=0); virtual ~DbgButton() {}; void drawButtonLabel(TQPainter *painter); - TQSize tqsizeHint() const; + TQSize sizeHint() const; private: TQPixmap pixmap_; @@ -197,19 +197,19 @@ void DbgButton::drawButtonLabel(TQPainter *painter) painter->drawPixmap(x, y, pixmap_); if (hasText) { - painter->setPen(tqcolorGroup().text()); + painter->setPen(colorGroup().text()); painter->drawText(height()+2, 0, width()-(height()+2), height(), AlignLeft|AlignVCenter, text()); } } // ************************************************************************** -TQSize DbgButton::tqsizeHint() const +TQSize DbgButton::sizeHint() const { if (text().isEmpty()) return pixmap_.size(); else - return TQPushButton::tqsizeHint(); + return TQPushButton::sizeHint(); } // ************************************************************************** @@ -351,12 +351,12 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part, nextLayout->addWidget(bNext); -// int w = TQMAX(bRun->tqsizeHint().width(), bFinish->tqsizeHint().width()); -// w = TQMAX(w, bInterrupt->tqsizeHint().width()); -// w = TQMAX(w, bView->tqsizeHint().width()); +// int w = TQMAX(bRun->sizeHint().width(), bFinish->sizeHint().width()); +// w = TQMAX(w, bInterrupt->sizeHint().width()); +// w = TQMAX(w, bView->sizeHint().width()); // they should have the same height, so don't be too fussy -// int h = bFinish->tqsizeHint().height(); +// int h = bFinish->sizeHint().height(); // // bNext->setMinimumHeight(h); // bNexti->setMinimumHeight(h); @@ -390,10 +390,10 @@ void DbgToolBar::slotKdevFocus() // If anyone has a way of determining what window the app is _actually_ running on // then please fix and send a patch. - if (winModule_->activeWindow() != tqtopLevelWidget()->winId()) + if (winModule_->activeWindow() != topLevelWidget()->winId()) activeWindow_ = winModule_->activeWindow(); - KWin::activateWindow(tqtopLevelWidget()->winId()); + KWin::activateWindow(topLevelWidget()->winId()); } // ************************************************************************** @@ -407,7 +407,7 @@ void DbgToolBar::slotPrevFocus() // If the app is active then the app button is highlighted, otherwise // kdev button is highlighted. -void DbgToolBar::slotDbgtqStatus(const TQString&, int state) +void DbgToolBar::slotDbgStatus(const TQString&, int state) { bool appIndicator = state & s_appBusy; if (appIndicator != appIsActive_) { @@ -421,11 +421,11 @@ void DbgToolBar::slotDbgtqStatus(const TQString&, int state) void DbgToolBar::setAppIndicator(bool appIndicator) { if (appIndicator) { - bPrevFocus_->setPalette(TQPalette(tqcolorGroup().mid())); - bKDevFocus_->setPalette(TQPalette(tqcolorGroup().background())); + bPrevFocus_->setPalette(TQPalette(colorGroup().mid())); + bKDevFocus_->setPalette(TQPalette(colorGroup().background())); } else { - bPrevFocus_->setPalette(TQPalette(tqcolorGroup().background())); - bKDevFocus_->setPalette(TQPalette(tqcolorGroup().mid())); + bPrevFocus_->setPalette(TQPalette(colorGroup().background())); + bKDevFocus_->setPalette(TQPalette(colorGroup().mid())); } } @@ -473,7 +473,7 @@ void DbgToolBar::slotActivateAndUndock() if (!docked_) return; - KWin::activateWindow(tqtopLevelWidget()->winId()); + KWin::activateWindow(topLevelWidget()->winId()); slotUndock(); } diff --git a/languages/ruby/debugger/dbgtoolbar.h b/languages/ruby/debugger/dbgtoolbar.h index 5b3cc649..f82b2133 100644 --- a/languages/ruby/debugger/dbgtoolbar.h +++ b/languages/ruby/debugger/dbgtoolbar.h @@ -64,7 +64,7 @@ public: virtual ~DbgToolBar(); private slots: - void slotDbgtqStatus(const TQString&, int); + void slotDbgStatus(const TQString&, int); void slotDock(); void slotUndock(); void slotIconifyAndDock(); diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp index 2d6437fe..5d468de7 100644 --- a/languages/ruby/debugger/debuggerpart.cpp +++ b/languages/ruby/debugger/debuggerpart.cpp @@ -312,16 +312,16 @@ void RubyDebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) if (econtext->url().isLocalFile()) { int id = popup->insertItem( i18n("Toggle Breakpoint"), this, TQT_SLOT(toggleBreakpoint()) ); - popup->tqsetWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line.")); + popup->setWhatsThis(id, i18n("<b>Toggle breakpoint</b><p>Toggles breakpoint at the current line.")); } if (!m_contextIdent.isEmpty()) { TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30); - int id = popup->insertItem( i18n("Watch: %1").tqarg(squeezed), this, TQT_SLOT(contextWatch()) ); - popup->tqsetWhatsThis(id, i18n("<b>Watch</b><p>Adds an expression under the cursor to the Variables/Watch list.")); + int id = popup->insertItem( i18n("Watch: %1").arg(squeezed), this, TQT_SLOT(contextWatch()) ); + popup->setWhatsThis(id, i18n("<b>Watch</b><p>Adds an expression under the cursor to the Variables/Watch list.")); - id = popup->insertItem( i18n("Inspect: %1").tqarg(squeezed), this, TQT_SLOT(contextRubyInspect()) ); - popup->tqsetWhatsThis(id, i18n("<b>Inspect</b><p>Evaluates an expression under the cursor.")); + id = popup->insertItem( i18n("Inspect: %1").arg(squeezed), this, TQT_SLOT(contextRubyInspect()) ); + popup->setWhatsThis(id, i18n("<b>Inspect</b><p>Evaluates an expression under the cursor.")); } } @@ -412,8 +412,8 @@ void RubyDebuggerPart::setupController() // controller -> this - connect( controller, TQT_SIGNAL(dbgtqStatus(const TQString&, int)), - this, TQT_SLOT(slottqStatus(const TQString&, int))); + connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), + this, TQT_SLOT(slotStatus(const TQString&, int))); connect( controller, TQT_SIGNAL(showStepInSource(const TQString&, int, const TQString&)), this, TQT_SLOT(slotShowStep(const TQString&, int))); @@ -428,8 +428,8 @@ void RubyDebuggerPart::setupController() rdbOutputWidget, TQT_SLOT(slotReceivedStdout(const char*)) ); connect( controller, TQT_SIGNAL(rdbStderr(const char*)), rdbOutputWidget, TQT_SLOT(slotReceivedStderr(const char*)) ); - connect( controller, TQT_SIGNAL(dbgtqStatus(const TQString&, int)), - rdbOutputWidget, TQT_SLOT(slotDbgtqStatus(const TQString&, int))); + connect( controller, TQT_SIGNAL(dbgStatus(const TQString&, int)), + rdbOutputWidget, TQT_SLOT(slotDbgStatus(const TQString&, int))); } @@ -478,7 +478,7 @@ bool RubyDebuggerPart::startDebugger() { KMessageBox::error( mainWindow()->main(), - i18n("Could not locate the debugging shell '%1'.").tqarg( shell ), + i18n("Could not locate the debugging shell '%1'.").arg( shell ), i18n("Debugging Shell Not Found") ); return false; } @@ -683,7 +683,7 @@ void RubyDebuggerPart::slotRefreshBPState( const Breakpoint& BP) } -void RubyDebuggerPart::slottqStatus(const TQString &msg, int state) +void RubyDebuggerPart::slotStatus(const TQString &msg, int state) { TQString stateIndicator; diff --git a/languages/ruby/debugger/debuggerpart.h b/languages/ruby/debugger/debuggerpart.h index 61558bb1..cdae0880 100644 --- a/languages/ruby/debugger/debuggerpart.h +++ b/languages/ruby/debugger/debuggerpart.h @@ -76,7 +76,7 @@ private slots: void slotStepOut(); void slotRefreshBPState(const Breakpoint&); - void slottqStatus(const TQString &msg, int state); + void slotStatus(const TQString &msg, int state); void slotShowStep(const TQString &fileName, int lineNum); void slotGotoSource(const TQString &fileName, int lineNum); diff --git a/languages/ruby/debugger/framestackwidget.cpp b/languages/ruby/debugger/framestackwidget.cpp index 72b148b6..5d3a606e 100644 --- a/languages/ruby/debugger/framestackwidget.cpp +++ b/languages/ruby/debugger/framestackwidget.cpp @@ -119,7 +119,7 @@ void FramestackWidget::parseRDBThreadList(char *str) ThreadStackItem* thread; thread = new ThreadStackItem( this, thread_re.cap(2).toInt(), - TQString("%1 %2").tqarg(thread_re.cap(2)).tqarg(thread_re.cap(3)) ); + TQString("%1 %2").arg(thread_re.cap(2)).arg(thread_re.cap(3)) ); // The thread with a '+' is always the viewedthread if (thread_re.cap(1) == "+") { viewedThread_ = thread; @@ -148,7 +148,7 @@ void FramestackWidget::parseRDBBacktraceList(char *str) } int frameNo = frame_re.cap(1).toInt(); - TQString frameName = TQString("T%1#%2 %3").tqarg(viewedThread_->threadNo()).tqarg(frame_re.cap(1)).tqarg(method); + TQString frameName = TQString("T%1#%2 %3").arg(viewedThread_->threadNo()).arg(frame_re.cap(1)).arg(method); new FrameStackItem(viewedThread_, frameNo, TQString(frame_re.cap(0)), frameName); // Tell the Variable Tree that this frame is active diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp index 03d42788..9b5ad22a 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.cpp +++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp @@ -39,7 +39,7 @@ #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqregexp.h> #include <stdlib.h> @@ -56,7 +56,7 @@ enum Column { Control = 0, Enable = 1, Type = 2, - tqStatus = 3, + Status = 3, Location = 4 }; @@ -149,7 +149,7 @@ void BreakpointTableRow::setRow() TQString status=m_breakpoint->statusDisplay(m_activeFlag); - table()->setText(row(), tqStatus, status); + table()->setText(row(), Status, status); TQString displayType = m_breakpoint->displayType(); table()->setText(row(), Location, m_breakpoint->location()); @@ -159,7 +159,7 @@ void BreakpointTableRow::setRow() table()->setText(row(), Type, displayType); table()->adjustColumn(Type); - table()->adjustColumn(tqStatus); + table()->adjustColumn(Status); table()->adjustColumn(Location); } } @@ -221,14 +221,14 @@ RDBBreakpointWidget::RDBBreakpointWidget(TQWidget *parent, const char *name) : m_table->hideColumn(Control); m_table->setColumnReadOnly(Type, true); - m_table->setColumnReadOnly(tqStatus, true); + m_table->setColumnReadOnly(Status, true); m_table->setColumnWidth( Enable, 20); TQHeader *header = m_table->horizontalHeader(); header->setLabel( Enable, "" ); header->setLabel( Type, i18n("Type") ); - header->setLabel( tqStatus, i18n("Status") ); + header->setLabel( Status, i18n("Status") ); header->setLabel( Location, i18n("Location") ); m_table->show(); @@ -773,7 +773,7 @@ void RDBBreakpointWidget::slotNewValue(int row, int col) } case Type: - case tqStatus: + case Status: default: break; } @@ -904,7 +904,7 @@ void RDBBreakpointWidget::slotAddBreakpoint( ) { if (m_add->popup()) { - m_add->popup()->popup(mapToGlobal(this->tqgeometry().topLeft())); + m_add->popup()->popup(mapToGlobal(this->geometry().topLeft())); } } diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp index d98695af..3e751168 100644 --- a/languages/ruby/debugger/rdbcontroller.cpp +++ b/languages/ruby/debugger/rdbcontroller.cpp @@ -49,7 +49,7 @@ #include <tqfileinfo.h> #include <tqregexp.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <iostream> #include <ctype.h> @@ -236,7 +236,7 @@ void RDBController::executeCmd() emit rdbStdout( prettyCmd.latin1() ); if (!stateIsOn(s_silent)) - emit dbgtqStatus("", state_); + emit dbgStatus("", state_); } // ************************************************************************** @@ -301,7 +301,7 @@ void RDBController::actOnProgramPause(const TQString &msg) if (stateIsOn(s_silent)) return; - emit dbgtqStatus (msg, state_); + emit dbgStatus (msg, state_); // We're always at frame one when the program stops // and we must reset the active flag @@ -341,14 +341,14 @@ void RDBController::programNoApp(const TQString &msg, bool msgBox) varTree_->viewport()->setUpdatesEnabled(false); varTree_->prune(); varTree_->viewport()->setUpdatesEnabled(true); - varTree_->tqrepaint(); + varTree_->repaint(); frameStack_->clear(); if (msgBox) KMessageBox::error(0, i18n("rdb message:\n")+msg); - emit dbgtqStatus (msg, state_); + emit dbgStatus (msg, state_); } // ************************************************************************** @@ -394,9 +394,9 @@ void RDBController::parseProgramLocation(char *buf) } if (stateIsOn(s_appBusy)) - actOnProgramPause(i18n("No source: %1").tqarg(sourceFile)); + actOnProgramPause(i18n("No source: %1").arg(sourceFile)); else - emit dbgtqStatus (i18n("No source: %1").tqarg(sourceFile), state_); + emit dbgStatus (i18n("No source: %1").arg(sourceFile), state_); } // ************************************************************************** @@ -458,7 +458,7 @@ void RDBController::parseFrameMove(char *buf) } } - emit dbgtqStatus(i18n("No source: %1").tqarg(sourceFile), state_); + emit dbgStatus(i18n("No source: %1").arg(sourceFile), state_); } // ************************************************************************** @@ -492,7 +492,7 @@ void RDBController::parseRequestedData(char *buf) varTree_->viewport()->setUpdatesEnabled(false); item->expandValue(buf); varTree_->viewport()->setUpdatesEnabled(true); - varTree_->tqrepaint(); + varTree_->repaint(); } } @@ -505,7 +505,7 @@ void RDBController::parseFrameSelected(char *buf) { if (!stateIsOn(s_silent)) { emit showStepInSource("", -1, ""); - emit dbgtqStatus (i18n("No source: %1").tqarg(TQString(buf)), state_); + emit dbgStatus (i18n("No source: %1").arg(TQString(buf)), state_); } } @@ -517,7 +517,7 @@ void RDBController::parseDisplay(char *buf, char * expr) varTree_->viewport()->setUpdatesEnabled(false); varTree_->watchRoot()->setWatchExpression(buf, expr); varTree_->viewport()->setUpdatesEnabled(true); - varTree_->tqrepaint(); + varTree_->repaint(); } // ************************************************************************** @@ -538,7 +538,7 @@ void RDBController::parseUpdateDisplay(char *buf) } varTree_->viewport()->setUpdatesEnabled(true); - varTree_->tqrepaint(); + varTree_->repaint(); } // ************************************************************************** @@ -549,7 +549,7 @@ void RDBController::parseGlobals(char *buf) varTree_->viewport()->setUpdatesEnabled(false); varTree_->globalRoot()->setGlobals(buf); varTree_->viewport()->setUpdatesEnabled(true); - varTree_->tqrepaint(); + varTree_->repaint(); } // ************************************************************************** @@ -584,7 +584,7 @@ void RDBController::parseLocals(char type, char *buf) } varTree_->viewport()->setUpdatesEnabled(true); - varTree_->tqrepaint(); + varTree_->repaint(); } @@ -766,9 +766,9 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString& // BUT the app hasn't been started yet! A run command is about to be issued // by whoever is controlling us. - if (!dbgProcess_->writeStdin(TQString("%1\n").tqarg(unixSocketPath_.data()).latin1(), strlen(unixSocketPath_) + 1)) { + if (!dbgProcess_->writeStdin(TQString("%1\n").arg(unixSocketPath_.data()).latin1(), strlen(unixSocketPath_) + 1)) { kdDebug(9012) << "failed to write Unix domain socket path to rdb " - << TQString("%1\n").tqarg(unixSocketPath_.data()).latin1() << endl; + << TQString("%1\n").arg(unixSocketPath_.data()).latin1() << endl; } setStateOff(s_programExited); @@ -797,7 +797,7 @@ void RDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->tqprocessEvents(20); + kapp->processEvents(20); now = TQTime::currentTime(); if (!stateIsOn(s_appBusy) || start.msecsTo( now ) > 2000) break; @@ -816,7 +816,7 @@ void RDBController::slotStopDebugger() start = TQTime::currentTime(); while (-1) { - kapp->tqprocessEvents(20); + kapp->processEvents(20); now = TQTime::currentTime(); if (stateIsOn(s_programExited) || start.msecsTo( now ) > 2000) break; @@ -833,7 +833,7 @@ void RDBController::slotStopDebugger() delete tty_; tty_ = 0; state_ = s_dbgNotStarted | s_appNotStarted | s_silent; - emit dbgtqStatus (i18n("Debugger stopped"), state_); + emit dbgStatus (i18n("Debugger stopped"), state_); } @@ -1175,7 +1175,7 @@ void RDBController::slotDbgWroteStdin(KProcess *) { // setStateOff(s_waitForWrite); // if (!stateIsOn(s_silent)) - // emit dbgtqStatus ("", state_); + // emit dbgStatus ("", state_); // executeCmd(); } @@ -1203,7 +1203,7 @@ void RDBController::slotAcceptConnection(int masterSocket) this, TQT_SLOT(slotReadFromSocket(int)) ); setStateOff(s_dbgNotStarted); - emit dbgtqStatus ("", state_); + emit dbgStatus ("", state_); cmdList_.clear(); rdbOutputLen_ = 0; @@ -1283,7 +1283,7 @@ void RDBController::slotDbgProcessExited(KProcess*) { destroyCmds(); state_ = s_appNotStarted|s_programExited|(state_&(s_shuttingDown)); - emit dbgtqStatus (i18n("Process exited"), state_); + emit dbgStatus (i18n("Process exited"), state_); emit rdbStdout("(rdb:1) Process exited\n"); frameStack_->clear(); varTree_->clear(); diff --git a/languages/ruby/debugger/rdboutputwidget.cpp b/languages/ruby/debugger/rdboutputwidget.cpp index ea249fe2..cba5a8b4 100644 --- a/languages/ruby/debugger/rdboutputwidget.cpp +++ b/languages/ruby/debugger/rdboutputwidget.cpp @@ -30,8 +30,8 @@ #include <klocale.h> #include <tqlabel.h> -#include <tqlayout.h> -#include <tqtextedit.h> +#include <layout.h> +#include <textedit.h> #include <tqtoolbutton.h> #include <tqtooltip.h> @@ -65,7 +65,7 @@ RDBOutputWidget::RDBOutputWidget( TQWidget *parent, const char *name) : userRDBCmdEntry->setStretchFactor(m_userRDBCmdEditor, 1); m_Interrupt = new TQToolButton( this, "add breakpoint" ); - m_Interrupt->tqsetSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0, + m_Interrupt->setSizePolicy ( TQSizePolicy ( (TQSizePolicy::SizeType)0, ( TQSizePolicy::SizeType)0, 0, 0, @@ -79,7 +79,7 @@ RDBOutputWidget::RDBOutputWidget( TQWidget *parent, const char *name) : topLayout->addWidget(m_rdbView, 10); topLayout->addLayout(userRDBCmdEntry); - slotDbgtqStatus( "", s_dbgNotStarted); + slotDbgStatus( "", s_dbgNotStarted); connect( m_userRDBCmdEditor, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotRDBCmd()) ); connect( m_Interrupt, TQT_SIGNAL(clicked()), TQT_SIGNAL(breakInto())); @@ -133,7 +133,7 @@ void RDBOutputWidget::slotRDBCmd() /***************************************************************************/ -void RDBOutputWidget::slotDbgtqStatus(const TQString &, int statusFlag) +void RDBOutputWidget::slotDbgStatus(const TQString &, int statusFlag) { if (statusFlag & s_dbgNotStarted) { diff --git a/languages/ruby/debugger/rdboutputwidget.h b/languages/ruby/debugger/rdboutputwidget.h index 7655bf19..dd95913d 100644 --- a/languages/ruby/debugger/rdboutputwidget.h +++ b/languages/ruby/debugger/rdboutputwidget.h @@ -48,7 +48,7 @@ public: public slots: void slotReceivedStdout(const char* line); void slotReceivedStderr(const char* line); - void slotDbgtqStatus (const TQString &status, int statusFlag); + void slotDbgStatus (const TQString &status, int statusFlag); void slotRDBCmd(); diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp index 2dd28b31..47e76c47 100644 --- a/languages/ruby/debugger/variablewidget.cpp +++ b/languages/ruby/debugger/variablewidget.cpp @@ -30,7 +30,7 @@ #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqhbox.h> #include <tqpainter.h> #include <tqpushbutton.h> @@ -39,7 +39,7 @@ #include <klocale.h> #include <tqpoint.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <kapplication.h> // ************************************************************************** @@ -202,7 +202,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) emit removeWatchExpression(((WatchVarItem*)item)->displayId()); delete item; } else if (res == idCopyToClipboard) { - TQClipboard *qb = KApplication::tqclipboard(); + TQClipboard *qb = KApplication::clipboard(); TQString text = "{ \"" + item->text( VAR_NAME_COLUMN ) + "\", " + "\"" + item->text( VALUE_COLUMN ) + "\" }"; @@ -280,7 +280,7 @@ void VariableTree::prune() // ************************************************************************** -// The debugger has moved onto the next program pause, so tqinvalidate +// The debugger has moved onto the next program pause, so invalidate // everything in the Variable Tree void VariableTree::nextActivationId() { @@ -428,7 +428,7 @@ void VariableTree::maybeTip(const TQPoint &p) { VarItem * item = dynamic_cast<VarItem*>( itemAt(p) ); if (item != 0) { - TQRect r = tqitemRect(item); + TQRect r = itemRect(item); if (r.isValid()) { tip(r, item->tipText()); } @@ -635,7 +635,7 @@ void VarItem::setText(int column, const TQString &data) } TQListViewItem::setText(column, data); - tqrepaint(); + repaint(); } // ************************************************************************** diff --git a/languages/ruby/debugger/variablewidget.h b/languages/ruby/debugger/variablewidget.h index 60e73218..9e2b8ce9 100644 --- a/languages/ruby/debugger/variablewidget.h +++ b/languages/ruby/debugger/variablewidget.h @@ -276,7 +276,7 @@ public: virtual int rtti() const { return RTTI_VAR_FRAME_ROOT; } virtual TQString key(int column, bool /*ascending*/) const { - return TQString("%1%2").tqarg(RTTI_VAR_FRAME_ROOT).tqarg(text(column)); + return TQString("%1%2").arg(RTTI_VAR_FRAME_ROOT).arg(text(column)); } void addLocals(char *variables); @@ -311,7 +311,7 @@ public: virtual int rtti() const { return RTTI_WATCH_ROOT; } virtual TQString key(int column, bool /*ascending*/) const { - return TQString("%1%2").tqarg(RTTI_WATCH_ROOT).tqarg(text(column)); + return TQString("%1%2").arg(RTTI_WATCH_ROOT).arg(text(column)); } void setWatchExpression(char * buf, char * expr); @@ -334,7 +334,7 @@ public: virtual int rtti() const { return RTTI_GLOBAL_ROOT; } virtual TQString key(int column, bool /*ascending*/) const { - return TQString("%1%2").tqarg(RTTI_GLOBAL_ROOT).tqarg(text(column)); + return TQString("%1%2").arg(RTTI_GLOBAL_ROOT).arg(text(column)); } void setOpen(bool open); diff --git a/languages/ruby/rubyconfigwidgetbase.ui b/languages/ruby/rubyconfigwidgetbase.ui index bbddef8c..569ac658 100644 --- a/languages/ruby/rubyconfigwidgetbase.ui +++ b/languages/ruby/rubyconfigwidgetbase.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -158,7 +158,7 @@ def cd(dir) Dir.chdir dir end</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -321,7 +321,7 @@ def cd(dir) Dir.chdir dir end</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/languages/ruby/rubyimplementationwidget.cpp b/languages/ruby/rubyimplementationwidget.cpp index 9b11be96..1498ab9c 100644 --- a/languages/ruby/rubyimplementationwidget.cpp +++ b/languages/ruby/rubyimplementationwidget.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> #include <tqregexp.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <klineedit.h> #include <klocale.h> diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp index 0cee14b2..664dabd4 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -532,12 +532,12 @@ void RubySupportPart::slotRun () appFrontend->startAppCommand(project()->projectDirectory(), cmd, false); } else { TQString cmd = TQString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6") - .tqarg(interpreter()) - .tqarg(characterCoding()) - .tqarg(runDirectory()) - .tqarg(program.dirPath()) - .tqarg(program.fileName()) - .tqarg(programArgs()); + .arg(interpreter()) + .arg(characterCoding()) + .arg(runDirectory()) + .arg(program.dirPath()) + .arg(program.fileName()) + .arg(programArgs()); startApplication(cmd); } } @@ -669,7 +669,7 @@ void RubySupportPart::contextMenu( TQPopupMenu * popup, const Context * context { m_contextFileName = url.fileName(); int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQT_SLOT(slotCreateSubclass())); - popup->tqsetWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner.")); + popup->setWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner.")); } } } @@ -896,12 +896,12 @@ void RubySupportPart::slotRunTestUnderCursor() TQFileInfo program(prog); TQString cmd = TQString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6") - .tqarg(interpreter()) - .tqarg(characterCoding()) - .tqarg(runDirectory()) - .tqarg(program.dirPath()) - .tqarg(program.fileName()) - .tqarg(" -n " + fun->name()); + .arg(interpreter()) + .arg(characterCoding()) + .arg(runDirectory()) + .arg(program.dirPath()) + .arg(program.fileName()) + .arg(" -n " + fun->name()); startApplication(cmd); } diff --git a/languages/sql/README.dox b/languages/sql/README.dox index 8642d2b4..14634fba 100644 --- a/languages/sql/README.dox +++ b/languages/sql/README.dox @@ -6,7 +6,7 @@ This is a SQL support plugin \maintainer <a href="mailto:harry AT tdevelop.org">Harald Fernengel</a> \feature SQL language support -\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet. .. diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp index b1881811..633a687d 100644 --- a/languages/sql/sqlactions.cpp +++ b/languages/sql/sqlactions.cpp @@ -86,7 +86,7 @@ void SqlListAction::refresh() TQSqlDatabase* db = TQSqlDatabase::database( (*it), false ); if ( !db ) { kdDebug( 9000 ) << "Could not find database connection " << (*it) << endl; - m_combo->insertItem( SmallIcon( "no" ), i18n("<error - no connection %1>").tqarg( *it ) ); + m_combo->insertItem( SmallIcon( "no" ), i18n("<error - no connection %1>").arg( *it ) ); continue; } cName = db->driverName(); diff --git a/languages/sql/sqlconfigwidget.ui b/languages/sql/sqlconfigwidget.ui index e8be196f..5f836677 100644 --- a/languages/sql/sqlconfigwidget.ui +++ b/languages/sql/sqlconfigwidget.ui @@ -88,7 +88,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> diff --git a/languages/sql/sqloutputwidget.cpp b/languages/sql/sqloutputwidget.cpp index 548ba0e8..9c488d93 100644 --- a/languages/sql/sqloutputwidget.cpp +++ b/languages/sql/sqloutputwidget.cpp @@ -16,9 +16,9 @@ #include <tqsqlrecord.h> #include <tqwidgetstack.h> #include <tqdatatable.h> -#include <tqtextedit.h> -#include <tqlayout.h> -#include <tqstylesheet.h> +#include <textedit.h> +#include <layout.h> +#include <stylesheet.h> #include <klocale.h> @@ -44,11 +44,11 @@ public: { return exec( lastQuery() ); } TQSqlIndex primaryIndex( bool /*prime*/ = TRUE ) const { return TQSqlIndex(); } - int insert( bool /*tqinvalidate*/ = TRUE ) + int insert( bool /*invalidate*/ = TRUE ) { return FALSE; } - int update( bool /*tqinvalidate*/ = TRUE ) + int update( bool /*invalidate*/ = TRUE ) { return FALSE; } - int del( bool /*tqinvalidate*/ = TRUE ) + int del( bool /*invalidate*/ = TRUE ) { return FALSE; } void setName( const TQString& /*name*/, bool /*autopopulate*/ = TRUE ) {} }; @@ -67,8 +67,8 @@ SqlOutputWidget::SqlOutputWidget ( TQWidget* parent, const char* name ) : m_stack->addWidget( m_textEdit ); m_stack->addWidget( m_table ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_stack ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->addWidget( m_stack ); } SqlOutputWidget::~SqlOutputWidget() @@ -78,7 +78,7 @@ void SqlOutputWidget::showQuery( const TQString& connectionName, const TQString& { TQSqlDatabase* db = TQSqlDatabase::database( connectionName, true ); if ( !db ) { - showError( i18n("No such connection: %1").tqarg( connectionName ) ); + showError( i18n("No such connection: %1").arg( connectionName ) ); return; } if ( !db->isOpen() ) { @@ -101,7 +101,7 @@ void SqlOutputWidget::showQuery( const TQString& connectionName, const TQString& void SqlOutputWidget::showSuccess( int rowsAffected ) { m_textEdit->clear(); - m_textEdit->setText( i18n("Query successful, number of rows affected: %1").tqarg( rowsAffected ) ); + m_textEdit->setText( i18n("Query successful, number of rows affected: %1").arg( rowsAffected ) ); m_stack->raiseWidget( m_textEdit ); } diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp index 81098a85..78c1c1f2 100644 --- a/languages/sql/sqlsupport_part.cpp +++ b/languages/sql/sqlsupport_part.cpp @@ -71,8 +71,8 @@ TQString SQLSupportPart::cryptStr(const TQString& aStr) { TQString result; for (unsigned int i = 0; i < aStr.length(); i++) - result += (aStr[i].tqunicode() < 0x20) ? aStr[i] : - TQChar(0x1001F - aStr[i].tqunicode()); + result += (aStr[i].unicode() < 0x20) ? aStr[i] : + TQChar(0x1001F - aStr[i].unicode()); return result; } @@ -113,7 +113,7 @@ void SQLSupportPart::loadConfig() conName = "KDEVSQLSUPPORT_"; conName += TQString::number( i ); conNames << conName; - TQSqlDatabase* db = TQSqlDatabase::addDatabase( sdb[0], TQString( "KDEVSQLSUPPORT_%1" ).tqarg( i ) ); + TQSqlDatabase* db = TQSqlDatabase::addDatabase( sdb[0], TQString( "KDEVSQLSUPPORT_%1" ).arg( i ) ); db->setDatabaseName( sdb[1] ); db->setHostName( sdb[2] ); bool ok; @@ -183,10 +183,10 @@ static TQString dbCaption(const TQSqlDatabase* db) if (!db) return res; res = db->driverName(); - res += TQString::tqfromLatin1("@"); + res += TQString::fromLatin1("@"); res += db->hostName(); if (db->port() >= 0) - res += TQString::tqfromLatin1(":") + TQString::number(db->port()); + res += TQString::fromLatin1(":") + TQString::number(db->port()); return res; } #endif diff --git a/lib/antlr/antlr/AST.hpp b/lib/antlr/antlr/AST.hpp index b14b123b..b01a60a9 100644 --- a/lib/antlr/antlr/AST.hpp +++ b/lib/antlr/antlr/AST.hpp @@ -63,10 +63,10 @@ public: /// Add a node to the end of the child list for this node virtual void addChild(RefAST c) = 0; - /// Get the number of tqchildren. Returns 0 if the node is a leaf + /// Get the number of children. Returns 0 if the node is a leaf virtual size_t getNumberOfChildren() const = 0; - /// Get the first child of this node; null if no tqchildren + /// Get the first child of this node; null if no children virtual RefAST getFirstChild() const = 0; /// Get the next sibling in line after this one virtual RefAST getNextSibling() const = 0; diff --git a/lib/antlr/antlr/ASTFactory.hpp b/lib/antlr/antlr/ASTFactory.hpp index 0fb78dc1..968ab6c5 100644 --- a/lib/antlr/antlr/ASTFactory.hpp +++ b/lib/antlr/antlr/ASTFactory.hpp @@ -86,7 +86,7 @@ public: RefAST dupTree(RefAST t); /** Make a tree from a list of nodes. The first element in the * array is the root. If the root is null, then the tree is - * a simple list not a tree. Handles null tqchildren nodes correctly. + * a simple list not a tree. Handles null children nodes correctly. * For example, make(a, b, null, c) yields tree (a b c). make(null,a,b) * yields tree (nil a b). */ diff --git a/lib/antlr/antlr/BaseAST.hpp b/lib/antlr/antlr/BaseAST.hpp index 3a88db32..1bfc4e56 100644 --- a/lib/antlr/antlr/BaseAST.hpp +++ b/lib/antlr/antlr/BaseAST.hpp @@ -96,7 +96,7 @@ public: */ virtual size_t getNumberOfChildren() const; - /// Get the first child of this node; null if no tqchildren + /// Get the first child of this node; null if no children virtual RefAST getFirstChild() const { return RefAST(down); @@ -118,7 +118,7 @@ public: return 0; } - /// Remove all tqchildren + /// Remove all children virtual void removeChildren() { down = static_cast<BaseAST*>(static_cast<AST*>(nullAST)); diff --git a/lib/antlr/src/ASTFactory.cpp b/lib/antlr/src/ASTFactory.cpp index a255ca10..98ce6b7a 100644 --- a/lib/antlr/src/ASTFactory.cpp +++ b/lib/antlr/src/ASTFactory.cpp @@ -217,7 +217,7 @@ RefAST ASTFactory::dupList(RefAST t) RefAST ASTFactory::dupTree(RefAST t) { RefAST result = dup(t); // make copy of root - // copy all tqchildren of root. + // copy all children of root. if( t ) result->setFirstChild( dupList(t->getFirstChild()) ); return result; @@ -225,7 +225,7 @@ RefAST ASTFactory::dupTree(RefAST t) /** Make a tree from a list of nodes. The first element in the * array is the root. If the root is null, then the tree is - * a simple list not a tree. Handles null tqchildren nodes correctly. + * a simple list not a tree. Handles null children nodes correctly. * For example, make(a, b, null, c) yields tree (a b c). make(null,a,b) * yields tree (nil a b). */ @@ -240,7 +240,7 @@ RefAST ASTFactory::make(ANTLR_USE_NAMESPACE(std)vector<RefAST>& nodes) if( root ) root->setFirstChild(RefAST(nullASTptr)); // don't leave any old pointers set - // link in tqchildren; + // link in children; for( unsigned int i = 1; i < nodes.size(); i++ ) { if ( nodes[i] == 0 ) // ignore null nodes @@ -336,7 +336,7 @@ void ASTFactory::loadChildren( ANTLR_USE_NAMESPACE(std)istream& infile, { char ch; - for(;;) // for all tqchildren of this node.... + for(;;) // for all children of this node.... { eatwhite(infile); @@ -438,7 +438,7 @@ RefAST ASTFactory::LoadAST( ANTLR_USE_NAMESPACE(std)istream& infile ) infile.get(ch); // now if we have a '/' here it's a single node. If it's a '>' we get - // a tree with tqchildren + // a tree with children if( ch == '/' ) { diff --git a/lib/antlr/src/BaseAST.cpp b/lib/antlr/src/BaseAST.cpp index 17d8de68..f10f1e16 100644 --- a/lib/antlr/src/BaseAST.cpp +++ b/lib/antlr/src/BaseAST.cpp @@ -47,7 +47,7 @@ void BaseAST::doWorkForFindAll( (!partialMatch && sibling->equalsTree(target)) ) { v.push_back(sibling); } - // regardless of match or not, check any tqchildren for matches + // regardless of match or not, check any children for matches if ( sibling->getFirstChild() ) { RefBaseAST(sibling->getFirstChild())->doWorkForFindAll(v, target, partialMatch); } @@ -70,7 +70,7 @@ bool BaseAST::equalsList(RefAST t) const // as a quick optimization, check roots first. if (!sibling->equals(t)) return false; - // if roots match, do full list match test on tqchildren. + // if roots match, do full list match test on children. if (sibling->getFirstChild()) { if (!sibling->getFirstChild()->equalsList(t->getFirstChild())) return false; @@ -103,7 +103,7 @@ bool BaseAST::equalsListPartial(RefAST sub) const // as a quick optimization, check roots first. if (!sibling->equals(sub)) return false; - // if roots match, do partial list match test on tqchildren. + // if roots match, do partial list match test on children. if (sibling->getFirstChild()) if (!sibling->getFirstChild()->equalsListPartial(sub->getFirstChild())) return false; @@ -125,7 +125,7 @@ bool BaseAST::equalsTree(RefAST t) const // check roots first if (!equals(t)) return false; - // if roots match, do full list match test on tqchildren. + // if roots match, do full list match test on children. if (getFirstChild()) { if (!getFirstChild()->equalsList(t->getFirstChild())) return false; @@ -149,7 +149,7 @@ bool BaseAST::equalsTreePartial(RefAST sub) const // check roots first if (!equals(sub)) return false; - // if roots match, do full list partial match test on tqchildren. + // if roots match, do full list partial match test on children. if (getFirstChild()) if (!getFirstChild()->equalsListPartial(sub->getFirstChild())) return false; @@ -256,7 +256,7 @@ void BaseAST::toStream( ANTLR_USE_NAMESPACE(std)ostream& out ) const if( need_close_tag ) { - // got tqchildren so write them... + // got children so write them... if( node->getFirstChild() != 0 ) node->getFirstChild()->toStream( out ); diff --git a/lib/catalog/tag.h b/lib/catalog/tag.h index 95604c83..a3f7711b 100644 --- a/lib/catalog/tag.h +++ b/lib/catalog/tag.h @@ -122,7 +122,7 @@ public: data->fileName = fileName; } - TQString path( const TQString& sep = TQString::tqfromLatin1("::") ) const + TQString path( const TQString& sep = TQString::fromLatin1("::") ) const { TQString s = scope().join( sep ); if( s.isNull() ) diff --git a/lib/cppparser/ast.cpp b/lib/cppparser/ast.cpp index e4e3cf5d..8f2f2ad7 100644 --- a/lib/cppparser/ast.cpp +++ b/lib/cppparser/ast.cpp @@ -136,7 +136,7 @@ AST::AST() m_endLine( 0 ), m_endColumn( 0 ) { #ifndef CPPPARSER_NO_CHILDREN - m_tqchildren.setAutoDelete( false ); + m_children.setAutoDelete( false ); #endif } @@ -196,12 +196,12 @@ void AST::setParent( AST* parent ) #ifndef CPPPARSER_NO_CHILDREN void AST::appendChild( AST* child ) { - m_tqchildren.append( child ); + m_children.append( child ); } void AST::removeChild( AST* child ) { - m_tqchildren.remove( child ); + m_children.remove( child ); } #endif @@ -474,7 +474,7 @@ TQString ClassOrNamespaceNameAST::text() const TQString str = m_name->text(); if( m_templateArgumentList.get() ) - str += TQString::tqfromLatin1("< ") + m_templateArgumentList->text() + TQString::tqfromLatin1(" >"); + str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >"); return str; } diff --git a/lib/cppparser/ast.h b/lib/cppparser/ast.h index c98c2fe7..5db231fd 100644 --- a/lib/cppparser/ast.h +++ b/lib/cppparser/ast.h @@ -263,7 +263,7 @@ public: void getEndPosition( int* line, int* col ) const; #ifndef CPPPARSER_NO_CHILDREN - TQPtrList<AST> tqchildren() { return m_tqchildren; } + TQPtrList<AST> children() { return m_children; } void appendChild( AST* child ); void removeChild( AST* child ); #endif @@ -292,7 +292,7 @@ private: int m_endLine, m_endColumn; Slice m_slice; #ifndef CPPPARSER_NO_CHILDREN - TQPtrList<AST> m_tqchildren; + TQPtrList<AST> m_children; #endif private: diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp index bcaea218..91945e53 100644 --- a/lib/cppparser/driver.cpp +++ b/lib/cppparser/driver.cpp @@ -383,7 +383,7 @@ void Driver::addDependence( const TQString & fileName, const Dependence & dep ) m_currentParsedFile->addIncludeFile( file, 0, dep.second == Dep_Local ); if ( !TQFile::exists( file ) ) { - Problem p( i18n( "Could not find include file %1" ).tqarg( dep.first ), + Problem p( i18n( "Could not find include file %1" ).arg( dep.first ), lexer ? lexer->currentLine() : -1, lexer ? lexer->currentColumn() : -1, Problem::Level_Warning ); addProblem( fileName, p ); diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp index 1ed9fca7..167c88c4 100644 --- a/lib/cppparser/lexer.cpp +++ b/lib/cppparser/lexer.cpp @@ -184,7 +184,7 @@ int Lexer::toInt( const Token& token ) int i = s[0] == 'L' ? 2 : 1; // wide char ? if( s[i] == '\\' ){ // escaped char - int c = s[i+1].tqunicode(); + int c = s[i+1].unicode(); switch( c ) { case '0': return 0; @@ -195,7 +195,7 @@ int Lexer::toInt( const Token& token ) return c; } } else { - return s[i].tqunicode(); + return s[i].unicode(); } } else { return 0; @@ -386,21 +386,21 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) TQString tokText = tok.text(); HashedString str = (tok == Token_identifier && d->hasBind(tokText)) ? d->apply( tokText ) : tokText; if( str == ide ){ - //Problem p( i18n("unsafe use of macro '%1', macro is ignored").tqarg(ide.str()), m_currentLine, m_currentColumn, Problem::Level_Warning ); + //Problem p( i18n("unsafe use of macro '%1', macro is ignored").arg(ide.str()), m_currentLine, m_currentColumn, Problem::Level_Warning ); //m_driver->addProblem( m_driver->currentFileName(), p ); m_driver->removeMacro( ide ); // str = TQString(); } if( stringify ) { - textToInsert.append( TQString::tqfromLatin1("\"") + str.str() + TQString::tqfromLatin1("\" ") ); + textToInsert.append( TQString::fromLatin1("\"") + str.str() + TQString::fromLatin1("\" ") ); } else if( merge ){ textToInsert.truncate( textToInsert.length() - 1 ); - textToInsert.append( str.str() + TQString::tqfromLatin1(" ") ); + textToInsert.append( str.str() + TQString::fromLatin1(" ") ); } else if( tok == Token_ellipsis && d->hasBind("...") ){ textToInsert.append( ellipsisArg ); } else { - textToInsert.append( str.str() + TQString::tqfromLatin1(" ") ); + textToInsert.append( str.str() + TQString::fromLatin1(" ") ); } } diff --git a/lib/cppparser/lexer.h b/lib/cppparser/lexer.h index 2630edf7..12f16696 100644 --- a/lib/cppparser/lexer.h +++ b/lib/cppparser/lexer.h @@ -244,11 +244,11 @@ public: int currentColumn() const { return m_currentColumn; } inline const CHARTYPE* offset( int offset ) const { - return m_source.tqunicode() + offset; + return m_source.unicode() + offset; } inline int getOffset( const TQChar* p ) const { - return int(p - (m_source.tqunicode())); + return int(p - (m_source.unicode())); } private: diff --git a/lib/cppparser/lexercache.cpp b/lib/cppparser/lexercache.cpp index 7f420cac..cbe8640d 100644 --- a/lib/cppparser/lexercache.cpp +++ b/lib/cppparser/lexercache.cpp @@ -112,13 +112,13 @@ TQDateTime LexerCache::fileModificationTimeCached( const HashedString& fileName FileModificationMap::const_iterator it = m_fileModificationCache.find( fileName ); if( it != m_fileModificationCache.end() ) { ///Use the cache for 10 seconds - if( (*it).second.m_readTime.secsTo( m_tqcurrentDateTime ) < 10 ) { + if( (*it).second.m_readTime.secsTo( m_currentDateTime ) < 10 ) { return (*it).second.m_modificationTime; } } TQFileInfo fileInfo( fileName.str() ); - m_fileModificationCache[fileName].m_readTime = TQDateTime::tqcurrentDateTime(); + m_fileModificationCache[fileName].m_readTime = TQDateTime::currentDateTime(); m_fileModificationCache[fileName].m_modificationTime = fileInfo.lastModified(); return fileInfo.lastModified(); @@ -239,7 +239,7 @@ size_t CachedLexedFile::hash() const { } void LexerCache::initFileModificationCache() { - m_tqcurrentDateTime = TQDateTime::tqcurrentDateTime(); + m_currentDateTime = TQDateTime::currentDateTime(); } void LexerCache::saveMemory() { diff --git a/lib/cppparser/lexercache.h b/lib/cppparser/lexercache.h index 535768bc..c1aac432 100644 --- a/lib/cppparser/lexercache.h +++ b/lib/cppparser/lexercache.h @@ -155,7 +155,7 @@ class LexerCache : public CacheManager { typedef __gnu_cxx::hash_map<HashedString, FileModificationCache> FileModificationMap; FileModificationMap m_fileModificationCache; Driver* m_driver; - TQDateTime m_tqcurrentDateTime; + TQDateTime m_currentDateTime; }; diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp index 9b0a0c1f..08b4e6bb 100644 --- a/lib/cppparser/parser.cpp +++ b/lib/cppparser/parser.cpp @@ -37,7 +37,7 @@ using namespace std; { \ const Token& token = lex->lookAhead( 0 ); \ if( token != tk ){ \ - reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \ + reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \ return false; \ } \ nextToken(); \ @@ -47,7 +47,7 @@ using namespace std; { \ const Token& token = lex->lookAhead( 0 ); \ if( token != tk ){ \ - reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \ + reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \ } \ else \ nextToken(); \ @@ -139,7 +139,7 @@ bool Parser::reportError( const Error& err ) if( s.isEmpty() ) s = i18n( "<eof>" ); - m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.tqarg(s), line, col) ); + m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.arg(s), line, col) ); } return true; diff --git a/lib/interfaces/extensions/kdevcreatefile.h b/lib/interfaces/extensions/kdevcreatefile.h index ee30f555..76dff18b 100644 --- a/lib/interfaces/extensions/kdevcreatefile.h +++ b/lib/interfaces/extensions/kdevcreatefile.h @@ -54,7 +54,7 @@ public: public: /**The status of a file.*/ - enum tqStatus { + enum Status { STATUS_OK /**<File was successfuly created.*/, STATUS_CANCELED /**<File was not created due to user intervention.*/, STATUS_NOTCREATED /**<File was not created due to error.*/, @@ -105,7 +105,7 @@ public: there are several file templates for each extension.*/ TQString subtype; /**Current status.*/ - tqStatus status; + Status status; /**true if the file should be added to a project.*/ bool addToProject; }; diff --git a/lib/interfaces/extensions/kdevversioncontrol.h b/lib/interfaces/extensions/kdevversioncontrol.h index 2dcfe869..2b61805d 100644 --- a/lib/interfaces/extensions/kdevversioncontrol.h +++ b/lib/interfaces/extensions/kdevversioncontrol.h @@ -198,7 +198,7 @@ public: This is a <b>synchronous operation</b> (blocking). @param dirPath The relative (to project dir) directory path to stat. - @return tqStatus for all <b>registered</b> files.*/ + @return Status for all <b>registered</b> files.*/ virtual const VCSFileInfoMap *status(const TQString &dirPath) = 0; /**Starts a request for directory status to the remote repository. @@ -210,18 +210,18 @@ public: @param dirPath The (relative to project directory) directory which status you are asking for. @param callerData The pointer to some data you want the provider will return to you when it has done. - @param recursive If false, retrieve information only for dirPath's immediate tqchildren. + @param recursive If false, retrieve information only for dirPath's immediate children. @param checkRepos If true, contact remote repository and augment repository's status. If false, retrieve only for local modification information. @return true if the request has been successfully started, false otherwise.*/ - virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ) = 0; + virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ) = 0; signals: /**Emitted when the status request to remote repository has finished. @param fileInfoMap The status for <b>registered in repository</b> files. @param callerData The pointer to some data you want the provider will return to you when it has done - @see requesttqStatus for to find out when this signal should be used.*/ + @see requestStatus for to find out when this signal should be used.*/ void statusReady(const VCSFileInfoMap &fileInfoMap, void *callerData); protected: diff --git a/lib/interfaces/external/designer.h b/lib/interfaces/external/designer.h index 9f0c0064..c071f2db 100644 --- a/lib/interfaces/external/designer.h +++ b/lib/interfaces/external/designer.h @@ -91,7 +91,7 @@ signals: /**Emitted when a form state is changed in the designer. @param formName An absolute name of the form file. @param status 0: form is clean, 1: form is modified.*/ - void newtqStatus(const TQString &formName, int status); + void newStatus(const TQString &formName, int status); }; } diff --git a/lib/interfaces/hashedstring.cpp b/lib/interfaces/hashedstring.cpp index f974df10..8392e271 100644 --- a/lib/interfaces/hashedstring.cpp +++ b/lib/interfaces/hashedstring.cpp @@ -30,7 +30,7 @@ size_t hashStringSafe( const TQString& str ) { size_t hash = 0; int len = str.length(); for( int a = 0; a < len; a++ ) { - hash = str[a].tqunicode() + (hash * 17); + hash = str[a].unicode() + (hash * 17); } return hash; } @@ -43,12 +43,12 @@ size_t HashedString::hashString( const TQString& str ) size_t fastHashString( const TQString& str ) { size_t hash = 0; if( !str.isEmpty() ) { - const TQChar* curr = str.tqunicode(); + const TQChar* curr = str.unicode(); const TQChar* end = curr + str.length(); TQChar c; for(; curr < end ;) { c = *curr; - hash = c.tqunicode() + ( hash * 17 ); + hash = c.unicode() + ( hash * 17 ); ++curr; } } diff --git a/lib/interfaces/kdevplugincontroller.cpp b/lib/interfaces/kdevplugincontroller.cpp index 86384440..c9746047 100644 --- a/lib/interfaces/kdevplugincontroller.cpp +++ b/lib/interfaces/kdevplugincontroller.cpp @@ -28,7 +28,7 @@ KTrader::OfferList KDevPluginController::query(const TQString &serviceType, const TQString &constraint) { return KTrader::self()->query(serviceType, - TQString("%1 and [X-KDevelop-Version] == %2").tqarg(constraint).tqarg(KDEVELOP_PLUGIN_VERSION)); + TQString("%1 and [X-KDevelop-Version] == %2").arg(constraint).arg(KDEVELOP_PLUGIN_VERSION)); } KTrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint) diff --git a/lib/interfaces/kdevplugininfo.cpp b/lib/interfaces/kdevplugininfo.cpp index ae5ddf2d..6c869d23 100644 --- a/lib/interfaces/kdevplugininfo.cpp +++ b/lib/interfaces/kdevplugininfo.cpp @@ -149,7 +149,7 @@ TQString KDevPluginInfo::bugsEmailAddress() const TQVariant KDevPluginInfo::property(const TQString &name) const { - KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").tqarg(d->m_pluginName)); + KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); if (offers.count() == 1) return offers.first()->property(name); return TQVariant(); @@ -162,7 +162,7 @@ TQVariant KDevPluginInfo::operator [](const TQString &name) const TQStringList KDevPluginInfo::propertyNames( ) const { - KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").tqarg(d->m_pluginName)); + KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); if (offers.count() == 1) return offers.first()->propertyNames(); return TQStringList(); diff --git a/lib/util/blockingkprocess.cpp b/lib/util/blockingkprocess.cpp index 51845a5c..c0d1b106 100644 --- a/lib/util/blockingkprocess.cpp +++ b/lib/util/blockingkprocess.cpp @@ -68,12 +68,12 @@ bool BlockingKProcess::start(RunMode runmode, Communication comm) void BlockingKProcess::slotReceivedStdOut(KProcess *, char *buffer, int buflen) { - m_stdOut += TQString::tqfromLatin1(buffer, buflen); + m_stdOut += TQString::fromLatin1(buffer, buflen); } void BlockingKProcess::slotReceivedStdErr(KProcess *, char *buffer, int buflen) { - m_stdErr += TQString::tqfromLatin1(buffer, buflen); + m_stdErr += TQString::fromLatin1(buffer, buflen); } void BlockingKProcess::slotProcessExited(KProcess *) diff --git a/lib/util/domutil.cpp b/lib/util/domutil.cpp index 0c9a2491..1f148fad 100644 --- a/lib/util/domutil.cpp +++ b/lib/util/domutil.cpp @@ -260,18 +260,18 @@ TQDomElement DomUtil::elementByPathExt(TQDomDocument &doc, const TQString &paths { DomPath dompath = resolvPathStringExt(pathstring); TQDomElement elem = doc.documentElement(); - TQDomNodeList tqchildren; + TQDomNodeList children; TQDomElement nextElem = elem; for (unsigned int j=0; j<dompath.count(); j++) { - tqchildren = nextElem.childNodes(); + children = nextElem.childNodes(); DomPathElement dompathelement= dompath[j]; bool wrongchild = false; int matchCount = 0; - for (unsigned int i=0; i<tqchildren.count(); i++) + for (unsigned int i=0; i<children.count(); i++) { wrongchild = false; - TQDomElement child = tqchildren.item(i).toElement(); + TQDomElement child = children.item(i).toElement(); TQString tag = child.tagName(); tag = dompathelement.tagName; if (child.tagName() == dompathelement.tagName) @@ -339,10 +339,10 @@ bool DomUtil::removeTextNodes(TQDomDocument doc,TQString pathExt) TQDomElement elem = elementByPathExt(doc,pathExt); if (elem.isNull()) return false; - TQDomNodeList tqchildren = elem.childNodes(); - for (unsigned int i=0;i<tqchildren.count();i++) - if (tqchildren.item(i).isText()) - elem.removeChild(tqchildren.item(i)); + TQDomNodeList children = elem.childNodes(); + for (unsigned int i=0;i<children.count();i++) + if (children.item(i).isText()) + elem.removeChild(children.item(i)); return true; } diff --git a/lib/util/domutil.h b/lib/util/domutil.h index ea28a407..7856e3c6 100644 --- a/lib/util/domutil.h +++ b/lib/util/domutil.h @@ -168,7 +168,7 @@ public: Retrieve an element specified with extended path examples: - - 1: "widget|class=TQDialog/property|name=tqgeometry" + - 1: "widget|class=TQDialog/property|name=geometry" or "widget|class=TQDialog/property||1" - 2: "widget/property|name=caption/string" or "widget/property||2/string" diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp index b3d83746..62eb5924 100644 --- a/lib/util/execcommand.cpp +++ b/lib/util/execcommand.cpp @@ -49,7 +49,7 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, bool ok = proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ); if ( !ok ) { - KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").tqarg( executable ), + KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").arg( executable ), i18n("Error Invoking Command") ); emit finished( TQString(), TQString() ); @@ -57,7 +57,7 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, } else { progressDlg = new KProgressDialog( 0, 0, i18n("Command running..."), - i18n("Please wait until the \"%1\" command finishes.").tqarg( executable ), false ); + i18n("Please wait until the \"%1\" command finishes.").arg( executable ), false ); connect( progressDlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked()) ); } diff --git a/lib/util/filetemplate.cpp b/lib/util/filetemplate.cpp index e0425614..34165e84 100644 --- a/lib/util/filetemplate.cpp +++ b/lib/util/filetemplate.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> #include <tqfileinfo.h> #include <tqregexp.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kstandarddirs.h> @@ -69,8 +69,8 @@ TQString FileTemplate::makeSubstitutions( TQDomDocument & dom, const TQString & TQString email = DomUtil::readEntry(dom, "/general/email"); TQString version = DomUtil::readEntry(dom, "/general/version"); TQString appname = DomUtil::readEntry(dom, "/general/projectname"); - TQString date = TQDate::tqcurrentDate().toString(); - TQString year = TQString::number(TQDate::tqcurrentDate().year()); + TQString date = TQDate::currentDate().toString(); + TQString year = TQString::number(TQDate::currentDate().year()); TQString str = text; str.replace(TQRegExp("\\$EMAIL\\$"),email); diff --git a/lib/util/kscriptactionmanager.cpp b/lib/util/kscriptactionmanager.cpp index 3c906902..ffc3a536 100644 --- a/lib/util/kscriptactionmanager.cpp +++ b/lib/util/kscriptactionmanager.cpp @@ -95,7 +95,7 @@ void KScriptAction::activate( ) } else { - KMessageBox::sorry(0, i18n("Unable to get KScript Runner for type \"%1\".").tqarg(m_scriptType), i18n("KScript Error")); + KMessageBox::sorry(0, i18n("Unable to get KScript Runner for type \"%1\".").arg(m_scriptType), i18n("KScript Error")); kdDebug() << "Query string: " << scriptTypeQuery << endl; return; } diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp index f91c91f0..c9087942 100644 --- a/lib/util/settings.cpp +++ b/lib/util/settings.cpp @@ -23,12 +23,12 @@ TQString Settings::terminalEmulatorName( KConfig & config ) if ( useKDESetting ) { - KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); - terminal = confGroup.readEntry("TerminalApplication", TQString::tqfromLatin1("konsole")); + KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + terminal = confGroup.readEntry("TerminalApplication", TQString::fromLatin1("konsole")); } else { - terminal = config.readEntry( "TerminalApplication", TQString::tqfromLatin1("konsole")); + terminal = config.readEntry( "TerminalApplication", TQString::fromLatin1("konsole")); } return terminal; } diff --git a/lib/util/urlutil.cpp b/lib/util/urlutil.cpp index 12b00065..81eecf84 100644 --- a/lib/util/urlutil.cpp +++ b/lib/util/urlutil.cpp @@ -303,7 +303,7 @@ TQString URLUtil::envExpand ( const TQString& str ) if (pos < 0) pos = len; - char* ret = getenv( TQConstString(str.tqunicode()+1, pos-1).string().local8Bit().data() ); + char* ret = getenv( TQConstString(str.unicode()+1, pos-1).string().local8Bit().data() ); if (ret) { diff --git a/lib/widgets/fancylistviewitem.cpp b/lib/widgets/fancylistviewitem.cpp index ef911ca0..6956636e 100644 --- a/lib/widgets/fancylistviewitem.cpp +++ b/lib/widgets/fancylistviewitem.cpp @@ -108,13 +108,13 @@ void FancyListViewItem::paintCell( TQPainter *painter, const TQColorGroup &cg, if ( isEnabled() || !lv ) p->setPen( cg.highlightedText() ); else if ( !isEnabled() && lv) - p->setPen( lv->tqpalette().disabled().highlightedText() ); + p->setPen( lv->palette().disabled().highlightedText() ); } { if ( isEnabled() || !lv ) p->setPen( cg.text() ); else if ( !isEnabled() && lv) - p->setPen( lv->tqpalette().disabled().text() ); + p->setPen( lv->palette().disabled().text() ); int iconWidth = 0; @@ -129,7 +129,7 @@ void FancyListViewItem::paintCell( TQPainter *painter, const TQColorGroup &cg, else if ( align & AlignTop ) yo = 0; -// respect horizontal tqalignment when there is no text for an item. +// respect horizontal alignment when there is no text for an item. if ( t.isEmpty() ) { if ( align & AlignRight ) xo = width - 2 * marg - iconWidth; diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp index 038d7936..648001b5 100644 --- a/lib/widgets/flagboxes.cpp +++ b/lib/widgets/flagboxes.cpp @@ -28,7 +28,7 @@ #include <tqtooltip.h> #include <tqheader.h> #include <tqstringlist.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqregexp.h> #include <tqspinbox.h> @@ -72,7 +72,7 @@ void FlagListToolTip::maybeTip(const TQPoint &pos) FlagListItem *flitem = static_cast<FlagListItem*>(item); if (item) - tip(listbox->tqitemRect(item), flitem->desc); + tip(listbox->itemRect(item), flitem->desc); } @@ -306,22 +306,22 @@ FlagPathEdit::FlagPathEdit( TQWidget * parent, TQString pathDelimiter, { TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1); topLayout->addWidget(new TQLabel(description, this)); - TQBoxLayout *tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); + TQBoxLayout *layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); if (delimiter.isEmpty()) { url = new KURLRequester(this); url->setMode(mode); - tqlayout->addWidget(url); + layout->addWidget(url); } else { edit = new KLineEdit(this); - tqlayout->addWidget(edit); + layout->addWidget(edit); details = new TQPushButton("...", this); details->setMaximumWidth(30); connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPathDetails())); - tqlayout->addWidget(details); + layout->addWidget(details); } TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); @@ -532,16 +532,16 @@ FlagListEdit::FlagListEdit( TQWidget * parent, TQString listDelimiter, FlagEditC { TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1); topLayout->addWidget(new TQLabel(description, this)); - TQBoxLayout *tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); + TQBoxLayout *layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); edit = new KLineEdit(this); - tqlayout->addWidget(edit); + layout->addWidget(edit); if (! listDelimiter.isEmpty()) { details = new TQPushButton("...", this); details->setMaximumWidth(30); connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showListDetails())); - tqlayout->addWidget(details); + layout->addWidget(details); } TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); @@ -624,7 +624,7 @@ void FlagSpinEdit::setText( const TQString text ) TQString FlagSpinEdit::text( ) { - return TQString("%1").tqarg(spb->value()); + return TQString("%1").arg(spb->value()); } TQString FlagSpinEdit::flags( ) diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp index bb9bc892..bb476fdb 100644 --- a/lib/widgets/kdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -1,5 +1,5 @@ #include <tqfile.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqapplication.h> #include <kxmlguiclient.h> @@ -495,7 +495,7 @@ void KDevHTMLPart::slotCopy( ) { TQString text = selectedText(); text.replace( TQChar( 0xa0 ), ' ' ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); cb->setText(text); connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp index 1b4cb3ab..f28e4ec7 100644 --- a/lib/widgets/processwidget.cpp +++ b/lib/widgets/processwidget.cpp @@ -73,7 +73,7 @@ void ProcessListBoxItem::paint(TQPainter *p) { TQColor dim, warn, err, back; if (listBox()) { - const TQColorGroup& group = listBox()->tqpalette().active(); + const TQColorGroup& group = listBox()->palette().active(); if (isSelected()) { back = group.button(); warn = group.buttonText(); @@ -227,7 +227,7 @@ void ProcessWidget::childFinished(bool normal, int status) if (normal) { if (status) { - s = i18n("*** Exited with status: %1 ***").tqarg(status); + s = i18n("*** Exited with status: %1 ***").arg(status); t = ProcessListBoxItem::Error; } else { s = i18n("*** Exited normally ***"); @@ -249,12 +249,12 @@ void ProcessWidget::childFinished(bool normal, int status) } -TQSize ProcessWidget::tqminimumSizeHint() const +TQSize ProcessWidget::minimumSizeHint() const { - // I'm not sure about this, but when I don't use override tqminimumSizeHint(), + // I'm not sure about this, but when I don't use override minimumSizeHint(), // the initial size in clearly too small - return TQSize( TQListBox::tqsizeHint().width(), + return TQSize( TQListBox::sizeHint().width(), (fontMetrics().lineSpacing()+2)*4 ); } diff --git a/lib/widgets/processwidget.h b/lib/widgets/processwidget.h index 5c33dd86..814db870 100644 --- a/lib/widgets/processwidget.h +++ b/lib/widgets/processwidget.h @@ -109,7 +109,7 @@ signals: void rowSelected(int row); protected: - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; void maybeScrollToBottom(); protected slots: diff --git a/lib/widgets/propeditor/pcheckbox.cpp b/lib/widgets/propeditor/pcheckbox.cpp index 4a12d575..22c9a9c2 100644 --- a/lib/widgets/propeditor/pcheckbox.cpp +++ b/lib/widgets/propeditor/pcheckbox.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "pcheckbox.h" -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqpainter.h> @@ -36,7 +36,7 @@ PCheckBox::PCheckBox(MultiProperty *property, TQWidget *parent, const char *name { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQCheckBox(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); diff --git a/lib/widgets/propeditor/pcolorbutton.cpp b/lib/widgets/propeditor/pcolorbutton.cpp index bb927a08..5050791d 100644 --- a/lib/widgets/propeditor/pcolorbutton.cpp +++ b/lib/widgets/propeditor/pcolorbutton.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "pcolorbutton.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #ifndef PURE_QT @@ -45,7 +45,7 @@ PColorButton::PColorButton(MultiProperty* property, TQWidget* parent, const char connect(m_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeColor())); #endif - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); } diff --git a/lib/widgets/propeditor/pcolorcombo.cpp b/lib/widgets/propeditor/pcolorcombo.cpp index b0c82de3..73ad6bc8 100644 --- a/lib/widgets/propeditor/pcolorcombo.cpp +++ b/lib/widgets/propeditor/pcolorcombo.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "pcolorcombo.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <kcolorcombo.h> @@ -31,7 +31,7 @@ PColorCombo::PColorCombo(MultiProperty *property, TQWidget *parent, const char * { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KColorCombo(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); diff --git a/lib/widgets/propeditor/pcombobox.cpp b/lib/widgets/propeditor/pcombobox.cpp index fa21678b..2ba2cd57 100644 --- a/lib/widgets/propeditor/pcombobox.cpp +++ b/lib/widgets/propeditor/pcombobox.cpp @@ -20,7 +20,7 @@ #include "pcombobox.h" #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> namespace PropertyLib{ @@ -40,7 +40,7 @@ void PComboBox::init(bool rw) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQComboBox(rw, this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); fillBox(); diff --git a/lib/widgets/propeditor/pdateedit.cpp b/lib/widgets/propeditor/pdateedit.cpp index 64bbde18..ef96e430 100644 --- a/lib/widgets/propeditor/pdateedit.cpp +++ b/lib/widgets/propeditor/pdateedit.cpp @@ -21,7 +21,7 @@ #include <tqdatetimeedit.h> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> namespace PropertyLib{ @@ -30,7 +30,7 @@ PDateEdit::PDateEdit(MultiProperty* property, TQWidget* parent, const char* name { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQDateEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&))); diff --git a/lib/widgets/propeditor/pdatetimeedit.cpp b/lib/widgets/propeditor/pdatetimeedit.cpp index 59df2440..0aa88262 100644 --- a/lib/widgets/propeditor/pdatetimeedit.cpp +++ b/lib/widgets/propeditor/pdatetimeedit.cpp @@ -21,7 +21,7 @@ #include <tqdatetimeedit.h> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> namespace PropertyLib{ @@ -29,7 +29,7 @@ PDateTimeEdit::PDateTimeEdit(MultiProperty* property, TQWidget* parent, const ch { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQDateTimeEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&))); diff --git a/lib/widgets/propeditor/pdoublenuminput.cpp b/lib/widgets/propeditor/pdoublenuminput.cpp index e48475de..12c58616 100644 --- a/lib/widgets/propeditor/pdoublenuminput.cpp +++ b/lib/widgets/propeditor/pdoublenuminput.cpp @@ -27,7 +27,7 @@ #include <limits.h> #include <math.h> -#include <tqlayout.h> +#include <layout.h> namespace PropertyLib{ @@ -43,7 +43,7 @@ PDoubleNumInput::PDoubleNumInput(MultiProperty *property, TQWidget *parent, cons m_edit = new TQFloatInput(-999999, 999999, 0.01, 2, this ); connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); #endif - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); /* m_edit->setMinValue(-999999999); m_edit->setMaxValue(+999999999); m_edit->setPrecision(2);*/ @@ -78,7 +78,7 @@ void PDoubleNumInput::updateProperty(double val) void PDoubleNumInput::updateProperty(int val) { #ifdef PURE_QT - TQString format = TQString("%.%1f").tqarg( m_edit->digits() ); + TQString format = TQString("%.%1f").arg( m_edit->digits() ); TQString strVal = TQString().sprintf(format.latin1(), (val/(float)pow(m_edit->digits(),10)) ); emit propertyChanged(m_property, TQVariant(strVal)); diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp index e54e401f..edfb0b3c 100644 --- a/lib/widgets/propeditor/pfontbutton.cpp +++ b/lib/widgets/propeditor/pfontbutton.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "pfontbutton.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqpushbutton.h> @@ -38,7 +38,7 @@ PFontButton::PFontButton(MultiProperty* property, TQWidget* parent, const char* { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KFontRequester(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); #ifndef PURE_QT m_edit->button()->setText(i18n("...")); #endif @@ -61,7 +61,7 @@ void PFontButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, fi.family() + (fi.bold() ? i18n(" Bold") : TQString("")) + (fi.italic() ? i18n(" Italic") : TQString("")) + - " " + TQString("%1").tqarg(fi.pointSize()) ); + " " + TQString("%1").arg(fi.pointSize()) ); } void PFontButton::setValue(const TQVariant& value, bool emitChange) diff --git a/lib/widgets/propeditor/pfontcombo.cpp b/lib/widgets/propeditor/pfontcombo.cpp index 51b44e8c..2e5a5da3 100644 --- a/lib/widgets/propeditor/pfontcombo.cpp +++ b/lib/widgets/propeditor/pfontcombo.cpp @@ -25,7 +25,7 @@ #include <tqcombobox.h> #endif -#include <tqlayout.h> +#include <layout.h> #ifdef PURE_QT #include <tqfontdatabase.h> @@ -38,7 +38,7 @@ PFontCombo::PFontCombo(MultiProperty *property, TQWidget *parent, const char *na { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KFontCombo(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); /*adymo: KFontCombo seems to have a bug: when it is not editable, the signals diff --git a/lib/widgets/propeditor/plineedit.cpp b/lib/widgets/propeditor/plineedit.cpp index 2c4fabc9..3d28a6da 100644 --- a/lib/widgets/propeditor/plineedit.cpp +++ b/lib/widgets/propeditor/plineedit.cpp @@ -20,7 +20,7 @@ #include "plineedit.h" #include <klineedit.h> -#include <tqlayout.h> +#include <layout.h> namespace PropertyLib{ @@ -29,7 +29,7 @@ PLineEdit::PLineEdit(MultiProperty *property, TQWidget *parent, const char *name { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); diff --git a/lib/widgets/propeditor/plinestyleedit.cpp b/lib/widgets/propeditor/plinestyleedit.cpp index a47dc614..3fc3315a 100644 --- a/lib/widgets/propeditor/plinestyleedit.cpp +++ b/lib/widgets/propeditor/plinestyleedit.cpp @@ -22,7 +22,7 @@ #include <tqpainter.h> #include <tqpixmap.h> #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> namespace PropertyLib { @@ -131,7 +131,7 @@ PLineStyleEdit::PLineStyleEdit(MultiProperty* property, TQWidget* parent, const { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQComboBox(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->insertItem(TQPixmap(nopen)); diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp index 20f943e8..6217ed07 100644 --- a/lib/widgets/propeditor/ppixmapedit.cpp +++ b/lib/widgets/propeditor/ppixmapedit.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ #include "ppixmapedit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqlabel.h> #include <tqcursor.h> @@ -46,7 +46,7 @@ PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* parent, const char* { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQLabel(this); - m_edit->tqsetAlignment(TQt::AlignTop); + m_edit->setAlignment(TQt::AlignTop); m_edit->resize(width(), height()-1); m_edit->setBackgroundMode(TQt::PaletteBase); m_edit->installEventFilter(this); @@ -54,7 +54,7 @@ PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* parent, const char* m_button = new TQPushButton(i18n("..."), this); m_button->resize(height(), height()-8); m_button->move(width() - m_button->width() -1, 0); - m_button->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed); + m_button->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed); l->addWidget(m_edit); l->addWidget(m_button); m_popup = new TQLabel(0, 0, TQt::WStyle_NoBorder|TQt::WX11BypassWM|WStyle_StaysOnTop); diff --git a/lib/widgets/propeditor/ppointedit.cpp b/lib/widgets/propeditor/ppointedit.cpp index 4e85d214..950da89b 100644 --- a/lib/widgets/propeditor/ppointedit.cpp +++ b/lib/widgets/propeditor/ppointedit.cpp @@ -20,7 +20,7 @@ #include "ppointedit.h" #include <klineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> namespace PropertyLib{ @@ -29,7 +29,7 @@ PPointEdit::PPointEdit(MultiProperty* property, TQWidget* parent, const char* na { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->setReadOnly(true); @@ -45,13 +45,13 @@ void PPointEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y())); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y())); } void PPointEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y())); + m_edit->setText(TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y())); if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/prectedit.cpp b/lib/widgets/propeditor/prectedit.cpp index d7a5fa01..c9f5388e 100644 --- a/lib/widgets/propeditor/prectedit.cpp +++ b/lib/widgets/propeditor/prectedit.cpp @@ -20,7 +20,7 @@ #include "prectedit.h" #include <klineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> namespace PropertyLib{ @@ -29,7 +29,7 @@ PRectEdit::PRectEdit(MultiProperty* property, TQWidget* parent, const char* name { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->setReadOnly(true); @@ -45,13 +45,13 @@ void PRectEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height())); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height())); } void PRectEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height())); + m_edit->setText(TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height())); if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/property.h b/lib/widgets/propeditor/property.h index 48c6987f..a94ea4cb 100644 --- a/lib/widgets/propeditor/property.h +++ b/lib/widgets/propeditor/property.h @@ -105,7 +105,7 @@ public: //predefined custom types ValueFromList = 2000 /**<string value from a list*/, - Symbol = 2001 /**<tqunicode symbol code*/, + Symbol = 2001 /**<unicode symbol code*/, FontName = 2002 /**<font name, e.g. "times new roman"*/, FileURL = 2003 /**<url of a file*/, DirectoryURL = 2004 /**<url of a directory*/, diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp index ed7b81f2..bda2077c 100644 --- a/lib/widgets/propeditor/propertyeditor.cpp +++ b/lib/widgets/propeditor/propertyeditor.cpp @@ -28,7 +28,7 @@ #endif #include <tqtable.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqptrlist.h> #include <tqvaluelist.h> @@ -196,7 +196,7 @@ PropertyEditor::PropertyEditor(TQWidget *parent, const char *name) #else m_undoButton->setPixmap( TQPixmap("undo.xpm") ); #endif - m_undoButton->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); + m_undoButton->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); m_undoButton->resize(m_undoButton->height(), m_undoButton->height()); m_undoButton->hide(); connect(m_undoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(undo())); @@ -270,7 +270,7 @@ void PropertyEditor::addChildProperties(PropertyItem *parent) machine(prop); } -// qWarning("seeking tqchildren: count: %d", prop->details.count()); +// qWarning("seeking children: count: %d", prop->details.count()); parent->setOpen(true); for (TQValueList<ChildProperty>::iterator it = prop->details.begin(); it != prop->details.end(); ++it) @@ -301,7 +301,7 @@ void PropertyEditor::propertyValueChanged(Property *property) m_currentEditWidget->setValue(property->value(), false); else { -// tqrepaint all items +// repaint all items TQListViewItemIterator it(this); while (it.current()) { @@ -360,11 +360,11 @@ void PropertyEditor::showEditor(PropertyItem *item) void PropertyEditor::placeEditor(PropertyItem *item) { - TQRect r = tqitemRect(item); + TQRect r = itemRect(item); if (!r.size().isValid()) { ensureItemVisible(item); - r = tqitemRect(item); + r = itemRect(item); } r.setX(header()->sectionPos(1)); @@ -386,7 +386,7 @@ void PropertyEditor::placeEditor(PropertyItem *item) m_currentEditLayout->addWidget(editor, 0, 0); m_currentEditLayout->addWidget(m_undoButton, 0, 1); m_currentEditArea->resize(r.size()); -// m_currentEditLayout->tqinvalidate(); +// m_currentEditLayout->invalidate(); moveChild(m_currentEditArea, r.x(), r.y()); m_currentEditWidget = editor; } @@ -447,7 +447,7 @@ Machine *PropertyEditor::machine(MultiProperty *property) m_registeredForType[name] = PropertyMachineFactory::getInstance()->machineForProperty(property); connect(m_registeredForType[name]->propertyEditor, TQT_SIGNAL(propertyChanged(MultiProperty*, const TQVariant&)), this, TQT_SLOT(propertyChanged(MultiProperty*, const TQVariant&))); - m_registeredForType[name]->propertyEditor->reparent(m_currentEditArea, 0, m_currentEditArea->tqchildrenRect().topLeft()); + m_registeredForType[name]->propertyEditor->reparent(m_currentEditArea, 0, m_currentEditArea->childrenRect().topLeft()); m_registeredForType[name]->propertyEditor->hide(); } return m_registeredForType[name]; diff --git a/lib/widgets/propeditor/propertywidgetproxy.cpp b/lib/widgets/propeditor/propertywidgetproxy.cpp index 813708ca..c891672e 100644 --- a/lib/widgets/propeditor/propertywidgetproxy.cpp +++ b/lib/widgets/propeditor/propertywidgetproxy.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "propertywidgetproxy.h" -#include <tqlayout.h> +#include <layout.h> #include "propertywidget.h" #include "propertymachinefactory.h" diff --git a/lib/widgets/propeditor/psizeedit.cpp b/lib/widgets/propeditor/psizeedit.cpp index 5558c3f3..1077a4be 100644 --- a/lib/widgets/propeditor/psizeedit.cpp +++ b/lib/widgets/propeditor/psizeedit.cpp @@ -20,7 +20,7 @@ #include "psizeedit.h" #include <klineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> namespace PropertyLib{ @@ -30,7 +30,7 @@ PSizeEdit::PSizeEdit(MultiProperty *property, TQWidget *parent, const char *name { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->setReadOnly(true); @@ -46,13 +46,13 @@ void PSizeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height())); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height())); } void PSizeEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height())); + m_edit->setText(TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height())); if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/psizepolicyedit.cpp b/lib/widgets/propeditor/psizepolicyedit.cpp index 94847d2a..640c873f 100644 --- a/lib/widgets/propeditor/psizepolicyedit.cpp +++ b/lib/widgets/propeditor/psizepolicyedit.cpp @@ -20,7 +20,7 @@ #include "psizepolicyedit.h" #include <klineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqsizepolicy.h> @@ -31,7 +31,7 @@ PSizePolicyEdit::PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->setReadOnly(true); @@ -47,13 +47,13 @@ void PSizePolicyEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQR p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("%1/%2/%3/%4").tqarg(findValueDescription(value.toSizePolicy().horData())).tqarg(findValueDescription(value.toSizePolicy().verData())).tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch())); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch())); } void PSizePolicyEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(TQString("%1/%2/%3/%4").tqarg(findValueDescription(value.toSizePolicy().horData())).tqarg(findValueDescription(value.toSizePolicy().verData())).tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch())); + m_edit->setText(TQString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch())); if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/pspinbox.cpp b/lib/widgets/propeditor/pspinbox.cpp index e9c25325..3dfc5abe 100644 --- a/lib/widgets/propeditor/pspinbox.cpp +++ b/lib/widgets/propeditor/pspinbox.cpp @@ -22,7 +22,7 @@ #include <limits.h> #include <tqspinbox.h> -#include <tqlayout.h> +#include <layout.h> namespace PropertyLib{ @@ -31,7 +31,7 @@ PSpinBox::PSpinBox(MultiProperty *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQSpinBox(INT_MIN, INT_MAX, 1, this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); diff --git a/lib/widgets/propeditor/pstringlistedit.cpp b/lib/widgets/propeditor/pstringlistedit.cpp index fda16a8b..2b0fc8f8 100644 --- a/lib/widgets/propeditor/pstringlistedit.cpp +++ b/lib/widgets/propeditor/pstringlistedit.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "pstringlistedit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqdialog.h> #include <tqpainter.h> #include <klineedit.h> @@ -43,10 +43,10 @@ PStringListEdit::PStringListEdit(MultiProperty *property, TQWidget *parent, cons edit = new KLineEdit(this); edit->setReadOnly(true); - edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(edit); pbSelect = new TQPushButton("...", this); - pbSelect->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); + pbSelect->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); l->addWidget(pbSelect); connect(pbSelect, TQT_SIGNAL(clicked()), this, TQT_SLOT(showEditor())); diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp index 7e79945a..25fe3ebd 100644 --- a/lib/widgets/propeditor/psymbolcombo.cpp +++ b/lib/widgets/propeditor/psymbolcombo.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqpushbutton.h> #include <klineedit.h> @@ -40,11 +40,11 @@ PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char { l = new TQHBoxLayout(this); m_edit = new KLineEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); m_edit->setMaxLength(1); l->addWidget(m_edit); m_select = new TQPushButton("...", this); - m_select->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); + m_select->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); l->addWidget(m_select); #ifdef PURE_QT @@ -58,7 +58,7 @@ PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char TQVariant PSymbolCombo::value() const { if (!(m_edit->text().isNull())) - return TQVariant(TQString("%1").tqarg(m_edit->text().tqat(0).tqunicode())); + return TQVariant(TQString("%1").arg(m_edit->text().at(0).unicode())); else return TQVariant(0); } @@ -109,7 +109,7 @@ void PSymbolCombo::selectChar() void PSymbolCombo::updateProperty(const TQString& val) { - emit propertyChanged(m_property, TQVariant(TQString("%1").tqarg(val.tqat(0).tqunicode()))); + emit propertyChanged(m_property, TQVariant(TQString("%1").arg(val.at(0).unicode()))); } void PSymbolCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value) diff --git a/lib/widgets/propeditor/purledit.cpp b/lib/widgets/propeditor/purledit.cpp index df8316cd..0625aa38 100644 --- a/lib/widgets/propeditor/purledit.cpp +++ b/lib/widgets/propeditor/purledit.cpp @@ -26,7 +26,7 @@ #include <tqlineedit.h> #endif #include <tqfiledialog.h> -#include <tqlayout.h> +#include <layout.h> namespace PropertyLib{ @@ -47,7 +47,7 @@ PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent, const c m_mode = mode; connect( m_select, TQT_SIGNAL(clicked()),this,TQT_SLOT(select())); #endif - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); } TQVariant PUrlEdit::value() const diff --git a/lib/widgets/propeditor/pyesnobutton.cpp b/lib/widgets/propeditor/pyesnobutton.cpp index 614b751b..7e96f772 100644 --- a/lib/widgets/propeditor/pyesnobutton.cpp +++ b/lib/widgets/propeditor/pyesnobutton.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "pyesnobutton.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqpushbutton.h> @@ -37,7 +37,7 @@ PYesNoButton::PYesNoButton(MultiProperty* property, TQWidget* parent, const char TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQPushButton(this); m_edit->setToggleButton(true); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); diff --git a/lib/widgets/propeditor/qeditlistbox.cpp b/lib/widgets/propeditor/qeditlistbox.cpp index fda5a006..d8c8bcdf 100644 --- a/lib/widgets/propeditor/qeditlistbox.cpp +++ b/lib/widgets/propeditor/qeditlistbox.cpp @@ -24,7 +24,7 @@ #include <klineedit.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqlistbox.h> #include <tqwhatsthis.h> @@ -92,7 +92,7 @@ void QEditListBox::init( bool checkAtEntering, int buttons, servNewButton = servRemoveButton = servUpButton = servDownButton = 0L; - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, + setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); TQWidget * gb = this; diff --git a/lib/widgets/propeditor/qfloatinput.cpp b/lib/widgets/propeditor/qfloatinput.cpp index 1922ea6a..f2fefed8 100644 --- a/lib/widgets/propeditor/qfloatinput.cpp +++ b/lib/widgets/propeditor/qfloatinput.cpp @@ -38,7 +38,7 @@ TQFloatInput::TQFloatInput( int min, int max, float step, int digits, TQString TQFloatInput::mapValueToText( int value ) { - TQString format = TQString("%.%1f").tqarg( m_digits ); + TQString format = TQString("%.%1f").arg( m_digits ); return TQString().sprintf(format.latin1(), (value/(float)pow(m_digits,10)) ); } diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp index 2dcfb9f3..113c8d38 100644 --- a/lib/widgets/qcomboview.cpp +++ b/lib/widgets/qcomboview.cpp @@ -39,7 +39,7 @@ public: QComboViewData( QComboView *cb ): current(0), lView( 0 ), combo( cb ) { duplicatesEnabled = TRUE; - cb->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); + cb->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); } inline TQListView * listView() { return lView; } @@ -68,7 +68,7 @@ public: TQLineEdit * ed; // /bin/ed rules! TQTimer *completionTimer; - TQSize tqsizeHint; + TQSize sizeHint; private: bool usinglView; @@ -81,14 +81,14 @@ void QComboViewData::updateLinedGeometry() { if ( !ed || !combo ) return; - TQRect r = TQStyle::tqvisualRect( combo->tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, combo, + TQRect r = TQStyle::visualRect( combo->tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, combo, TQStyle::SC_ComboBoxEditField), combo ); // qWarning("updateLinedGeometry(): currentItem is %d", combo->currentItem() == 0 ? 0 : 1); const TQPixmap *pix = combo->currentItem() ? combo->currentItem()->pixmap(0) : 0; if ( pix && pix->width() < r.width() ) r.setLeft( r.left() + pix->width() + 4 ); - if ( r != ed->tqgeometry() ) + if ( r != ed->geometry() ) ed->setGeometry( r ); } @@ -204,7 +204,7 @@ void QComboView::clear() d->current = 0; if ( d->ed ) { - d->ed->setText( TQString::tqfromLatin1("") ); + d->ed->setText( TQString::fromLatin1("") ); d->updateLinedGeometry(); } currentChanged(); @@ -269,13 +269,13 @@ void QComboView::setAutoResize( bool enable ) reimp This implementation caches the size hint to avoid resizing when - the contents change dynamically. To tqinvalidate the cached value + the contents change dynamically. To invalidate the cached value call setFont(). */ -TQSize QComboView::tqsizeHint() const +TQSize QComboView::sizeHint() const { - if ( isVisible() && d->tqsizeHint.isValid() ) - return d->tqsizeHint; + if ( isVisible() && d->sizeHint.isValid() ) + return d->sizeHint; constPolish(); // int i, w; @@ -290,10 +290,10 @@ TQSize QComboView::tqsizeHint() const maxW = w; } */ - d->tqsizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, this, + d->sizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, this, TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut())); - return d->tqsizeHint; + return d->sizeHint; } @@ -385,7 +385,7 @@ void QComboView::setPalette( const TQPalette &palette ) void QComboView::setFont( const TQFont &font ) { - d->tqsizeHint = TQSize(); // tqinvalidate size hint + d->sizeHint = TQSize(); // invalidate size hint TQWidget::setFont( font ); d->listView()->setFont( font ); if (d->ed) @@ -412,7 +412,7 @@ void QComboView::resizeEvent( TQResizeEvent * e ) void QComboView::paintEvent( TQPaintEvent * ) { TQPainter p( this ); - const TQColorGroup & g = tqcolorGroup(); + const TQColorGroup & g = colorGroup(); p.setPen(g.text()); TQStyle::SFlags flags = TQStyle::Style_Default; @@ -428,7 +428,7 @@ void QComboView::paintEvent( TQPaintEvent * ) } // bool reverse = TQApplication::reverseLayout(); - tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g, + tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g, flags, TQStyle::SC_All, (d->arrowDown ? TQStyle::SC_ComboBoxArrow : @@ -436,7 +436,7 @@ void QComboView::paintEvent( TQPaintEvent * ) TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); - re = TQStyle::tqvisualRect(re, this); + re = TQStyle::visualRect(re, this); p.setClipRect( re ); if ( !d->ed ) { @@ -445,14 +445,14 @@ void QComboView::paintEvent( TQPaintEvent * ) // we calculate the TQListBoxTexts height (ignoring strut) int itemh = d->listView()->fontMetrics().lineSpacing() + 2; p.translate( re.x(), re.y() + (re.height() - itemh)/2 ); - item->paintCell( &p, d->listView()->tqcolorGroup(), 0, width(), AlignLeft | AlignVCenter ); + item->paintCell( &p, d->listView()->colorGroup(), 0, width(), AlignLeft | AlignVCenter ); } } else if ( d->listView() && d->listView()->currentItem( ) && d->current ) { TQListViewItem * item = d->current ; const TQPixmap *pix = item->pixmap(0); if ( pix ) { p.fillRect( re.x(), re.y(), pix->width() + 4, re.height(), - tqcolorGroup().brush( TQColorGroup::Base ) ); + colorGroup().brush( TQColorGroup::Base ) ); p.drawPixmap( re.x() + 2, re.y() + ( re.height() - pix->height() ) / 2, *pix ); } @@ -474,7 +474,7 @@ void QComboView::mousePressEvent( TQMouseEvent *e ) } TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); - arrowRect = TQStyle::tqvisualRect(arrowRect, this); + arrowRect = TQStyle::visualRect(arrowRect, this); // Correction for motif style, where arrow is smaller // and thus has a rect that doesn't fit the button. @@ -489,7 +489,7 @@ void QComboView::mousePressEvent( TQMouseEvent *e ) if ( arrowRect.contains( e->pos() ) ) { d->arrowPressed = TRUE; d->arrowDown = TRUE; - tqrepaint( FALSE ); + repaint( FALSE ); } TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout())); d->shortClick = TRUE; @@ -700,12 +700,12 @@ static int listHeight( TQListView *l, int /*sl*/ ) prefH = ch * l->firstChild()->height(); } else - prefH = l->tqsizeHint().height(); + prefH = l->sizeHint().height(); if (l->header()->isVisible()) - prefH += l->header()->tqsizeHint().height(); + prefH += l->header()->sizeHint().height(); -// return prefH < l->tqsizeHint().height() ? prefH : l->tqsizeHint().height(); +// return prefH < l->sizeHint().height() ? prefH : l->sizeHint().height(); return prefH+2; } @@ -727,7 +727,7 @@ void QComboView::popup() lb->installEventFilter( this ); lb->viewport()->installEventFilter( this ); d->mouseWasInsidePopup = FALSE; -// int w = lb->variableWidth() ? lb->tqsizeHint().width() : width(); +// int w = lb->variableWidth() ? lb->sizeHint().width() : width(); int w = width(); int h = listHeight( lb, d->sizeLimit ); TQRect screen = TQApplication::desktop()->availableGeometry( const_cast<QComboView*>(this) ); @@ -790,7 +790,7 @@ void QComboView::updateMask() { TQPainter p( &bm, this ); - tqstyle().tqdrawComplexControlMask(TQStyle::CC_ComboBox, &p, this, rect()); + tqstyle().drawComplexControlMask(TQStyle::CC_ComboBox, &p, this, rect()); } setMask( bm ); @@ -808,7 +808,7 @@ void QComboView::popDownListView() d->listView()->setCurrentItem( d->current ); if ( d->arrowDown ) { d->arrowDown = FALSE; - tqrepaint( FALSE ); + repaint( FALSE ); } d->poppedUp = FALSE; } @@ -904,21 +904,21 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); - arrowRect = TQStyle::tqvisualRect(arrowRect, this); + arrowRect = TQStyle::visualRect(arrowRect, this); if ( arrowRect.contains( comboPos ) ) { if ( !d->arrowDown ) { d->arrowDown = TRUE; - tqrepaint( FALSE ); + repaint( FALSE ); } } else { if ( d->arrowDown ) { d->arrowDown = FALSE; - tqrepaint( FALSE ); + repaint( FALSE ); } } } } else if ((e->state() & ( Qt::RightButton | Qt::LeftButton | Qt::MidButton ) ) == 0 && - tqstyle().tqstyleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) { + tqstyle().styleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) { // qWarning("event filter:: emu"); TQWidget *mouseW = TQApplication::widgetAt( e->globalPos(), TRUE ); // if ( mouseW == d->listView()->viewport() ) { //### @@ -948,7 +948,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) d->arrowPressed = FALSE; if ( d->arrowDown ) { d->arrowDown = FALSE; - tqrepaint( FALSE ); + repaint( FALSE ); } } } @@ -1333,7 +1333,7 @@ bool QComboView::autoCompletion() const */ void QComboView::styleChange( TQStyle& s ) { - d->tqsizeHint = TQSize(); // tqinvalidate size hint... + d->sizeHint = TQSize(); // invalidate size hint... if ( d->ed ) d->updateLinedGeometry(); TQWidget::styleChange( s ); diff --git a/lib/widgets/qcomboview.h b/lib/widgets/qcomboview.h index ecfa8ee2..35eef4f1 100644 --- a/lib/widgets/qcomboview.h +++ b/lib/widgets/qcomboview.h @@ -68,7 +68,7 @@ public: bool autoResize() const; virtual void setAutoResize( bool ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void setPalette( const TQPalette & ); void setFont( const TQFont & ); diff --git a/lib/widgets/resizablecombo.cpp b/lib/widgets/resizablecombo.cpp index aba2f658..3e2df727 100644 --- a/lib/widgets/resizablecombo.cpp +++ b/lib/widgets/resizablecombo.cpp @@ -21,7 +21,7 @@ #include "kcomboview.h" #include <tqevent.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <tqapplication.h> #include <tqwhatsthis.h> diff --git a/parts/abbrev/abbrevconfigwidgetbase.ui b/parts/abbrev/abbrevconfigwidgetbase.ui index f53ec3df..fd04ec23 100644 --- a/parts/abbrev/abbrevconfigwidgetbase.ui +++ b/parts/abbrev/abbrevconfigwidgetbase.ui @@ -45,7 +45,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/parts/abbrev/addtemplatedlgbase.ui b/parts/abbrev/addtemplatedlgbase.ui index bab82762..b4a01258 100644 --- a/parts/abbrev/addtemplatedlgbase.ui +++ b/parts/abbrev/addtemplatedlgbase.ui @@ -43,7 +43,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>10</height> diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index eb3fb4f6..8498f392 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -27,8 +27,8 @@ #include <tqpushbutton.h> #include <tqradiobutton.h> #include <tqregexp.h> -#include <tqtextstream.h> -#include <tqtextview.h> +#include <textstream.h> +#include <textview.h> #include <tqtoolbutton.h> #include <tqtooltip.h> #include <tqvalidator.h> @@ -61,7 +61,7 @@ #include <kfileitem.h> #include <kio/chmodjob.h> -#include <tqlayout.h> +#include <layout.h> #include "domutil.h" #include "kdevversioncontrol.h" @@ -486,7 +486,7 @@ void AppWizardDialog::accept() } else { - KMessageBox::sorry(this, i18n("The template %1 cannot be opened.").tqarg( source + "/" + m_pCurrentAppInfo->sourceArchive ) ); + KMessageBox::sorry(this, i18n("The template %1 cannot be opened.").arg( source + "/" + m_pCurrentAppInfo->sourceArchive ) ); templateArchive.close(); return; } @@ -509,7 +509,7 @@ void AppWizardDialog::accept() m_pCurrentAppInfo->subMap.insert("EMAIL", email_edit->text() ); m_pCurrentAppInfo->subMap.insert("VERSION", version_edit->text()); m_pCurrentAppInfo->subMap.insert( "I18N", "i18n" ); - m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::tqcurrentDate().year() ) ); + m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::currentDate().year() ) ); // This isn't too pretty, but we have several templates that use KAboutData::License_${LICENSE} // and unsurprisingly, KAboutData doesn't cover every imaginable case. @@ -543,7 +543,7 @@ void AppWizardDialog::accept() // This is too silly for words, but it's either this or reimplementing FileTemplate TQString tempProjectDomSource = "<!DOCTYPE tdevelop><tdevelop><general><author>%1</author><email>%2</email><version>%3</version></general></tdevelop>"; - tempProjectDomSource = tempProjectDomSource.tqarg( author_edit->text() ).tqarg( email_edit->text() ).tqarg( version_edit->text() ); + tempProjectDomSource = tempProjectDomSource.arg( author_edit->text() ).arg( email_edit->text() ).arg( version_edit->text() ); TQDomDocument tempProjectDom; tempProjectDom.setContent( tempProjectDomSource ); @@ -559,13 +559,13 @@ void AppWizardDialog::accept() temps.setEncoding(TQTextStream::UnicodeUTF8); temps << templateText; f.flush(); - TQString templateName( TQString( "%1_TEMPLATE" ).tqarg( (*it).suffix ).upper() ); + TQString templateName( TQString( "%1_TEMPLATE" ).arg( (*it).suffix ).upper() ); cleanUpSubstMap << templateName; m_pCurrentAppInfo->subMap.insert( templateName, KMacroExpander::expandMacros(templateText , m_pCurrentAppInfo->subMap) ); installFile file; file.source = tempFile->name(); - file.dest = TQString( "%{dest}/templates/%1" ).tqarg( (*it).suffix ); + file.dest = TQString( "%{dest}/templates/%1" ).arg( (*it).suffix ); file.process = true; file.isXML = false; m_pCurrentAppInfo->fileList.append( file ); @@ -585,8 +585,8 @@ void AppWizardDialog::accept() for( ; it != files.end(); ++it ) { installFile file; - file.source = TQString( "%{tdevelop}/template-common/%1" ).tqarg( *it ); - file.dest = TQString("%{dest}/%1").tqarg( *it ); + file.source = TQString( "%{tdevelop}/template-common/%1" ).arg( *it ); + file.dest = TQString("%{dest}/%1").arg( *it ); file.process = true; file.isXML = false; m_pCurrentAppInfo->fileList.append( file ); @@ -645,7 +645,7 @@ void AppWizardDialog::accept() { if( ! KIO::NetAccess::mkdir( (*dirIt).dir, this ) ) { - KMessageBox::sorry(this, i18n("The directory %1 cannot be created.").tqarg( (*dirIt).dir ) ); + KMessageBox::sorry(this, i18n("The directory %1 cannot be created.").arg( (*dirIt).dir ) ); return; } } @@ -664,7 +664,7 @@ void AppWizardDialog::accept() } else { - KMessageBox::sorry(this, i18n("The archive %1 cannot be opened.").tqarg( (*archIt).source ) ); + KMessageBox::sorry(this, i18n("The archive %1 cannot be opened.").arg( (*archIt).source ) ); archive.close(); return; } @@ -682,7 +682,7 @@ void AppWizardDialog::accept() { if( !copyFile( *fileIt ) ) { - KMessageBox::sorry(this, i18n("The file %1 cannot be created.").tqarg( (*fileIt).dest) ); + KMessageBox::sorry(this, i18n("The file %1 cannot be created.").arg( (*fileIt).dest) ); return; } setPermissions(*fileIt); @@ -824,7 +824,7 @@ void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const TQStrin // ( where should we currently get that info from? ) if ( !copyFile( TQDir::cleanDirPath(tdir.name()+"/"+file->name()), dest + "/" + file->name(), false, process ) ) { - KMessageBox::sorry(this, i18n("The file %1 cannot be created.").tqarg( dest) ); + KMessageBox::sorry(this, i18n("The file %1 cannot be created.").arg( dest) ); return; } setPermissions(file, dest + "/" + file->name()); @@ -893,7 +893,7 @@ void AppWizardDialog::templatesTreeViewClicked(TQListViewItem *item) if (it == l.end()) m_lastPage = edit; fileTemplate.edit = edit; - addPage(edit, i18n("Template for .%1 Files").tqarg(fileTemplate.suffix)); + addPage(edit, i18n("Template for .%1 Files").arg(fileTemplate.suffix)); m_fileTemplates.append(fileTemplate); } licenseChanged(); // to populate the template views @@ -919,7 +919,7 @@ void AppWizardDialog::destButtonClicked(const TQString& dir) TQDir newDir (dir); kdDebug(9010) << "DevPrjDir == newdir?: " << defPrjDir.absPath() << " == " << newDir.absPath() << endl; if (defPrjDir != newDir) { - if (KMessageBox::questionYesNo(this, i18n("Set default project location to: %1?").tqarg( newDir.absPath() ), + if (KMessageBox::questionYesNo(this, i18n("Set default project location to: %1?").arg( newDir.absPath() ), i18n("New Project"), i18n("Set"), i18n("Do Not Set")) == KMessageBox::Yes) { config->writePathEntry("DefaultProjectsDir", newDir.absPath() + "/"); @@ -1015,7 +1015,7 @@ void AppWizardDialog::openAfterGeneration() { KMessageBox::sorry( 0, i18n("This is not a valid project file.\n" "XML error in line %1, column %2:\n%3") - .tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg)); + .arg(errorLine).arg(errorCol).arg(errorMsg)); return; } @@ -1023,7 +1023,7 @@ void AppWizardDialog::openAfterGeneration() DomUtil::writeMapEntry( projectDOM, "substmap", m_pCurrentAppInfo->subMap ); //save the selected vcs - KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", TQString("[X-KDevelop-VCS]=='%1'").tqarg(m_vcsForm->combo->currentText())); + KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", TQString("[X-KDevelop-VCS]=='%1'").arg(m_vcsForm->combo->currentText())); if (offers.count() == 1) { KService::Ptr service = offers.first(); @@ -1318,7 +1318,7 @@ void AppWizardDialog::showTemplates(bool all) TQDictIterator<TQListViewItem> dit(m_categoryMap); for (; dit.current(); ++dit) { - //checking whether all tqchildren are not visible + //checking whether all children are not visible kdDebug(9010) << "check: " << dit.current()->text(0) << endl; bool visible = false; TQListViewItemIterator it(dit.current()); diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui index 902be185..525aeef0 100644 --- a/parts/appwizard/appwizarddlgbase.ui +++ b/parts/appwizard/appwizarddlgbase.ui @@ -139,13 +139,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>180</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>250</width> <height>180</height> @@ -160,7 +160,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -179,7 +179,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -219,7 +219,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> @@ -286,13 +286,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>250</width> <height>32767</height> @@ -345,7 +345,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -388,7 +388,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -422,7 +422,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -491,7 +491,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>550</width> <height>270</height> diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh index 0cb90869..3506ead3 100644 --- a/parts/appwizard/common/incadmin/ltmain.sh +++ b/parts/appwizard/common/incadmin/ltmain.sh @@ -4565,7 +4565,7 @@ func_mode_link () continue ;; - # Tru64 UNIX uses -model [arg] to determine the tqlayout of C++ + # Tru64 UNIX uses -model [arg] to determine the layout of C++ # classes, name mangling, and exception handling. # Darwin uses the -arch flag to determine output architecture. -model|-arch|-isysroot) diff --git a/parts/appwizard/common/kde-index.docbook b/parts/appwizard/common/kde-index.docbook index aacd7a48..332d3af3 100644 --- a/parts/appwizard/common/kde-index.docbook +++ b/parts/appwizard/common/kde-index.docbook @@ -257,7 +257,7 @@ Programming &%{APPNAMELC}; plugins is a joy to behold. Just read through the nex should consult the docbook reference for further details. The example below was taken from that reference and shortened a bit for readability. --> -<refentry id="re-1007-unmanagetqchildren-1"> +<refentry id="re-1007-unmanagechildren-1"> <refmeta> <refentrytitle>XtUnmanageChildren</refentrytitle> <refmiscinfo>Xt - Geometry Management</refmiscinfo> @@ -265,10 +265,10 @@ taken from that reference and shortened a bit for readability. --> <refnamediv> <refname>XtUnmanageChildren </refname> -<refpurpose>remove a list of tqchildren from a parent widget's managed +<refpurpose>remove a list of children from a parent widget's managed list. -<indexterm id="ix-1007-unmanagetqchildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm> -<indexterm id="ix-1007-unmanagetqchildren-2"><primary>XtUnmanageChildren</primary></indexterm> +<indexterm id="ix-1007-unmanagechildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm> +<indexterm id="ix-1007-unmanagechildren-2"><primary>XtUnmanageChildren</primary></indexterm> </refpurpose> </refnamediv> @@ -277,16 +277,16 @@ list. <date>4 March 1996</date> </refsynopsisdivinfo> <synopsis> -void XtUnmanageChildren(<replaceable class="parameter">tqchildren</replaceable>, <replaceable class="parameter">num_tqchildren</replaceable>) - WidgetList <replaceable class="parameter">tqchildren</replaceable>; - Cardinal <replaceable class="parameter">num_tqchildren</replaceable>; +void XtUnmanageChildren(<replaceable class="parameter">children</replaceable>, <replaceable class="parameter">num_children</replaceable>) + WidgetList <replaceable class="parameter">children</replaceable>; + Cardinal <replaceable class="parameter">num_children</replaceable>; </synopsis> -<refsect2 id="r2-1007-unmanagetqchildren-1"> +<refsect2 id="r2-1007-unmanagechildren-1"> <title>Inputs</title> <variablelist> <varlistentry> -<term><replaceable class="parameter">tqchildren</replaceable> +<term><replaceable class="parameter">children</replaceable> </term> <listitem> <para>Specifies an array of child widgets. Each child must be of @@ -295,26 +295,26 @@ class RectObj or any subclass thereof. </listitem> </varlistentry> <varlistentry> -<term><replaceable class="parameter">num_tqchildren</replaceable> +<term><replaceable class="parameter">num_children</replaceable> </term> <listitem> -<para>Specifies the number of elements in <replaceable class="parameter">tqchildren</replaceable>. +<para>Specifies the number of elements in <replaceable class="parameter">children</replaceable>. </para> </listitem> </varlistentry> </variablelist> </refsect2></refsynopsisdiv> -<refsect1 id="r1-1007-unmanagetqchildren-1"> +<refsect1 id="r1-1007-unmanagechildren-1"> <title>Description </title> <para><function>XtUnmanageChildren()</function> unmaps the specified widgets -and removes them from their parent's tqgeometry management. +and removes them from their parent's geometry management. The widgets will disappear from the screen, and (depending on its parent) may no longer have screen space allocated for them. </para> -<para>Each of the widgets in the <replaceable class="parameter">tqchildren</replaceable> array must have +<para>Each of the widgets in the <replaceable class="parameter">children</replaceable> array must have the same parent. </para> <para>See the “Algorithm” section below for full details of the @@ -322,13 +322,13 @@ widget unmanagement procedure. </para> </refsect1> -<refsect1 id="r1-1007-unmanagetqchildren-2"> +<refsect1 id="r1-1007-unmanagechildren-2"> <title>Usage</title> <para>Unmanaging widgets is the usual method for temporarily making them invisible. They can be re-managed with <function>XtManageChildren()</function>. </para> -<para>You can unmap a widget, but leave it under tqgeometry +<para>You can unmap a widget, but leave it under geometry management by calling <function>XtUnmapWidget()</function>. You can destroy a widget's window without destroying the widget by calling <function>XtUnrealizeWidget()</function>. You can destroy a @@ -345,7 +345,7 @@ method once. </para> </refsect1> -<refsect1 id="r1-1007-unmanagetqchildren-3"> +<refsect1 id="r1-1007-unmanagechildren-3"> <title>Algorithm </title> <para><function>XtUnmanageChildren()</function> performs the following: @@ -374,11 +374,11 @@ by unmapping it. </para> </refsect1> -<refsect1 id="r1-1007-unmanagetqchildren-4"> +<refsect1 id="r1-1007-unmanagechildren-4"> <title>Structures</title> <para>The <type>WidgetList</type> type is simply an array of widgets: </para> -<screen id="sc-1007-unmanagetqchildren-1">typedef Widget *WidgetList; +<screen id="sc-1007-unmanagechildren-1">typedef Widget *WidgetList; </screen> </refsect1> </refentry> diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py index 037b4af0..2e875b75 100644 --- a/parts/appwizard/common/scons/admin/kde.py +++ b/parts/appwizard/common/scons/admin/kde.py @@ -117,15 +117,15 @@ def detect_kde(env): ## check for the qt and kde includes print "Checking for the qt includes : ", - if qtincludes and os.path.isfile(qtincludes + "/qtqlayout.h"): + if qtincludes and os.path.isfile(qtincludes + "/qlayout.h"): # The user told where to look for and it looks valid print GREEN + "ok " + qtincludes + NORMAL else: - if os.path.isfile(qtdir + "/include/qtqlayout.h"): + if os.path.isfile(qtdir + "/include/qlayout.h"): # Automatic detection print GREEN + "ok " + qtdir + "/include/ " + NORMAL qtincludes = qtdir + "/include/" - elif os.path.isfile("/usr/include/qt3/qtqlayout.h"): + elif os.path.isfile("/usr/include/qt3/qlayout.h"): # Debian probably print YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL qtincludes = "/usr/include/qt3" diff --git a/parts/appwizard/filepropspage.cpp b/parts/appwizard/filepropspage.cpp index 3e946abf..d83be6c3 100644 --- a/parts/appwizard/filepropspage.cpp +++ b/parts/appwizard/filepropspage.cpp @@ -1,7 +1,7 @@ #include "filepropspage.h" #include <tqlistbox.h> #include <klineedit.h> -#include <tqtextview.h> +#include <textview.h> #include <klocale.h> #include <tqlabel.h> #include <tqmultilineedit.h> diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp index 82662921..6234d81c 100644 --- a/parts/appwizard/importdlg.cpp +++ b/parts/appwizard/importdlg.cpp @@ -15,11 +15,11 @@ #include <tqdir.h> #include <tqfile.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klineedit.h> #include <tqpushbutton.h> #include <tqregexp.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtooltip.h> #include <tqcheckbox.h> #include <kbuttonbox.h> @@ -151,7 +151,7 @@ void ImportDialog::accept() { KMessageBox::sorry( 0, i18n("This is not a valid project file.\n" "XML error in line %1, column %2:\n%3") - .tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg)); + .arg(errorLine).arg(errorCol).arg(errorMsg)); return; } diff --git a/parts/appwizard/importdlgbase.ui b/parts/appwizard/importdlgbase.ui index 29687ff9..957bb80d 100644 --- a/parts/appwizard/importdlgbase.ui +++ b/parts/appwizard/importdlgbase.ui @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -208,7 +208,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -276,7 +276,7 @@ will be the author, everything between <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/parts/appwizard/kdevlicense.cpp b/parts/appwizard/kdevlicense.cpp index 1357c774..5e189422 100644 --- a/parts/appwizard/kdevlicense.cpp +++ b/parts/appwizard/kdevlicense.cpp @@ -70,12 +70,12 @@ TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const strFill + " * $EMAIL$ *\n" + strFill + " * *\n"; -// str = str.tqarg(TQDate::tqcurrentDate().year()).tqarg(author.left(45),-45).tqarg(email.left(67),-67); +// str = str.arg(TQDate::currentDate().year()).arg(author.left(45),-45).arg(email.left(67),-67); TQStringList::Iterator it; for( it = m_rawLines.begin(); it != m_rawLines.end(); ++it ) { - str += TQString( "%1 * %2 *\n").tqarg( strFill ).tqarg( *it, -69 ); + str += TQString( "%1 * %2 *\n").arg( strFill ).arg( *it, -69 ); } str += strFill + " ***************************************************************************/\n"; diff --git a/parts/appwizard/vcs_form.ui b/parts/appwizard/vcs_form.ui index 9ac7dba9..6bb59c93 100644 --- a/parts/appwizard/vcs_form.ui +++ b/parts/appwizard/vcs_form.ui @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>20</height> diff --git a/parts/astyle/astyle_adaptor.h b/parts/astyle/astyle_adaptor.h index 21398fbb..7b5c7ef9 100644 --- a/parts/astyle/astyle_adaptor.h +++ b/parts/astyle/astyle_adaptor.h @@ -3,7 +3,7 @@ #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqmap.h> #include <tqvariant.h> diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index 6a478982..38f9b737 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -2,7 +2,7 @@ #include <tqwhatsthis.h> #include <tqvbox.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqpopupmenu.h> #include <tdeversion.h> #include <kdebug.h> @@ -531,7 +531,7 @@ void AStylePart::formatFiles() } if ( processed != 0 ) { - KMessageBox::information ( 0, i18n ( "Processed %1 files ending with extensions %2" ).tqarg ( processed ).tqarg(getProjectExtensions().stripWhiteSpace()) ); + KMessageBox::information ( 0, i18n ( "Processed %1 files ending with extensions %2" ).arg ( processed ).arg(getProjectExtensions().stripWhiteSpace()) ); } m_urls.clear(); diff --git a/parts/astyle/astyleconfig.ui b/parts/astyle/astyleconfig.ui index 4582fa4b..fd68fe48 100644 --- a/parts/astyle/astyleconfig.ui +++ b/parts/astyle/astyleconfig.ui @@ -62,13 +62,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>350</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>400</width> <height>32767</height> @@ -293,7 +293,7 @@ Can use * on its own for any file.</string> <property name="name"> <cstring>FillingGroup</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>400</width> <height>32767</height> @@ -322,7 +322,7 @@ Can use * on its own for any file.</string> </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -380,7 +380,7 @@ Can use * on its own for any file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>34</width> <height>21</height> @@ -440,7 +440,7 @@ The number of spaces per tab is controled by the editor.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -455,7 +455,7 @@ The number of spaces per tab is controled by the editor.</string> <property name="name"> <cstring>BracketGroup</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>400</width> <height>32767</height> @@ -473,7 +473,7 @@ The number of spaces per tab is controled by the editor.</string> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -567,7 +567,7 @@ from their immediately preceding closing brackets.</string> <property name="name"> <cstring>ContinueationGroup</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>400</width> <height>32767</height> @@ -640,7 +640,7 @@ belonging to a conditional header.</string> <property name="name"> <cstring>IndentGroup</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>400</width> <height>32767</height> @@ -772,7 +772,7 @@ flushed completely to the left (which is the default).</string> <property name="name"> <cstring>BlockGroup</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>400</width> <height>32767</height> @@ -844,7 +844,7 @@ correctly. <property name="name"> <cstring>PaddingGroup</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>400</width> <height>32767</height> @@ -909,7 +909,7 @@ There is no unpad operator option.</string> <property name="name"> <cstring>OneLinersGroup</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>400</width> <height>32767</height> diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp index 965b359b..0d101a3f 100644 --- a/parts/bookmarks/bookmarks_part.cpp +++ b/parts/bookmarks/bookmarks_part.cpp @@ -12,7 +12,7 @@ #include <tqwhatsthis.h> #include <tqvbox.h> #include <tqtimer.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <kdebug.h> diff --git a/parts/bookmarks/bookmarks_settings_base.ui b/parts/bookmarks/bookmarks_settings_base.ui index 5fe07a63..e23e55f4 100644 --- a/parts/bookmarks/bookmarks_settings_base.ui +++ b/parts/bookmarks/bookmarks_settings_base.ui @@ -49,7 +49,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -96,7 +96,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>20</height> @@ -137,7 +137,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> @@ -204,7 +204,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>240</height> diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp index 304d40fd..5fccd218 100644 --- a/parts/bookmarks/bookmarks_widget.cpp +++ b/parts/bookmarks/bookmarks_widget.cpp @@ -13,7 +13,7 @@ #include <tqheader.h> #include <tqtooltip.h> #include <tqpair.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <kparts/part.h> #include <klibloader.h> @@ -167,7 +167,7 @@ void BookmarksWidget::maybeTip(const TQPoint &p) if ( ! _part->config()->toolTip() ) return; BookmarkItem * item = dynamic_cast<BookmarkItem*>( itemAt( p ) ); - TQRect r = tqitemRect( item ); + TQRect r = itemRect( item ); if ( item && r.isValid() ) { diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp index a30e0e11..43ccfa18 100644 --- a/parts/classview/classtooldlg.cpp +++ b/parts/classview/classtooldlg.cpp @@ -41,37 +41,37 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) parents_button = new TQToolButton(this); parents_button->setPixmap( UserIcon("CTparents", KIcon::DefaultState, ClassViewFactory::instance()) ); parents_button->setToggleButton(true); - parents_button->setFixedSize(parents_button->tqsizeHint()); + parents_button->setFixedSize(parents_button->sizeHint()); TQToolTip::add(parents_button, i18n("Show parents")); - tqchildren_button = new TQToolButton(this); - tqchildren_button->setPixmap( UserIcon("CTtqchildren", KIcon::DefaultState, ClassViewFactory::instance()) ); - tqchildren_button->setToggleButton(true); - tqchildren_button->setFixedSize(tqchildren_button->tqsizeHint()); - TQToolTip::add(tqchildren_button, i18n("Show tqchildren")); + children_button = new TQToolButton(this); + children_button->setPixmap( UserIcon("CTchildren", KIcon::DefaultState, ClassViewFactory::instance()) ); + children_button->setToggleButton(true); + children_button->setFixedSize(children_button->sizeHint()); + TQToolTip::add(children_button, i18n("Show children")); clients_button = new TQToolButton(this); clients_button->setPixmap( UserIcon("CTclients", KIcon::DefaultState, ClassViewFactory::instance()) ); clients_button->setToggleButton(true); - clients_button->setFixedSize(clients_button->tqsizeHint()); + clients_button->setFixedSize(clients_button->sizeHint()); TQToolTip::add(clients_button, i18n("Show clients")); suppliers_button = new TQToolButton(this); suppliers_button->setPixmap( UserIcon("CTsuppliers", KIcon::DefaultState, ClassViewFactory::instance()) ); suppliers_button->setToggleButton(true); - suppliers_button->setFixedSize(suppliers_button->tqsizeHint()); + suppliers_button->setFixedSize(suppliers_button->sizeHint()); TQToolTip::add(suppliers_button, i18n("Show suppliers")); methods_button = new TQToolButton(this); methods_button->setPixmap( UserIcon("CVpublic_meth", KIcon::DefaultState, ClassViewFactory::instance()) ); methods_button->setToggleButton(true); - methods_button->setFixedSize(methods_button->tqsizeHint()); + methods_button->setFixedSize(methods_button->sizeHint()); TQToolTip::add(methods_button, i18n("Show methods")); attributes_button = new TQToolButton(this); attributes_button->setPixmap( UserIcon("CVpublic_var", KIcon::DefaultState, ClassViewFactory::instance()) ); attributes_button->setToggleButton(true); - attributes_button->setFixedSize(attributes_button->tqsizeHint()); + attributes_button->setFixedSize(attributes_button->sizeHint()); TQToolTip::add(attributes_button, i18n("Show attributes")); access_combo = new TQComboBox(false, this, "access combo"); @@ -86,17 +86,17 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) class_tree = new ClassToolWidget(part, this); // classTree->setMinimumSize( 500, 400 ); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); TQHBoxLayout *firstrowLayout = new TQHBoxLayout(); TQHBoxLayout *secondrowLayout = new TQHBoxLayout(); - tqlayout->addLayout(firstrowLayout); - tqlayout->addLayout(secondrowLayout); + layout->addLayout(firstrowLayout); + layout->addLayout(secondrowLayout); firstrowLayout->addWidget(class_combo, 1); firstrowLayout->addWidget(close_button, 0); secondrowLayout->addWidget(parents_button); - secondrowLayout->addWidget(tqchildren_button); + secondrowLayout->addWidget(children_button); secondrowLayout->addWidget(clients_button); secondrowLayout->addWidget(suppliers_button); secondrowLayout->addStretch(); @@ -104,7 +104,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) secondrowLayout->addWidget(attributes_button); secondrowLayout->addWidget(access_combo); - tqlayout->addWidget(class_tree, 10); + layout->addWidget(class_tree, 10); connect( class_combo, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotClassComboChoice(const TQString&)) ); @@ -113,7 +113,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) connect( access_combo, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotAccessComboChoice(const TQString&)) ); connect( parents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents())); - connect( tqchildren_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren())); + connect( children_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren())); connect( clients_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewClients())); connect( suppliers_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewSuppliers())); connect( methods_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewMethods())); @@ -178,7 +178,7 @@ void ClassToolDialog::viewParents() } -/** View the tqchildren of the current class. */ +/** View the children of the current class. */ void ClassToolDialog::viewChildren() { currentOperation = ViewChildren; @@ -287,7 +287,7 @@ void ClassToolDialog::updateCaptionAndButtons() caption = i18n("Parents"); break; case ViewChildren: - button = tqchildren_button; + button = children_button; caption = i18n("Children"); break; case ViewClients: @@ -300,11 +300,11 @@ void ClassToolDialog::updateCaptionAndButtons() break; case ViewMethods: button = methods_button; - caption = i18n("%1 Methods").tqarg(access_combo->currentText()); + caption = i18n("%1 Methods").arg(access_combo->currentText()); break; case ViewAttributes: button = attributes_button; - caption = i18n("%1 Attributes").tqarg(access_combo->currentText()); + caption = i18n("%1 Attributes").arg(access_combo->currentText()); break; default: button = 0; @@ -313,7 +313,7 @@ void ClassToolDialog::updateCaptionAndButtons() } parents_button->setOn(false); - tqchildren_button->setOn(false); + children_button->setOn(false); clients_button->setOn(false); suppliers_button->setOn(false); methods_button->setOn(false); @@ -321,7 +321,7 @@ void ClassToolDialog::updateCaptionAndButtons() if (button) { button->setOn(true); - setCaption(i18n("%1 of Class %2").tqarg(caption).tqarg(currentClass->name())); + setCaption(i18n("%1 of Class %2").arg(caption).arg(currentClass->name())); } else setCaption(caption); } diff --git a/parts/classview/classtooldlg.h b/parts/classview/classtooldlg.h index 9b722346..54d1d1cd 100644 --- a/parts/classview/classtooldlg.h +++ b/parts/classview/classtooldlg.h @@ -18,7 +18,7 @@ #include <tqlabel.h> #include <tqtoolbutton.h> #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> #include "classtoolwidget.h" #include "parseditem.h" @@ -47,7 +47,7 @@ public slots: void viewNone(); /** View the parents of the current class. */ void viewParents(); - /** View the tqchildren of the current class. */ + /** View the children of the current class. */ void viewChildren(); /** View all classes that has this class as an attribute. */ void viewClients(); @@ -76,7 +76,7 @@ private: TQComboBox *class_combo; TQToolButton *parents_button; - TQToolButton *tqchildren_button; + TQToolButton *children_button; TQToolButton *clients_button; TQToolButton *suppliers_button; TQToolButton *methods_button; diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp index d057f6e0..a541251b 100644 --- a/parts/classview/classtreebase.cpp +++ b/parts/classview/classtreebase.cpp @@ -436,7 +436,7 @@ void ClassToolTip::maybeTip(const TQPoint &p) ClassTreeBase *ctw = static_cast<ClassTreeBase*>(parentWidget()); TQListViewItem *item = ctw->itemAt(p); - TQRect r = ctw->tqitemRect(item); + TQRect r = ctw->itemRect(item); if (item && r.isValid()) { ClassTreeItem *ctitem = static_cast<ClassTreeItem*>(item); diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp index 20c8e8b1..0908af61 100644 --- a/parts/classview/classviewwidget.cpp +++ b/parts/classview/classviewwidget.cpp @@ -43,7 +43,7 @@ #include <tqheader.h> #include <tqdir.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <tqstringlist.h> // namespace ?!? @@ -1259,7 +1259,7 @@ void ClassViewWidget::maybeTip( TQPoint const & p ) kdDebug(0) << tooltip << endl; - TQRect r = tqitemRect( item ); + TQRect r = itemRect( item ); if ( item && r.isValid() && !tooltip.isEmpty() ) { diff --git a/parts/classview/digraphview.cpp b/parts/classview/digraphview.cpp index ba09e463..49d3b259 100644 --- a/parts/classview/digraphview.cpp +++ b/parts/classview/digraphview.cpp @@ -16,7 +16,7 @@ #include <tqapplication.h> #include <tqpainter.h> #include <tqpaintdevicemetrics.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kglobal.h> #include <klocale.h> #include <kmessagebox.h> @@ -235,7 +235,7 @@ void DigraphView::process( const TQString& file, const TQString& ext ) TQTextStream &is = *ifile.textStream(); is << "digraph G {" << endl; is << "rankdir=LR;" << endl; - is << "node [tqshape=box,fontname=Helvetica,fontsize=12];" << endl; + is << "node [shape=box,fontname=Helvetica,fontsize=12];" << endl; TQStringList::Iterator it; for (it = inputs.begin(); it != inputs.end(); ++it) is << (*it) << endl; @@ -313,7 +313,7 @@ void DigraphView::drawContents(TQPainter* p, int clipx, int clipy, int clipw, in triangle[0] = p2 + TQPoint((int)(d11+d21),(int)(d12+d22)); triangle[1] = p2 + TQPoint((int)(d11-d21),(int)(d12-d22)); triangle[2] = p2; - p->tqdrawPolygon(triangle, true); + p->drawPolygon(triangle, true); } } @@ -338,7 +338,7 @@ void DigraphView::contentsMousePressEvent(TQMouseEvent *e) } -TQSize DigraphView::tqsizeHint() const +TQSize DigraphView::sizeHint() const { if (width == -1) return TQSize(100, 100); // arbitrary diff --git a/parts/classview/digraphview.h b/parts/classview/digraphview.h index 9130be75..cd25e279 100644 --- a/parts/classview/digraphview.h +++ b/parts/classview/digraphview.h @@ -42,7 +42,7 @@ signals: protected: virtual void drawContents(TQPainter* p, int clipx, int clipy, int clipw, int cliph); virtual void contentsMousePressEvent(TQMouseEvent *e); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; private: int toXPixel(double x); diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp index 0929c5cd..428692fa 100644 --- a/parts/classview/hierarchydlg.cpp +++ b/parts/classview/hierarchydlg.cpp @@ -22,7 +22,7 @@ #include <kmessagebox.h> #include <kdebug.h> -#include <tqlayout.h> +#include <layout.h> #include <tqfileinfo.h> #include <tqlistview.h> #include <tqapplication.h> @@ -41,10 +41,10 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part ) : TQDialog(0, "hierarchy dialog", false) { class_combo = new KComboView(true, 150, this); - class_combo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); + class_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); // class_combo->setMinimumWidth(150); namespace_combo = new KComboView(true, 150, this); - namespace_combo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); + namespace_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); // namespace_combo->setMinimumWidth(150); TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), this); @@ -55,16 +55,16 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part ) digraph = new DigraphView(splitter, "digraph view"); // member_tree = new ClassToolWidget(part, splitter); - TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); TQBoxLayout *combo_layout = new TQHBoxLayout(); - tqlayout->addLayout(combo_layout); + layout->addLayout(combo_layout); combo_layout->addWidget(namespace_combo); combo_layout->addWidget(class_combo); combo_layout->addSpacing(60); combo_layout->addWidget(refresh_button); combo_layout->addWidget(save_button); combo_layout->addWidget(close_button); - tqlayout->addWidget(splitter); + layout->addWidget(splitter); connect( namespace_combo, TQT_SIGNAL(activated(TQListViewItem*)), this, TQT_SLOT(slotNamespaceComboChoice(TQListViewItem*)) ); diff --git a/parts/ctags2/ctags2_createtagfilebase.ui b/parts/ctags2/ctags2_createtagfilebase.ui index 39202844..c60f9145 100644 --- a/parts/ctags2/ctags2_createtagfilebase.ui +++ b/parts/ctags2/ctags2_createtagfilebase.ui @@ -60,7 +60,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -76,7 +76,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp index 2ea9c643..4cf8a9b5 100644 --- a/parts/ctags2/ctags2_part.cpp +++ b/parts/ctags2/ctags2_part.cpp @@ -11,7 +11,7 @@ #include <tqwhatsthis.h> #include <tqpopupmenu.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <tqregexp.h> @@ -194,13 +194,13 @@ void CTags2Part::contextMenu(TQPopupMenu *popup, const Context *context) popup->insertSeparator(); if ( showDeclaration ) - popup->insertItem( i18n("CTags - Go to Declaration: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoDeclaration()) ); + popup->insertItem( i18n("CTags - Go to Declaration: %1").arg(squeezed), this, TQT_SLOT(slotGotoDeclaration()) ); if ( showDefinition ) - popup->insertItem( i18n("CTags - Go to Definition: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoDefinition()) ); + popup->insertItem( i18n("CTags - Go to Definition: %1").arg(squeezed), this, TQT_SLOT(slotGotoDefinition()) ); if ( showLookup ) - popup->insertItem( i18n("CTags - Lookup: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoTag()) ); + popup->insertItem( i18n("CTags - Lookup: %1").arg(squeezed), this, TQT_SLOT(slotGotoTag()) ); } } diff --git a/parts/ctags2/ctags2_selecttagfilebase.ui b/parts/ctags2/ctags2_selecttagfilebase.ui index 3969a4f1..c06582b8 100644 --- a/parts/ctags2/ctags2_selecttagfilebase.ui +++ b/parts/ctags2/ctags2_selecttagfilebase.ui @@ -47,7 +47,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>20</height> diff --git a/parts/ctags2/ctags2_settingswidgetbase.ui b/parts/ctags2/ctags2_settingswidgetbase.ui index 2367f673..c96d04a2 100644 --- a/parts/ctags2/ctags2_settingswidgetbase.ui +++ b/parts/ctags2/ctags2_settingswidgetbase.ui @@ -192,7 +192,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -214,7 +214,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <grid> <property name="name"> @@ -248,7 +248,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout21</cstring> + <cstring>layout21</cstring> </property> <grid> <property name="name"> @@ -290,7 +290,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>61</height> diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp index f6fec985..4f400272 100644 --- a/parts/ctags2/ctags2_widget.cpp +++ b/parts/ctags2/ctags2_widget.cpp @@ -104,7 +104,7 @@ void CTags2Widget::line_edit_changed_delayed( ) void CTags2Widget::showHitCount( int n ) { - hitcount_label->setText( i18n("Hits: %1").tqarg( n ) ); + hitcount_label->setText( i18n("Hits: %1").arg( n ) ); } int CTags2Widget::calculateHitCount( ) @@ -174,7 +174,7 @@ void CTags2Widget::goToNext( ) if ( (item = item->nextSibling()) != NULL ) { item->setSelected( true ); - output_view->tqrepaint( true ); + output_view->repaint( true ); itemExecuted( item ); return; } diff --git a/parts/ctags2/ctags2_widgetbase.ui b/parts/ctags2/ctags2_widgetbase.ui index 99f150e7..465958df 100644 --- a/parts/ctags2/ctags2_widgetbase.ui +++ b/parts/ctags2/ctags2_widgetbase.ui @@ -71,7 +71,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> diff --git a/parts/diff/diffdlg.cpp b/parts/diff/diffdlg.cpp index 16e84b9e..1965cebb 100644 --- a/parts/diff/diffdlg.cpp +++ b/parts/diff/diffdlg.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> @@ -22,8 +22,8 @@ DiffDlg::DiffDlg( TQWidget *parent, const char *name ): diffWidget = new DiffWidget( this, "Main Diff Widget" ); setMainWidget( diffWidget ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 0, spacingHint() ); - tqlayout->addWidget( diffWidget ); + TQVBoxLayout* layout = new TQVBoxLayout( this, 0, spacingHint() ); + layout->addWidget( diffWidget ); } DiffDlg::~DiffDlg() diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp index 133a29f3..647a5cc5 100644 --- a/parts/diff/diffpart.cpp +++ b/parts/diff/diffpart.cpp @@ -182,7 +182,7 @@ void DiffPart::processExited( KProcess* p ) else showDiff( resultBuffer ); } else { - KMessageBox::error( 0, i18n("Diff command failed (%1):\n").tqarg( p->exitStatus() ) + resultErr ); + KMessageBox::error( 0, i18n("Diff command failed (%1):\n").arg( p->exitStatus() ) + resultErr ); } resultBuffer = resultErr = TQString(); delete proc; diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp index b2a14518..c8e2c171 100644 --- a/parts/diff/diffwidget.cpp +++ b/parts/diff/diffwidget.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include <tqlayout.h> -#include <tqtextedit.h> +#include <layout.h> +#include <textedit.h> #include <tqpopupmenu.h> #include <tqcursor.h> #include <tqfile.h> @@ -73,7 +73,7 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) int i = 0; for ( TQStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) { - popup->insertItem( i18n( "Show in %1" ).tqarg( *it ), i + POPUP_BASE, i ); + popup->insertItem( i18n( "Show in %1" ).arg( *it ), i + POPUP_BASE, i ); i++; } if ( !extPartsTranslated.isEmpty() ) @@ -192,8 +192,8 @@ DiffWidget::DiffWidget( DiffPart * part, TQWidget *parent, const char *name, WFl // te->setMinimumSize( 300, 200 ); connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( te ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->addWidget( te ); } DiffWidget::~DiffWidget() @@ -233,7 +233,7 @@ void DiffWidget::loadExtPart( const TQString& partName ) if ( !extPart || !extPart->widget() ) return; - tqlayout()->add( extPart->widget() ); + layout()->add( extPart->widget() ); setExtPartVisible( true ); diff --git a/parts/diff/diffwidget.h b/parts/diff/diffwidget.h index df4b296b..ec5904b0 100644 --- a/parts/diff/diffwidget.h +++ b/parts/diff/diffwidget.h @@ -13,7 +13,7 @@ #define _DIFFWIDGET_H_ #include <tqwidget.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqstringlist.h> #include <kurl.h> diff --git a/parts/distpart/distpart_ui.ui b/parts/distpart/distpart_ui.ui index 7cb665ce..6182100f 100644 --- a/parts/distpart/distpart_ui.ui +++ b/parts/distpart/distpart_ui.ui @@ -21,13 +21,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -69,7 +69,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>0</height> @@ -91,13 +91,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>48</width> <height>48</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>48</width> <height>48</height> @@ -231,7 +231,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -314,7 +314,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -322,7 +322,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <grid> <property name="name"> @@ -646,7 +646,7 @@ changes project compiled version number</string> </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <vbox> <property name="name"> @@ -654,7 +654,7 @@ changes project compiled version number</string> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -702,7 +702,7 @@ Build Files</string> </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <hbox> <property name="name"> @@ -710,7 +710,7 @@ Build Files</string> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <vbox> <property name="name"> @@ -755,7 +755,7 @@ Build Files</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <vbox> <property name="name"> @@ -866,7 +866,7 @@ Build Files</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -885,7 +885,7 @@ Build Files</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -954,7 +954,7 @@ Build Files</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>0</height> @@ -993,7 +993,7 @@ Build Files</string> <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1071,7 +1071,7 @@ Build Files</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp index 412f957e..cabbe68d 100644 --- a/parts/distpart/distpart_widget.cpp +++ b/parts/distpart/distpart_widget.cpp @@ -34,7 +34,7 @@ #include <kdevcore.h> #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqnetwork.h> #include <tqurloperator.h> #include <tqmessagebox.h> @@ -142,14 +142,14 @@ void DistpartDialog::slotcreateSrcArchPushButtonPressed() { } else { - prog->setLabel(i18n("Adding file: %1").tqarg( file) ); + prog->setLabel(i18n("Adding file: %1").arg( file) ); prog->progressBar()->setValue( (idx*100)/srcDistFileListBox->numRows() ); } } tar.close( ); prog->hide(); delete prog; - KMessageBox::information( this, i18n("Archive made at: %1").tqarg( filename ), i18n("Archive Done") ); + KMessageBox::information( this, i18n("Archive made at: %1").arg( filename ), i18n("Archive Done") ); } else @@ -457,7 +457,7 @@ TQString DistpartDialog::getSourceName() { name += (getcustomProjectCheckBoxState() && getbzipCheckBoxState()) ? ".tar.bz2" : ".tar.gz"; return name.replace(TQRegExp("%n"),getappNameFormatLineEditText()) .replace(TQRegExp("%v"),getversionLineEditText()) - .replace(TQRegExp("%d"),TQDate::tqcurrentDate().toString("yyyyMMdd")); + .replace(TQRegExp("%d"),TQDate::currentDate().toString("yyyyMMdd")); } void DistpartDialog::loadSettings() { @@ -592,7 +592,7 @@ void DistpartDialog::slotAddFileButtonPressed(){ } void DistpartDialog::slotRemoveFile(TQListBoxItem *item){ - if ( KMessageBox::Yes == KMessageBox::warningYesNo( this, i18n("Remove %1").tqarg( item->text() ), i18n("Remove File") )){ + if ( KMessageBox::Yes == KMessageBox::warningYesNo( this, i18n("Remove %1").arg( item->text() ), i18n("Remove File") )){ for(uint count =0; count< srcDistFileListBox->numRows(); count++){ if ( item == srcDistFileListBox->item(count)){ srcDistFileListBox->removeItem(count); diff --git a/parts/documentation/addcatalogdlgbase.ui b/parts/documentation/addcatalogdlgbase.ui index 699361be..8b67c4fa 100644 --- a/parts/documentation/addcatalogdlgbase.ui +++ b/parts/documentation/addcatalogdlgbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <grid> <property name="name"> @@ -53,7 +53,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>18</height> @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp index 6ee782ee..4ba521f1 100644 --- a/parts/documentation/bookmarkview.cpp +++ b/parts/documentation/bookmarkview.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "bookmarkview.h" -#include <tqlayout.h> +#include <layout.h> #include <tqheader.h> #include <tqpoint.h> diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp index 2581f5a0..7282ccd2 100644 --- a/parts/documentation/contentsview.cpp +++ b/parts/documentation/contentsview.cpp @@ -20,7 +20,7 @@ #include "contentsview.h" #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> #include <klistview.h> diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 8d524a47..36bdb589 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -23,7 +23,7 @@ ***************************************************************************/ #include "docglobalconfigwidget.h" -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbox.h> #include <tqcheckbox.h> #include <tqwidgetstack.h> diff --git a/parts/documentation/docglobalconfigwidgetbase.ui b/parts/documentation/docglobalconfigwidgetbase.ui index b073b6ee..5efa3b92 100644 --- a/parts/documentation/docglobalconfigwidgetbase.ui +++ b/parts/documentation/docglobalconfigwidgetbase.ui @@ -60,7 +60,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>190</height> @@ -141,7 +141,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -265,7 +265,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/parts/documentation/docprojectconfigwidgetbase.ui b/parts/documentation/docprojectconfigwidgetbase.ui index 3476d07a..d1c52d8c 100644 --- a/parts/documentation/docprojectconfigwidgetbase.ui +++ b/parts/documentation/docprojectconfigwidgetbase.ui @@ -26,7 +26,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 9585c4e7..3d2f6f21 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -24,7 +24,7 @@ #include <tqtimer.h> #include <tqdir.h> #include <tqwhatsthis.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpopupmenu.h> #include <tqtabwidget.h> #include <tqapplication.h> @@ -125,8 +125,8 @@ DocumentationPart::~DocumentationPart() void DocumentationPart::loadDocumentationPlugins() { KTrader::OfferList docPluginOffers = - KTrader::self()->query(TQString::tqfromLatin1("KDevelop/DocumentationPlugins"), - TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION)); + KTrader::self()->query(TQString::fromLatin1("KDevelop/DocumentationPlugins"), + TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION)); KTrader::OfferList::ConstIterator serviceIt = docPluginOffers.begin(); for ( ; serviceIt != docPluginOffers.end(); ++serviceIt ) @@ -347,13 +347,13 @@ void DocumentationPart::infoPage() void DocumentationPart::manPage(const TQString &term) { - TQString url = TQString::tqfromLatin1("man:/%1").tqarg(term); + TQString url = TQString::fromLatin1("man:/%1").arg(term); partController()->showDocument(KURL(url)); } void DocumentationPart::infoPage(const TQString &term) { - TQString url = TQString::tqfromLatin1("info:/%1").tqarg(term); + TQString url = TQString::fromLatin1("info:/%1").arg(term); partController()->showDocument(KURL(url)); } @@ -465,40 +465,40 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) TQString squeezed = KStringHandler::csqueeze(m_contextStr, 30); int id = -1; if (hasContextFeature(Finder)) { - id = popup->insertItem(i18n("Find Documentation: %1").tqarg(squeezed), + id = popup->insertItem(i18n("Find Documentation: %1").arg(squeezed), this, TQT_SLOT(contextFindDocumentation())); - popup->tqsetWhatsThis(id, i18n("<b>Find documentation</b><p>" + popup->setWhatsThis(id, i18n("<b>Find documentation</b><p>" "Opens the documentation finder tab and searches " "all possible sources of documentation like " "table of contents, index, man and info databases, " "Google, etc.")); } if (hasContextFeature(IndexLookup)) { - id = popup->insertItem(i18n("Look in Documentation Index: %1").tqarg(squeezed), + id = popup->insertItem(i18n("Look in Documentation Index: %1").arg(squeezed), this, TQT_SLOT(contextLookInDocumentationIndex())); - popup->tqsetWhatsThis(id, i18n("<b>Look in documentation index</b><p>" + popup->setWhatsThis(id, i18n("<b>Look in documentation index</b><p>" "Opens the documentation index tab. It allows " "a term to be entered which will be looked for in " "the documentation index.")); } if (hasContextFeature(FullTextSearch)) { - id = popup->insertItem(i18n("Search in Documentation: %1").tqarg(squeezed), + id = popup->insertItem(i18n("Search in Documentation: %1").arg(squeezed), this, TQT_SLOT(contextSearchInDocumentation())); - popup->tqsetWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches " + popup->setWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches " "for a term under the cursor in " "the documentation. For this to work, " "a full text index must be created first, which can be done in the " "configuration dialog of the documentation plugin.")); } if (hasContextFeature(GotoMan)) { - id = popup->insertItem(i18n("Goto Manpage: %1").tqarg(squeezed), + id = popup->insertItem(i18n("Goto Manpage: %1").arg(squeezed), this, TQT_SLOT(contextManPage())); - popup->tqsetWhatsThis(id, i18n("<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor.")); + popup->setWhatsThis(id, i18n("<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor.")); } if (hasContextFeature(GotoInfo)) { - id = popup->insertItem( i18n("Goto Infopage: %1").tqarg(squeezed), + id = popup->insertItem( i18n("Goto Infopage: %1").arg(squeezed), this, TQT_SLOT(contextInfoPage()) ); - popup->tqsetWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor.")); + popup->setWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor.")); } if (id != -1) popup->insertSeparator(); diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp index 90cd6234..1bc9ae42 100644 --- a/parts/documentation/documentation_widget.cpp +++ b/parts/documentation/documentation_widget.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "documentation_widget.h" -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbox.h> #include <klineedit.h> diff --git a/parts/documentation/docutils.cpp b/parts/documentation/docutils.cpp index 4291a745..79fa9915 100644 --- a/parts/documentation/docutils.cpp +++ b/parts/documentation/docutils.cpp @@ -87,7 +87,7 @@ void DocUtils::docItemPopup(DocumentationPart *part, const TQString &title, cons if (showSearch) { menu.insertSeparator(); - menu.insertItem(TQString("%1: %2").tqarg(i18n("Search")).tqarg(KStringHandler::csqueeze(title,20)), 4); + menu.insertItem(TQString("%1: %2").arg(i18n("Search")).arg(KStringHandler::csqueeze(title,20)), 4); } switch (menu.exec(pos)) diff --git a/parts/documentation/editbookmarkdlg.ui b/parts/documentation/editbookmarkdlg.ui index 6f5ea912..8d6ac359 100644 --- a/parts/documentation/editbookmarkdlg.ui +++ b/parts/documentation/editbookmarkdlg.ui @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -125,7 +125,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/parts/documentation/editcatalogdlgbase.ui b/parts/documentation/editcatalogdlgbase.ui index 8a064022..d0d11779 100644 --- a/parts/documentation/editcatalogdlgbase.ui +++ b/parts/documentation/editcatalogdlgbase.ui @@ -49,7 +49,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -91,7 +91,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -107,7 +107,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp index 594c07c5..ac95d878 100644 --- a/parts/documentation/find_documentation.cpp +++ b/parts/documentation/find_documentation.cpp @@ -147,12 +147,12 @@ void FindDocumentation::procManExited( KProcess* ) void FindDocumentation::procInfoReadStdout( KProcess*, char* buf, int len) { - proc_info_out += TQString::tqfromLatin1( buf, len ); + proc_info_out += TQString::fromLatin1( buf, len ); } void FindDocumentation::procManReadStdout( KProcess*, char* buf, int len) { - proc_man_out += TQString::tqfromLatin1( buf, len ); + proc_man_out += TQString::fromLatin1( buf, len ); } void FindDocumentation::searchInInfo() diff --git a/parts/documentation/find_documentation_optionsbase.ui b/parts/documentation/find_documentation_optionsbase.ui index 4321cea0..5d85bdf1 100644 --- a/parts/documentation/find_documentation_optionsbase.ui +++ b/parts/documentation/find_documentation_optionsbase.ui @@ -59,7 +59,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/parts/documentation/find_documentationbase.ui b/parts/documentation/find_documentationbase.ui index 7cc11627..aa144ba4 100644 --- a/parts/documentation/find_documentationbase.ui +++ b/parts/documentation/find_documentationbase.ui @@ -70,7 +70,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>20</height> diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp index 3f323fc5..33e338f3 100644 --- a/parts/documentation/indexview.cpp +++ b/parts/documentation/indexview.cpp @@ -21,7 +21,7 @@ #include <tqapplication.h> #include <tqevent.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klineedit.h> @@ -85,7 +85,7 @@ void IndexView::searchInIndex(TQListBoxItem *item) else { SelectTopic *dia = new SelectTopic(urls); - dia->topicLabel->setText(dia->topicLabel->text().tqarg(item->text())); + dia->topicLabel->setText(dia->topicLabel->text().arg(item->text())); if (dia->exec()) m_widget->part()->partController()->showDocument(dia->selectedURL()); delete dia; diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp index a7db4555..e99e6db2 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp +++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp @@ -22,7 +22,7 @@ #include <tqpainter.h> #include <tqstyle.h> #include <tqheader.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kstandarddirs.h> #include <kiconloader.h> @@ -209,7 +209,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu p->fillRect(0, 0, width, height(), cg.brush(crole)); TQFontMetrics fm(lv->fontMetrics()); - int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv); + int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv); int marg = lv->itemMargin(); int styleflags = TQStyle::Style_Default; @@ -240,7 +240,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu int ConfigurationItem::width(const TQFontMetrics &fm, const TQListView *lv, int c) const { if ((c == 0) || (c == 1) || (c == 2)) - return lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4; + return lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4; return TQListViewItem::width(fm, lv, c); } diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp index 21b07207..09b81d72 100644 --- a/parts/documentation/plugins/chm/docchmplugin.cpp +++ b/parts/documentation/plugins/chm/docchmplugin.cpp @@ -138,7 +138,7 @@ static KListViewItem* chainEnd(KListViewItem *parent) { } static TQString decodeHTML(const TQString& s) { - TQRegExp rx(TQString::tqfromLatin1("&#(\\d+);| ")); + TQRegExp rx(TQString::fromLatin1("&#(\\d+);| ")); TQString out = s; int pos = rx.search(out); while(pos > -1) { diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp index 09c7310b..a0df440a 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp @@ -450,7 +450,7 @@ void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index, TQString filename = childEl.namedItem("filename").firstChild().toText().data(); IndexItemProto *indexItem = new IndexItemProto(this, item, index, classname, - i18n("%1 Class Reference").tqarg(classname)); + i18n("%1 Class Reference").arg(classname)); indexItem->addURL(KURL(prefix + filename)); createIndexFromTag(dom, index, item, childEl, prefix + filename); @@ -467,7 +467,7 @@ void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index, if (classname != membername) { - IndexItemProto *indexItem = new IndexItemProto(this, item, index, membername,i18n("%1::%2%3 Member Reference").tqarg(classname).tqarg(membername).tqarg(arglist)); + IndexItemProto *indexItem = new IndexItemProto(this, item, index, membername,i18n("%1::%2%3 Member Reference").arg(classname).arg(membername).arg(arglist)); indexItem->addURL(KURL(prefix + "#" + anchor)); } } diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp index 6513eb90..6abf51fa 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp @@ -214,7 +214,7 @@ void DocKDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childE { while (!childEl.isNull()) { - if (childEl.tagName() == TQString("tocsect%1").tqarg(level)) + if (childEl.tagName() == TQString("tocsect%1").arg(level)) { TQString name = childEl.attribute("name"); TQString url = childEl.attribute("url"); diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp index e1528d03..1d7543c3 100644 --- a/parts/documentation/protocols/chm/chm.cpp +++ b/parts/documentation/protocols/chm/chm.cpp @@ -342,7 +342,7 @@ bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path ) } else { - path = TQString::tqfromLatin1("/"); + path = TQString::fromLatin1("/"); } kdDebug() << "Found. chmFile=" << chmFile << " path=" << path << endl; break; diff --git a/parts/documentation/protocols/chm/decompress.cpp b/parts/documentation/protocols/chm/decompress.cpp index f411e8ec..b8f45ae2 100644 --- a/parts/documentation/protocols/chm/decompress.cpp +++ b/parts/documentation/protocols/chm/decompress.cpp @@ -121,7 +121,7 @@ struct * The LZX document does not state the uncompressed block has an * uncompressed length field. Where does this length field come from, so * we can know how large the block is? The implementation has it as the 24 - * bits following after the 3 blocktype bits, before the tqalignment + * bits following after the 3 blocktype bits, before the alignment * padding. * * The LZX document states that aligned offset blocks have their aligned diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index fd88c6c0..74d7a11b 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -23,10 +23,10 @@ ***************************************************************************/ #include "searchview.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdir.h> #include <tqregexp.h> @@ -182,11 +182,11 @@ void SearchView::search() d.mkdir(savedir); TQString query = TQString("words=%1;method=%2;matchesperpage=%3;format=%4;sort=%5") - .tqarg(m_edit->text()) - .tqarg(m_searchMethodBox->currentItem()==1? "or" : "and") - .tqarg(50) - .tqarg("builtin-short") - .tqarg(m_sortMethodBox->currentItem()==2? "date" : m_sortMethodBox->currentItem()==1? "title" : "score"); + .arg(m_edit->text()) + .arg(m_searchMethodBox->currentItem()==1? "or" : "and") + .arg(50) + .arg("builtin-short") + .arg(m_sortMethodBox->currentItem()==2? "date" : m_sortMethodBox->currentItem()==1? "title" : "score"); kdDebug(9002) << "starting kprocess" << endl; kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query << endl; @@ -211,7 +211,7 @@ void SearchView::search() } // While receiving data from the subprocess, we want - // to block the user interface, but still get tqrepaint + // to block the user interface, but still get repaint // events. Hack taken from NetAccess... kapp->setOverrideCursor(waitCursor); TQWidget blocker(0, 0, WType_Dialog | WShowModal); diff --git a/parts/documentation/selecttopicbase.ui b/parts/documentation/selecttopicbase.ui index bf53e4a9..696d78ae 100644 --- a/parts/documentation/selecttopicbase.ui +++ b/parts/documentation/selecttopicbase.ui @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index bd63375c..41c4529a 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -19,8 +19,8 @@ #include <tqapplication.h> #include <tqdir.h> #include <tqfile.h> -#include <tqlayout.h> -#include <tqtextstream.h> +#include <layout.h> +#include <textstream.h> #include <tqtimer.h> #include <tqlabel.h> @@ -122,7 +122,7 @@ void ProgressDialog::done(int r) void ProgressDialog::setFilesScanned(int n) { - filesLabel->setText(i18n("Files processed: %1").tqarg(n)); + filesLabel->setText(i18n("Files processed: %1").arg(n)); } void ProgressDialog::setFilesToDig(int n) @@ -214,7 +214,7 @@ bool ProgressDialog::createConfig() if (language == "C") language = "en"; - TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").tqarg(language)); + TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").arg(language)); if (wrapper.isEmpty()) wrapper = locate("data", TQString("kdevdocumentation/en/wrapper.html")); if (wrapper.isEmpty()) diff --git a/parts/doxygen/config.cpp b/parts/doxygen/config.cpp index 172da37f..74ad2b30 100644 --- a/parts/doxygen/config.cpp +++ b/parts/doxygen/config.cpp @@ -550,7 +550,7 @@ char *yytext; #include <tqfileinfo.h> #include <tqfile.h> #include <tqdir.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqregexp.h> #include <tqptrstack.h> @@ -3773,12 +3773,12 @@ void Config::create() ); cs->setWidgetType(ConfigString::File); cs = addString( "LAYOUT_FILE", - "The LAYOUT_FILE tag can be used to specify a tqlayout file which will be parsed by \n" - "doxygen. The tqlayout file controls the global structure of the generated output files \n" - "in an output format independent way. The create the tqlayout file that represents \n" + "The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by \n" + "doxygen. The layout file controls the global structure of the generated output files \n" + "in an output format independent way. The create the layout file that represents \n" "doxygen's defaults, run doxygen with the -l option. You can optionally specify a \n" "file name after the option, if omitted DoxygenLayout.xml will be used as the name \n" - "of the tqlayout file.\n" + "of the layout file.\n" ); cs->setWidgetType(ConfigString::File); addObsolete("DETAILS_AT_TOP"); @@ -4857,7 +4857,7 @@ void Config::create() cs = addString( "DOT_FONTNAME", "By default doxygen will write a font called FreeSans.ttf to the output \n" "directory and reference it in all dot files that doxygen generates. This \n" - "font does not include all possible tqunicode characters however, so when you need \n" + "font does not include all possible unicode characters however, so when you need \n" "these (or just want a differently looking font) you can specify the font name \n" "using DOT_FONTNAME. You need need to make sure dot is able to find the font, \n" "which can be done by putting it in a standard location or by setting the \n" @@ -5005,7 +5005,7 @@ void Config::create() "nodes that will be shown in the graph. If the number of nodes in a graph \n" "becomes larger than this value, doxygen will truncate the graph, which is \n" "visualized by representing a node as a red box. Note that doxygen if the \n" - "number of direct tqchildren of the root node in a graph is already larger than \n" + "number of direct children of the root node in a graph is already larger than \n" "DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note \n" "that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. \n", 0,10000, 50 @@ -5102,8 +5102,8 @@ static TQCString configFileToString(const char *name) } totalSize+=size+2; contents.resize(totalSize); - contents.tqat(totalSize-2)='\n'; // to help the scanner - contents.tqat(totalSize-1)='\0'; + contents.at(totalSize-2)='\n'; // to help the scanner + contents.at(totalSize-1)='\0'; return contents; } } diff --git a/parts/doxygen/config.h b/parts/doxygen/config.h index 3d47d5c6..adedd17c 100644 --- a/parts/doxygen/config.h +++ b/parts/doxygen/config.h @@ -5,7 +5,7 @@ #include <tqfile.h> #include <tqdict.h> #include <tqptrlist.h> -#include <tqtextstream.h> +#include <textstream.h> /*! \brief Abstract base class for any configuration option. * @@ -30,7 +30,7 @@ class ConfigOption enum { /*! Maximum length of an option in the config file. Used for - * tqalignment purposes. + * alignment purposes. */ MAX_OPTION_LENGTH = 23 }; diff --git a/parts/doxygen/doxygenconfigwidget.cpp b/parts/doxygen/doxygenconfigwidget.cpp index c70f5df6..72a7b5f2 100644 --- a/parts/doxygen/doxygenconfigwidget.cpp +++ b/parts/doxygen/doxygenconfigwidget.cpp @@ -16,7 +16,7 @@ #include <tqscrollview.h> #include <tqvbox.h> #include <tqwhatsthis.h> -#include <tqtextstream.h> +#include <textstream.h> #include <klocale.h> #include <kdebug.h> @@ -171,10 +171,10 @@ DoxygenConfigWidget::~DoxygenConfigWidget() } -TQSize DoxygenConfigWidget::tqsizeHint() const +TQSize DoxygenConfigWidget::sizeHint() const { // without this the whole dialog becomes much too large - return TQSize(TQTabWidget::tqsizeHint().width(), 1); + return TQSize(TQTabWidget::sizeHint().width(), 1); } diff --git a/parts/doxygen/doxygenconfigwidget.h b/parts/doxygen/doxygenconfigwidget.h index 7c4a31e6..f4a6db38 100644 --- a/parts/doxygen/doxygenconfigwidget.h +++ b/parts/doxygen/doxygenconfigwidget.h @@ -38,7 +38,7 @@ private slots: void changed(); private: - TQSize tqsizeHint() const; + TQSize sizeHint() const; void loadFile(); void saveFile(); void init(); diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp index c1a6469b..b8953d52 100644 --- a/parts/doxygen/doxygenpart.cpp +++ b/parts/doxygen/doxygenpart.cpp @@ -41,7 +41,7 @@ #include <tqvbox.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqpopupmenu.h> #include <tqfileinfo.h> @@ -448,7 +448,7 @@ void DoxygenPart::slotRunPreview( ) if (poDir != 0) *poDir->valueRef() = dirVal; - KMessageBox::error(mainWindow()->main(), i18n("Cannot create temporary file '%1'").tqarg(file.name())); + KMessageBox::error(mainWindow()->main(), i18n("Cannot create temporary file '%1'").arg(file.name())); return; } diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp index 31a1d4ed..907d5cd2 100644 --- a/parts/doxygen/input.cpp +++ b/parts/doxygen/input.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <klineedit.h> #include <tqpushbutton.h> @@ -113,13 +113,13 @@ const char **update_xpm = (const char **)update_xpm_data; InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * parent, bool &flag) : TQWidget(parent), state(flag), key(k) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); cb = new TQCheckBox(text,this); init(); - tqlayout->addWidget(cb); - tqlayout->addStretch(1); + layout->addWidget(cb); + layout->addStretch(1); connect( cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(valueChanged(bool))); } @@ -154,16 +154,16 @@ void InputBool::setEnabled(bool b) InputInt::InputInt(const TQString &label, TQWidget *parent, int &val, int minVal, int maxVal) : TQWidget(parent), m_val(val), m_minVal(minVal), m_maxVal(maxVal) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5); + TQHBoxLayout *layout = new TQHBoxLayout(this, 5); sp = new TQSpinBox(minVal, maxVal, 1, this); lab = new TQLabel(sp, label+":", this); init(); - tqlayout->addWidget(lab); - tqlayout->addWidget(sp); - tqlayout->addStretch(1); + layout->addWidget(lab); + layout->addWidget(sp); + layout->addStretch(1); connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); } @@ -203,25 +203,25 @@ InputString::InputString(const TQString & label, le = 0; br = 0; com = 0; if (m == StringFixed) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5); + TQHBoxLayout *layout = new TQHBoxLayout(this, 5); com = new TQComboBox(this); lab = new TQLabel(com,label+":", this); - tqlayout->addWidget(lab); - tqlayout->addWidget(com); - tqlayout->addStretch(1); + layout->addWidget(lab); + layout->addWidget(com); + layout->addStretch(1); } else { - TQGridLayout *tqlayout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5); + TQGridLayout *layout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5); le = new KLineEdit(this); lab = new TQLabel(le,label+":", this); - tqlayout->addWidget(lab, 0, 0); + layout->addWidget(lab, 0, 0); le->setText(s); - tqlayout->addWidget(le, 0, 1); + layout->addWidget(le, 0, 1); if (m == StringFile || m == StringDir) { br = new TQPushButton(this); br->setPixmap(SmallIcon(m==StringFile? "document" : "folder")); TQToolTip::add(br, m==StringFile? i18n("Browse to a file") : i18n("Browse to a folder")); - tqlayout->addWidget(br, 0, 2); + layout->addWidget(br, 0, 2); } } @@ -327,29 +327,29 @@ InputStrList::InputStrList(const TQString & label, TQWidget *parent, TQStrList &sl, ListMode lm) : TQWidget(parent), strList(sl) { - TQGridLayout *tqlayout = new TQGridLayout(this, 2, 2, 5); + TQGridLayout *layout = new TQGridLayout(this, 2, 2, 5); TQWidget *dw = new TQWidget(this); /* dummy widget used for layouting */ - TQHBoxLayout *boxtqlayout = new TQHBoxLayout(dw, 0, 5); + TQHBoxLayout *boxlayout = new TQHBoxLayout(dw, 0, 5); le = new KLineEdit(dw); lab = new TQLabel(le,label+":", this ); - tqlayout->addWidget(lab, 0, 0); - boxtqlayout->addWidget(le, 1); + layout->addWidget(lab, 0, 0); + boxlayout->addWidget(le, 1); add = new TQPushButton(dw); add->setPixmap(TQPixmap( add_xpm )); TQToolTip::add(add, i18n("Add item")); - boxtqlayout->addWidget(add); + boxlayout->addWidget(add); del = new TQPushButton(dw); del->setPixmap(TQPixmap( del_xpm )); TQToolTip::add(del, i18n("Delete selected item")); - boxtqlayout->addWidget(del); + boxlayout->addWidget(del); upd = new TQPushButton(dw); upd->setPixmap(TQPixmap( update_xpm )); TQToolTip::add(upd, i18n("Update selected item")); - boxtqlayout->addWidget(upd); + boxlayout->addWidget(upd); lb = new TQListBox(this); lb->setMinimumSize(400, 100); @@ -364,17 +364,17 @@ InputStrList::InputStrList(const TQString & label, brFile = new TQPushButton(dw); brFile->setPixmap(SmallIcon("document")); TQToolTip::add(brFile, i18n("Browse to a file")); - boxtqlayout->addWidget(brFile); + boxlayout->addWidget(brFile); } if (lm & ListDir) { brDir = new TQPushButton(dw); brDir->setPixmap(SmallIcon("folder")); TQToolTip::add(brDir, i18n("Browse to a folder")); - boxtqlayout->addWidget(brDir); + boxlayout->addWidget(brDir); } } - tqlayout->addWidget(dw, 0, 1); - tqlayout->addWidget(lb, 1, 1); + layout->addWidget(dw, 0, 1); + layout->addWidget(lb, 1, 1); connect( le, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(addString()) ); diff --git a/parts/filecreate/addglobaldlg.cpp b/parts/filecreate/addglobaldlg.cpp index 93914a2f..b60d90a4 100644 --- a/parts/filecreate/addglobaldlg.cpp +++ b/parts/filecreate/addglobaldlg.cpp @@ -14,7 +14,7 @@ #include <tqheader.h> #include <tqlistview.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -68,7 +68,7 @@ AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFla AddGlobalDlgLayout->addWidget( fcglobal_view, 0, 0 ); languageChange(); - resize( TQSize(511, 282).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(511, 282).expandedTo(minimumSizeHint()) ); // signals and slots connections connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp index 8b4ca11a..fa1af3e1 100644 --- a/parts/filecreate/fcconfigwidget.cpp +++ b/parts/filecreate/fcconfigwidget.cpp @@ -15,7 +15,7 @@ #include <tqtabwidget.h> #include <tqdom.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqcheckbox.h> #include <klineedit.h> #include <tqlabel.h> diff --git a/parts/filecreate/fcconfigwidgetbase.ui b/parts/filecreate/fcconfigwidgetbase.ui index 6302f05f..be039483 100644 --- a/parts/filecreate/fcconfigwidgetbase.ui +++ b/parts/filecreate/fcconfigwidgetbase.ui @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -173,7 +173,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -190,7 +190,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -286,7 +286,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>330</width> <height>20</height> @@ -381,7 +381,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>150</height> @@ -406,7 +406,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/parts/filecreate/fctemplateeditbase.ui b/parts/filecreate/fctemplateeditbase.ui index 371c37c9..df15692c 100644 --- a/parts/filecreate/fctemplateeditbase.ui +++ b/parts/filecreate/fctemplateeditbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -40,7 +40,7 @@ <property name="text"> <string>Template &name:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignBottom</set> </property> <property name="buddy" stdset="0"> @@ -56,7 +56,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -77,7 +77,7 @@ <property name="text"> <string>Set template content from &file:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignBottom</set> </property> <property name="buddy" stdset="0"> @@ -96,7 +96,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>26</height> @@ -110,7 +110,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/parts/filecreate/fctypeeditbase.ui b/parts/filecreate/fctypeeditbase.ui index faf18a37..9d97d82b 100644 --- a/parts/filecreate/fctypeeditbase.ui +++ b/parts/filecreate/fctypeeditbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -43,7 +43,7 @@ <property name="text"> <string>Type &extension:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignBottom</set> </property> <property name="buddy" stdset="0"> @@ -59,7 +59,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -75,7 +75,7 @@ <property name="text"> <string>Type &name:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignBottom</set> </property> <property name="buddy" stdset="0"> @@ -91,7 +91,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout3_2</cstring> + <cstring>layout3_2</cstring> </property> <vbox> <property name="name"> @@ -107,7 +107,7 @@ <property name="text"> <string>Type &description:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignBottom</set> </property> <property name="buddy" stdset="0"> @@ -125,7 +125,7 @@ <property name="name"> <cstring>icon_url</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>80</height> @@ -140,7 +140,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -161,7 +161,7 @@ <property name="text"> <string>Set template content from &file:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignBottom</set> </property> <property name="buddy" stdset="0"> @@ -180,7 +180,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>26</height> @@ -194,7 +194,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -210,7 +210,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/parts/filecreate/file-templates/ui-confdialog b/parts/filecreate/file-templates/ui-confdialog index e6be7b92..b61af20d 100644 --- a/parts/filecreate/file-templates/ui-confdialog +++ b/parts/filecreate/file-templates/ui-confdialog @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/parts/filecreate/file-templates/ui-dialogb b/parts/filecreate/file-templates/ui-dialogb index f369c82f..e02e5ea6 100644 --- a/parts/filecreate/file-templates/ui-dialogb +++ b/parts/filecreate/file-templates/ui-dialogb @@ -64,7 +64,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/parts/filecreate/file-templates/ui-dialogb-qt4 b/parts/filecreate/file-templates/ui-dialogb-qt4 index 4925e2dd..33167acc 100644 --- a/parts/filecreate/file-templates/ui-dialogb-qt4 +++ b/parts/filecreate/file-templates/ui-dialogb-qt4 @@ -24,7 +24,7 @@ <height>33</height> </rect> </property> - <tqlayout class=TQHBOXLAYOUT_OBJECT_NAME_STRING > + <layout class=TQHBOXLAYOUT_OBJECT_NAME_STRING > <property name="margin" > <number>0</number> </property> @@ -36,7 +36,7 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="tqsizeHint" > + <property name="sizeHint" > <size> <width>131</width> <height>31</height> @@ -58,7 +58,7 @@ </property> </widget> </item> - </tqlayout> + </layout> </widget> </widget> <pixmapfunction></pixmapfunction> diff --git a/parts/filecreate/file-templates/ui-dialogr b/parts/filecreate/file-templates/ui-dialogr index 76b7f24e..f5d5ffad 100644 --- a/parts/filecreate/file-templates/ui-dialogr +++ b/parts/filecreate/file-templates/ui-dialogr @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/parts/filecreate/file-templates/ui-dialogr-qt4 b/parts/filecreate/file-templates/ui-dialogr-qt4 index 74dbf04c..d047e11c 100644 --- a/parts/filecreate/file-templates/ui-dialogr-qt4 +++ b/parts/filecreate/file-templates/ui-dialogr-qt4 @@ -24,7 +24,7 @@ <height>106</height> </rect> </property> - <tqlayout class=TQVBOXLAYOUT_OBJECT_NAME_STRING > + <layout class=TQVBOXLAYOUT_OBJECT_NAME_STRING > <property name="margin" > <number>0</number> </property> @@ -50,7 +50,7 @@ <property name="orientation" > <enum>Qt::Vertical</enum> </property> - <property name="tqsizeHint" > + <property name="sizeHint" > <size> <width>20</width> <height>40</height> @@ -58,7 +58,7 @@ </property> </spacer> </item> - </tqlayout> + </layout> </widget> </widget> <pixmapfunction></pixmapfunction> diff --git a/parts/filecreate/file-templates/ui-tabdialog b/parts/filecreate/file-templates/ui-tabdialog index f7447450..56ac7bd7 100644 --- a/parts/filecreate/file-templates/ui-tabdialog +++ b/parts/filecreate/file-templates/ui-tabdialog @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/parts/filecreate/filecreate_newfile.cpp b/parts/filecreate/filecreate_newfile.cpp index b4b84de1..22084aef 100644 --- a/parts/filecreate/filecreate_newfile.cpp +++ b/parts/filecreate/filecreate_newfile.cpp @@ -16,7 +16,7 @@ #include <tqgrid.h> #include <tqhbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqlabel.h> #include <klineedit.h> diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index dc581ac3..0f33b216 100644 --- a/parts/filecreate/filecreate_part.cpp +++ b/parts/filecreate/filecreate_part.cpp @@ -451,7 +451,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString } void FileCreatePart::slotNoteFiletype(const FileType * filetype) { - kdDebug(9034) << "Noting file type: " << (filetype ? filetype->ext() : TQString::tqfromLatin1("Null") ) << endl; + kdDebug(9034) << "Noting file type: " << (filetype ? filetype->ext() : TQString::fromLatin1("Null") ) << endl; m_filedialogFiletype = filetype; } diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp index 840d62b4..d934aba0 100644 --- a/parts/filecreate/filecreate_widget2.cpp +++ b/parts/filecreate/filecreate_widget2.cpp @@ -191,7 +191,7 @@ namespace FileCreate { if( !i ) continue; - TQSize size = i->tqsizeHint(); + TQSize size = i->sizeHint(); maxHeight = size.height()>maxHeight ? size.height() : maxHeight; } setRowHeight(row,maxHeight+2); // bit of extra room @@ -206,7 +206,7 @@ namespace FileCreate { if( !i ) continue; - TQSize size = item(r,col)->tqsizeHint(); + TQSize size = item(r,col)->sizeHint(); maxWidth = size.width()>maxWidth ? size.width() : maxWidth; } setColumnWidth(col,maxWidth+2); // bit of extra room diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp index 223f53b6..4898440d 100644 --- a/parts/filelist/filelist_widget.cpp +++ b/parts/filelist/filelist_widget.cpp @@ -81,7 +81,7 @@ void FileListWidget::startRefreshTimer( ) void FileListWidget::maybeTip( TQPoint const & p ) { FileListItem * item = static_cast<FileListItem*>( itemAt( p ) ); - TQRect r = tqitemRect( item ); + TQRect r = itemRect( item ); if ( item && r.isValid() ) { diff --git a/parts/filelist/projectviewconfigbase.ui b/parts/filelist/projectviewconfigbase.ui index f5ae5a6d..7e362f85 100644 --- a/parts/filelist/projectviewconfigbase.ui +++ b/parts/filelist/projectviewconfigbase.ui @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>61</height> diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp index 1f35c027..63e943b6 100644 --- a/parts/filelist/projectviewpart.cpp +++ b/parts/filelist/projectviewpart.cpp @@ -34,7 +34,7 @@ #include <tqvbox.h> #include <tqhbox.h> #include <tqpoint.h> -#include <tqlayout.h> +#include <layout.h> #include <kmainwindow.h> #include <kinputdialog.h> @@ -107,7 +107,7 @@ ProjectviewPart::~ProjectviewPart() delete m_guibuilder; if ( m_widget ) { mainWindow()->removeView( m_widget ); - delete m_widget; // deletes the tqchildren as well + delete m_widget; // deletes the children as well } } @@ -491,7 +491,7 @@ void ProjectviewPart::slotSaveAsProjectView(bool askForName) } newProjectView = newProjectView.remove("="); // we use this string in config files and = would confuse it if (m_projectViews.contains(newProjectView) > 0 && - KMessageBox::warningContinueCancel(mainWindow()->main(), i18n("<qt>A view session named <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").tqarg(newProjectView), TQString(), i18n("Overwrite")) != KMessageBox::Continue) + KMessageBox::warningContinueCancel(mainWindow()->main(), i18n("<qt>A view session named <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").arg(newProjectView), TQString(), i18n("Overwrite")) != KMessageBox::Continue) { return; } diff --git a/parts/filelist/projectviewprojectconfigbase.ui b/parts/filelist/projectviewprojectconfigbase.ui index 847e423d..eca292ad 100644 --- a/parts/filelist/projectviewprojectconfigbase.ui +++ b/parts/filelist/projectviewprojectconfigbase.ui @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>265</width> <height>20</height> @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>71</height> diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index 04e09af1..e73bc347 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -30,7 +30,7 @@ #include <kdevmainwindow.h> #include <kdevpartcontroller.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbutton.h> #include <tqhbox.h> #include <tqvbox.h> @@ -105,7 +105,7 @@ void KDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * ) { if (m_tb) { - setMinimumHeight(m_tb->tqsizeHint().height()); + setMinimumHeight(m_tb->sizeHint().height()); m_tb->resize(width(),height()); } } @@ -136,7 +136,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main tqInstallMsgHandler( oldHandler ); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); - cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion); cmbPath->setCompletionObject( cmpl ); lo->addWidget(cmbPath); @@ -171,7 +171,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main btnFilter->setIconSet( SmallIconSet("filter" ) ); btnFilter->setToggleButton( true ); filter = new KHistoryCombo( true, filterBox, "filter"); - filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) ); lo->addWidget(filterBox); @@ -352,7 +352,7 @@ void KDevFileSelector::slotFilterChange( const TQString & nf ) filter->lineEdit()->setText( TQString() ); TQToolTip::add ( btnFilter, - TQString( i18n("Apply last filter (\"%1\")") ).tqarg( lastFilter ) ); + TQString( i18n("Apply last filter (\"%1\")") ).arg( lastFilter ) ); } else { diff --git a/parts/fileselector/kactionselector.cpp b/parts/fileselector/kactionselector.cpp index 3d2a67c3..42f0dbde 100644 --- a/parts/fileselector/kactionselector.cpp +++ b/parts/fileselector/kactionselector.cpp @@ -28,7 +28,7 @@ #include <tqlistbox.h> #include <tqtoolbutton.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqevent.h> #include <tqwhatsthis.h> diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp index 6467b83f..014749fa 100644 --- a/parts/fileselector/kbookmarkhandler.cpp +++ b/parts/fileselector/kbookmarkhandler.cpp @@ -21,7 +21,7 @@ #include <stdio.h> #include <stdlib.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kxmlguiclient.h> #include <kbookmarkimporter.h> diff --git a/parts/fileview/addfilegroupdlg.cpp b/parts/fileview/addfilegroupdlg.cpp index 98eec46d..701bc9c1 100644 --- a/parts/fileview/addfilegroupdlg.cpp +++ b/parts/fileview/addfilegroupdlg.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <kbuttonbox.h> #include <klocale.h> @@ -35,10 +35,10 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString TQFontMetrics fm(pattern_edit->fontMetrics()); pattern_edit->setMinimumWidth(fm.width('X')*35); connect( pattern_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10); + TQVBoxLayout *layout = new TQVBoxLayout(this, 10); TQGridLayout *grid = new TQGridLayout(2, 2); - tqlayout->addLayout(grid); + layout->addLayout(grid); grid->addWidget(title_label, 0, 0); grid->addWidget(title_edit, 0, 1); grid->addWidget(pattern_label, 1, 0); @@ -46,7 +46,7 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString TQFrame *frame = new TQFrame(this); frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); - tqlayout->addWidget(frame, 0); + layout->addWidget(frame, 0); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); @@ -56,8 +56,8 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString m_pOk->setDefault(true); connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); - buttonbox->tqlayout(); - tqlayout->addWidget(buttonbox, 0); + buttonbox->layout(); + layout->addWidget(buttonbox, 0); slotTextChanged(); } diff --git a/parts/fileview/filegroupsconfigwidgetbase.ui b/parts/fileview/filegroupsconfigwidgetbase.ui index 00687a21..01574b69 100644 --- a/parts/fileview/filegroupsconfigwidgetbase.ui +++ b/parts/fileview/filegroupsconfigwidgetbase.ui @@ -97,7 +97,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -171,7 +171,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp index 7efefd96..e0222eb5 100644 --- a/parts/fileview/filegroupswidget.cpp +++ b/parts/fileview/filegroupswidget.cpp @@ -228,7 +228,7 @@ void FileGroupsWidget::slotContextMenu(KListView *, TQListViewItem *item, const popup.insertTitle(i18n("File Groups")); /// @todo Add, remove groups int customizeId = popup.insertItem(i18n("Customize...")); - popup.tqsetWhatsThis(customizeId, i18n("<b>Customize</b><p>Opens <b>Customize File Groups</b> dialog where the groups can be managed.")); + popup.setWhatsThis(customizeId, i18n("<b>Customize</b><p>Opens <b>Customize File Groups</b> dialog where the groups can be managed.")); if (item) { if (item->parent()) { // Not for group items diff --git a/parts/fileview/fileitemfactory.cpp b/parts/fileview/fileitemfactory.cpp index 5f4478bc..3ccf5921 100644 --- a/parts/fileview/fileitemfactory.cpp +++ b/parts/fileview/fileitemfactory.cpp @@ -50,7 +50,7 @@ bool FileTreeViewItem::changeActiveDir( const TQString& olddir, const TQString& m_isActiveDir = false; setVisible( listView()->shouldBeShown( this ) ); foundolddir = true; - tqrepaint(); + repaint(); } if ( this->path() == newdir && isDir() && !m_isActiveDir ) @@ -58,7 +58,7 @@ bool FileTreeViewItem::changeActiveDir( const TQString& olddir, const TQString& m_isActiveDir = true; setVisible( listView()->shouldBeShown( this ) ); foundnewdir = true; - tqrepaint(); + repaint(); } if( foundnewdir && foundolddir ) @@ -85,7 +85,7 @@ bool FileTreeViewItem::setProjectFile( TQString const & path, bool pf ) kdDebug( 9017 ) << "FileTreeViewItem::setProjectFile(): " + path << " projectfile: " << pf << endl; m_isProjectFile = pf; setVisible( listView()->shouldBeShown( this ) ); - tqrepaint(); + repaint(); return true; } @@ -103,7 +103,7 @@ bool FileTreeViewItem::setProjectFile( TQString const & path, bool pf ) /////////////////////////////////////////////////////////////////////////////// void FileTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment) + int column, int width, int alignment) { if ( listView()->showNonProjectFiles() && isProjectFile() ) { @@ -119,7 +119,7 @@ void FileTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, p->setFont( font ); } - TQListViewItem::paintCell( p, cg, column, width, tqalignment ); + TQListViewItem::paintCell( p, cg, column, width, alignment ); } diff --git a/parts/fileview/fileitemfactory.h b/parts/fileview/fileitemfactory.h index bd484edd..065591d7 100644 --- a/parts/fileview/fileitemfactory.h +++ b/parts/fileview/fileitemfactory.h @@ -41,7 +41,7 @@ namespace filetreeview virtual ~FileTreeViewItem() {} public: - virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ); + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ); FileTreeWidget* listView() const; void hideOrShow(); bool isProjectFile() const { return m_isProjectFile; } diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp index 2793a52b..f1b557f2 100644 --- a/parts/fileview/filetreeviewwidgetimpl.cpp +++ b/parts/fileview/filetreeviewwidgetimpl.cpp @@ -97,7 +97,7 @@ void FileTreeViewWidgetImpl::fillPopupMenu( TQPopupMenu *popupMenu, TQListViewIt if (item == fileTree()->firstChild() && canReloadTree()) { int id = popupMenu->insertItem( i18n( "Reload Tree"), this, TQT_SLOT( slotReloadTree() ) ); - popupMenu->tqsetWhatsThis( id, i18n("<b>Reload tree</b><p>Reloads the project files tree.") ); + popupMenu->setWhatsThis( id, i18n("<b>Reload tree</b><p>Reloads the project files tree.") ); } m_actionToggleShowNonProjectFiles->plug( popupMenu ); diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp index 39177191..11bd6f56 100644 --- a/parts/fileview/partwidget.cpp +++ b/parts/fileview/partwidget.cpp @@ -12,7 +12,7 @@ #include <tqwhatsthis.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbutton.h> #include <tqdom.h> #include <kxmlguiclient.h> @@ -50,14 +50,14 @@ PartWidget::PartWidget( FileViewPart *part, TQWidget *parent ) m_filetree->setIcon(SmallIcon("folder")); TQWhatsThis::add(m_filetree, i18n("<b>File tree</b><p>" "The file viewer shows all files of the project " - "in a tree tqlayout.")); + "in a tree layout.")); TQHBox* filterBox = new TQHBox( this ); m_btnFilter = new TQToolButton( filterBox ); m_btnFilter->setIconSet( SmallIconSet("filter" ) ); m_btnFilter->setToggleButton( true ); m_filter = new KHistoryCombo( true, filterBox, "filter"); - m_filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + m_filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(m_filter, 2); connect( m_btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBtnFilterClick() ) ); @@ -101,7 +101,7 @@ void PartWidget::slotFilterChange( const TQString & nf ) if ( empty ) { m_filter->lineEdit()->setText( TQString() ); - TQToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").tqarg( m_lastFilter ) ); + TQToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").arg( m_lastFilter ) ); } else { diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp index 0e102cd9..780ccf9f 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.cpp +++ b/parts/fileview/vcsfiletreewidgetimpl.cpp @@ -46,12 +46,12 @@ public: : FileTreeViewItem( parent, item, branch, pf ), m_statusColor( &FileViewPart::vcsColors.unknown ) {} VCSFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch ) : FileTreeViewItem( parent, item, branch ), m_statusColor( &FileViewPart::vcsColors.unknown ) {} - virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ) + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ) { // paint cell in a different color depending on VCS state TQColorGroup mycg( cg ); mycg.setColor( TQColorGroup::Base, *m_statusColor ); - FileTreeViewItem::paintCell( p, mycg, column, width, tqalignment ); + FileTreeViewItem::paintCell( p, mycg, column, width, alignment ); } void setVCSInfo( const VCSFileInfo &info ); @@ -62,7 +62,7 @@ public: void setFileName( const TQString &p ) { setText( FILENAME_COLUMN, p ); } void setWorkingRev( const TQString &p ) { setText( WORKREVISION_COLUMN, p ); } void setRepositoryRev( const TQString &p ) { setText( REPOREVISION_COLUMN, p ); } - void settqStatus( const VCSFileInfo::FileState status ); + void setStatus( const VCSFileInfo::FileState status ); private: TQColor *m_statusColor; // cached @@ -75,12 +75,12 @@ void VCSFileTreeViewItem::setVCSInfo( const VCSFileInfo &info ) //setFileName( info.fileName ); setRepositoryRev( info.repoRevision ); setWorkingRev( info.workRevision ); - settqStatus( info.state ); + setStatus( info.state ); } /////////////////////////////////////////////////////////////////////////////// -void VCSFileTreeViewItem::settqStatus( const VCSFileInfo::FileState status ) +void VCSFileTreeViewItem::setStatus( const VCSFileInfo::FileState status ) { setText( STATUS_COLUMN, VCSFileInfo::state2String( status ) ); // Update color too @@ -331,7 +331,7 @@ void VCSFileTreeWidgetImpl::slotSyncWithRepository() const VCSFileTreeViewItem *myFileItem = static_cast<VCSFileTreeViewItem *>( m_vcsStatusRequestedItem ); const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), myFileItem->fileItem()->url().path() ); kdDebug(9017) << "VCS Info requested for: " << relDirPath << endl; - m_vcsInfoProvider->requesttqStatus( relDirPath, m_vcsStatusRequestedItem ); + m_vcsInfoProvider->requestStatus( relDirPath, m_vcsStatusRequestedItem ); m_isSyncingWithRepository = true; } @@ -344,7 +344,7 @@ void VCSFileTreeWidgetImpl::slotDirectoryExpanded( TQListViewItem* aItem ) const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), item->fileItem()->url().path() ); kdDebug(9017) << "ASync VCS Info requested for: " << relDirPath << endl; - m_vcsInfoProvider->requesttqStatus( relDirPath, item, false, false ); + m_vcsInfoProvider->requestStatus( relDirPath, item, false, false ); // m_isSyncingWithRepository = true; diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp index 6de74381..35e957a2 100644 --- a/parts/filter/shellfilterdlg.cpp +++ b/parts/filter/shellfilterdlg.cpp @@ -12,7 +12,7 @@ #include "shellfilterdlg.h" #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <kbuttonbox.h> #include <kconfig.h> @@ -31,18 +31,18 @@ ShellFilterDialog::ShellFilterDialog() : TQDialog(0, "shell filter dialog", true) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4); + TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4); combo = new TQComboBox(true, this); combo->setDuplicatesEnabled(false); - tqlayout->addWidget(combo); + layout->addWidget(combo); KButtonBox *buttonbox = new KButtonBox(this); start_button = buttonbox->addButton(i18n("&Start")); start_button->setDefault(true); cancel_button = buttonbox->addButton(KStdGuiItem::cancel()); - buttonbox->tqlayout(); - tqlayout->addWidget(buttonbox); + buttonbox->layout(); + layout->addWidget(buttonbox); connect( start_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartClicked()) ); @@ -120,7 +120,7 @@ void ShellFilterDialog::slotProcessExited(KProcess *) accept(); } else { KMessageBox::error(this, i18n("Process exited with status %1") - .tqarg(m_proc->exitStatus())); + .arg(m_proc->exitStatus())); reject(); } } diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp index 353dd7de..8752f6e9 100644 --- a/parts/filter/shellinsertdlg.cpp +++ b/parts/filter/shellinsertdlg.cpp @@ -12,7 +12,7 @@ #include "shellinsertdlg.h" #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <kconfig.h> #include <kbuttonbox.h> @@ -32,18 +32,18 @@ ShellInsertDialog::ShellInsertDialog() : TQDialog(0, "shell filter dialog", true) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4); + TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4); combo = new TQComboBox(true, this); combo->setDuplicatesEnabled(false); - tqlayout->addWidget(combo); + layout->addWidget(combo); KButtonBox *buttonbox = new KButtonBox(this); start_button = buttonbox->addButton(i18n("&Start")); start_button->setDefault(true); cancel_button = buttonbox->addButton(KStdGuiItem::cancel()); - buttonbox->tqlayout(); - tqlayout->addWidget(buttonbox); + buttonbox->layout(); + layout->addWidget(buttonbox); connect( start_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartClicked()) ); @@ -117,7 +117,7 @@ void ShellInsertDialog::slotProcessExited(KProcess *) accept(); } else { KMessageBox::error(this, i18n("Process exited with status %1") - .tqarg(m_proc->exitStatus())); + .arg(m_proc->exitStatus())); reject(); } } diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp index 18849f40..40d4ec85 100644 --- a/parts/grepview/grepdlg.cpp +++ b/parts/grepview/grepdlg.cpp @@ -11,7 +11,7 @@ #include "grepdlg.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqregexp.h> #include <tqhbox.h> @@ -88,25 +88,25 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name config = GrepViewFactory::instance()->config(); config->setGroup("GrepDialog"); - TQGridLayout *tqlayout = new TQGridLayout(this, 9, 2, 10, 4); - tqlayout->setColStretch(0, 0); - tqlayout->setColStretch(1, 20); + TQGridLayout *layout = new TQGridLayout(this, 9, 2, 10, 4); + layout->setColStretch(0, 0); + layout->setColStretch(1, 20); TQLabel *pattern_label = new TQLabel(i18n("&Pattern:"), this); - tqlayout->addWidget(pattern_label, 0, 0, AlignRight | AlignVCenter); + layout->addWidget(pattern_label, 0, 0, AlignRight | AlignVCenter); pattern_combo = new KHistoryCombo(true, this); pattern_label->setBuddy(pattern_combo); pattern_combo->setFocus(); pattern_combo->setHistoryItems(config->readListEntry("LastSearchItems"), true); pattern_combo->setInsertionPolicy(TQComboBox::NoInsertion); - tqlayout->addWidget(pattern_combo, 0, 1); + layout->addWidget(pattern_combo, 0, 1); TQLabel *template_label = new TQLabel(i18n("&Template:"), this); - tqlayout->addWidget(template_label, 1, 0, AlignRight | AlignVCenter); + layout->addWidget(template_label, 1, 0, AlignRight | AlignVCenter); TQBoxLayout *template_layout = new TQHBoxLayout(4); - tqlayout->addLayout(template_layout, 1, 1); + layout->addLayout(template_layout, 1, 1); template_edit = new KLineEdit(this); template_label->setBuddy(template_edit); @@ -118,22 +118,22 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name template_layout->addWidget(template_combo, 0); TQBoxLayout *search_opts_layout = new TQHBoxLayout(15); - tqlayout->addLayout(search_opts_layout, 2, 1); + layout->addLayout(search_opts_layout, 2, 1); regexp_box = new TQCheckBox(i18n("&Regular Expression"), this); regexp_box->setChecked(config->readBoolEntry("regexp", false )); search_opts_layout->addWidget(regexp_box); case_sens_box = new TQCheckBox(i18n("C&ase sensitive"), this); - case_sens_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + case_sens_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); case_sens_box->setChecked(config->readBoolEntry("case_sens", true)); search_opts_layout->addWidget(case_sens_box); TQLabel *dir_label = new TQLabel(i18n("&Directory:"), this); - tqlayout->addWidget(dir_label, 3, 0, AlignRight | AlignVCenter); + layout->addWidget(dir_label, 3, 0, AlignRight | AlignVCenter); TQBoxLayout *dir_layout = new TQHBoxLayout(4); - tqlayout->addLayout(dir_layout, 3, 1); + layout->addLayout(dir_layout, 3, 1); dir_combo = new KComboBox( true, this ); dir_combo->insertStringList(config->readPathListEntry("LastSearchPaths")); @@ -158,27 +158,27 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name dir_layout->addWidget( synch_button ); TQBoxLayout *dir_opts_layout = new TQHBoxLayout(15); - tqlayout->addLayout(dir_opts_layout, 4, 1); + layout->addLayout(dir_opts_layout, 4, 1); recursive_box = new TQCheckBox(i18n("Rec&ursive"), this); recursive_box->setChecked(config->readBoolEntry("recursive", true)); dir_opts_layout->addWidget(recursive_box); use_project_box = new TQCheckBox(i18n("Limit search to &project files"), this); - use_project_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + use_project_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); use_project_box->setChecked(config->readBoolEntry("search_project_files", true)); dir_opts_layout->addWidget(use_project_box); TQLabel *files_label = new TQLabel(i18n("&Files:"), this); - tqlayout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter); + layout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter); files_combo = new KComboBox(true, this); files_label->setBuddy(TQT_TQWIDGET(files_combo->focusProxy())); files_combo->insertStrList(filepatterns); - tqlayout->addWidget(files_combo, 5, 1); + layout->addWidget(files_combo, 5, 1); TQLabel *exclude_label = new TQLabel(i18n("&Exclude:"), this); - tqlayout->addWidget(exclude_label, 6, 0, AlignRight | AlignVCenter); + layout->addWidget(exclude_label, 6, 0, AlignRight | AlignVCenter); TQStringList exclude_list = config->readListEntry("exclude_patterns"); exclude_combo = new KComboBox(true, this); @@ -191,22 +191,22 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name exclude_combo->insertItem("/CVS/,/SCCS/,/\\.svn/,/_darcs/"); exclude_combo->insertItem(""); } - tqlayout->addWidget(exclude_combo, 6, 1); + layout->addWidget(exclude_combo, 6, 1); TQBoxLayout *other_opts_layout = new TQHBoxLayout(15); - tqlayout->addLayout(other_opts_layout, 7, 1); + layout->addLayout(other_opts_layout, 7, 1); keep_output_box = new TQCheckBox(i18n("New view"), this); keep_output_box->setChecked(config->readBoolEntry("new_view", true)); other_opts_layout->addWidget(keep_output_box); no_find_err_box = new TQCheckBox(i18n("&Suppress find errors"), this); - no_find_err_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + no_find_err_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); no_find_err_box->setChecked(config->readBoolEntry("no_find_errs", true)); other_opts_layout->addWidget(no_find_err_box); TQBoxLayout *button_layout = new TQHBoxLayout(4); - tqlayout->addLayout(button_layout, 8, 1); + layout->addLayout(button_layout, 8, 1); search_button = new KPushButton(KGuiItem(i18n("Sea&rch"),"grep"), this); search_button->setDefault(true); KPushButton *done_button = new KPushButton(KStdGuiItem::cancel(), this); @@ -214,7 +214,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name button_layout->addWidget(search_button); button_layout->addWidget(done_button); - resize(tqsizeHint()); + resize(sizeHint()); TQWhatsThis::add(pattern_combo, i18n("<qt>Enter the regular expression you want to search for here.<p>" diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp index 997723c1..11ffbd77 100644 --- a/parts/grepview/grepviewpart.cpp +++ b/parts/grepview/grepviewpart.cpp @@ -116,9 +116,9 @@ void GrepViewPart::contextMenu(TQPopupMenu *popup, const Context *context) if (!ident.isEmpty()) { m_popupstr = ident; TQString squeezed = KStringHandler::csqueeze(ident, 30); - int id = popup->insertItem( i18n("Grep: %1").tqarg(squeezed), + int id = popup->insertItem( i18n("Grep: %1").arg(squeezed), this, TQT_SLOT(slotContextGrep()) ); - popup->tqsetWhatsThis(id, i18n("<b>Grep</b><p>Opens the find in files dialog " + popup->setWhatsThis(id, i18n("<b>Grep</b><p>Opens the find in files dialog " "and sets the pattern to the text under the cursor.")); popup->insertSeparator(); } diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp index b0cd9968..fedd038c 100644 --- a/parts/grepview/grepviewwidget.cpp +++ b/parts/grepview/grepviewwidget.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include <tqdir.h> -#include <tqlayout.h> +#include <layout.h> #include <tqregexp.h> #include <tqpainter.h> #include <tqtoolbutton.h> @@ -73,7 +73,7 @@ void GrepListBoxItem::paint(TQPainter *p) { TQColor base, dim, result, bkground; if (listBox()) { - const TQColorGroup& group = listBox()->tqpalette().active(); + const TQColorGroup& group = listBox()->palette().active(); if (isSelected()) { bkground = group.button(); base = group.buttonText(); @@ -126,7 +126,7 @@ void GrepListBoxItem::paint(TQPainter *p) GrepViewWidget::GrepViewWidget(GrepViewPart *part) : TQWidget(0, "grepview widget") { - m_layout = new TQHBoxLayout(this, 0, -1, "greptqlayout"); + m_layout = new TQHBoxLayout(this, 0, -1, "greplayout"); m_tabWidget = new KTabWidget(this); diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp index 62a10d86..a69be352 100644 --- a/parts/konsole/konsoleviewwidget.cpp +++ b/parts/konsole/konsoleviewwidget.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <tqframe.h> #include <tqdir.h> diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp index 7fc1fcbe..c41d0ee6 100644 --- a/parts/openwith/openwithpart.cpp +++ b/parts/openwith/openwithpart.cpp @@ -50,7 +50,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) KPopupMenu * openAsPopup = new KPopupMenu( popup ); int id = popup->insertItem( i18n("Open As"), openAsPopup ); - popup->tqsetWhatsThis(id, i18n("<b>Open As</b><p>Lists all encodings that can be used to open the selected file.")); + popup->setWhatsThis(id, i18n("<b>Open As</b><p>Lists all encodings that can be used to open the selected file.")); TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); @@ -80,13 +80,13 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) } id = popup->insertItem( i18n("Open With"), openWithPopup ); - popup->tqsetWhatsThis(id, i18n("<b>Open With</b><p>Lists all applications that can be used to open the selected file.")); + popup->setWhatsThis(id, i18n("<b>Open With</b><p>Lists all applications that can be used to open the selected file.")); openWithPopup->insertSeparator(); // make sure the generic "Open with ..." entry gets appended to the submenu id = openWithPopup->insertItem(i18n("Open With..."), this, TQT_SLOT(openWithDialog())); - openWithPopup->tqsetWhatsThis(id, i18n("<b>Open With...</b><p>Provides a dialog to choose the application to open the selected file.")); + openWithPopup->setWhatsThis(id, i18n("<b>Open With...</b><p>Provides a dialog to choose the application to open the selected file.")); } diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index 2413a88a..24413db6 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -100,7 +100,7 @@ void AppOutputViewPart::startAppCommand(const TQString &directory, const TQStrin cmd = Settings::terminalEmulatorName( *kapp->config() ); if ( cmd == "konsole" && !directory.isNull() ) { // isn't setting the working directory below enough? // If a directory was specified, use it - cmd += TQString(" --workdir '%1'").tqarg(directory); + cmd += TQString(" --workdir '%1'").arg(directory); } cmd += " -e /bin/sh -c '"; cmd += program; diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp index 824a3f9e..5525f1f4 100644 --- a/parts/outputviews/appoutputwidget.cpp +++ b/parts/outputviews/appoutputwidget.cpp @@ -19,8 +19,8 @@ #include <tqcheckbox.h> #include <tqradiobutton.h> #include <tqfile.h> -#include <tqtextstream.h> -#include <tqclipboard.h> +#include <textstream.h> +#include <clipboard.h> #include <klocale.h> #include <kdebug.h> @@ -79,7 +79,7 @@ void AppOutputWidget::slotRowSelected(TQListBoxItem* row) if (row) { if (assertMatch.exactMatch(row->text())) { m_part->partController()->editDocument(KURL( assertMatch.cap(2) ), assertMatch.cap(3).toInt() - 1); - m_part->mainWindow()->statusBar()->message(i18n("Assertion failed: %1").tqarg(assertMatch.cap(1)), 10000); + m_part->mainWindow()->statusBar()->message(i18n("Assertion failed: %1").arg(assertMatch.cap(1)), 10000); m_part->mainWindow()->lowerView(this); } else if (lineInfoMatch.search(row->text()) != -1) { @@ -339,7 +339,7 @@ void AppOutputWidget::copySelected() if (isSelected(i)) buffer += item(i)->text() + "\n"; } - kapp->tqclipboard()->setText(buffer, TQClipboard::Clipboard); + kapp->clipboard()->setText(buffer, TQClipboard::Clipboard); } void AppOutputWidget::addPartialStderrLine(const TQCString & line) diff --git a/parts/outputviews/compileerrorfilter.cpp b/parts/outputviews/compileerrorfilter.cpp index 626187ca..efff1e1b 100644 --- a/parts/outputviews/compileerrorfilter.cpp +++ b/parts/outputviews/compileerrorfilter.cpp @@ -112,8 +112,8 @@ void CompileErrorFilter::processLine( const TQString& line ) if( hasmatch ) { // Add hacks for error strings you want excluded here - if( text.find( TQString::tqfromLatin1("(Each undeclared identifier is reported only once") ) >= 0 - || text.find( TQString::tqfromLatin1("for each function it appears in.)") ) >= 0 ) + if( text.find( TQString::fromLatin1("(Each undeclared identifier is reported only once") ) >= 0 + || text.find( TQString::fromLatin1("for each function it appears in.)") ) >= 0 ) hasmatch = false; } diff --git a/parts/outputviews/directorystatusmessagefilter.cpp b/parts/outputviews/directorystatusmessagefilter.cpp index cde1d552..114b98ac 100644 --- a/parts/outputviews/directorystatusmessagefilter.cpp +++ b/parts/outputviews/directorystatusmessagefilter.cpp @@ -87,8 +87,8 @@ bool DirectoryStatusMessageFilter::matchEnterDir( const TQString& line, TQString // we need a TQRegExp because KRegExp is not Utf8 aware. // 0x00AB is LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK // 0X00BB is RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK - static TQRegExp dirChange(TQString::tqfromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::tqfromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::tqfromLatin1(")(.*)")); - static TQRegExp enEnter(TQString::tqfromLatin1(".*: Entering directory")); + static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)")); + static TQRegExp enEnter(TQString::fromLatin1(".*: Entering directory")); kdDebug(9004) << "Directory filter line " << line << endl; // avoid TQRegExp if possible. This regex performs VERY badly with large inputs, @@ -160,7 +160,7 @@ bool DirectoryStatusMessageFilter::matchLeaveDir( const TQString& line, TQString // 0x00AB is LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK // 0X00BB is RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK - static TQRegExp dirChange(TQString::tqfromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::tqfromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::tqfromLatin1(")(.*)")); + static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)")); // avoid TQRegExp if possible. This regex performs VERY badly with large inputs, // and the input required is very short if these strings match. diff --git a/parts/outputviews/filterdlg.ui b/parts/outputviews/filterdlg.ui index 4faa7f58..6a315a70 100644 --- a/parts/outputviews/filterdlg.ui +++ b/parts/outputviews/filterdlg.ui @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp index 9686f035..aa25057d 100644 --- a/parts/outputviews/makeitem.cpp +++ b/parts/outputviews/makeitem.cpp @@ -11,7 +11,7 @@ #include "makeitem.h" -#include <tqstylesheet.h> +#include <stylesheet.h> #include <kdebug.h> #include <klocale.h> @@ -124,7 +124,7 @@ ExitStatusItem::ExitStatusItem( bool normalExit, int exitStatus ) m_text = i18n("*** Compilation aborted ***"); if ( m_normalExit ) if (m_exitStatus ) - m_text = i18n("*** Exited with status: %1 ***").tqarg( m_exitStatus ); + m_text = i18n("*** Exited with status: %1 ***").arg( m_exitStatus ); else m_text = i18n("*** Success ***"); } @@ -139,14 +139,14 @@ bool DirectoryItem::m_showDirectoryMessages = true; TQString EnteringDirectoryItem::text( EOutputLevel outputLevel ) { if ( outputLevel < eFull ) - return i18n("Entering directory %1").tqarg( directory ); + return i18n("Entering directory %1").arg( directory ); return m_text; } TQString ExitingDirectoryItem::text( EOutputLevel outputLevel ) { if ( outputLevel < eFull ) - return i18n("Leaving directory %1").tqarg( directory ); + return i18n("Leaving directory %1").arg( directory ); return m_text; } diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index 34618a97..e916d92c 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -37,10 +37,10 @@ #include <tqapplication.h> #include <tqdir.h> #include <tqimage.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <tqtimer.h> #include <tqfileinfo.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqpopupmenu.h> #include <tqrichtext_p.h> @@ -342,7 +342,7 @@ void MakeWidget::copy() selection.replace(""","\""); selection.replace("&","&"); - kapp->tqclipboard()->setText(selection, TQClipboard::Clipboard); + kapp->clipboard()->setText(selection, TQClipboard::Clipboard); } void MakeWidget::nextError() @@ -566,12 +566,12 @@ void MakeWidget::slotProcessExited(KProcess *) { if (childproc->exitStatus()) { - KNotifyClient::event( tqtopLevelWidget()->winId(), "ProcessError", i18n("The process has finished with errors")); + KNotifyClient::event( topLevelWidget()->winId(), "ProcessError", i18n("The process has finished with errors")); emit m_part->commandFailed(currentCommand); } else { - KNotifyClient::event( tqtopLevelWidget()->winId(), "ProcessSuccess", i18n("The process has finished successfully")); + KNotifyClient::event( topLevelWidget()->winId(), "ProcessSuccess", i18n("The process has finished successfully")); emit m_part->commandFinished(currentCommand); } } @@ -580,7 +580,7 @@ void MakeWidget::slotProcessExited(KProcess *) insertItem( item ); displayPendingItem(); - m_part->mainWindow()->statusBar()->message( TQString("%1: %2").tqarg(currentCommand).tqarg(item->m_text), 3000); + m_part->mainWindow()->statusBar()->message( TQString("%1: %2").arg(currentCommand).arg(item->m_text), 3000); m_part->core()->running(m_part, false); // Defensive programming: We emit this with a single shot timer so that we go once again @@ -700,22 +700,22 @@ TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos ) pMenu->insertSeparator(); int id = pMenu->insertItem(i18n("Line Wrapping"), this, TQT_SLOT(toggleLineWrapping()) ); pMenu->setItemChecked(id, m_bLineWrapping); - pMenu->tqsetWhatsThis(id, i18n("<b>Line wrapping</b><p>Enables or disables wrapping of command lines displayed.")); + pMenu->setWhatsThis(id, i18n("<b>Line wrapping</b><p>Enables or disables wrapping of command lines displayed.")); pMenu->insertSeparator(); id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, TQT_SLOT(slotVeryShortCompilerOutput()) ); - pMenu->tqsetWhatsThis(id, i18n("<b>Very short compiler output</b><p>Displays only warnings, errors and the file names which are compiled.")); + pMenu->setWhatsThis(id, i18n("<b>Very short compiler output</b><p>Displays only warnings, errors and the file names which are compiled.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eVeryShort); id = pMenu->insertItem(i18n("Short Compiler Output"), this, TQT_SLOT(slotShortCompilerOutput()) ); - pMenu->tqsetWhatsThis(id, i18n("<b>Short compiler output</b><p>Suppresses all the compiler flags and formats to something readable.")); + pMenu->setWhatsThis(id, i18n("<b>Short compiler output</b><p>Suppresses all the compiler flags and formats to something readable.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eShort); id = pMenu->insertItem(i18n("Full Compiler Output"), this, TQT_SLOT(slotFullCompilerOutput()) ); - pMenu->tqsetWhatsThis(id, i18n("<b>Full compiler output</b><p>Displays unmodified compiler output.")); + pMenu->setWhatsThis(id, i18n("<b>Full compiler output</b><p>Displays unmodified compiler output.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eFull); pMenu->insertSeparator(); id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, TQT_SLOT(toggleShowDirNavigMessages())); - pMenu->tqsetWhatsThis(id, i18n("<b>Show directory navigation messages</b><p>Shows <b>cd</b> commands that are executed while building.")); + pMenu->setWhatsThis(id, i18n("<b>Show directory navigation messages</b><p>Shows <b>cd</b> commands that are executed while building.")); pMenu->setItemChecked(id, DirectoryItem::getShowDirectoryMessages()); return pMenu; diff --git a/parts/outputviews/makewidget.h b/parts/outputviews/makewidget.h index b97b16bb..4d627efc 100644 --- a/parts/outputviews/makewidget.h +++ b/parts/outputviews/makewidget.h @@ -14,7 +14,7 @@ #include <tqptrstack.h> #include <tqregexp.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqvaluevector.h> #include <tqintdict.h> diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp index a32aabb5..934866cc 100644 --- a/parts/partexplorer/partexplorerform.cpp +++ b/parts/partexplorer/partexplorerform.cpp @@ -10,10 +10,10 @@ ***************************************************************************/ #include <tqlineedit.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqpushbutton.h> #include <tqtooltip.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> #include <tqlabel.h> @@ -47,7 +47,7 @@ public: TQString tipText() const { TQString tip = i18n("Name: %1 | Type: %2 | Value: %3"); - return tip.tqarg( text(0) ).tqarg( text(1) ).tqarg( text(2) ); + return tip.arg( text(0) ).arg( text(1) ).arg( text(2) ); } }; @@ -96,7 +96,7 @@ void ResultsToolTip::maybeTip( const TQPoint& p ) PartExplorer::PropertyItem *item = dynamic_cast<PartExplorer::PropertyItem*>( m_resultsList->itemAt( p ) ); if ( item ) { - TQRect r = m_resultsList->tqitemRect( item ); + TQRect r = m_resultsList->itemRect( item ); if ( r.isValid() ) tip( r, item->tipText() ); } @@ -116,12 +116,12 @@ PartExplorerForm::PartExplorerForm( TQWidget *parent ) m_resultsList->addColumn( i18n( "Property" ) ); m_resultsList->addColumn( i18n( "Type" ) ); m_resultsList->addColumn( i18n( "Value" ) ); - m_resultsList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, + m_resultsList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 0, 0, m_resultsList->sizePolicy().hasHeightForWidth() ) ); TQWhatsThis::add( m_resultsList, i18n("<b>Matching services</b><p>Results (if any) are shown grouped by matching service name.") ); m_base->resultsLabel->setBuddy(m_resultsList); - m_base->tqlayout()->add( m_resultsList ); + m_base->layout()->add( m_resultsList ); setMainWidget( m_base ); m_base->typeCombo->lineEdit()->setFocus(); @@ -220,7 +220,7 @@ void PartExplorerForm::fillServiceList( const KTrader::OfferList &services ) } TQString dProperty = " *** Found property < %1, %2, %3 >"; - dProperty = dProperty.tqarg( propertyName ).tqarg( propertyType ).tqarg( propertyValue ); + dProperty = dProperty.arg( propertyName ).arg( propertyType ).arg( propertyValue ); kdDebug( 9000 ) << dProperty << endl; new PartExplorer::PropertyItem( serviceItem, propertyName, propertyType, propertyValue ); diff --git a/parts/quickopen/quickopenbase.ui b/parts/quickopen/quickopenbase.ui index f4281564..2537a710 100644 --- a/parts/quickopen/quickopenbase.ui +++ b/parts/quickopen/quickopenbase.ui @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/parts/quickopen/quickopenclassdialog.cpp b/parts/quickopen/quickopenclassdialog.cpp index e0e38b70..1a5be1e6 100644 --- a/parts/quickopen/quickopenclassdialog.cpp +++ b/parts/quickopen/quickopenclassdialog.cpp @@ -78,7 +78,7 @@ void QuickOpenClassDialog::accept() TQString fileStr; QuickOpenFunctionChooseForm fdlg( this, "" ); - fdlg.setCaption(i18n("Select The Location of Class %1").tqarg(klasses.first()->name())); + fdlg.setCaption(i18n("Select The Location of Class %1").arg(klasses.first()->name())); fdlg.textLabel2->setText(i18n("Class name:")); for( ClassList::const_iterator it = klasses.constBegin(); it != klasses.constEnd() ; ++it ) diff --git a/parts/quickopen/quickopenfunctionchooseform.cpp b/parts/quickopen/quickopenfunctionchooseform.cpp index 8e7a959d..a8853417 100644 --- a/parts/quickopen/quickopenfunctionchooseform.cpp +++ b/parts/quickopen/quickopenfunctionchooseform.cpp @@ -31,7 +31,7 @@ QuickOpenFunctionChooseForm::QuickOpenFunctionChooseForm(TQWidget* parent, const char* name, bool modal, WFlags fl) : QuickOpenFunctionChooseFormBase(parent,name, modal,fl) { - setCaption( i18n("Select One Argument or File of Function %1").tqarg( name ) ); + setCaption( i18n("Select One Argument or File of Function %1").arg( name ) ); slotArgsChange( 0 ); slotFileChange( 0 ); } diff --git a/parts/quickopen/quickopenfunctionchooseformbase.ui b/parts/quickopen/quickopenfunctionchooseformbase.ui index 48f1d6b8..592eff07 100644 --- a/parts/quickopen/quickopenfunctionchooseformbase.ui +++ b/parts/quickopen/quickopenfunctionchooseformbase.ui @@ -72,7 +72,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>261</width> <height>31</height> @@ -120,7 +120,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="1" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> diff --git a/parts/regexptest/regexptestdlgbase.ui b/parts/regexptest/regexptestdlgbase.ui index fe6bb670..5649238c 100644 --- a/parts/regexptest/regexptestdlgbase.ui +++ b/parts/regexptest/regexptestdlgbase.ui @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -226,7 +226,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp index e808ab70..7a64cac8 100644 --- a/parts/replace/replace_part.cpp +++ b/parts/replace/replace_part.cpp @@ -99,9 +99,9 @@ void ReplacePart::contextMenu(TQPopupMenu *popup, const Context *context) if (!ident.isEmpty()) { m_popupstr = ident; TQString squeezed = KStringHandler::csqueeze(ident, 30); - int id = popup->insertItem( i18n("Replace Project Wide: %1").tqarg(squeezed), + int id = popup->insertItem( i18n("Replace Project Wide: %1").arg(squeezed), this, TQT_SLOT(slotReplace()) ); - popup->tqsetWhatsThis(id, i18n("<b>Replace Project Wide</b><p>Opens the find in files dialog " + popup->setWhatsThis(id, i18n("<b>Replace Project Wide</b><p>Opens the find in files dialog " "and sets the pattern to the text under the cursor.")); popup->insertSeparator(); } diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp index 1136e08a..b9ac5984 100644 --- a/parts/replace/replace_widget.cpp +++ b/parts/replace/replace_widget.cpp @@ -35,7 +35,7 @@ #include <klocale.h> #include <kstdguiitem.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqlineedit.h> #include <tqradiobutton.h> @@ -45,7 +45,7 @@ #include <tqdialog.h> #include <tqfile.h> #include <tqdir.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdatastream.h> #include <sys/types.h> @@ -65,8 +65,8 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part) _terminateOperation( false ) { // setup outputview - TQVBoxLayout * tqlayout = new TQVBoxLayout( this ); - TQHBoxLayout * buttontqlayout = new TQHBoxLayout( tqlayout ); + TQVBoxLayout * layout = new TQVBoxLayout( this ); + TQHBoxLayout * buttonlayout = new TQHBoxLayout( layout ); _cancel = new KPushButton( KStdGuiItem::cancel(), this ); _replace = new KPushButton( KGuiItem(i18n("Replace"),"filefind"), this ); @@ -74,11 +74,11 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part) _cancel->setEnabled( false ); _replace->setEnabled( false ); - buttontqlayout->addWidget( _replace ); - buttontqlayout->addWidget( _cancel ); + buttonlayout->addWidget( _replace ); + buttonlayout->addWidget( _cancel ); _listview = new ReplaceView( this ); - tqlayout->addWidget( _listview ); + layout->addWidget( _listview ); // setup signals connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( find() ) ); @@ -235,7 +235,7 @@ bool ReplaceWidget::showReplacements() } ++it; - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); } m_part->core()->running( m_part, false ); @@ -330,7 +330,7 @@ bool ReplaceWidget::makeReplacements() } fileitem = fileitem->nextSibling(); - kapp->tqprocessEvents( 100 ); + kapp->processEvents( 100 ); } // Telling the project about the edited files diff --git a/parts/replace/replacedlg.ui b/parts/replace/replacedlg.ui index 6a8b81f9..ce58234a 100644 --- a/parts/replace/replacedlg.ui +++ b/parts/replace/replacedlg.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -93,7 +93,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -200,7 +200,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -229,7 +229,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/parts/replace/replaceitem.cpp b/parts/replace/replaceitem.cpp index 853c170d..85033406 100644 --- a/parts/replace/replaceitem.cpp +++ b/parts/replace/replaceitem.cpp @@ -11,7 +11,7 @@ #include <tqpainter.h> #include <tqstyle.h> -#include <tqpalette.h> +#include <palette.h> #include <tqcheckbox.h> #include "replaceitem.h" @@ -56,7 +56,7 @@ void ReplaceItem::setChecked( bool checked ) return; } - // this is a parent item, set self and tqchildren + // this is a parent item, set self and children ReplaceItem * item = firstChild(); while ( item ) { @@ -84,13 +84,13 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, const BackgroundMode bgmode = lv->viewport()->backgroundMode(); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); - if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) ) + if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) ) p->fillRect( 0, 0, width, height(), cg.brush( crole ) ); else lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) ); TQFontMetrics fm( lv->fontMetrics() ); - int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv); + int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv); int marg = lv->itemMargin(); int r = marg; @@ -138,8 +138,8 @@ void ReplaceItem::activate( int, TQPoint const & localPos ) { TQListView * lv = listView(); TQCheckBox cb(0); - int boxsize = cb.tqsizeHint().width(); -//that's KDE-3.1 only int boxsize = lv->style().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv); + int boxsize = cb.sizeHint().width(); +//that's KDE-3.1 only int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv); int rightside = lv->itemMargin() + boxsize + ( isFile() ? 0 : lv->treeStepSize() ); // _lineclicked indicates if the click was on the line or in the checkbox diff --git a/parts/replace/replaceview.cpp b/parts/replace/replaceview.cpp index 4d5c4b41..3c84c0f0 100644 --- a/parts/replace/replaceview.cpp +++ b/parts/replace/replaceview.cpp @@ -10,11 +10,11 @@ ***************************************************************************/ #include <tqheader.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdir.h> #include <tqstringlist.h> #include <tqregexp.h> -#include <tqpalette.h> +#include <palette.h> #include "replaceitem.h" #include "replaceview.h" @@ -119,7 +119,7 @@ void ReplaceView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& po else if ( btn == Qt::LeftButton ) { // map pos to item/column and call ReplacetItem::activate(pos) - item->activate( col, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(item).top() ) ); + item->activate( col, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(item).top() ) ); } } } diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp index 0501ecd9..496746b2 100644 --- a/parts/scripting/scriptingpart.cpp +++ b/parts/scripting/scriptingpart.cpp @@ -86,8 +86,8 @@ void scriptingPart::setupActions() KConfig *cfg = kapp->config(); searchDirs += cfg->readListEntry("SearchDirs"); - unplugActionList(TQString::tqfromLatin1( "script_actions" )); - plugActionList( TQString::tqfromLatin1( "script_actions" ), m_scripts->scripts(core(),searchDirs)); + unplugActionList(TQString::fromLatin1( "script_actions" )); + plugActionList( TQString::fromLatin1( "script_actions" ), m_scripts->scripts(core(),searchDirs)); } void scriptingPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo) diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp index 4d847f01..7501f77d 100644 --- a/parts/snippet/snippet_part.cpp +++ b/parts/snippet/snippet_part.cpp @@ -112,9 +112,9 @@ void SnippetPart::slotConfigWidget( KDialogBase *dlg ) TQStringList SnippetPart::getAllLanguages() { KTrader::OfferList languageSupportOffers = - KTrader::self()->query(TQString::tqfromLatin1("KDevelop/LanguageSupport"), - TQString::tqfromLatin1("[X-KDevelop-Version] == %1" - ).tqarg( KDEVELOP_PLUGIN_VERSION )); + KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"), + TQString::fromLatin1("[X-KDevelop-Version] == %1" + ).arg( KDEVELOP_PLUGIN_VERSION )); TQStringList languages; diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp index 8b7796e8..db257d0a 100644 --- a/parts/snippet/snippet_widget.cpp +++ b/parts/snippet/snippet_widget.cpp @@ -11,7 +11,7 @@ #include <kurl.h> #include <kdebug.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <kpushbutton.h> #include <klistview.h> #include <tqheader.h> @@ -327,9 +327,9 @@ void SnippetWidget::writeConfig() SnippetGroup * group = dynamic_cast<SnippetGroup*>(item); if (group) { kdDebug(9035) << "-->GROUP " << item->getName() << group->getId() << " " << iGroupCount<< endl; - strKeyName=TQString("snippetGroupName_%1").tqarg(iGroupCount); - strKeyId=TQString("snippetGroupId_%1").tqarg(iGroupCount); - strKeyText=TQString("snippetGroupLang_%1").tqarg(iGroupCount); + strKeyName=TQString("snippetGroupName_%1").arg(iGroupCount); + strKeyId=TQString("snippetGroupId_%1").arg(iGroupCount); + strKeyText=TQString("snippetGroupLang_%1").arg(iGroupCount); _cfg->writeEntry(strKeyName, group->getName()); _cfg->writeEntry(strKeyId, group->getId()); @@ -337,9 +337,9 @@ void SnippetWidget::writeConfig() iGroupCount++; } else if (dynamic_cast<SnippetItem*>(item)) { kdDebug(9035) << "-->ITEM " << item->getName() << item->getParent() << " " << iSnipCount << endl; - strKeyName=TQString("snippetName_%1").tqarg(iSnipCount); - strKeyText=TQString("snippetText_%1").tqarg(iSnipCount); - strKeyId=TQString("snippetParent_%1").tqarg(iSnipCount); + strKeyName=TQString("snippetName_%1").arg(iSnipCount); + strKeyText=TQString("snippetText_%1").arg(iSnipCount); + strKeyId=TQString("snippetParent_%1").arg(iSnipCount); _cfg->writeEntry(strKeyName, item->getName()); _cfg->writeEntry(strKeyText, item->getText()); @@ -357,8 +357,8 @@ void SnippetWidget::writeConfig() for ( it = _mapSaved.begin(); it != _mapSaved.end(); ++it ) { //write the saved variable values if (it.data().length()<=0) continue; //is the saved value has no length -> no need to save it - strKeyName=TQString("snippetSavedName_%1").tqarg(iCount); - strKeyText=TQString("snippetSavedVal_%1").tqarg(iCount); + strKeyName=TQString("snippetSavedName_%1").arg(iCount); + strKeyText=TQString("snippetSavedVal_%1").arg(iCount); _cfg->writeEntry(strKeyName, it.key()); _cfg->writeEntry(strKeyText, it.data()); @@ -394,8 +394,8 @@ void SnippetWidget::initConfigOldVersion(KConfig *cfg) TQString strKeyName=""; TQString strKeyText=""; for ( int i=0; i<iCount; i++) { //read the snippet-list - strKeyName=TQString("snippetName_%1").tqarg(i); - strKeyText=TQString("snippetText_%1").tqarg(i); + strKeyName=TQString("snippetName_%1").arg(i); + strKeyText=TQString("snippetText_%1").arg(i); TQString strNameVal=""; TQString strTextVal=""; @@ -434,9 +434,9 @@ void SnippetWidget::initConfig() int iCount = _cfg->readNumEntry("snippetGroupCount", -1); for ( int i=0; i<iCount; i++) { //read the group-list - strKeyName=TQString("snippetGroupName_%1").tqarg(i); - strKeyId=TQString("snippetGroupId_%1").tqarg(i); - strKeyText=TQString("snippetGroupLang_%1").tqarg(i); + strKeyName=TQString("snippetGroupName_%1").arg(i); + strKeyId=TQString("snippetGroupId_%1").arg(i); + strKeyText=TQString("snippetGroupLang_%1").arg(i); TQString strNameVal=""; int iIdVal=-1; @@ -465,9 +465,9 @@ void SnippetWidget::initConfig() if (iCount != -1) { iCount = _cfg->readNumEntry("snippetCount", 0); for ( int i=0; i<iCount; i++) { //read the snippet-list - strKeyName=TQString("snippetName_%1").tqarg(i); - strKeyText=TQString("snippetText_%1").tqarg(i); - strKeyId=TQString("snippetParent_%1").tqarg(i); + strKeyName=TQString("snippetName_%1").arg(i); + strKeyText=TQString("snippetText_%1").arg(i); + strKeyId=TQString("snippetParent_%1").arg(i); TQString strNameVal=""; TQString strTextVal=""; @@ -492,8 +492,8 @@ void SnippetWidget::initConfig() iCount = _cfg->readNumEntry("snippetSavedCount", 0); for ( int i=1; i<=iCount; i++) { //read the saved-values and store in TQMap - strKeyName=TQString("snippetSavedName_%1").tqarg(i); - strKeyText=TQString("snippetSavedVal_%1").tqarg(i); + strKeyName=TQString("snippetSavedName_%1").arg(i); + strKeyText=TQString("snippetSavedVal_%1").arg(i); TQString strNameVal=""; TQString strTextVal=""; @@ -526,7 +526,7 @@ void SnippetWidget::maybeTip( const TQPoint & p ) if (!item) return; - TQRect r = tqitemRect( item ); + TQRect r = itemRect( item ); if (r.isValid() && _SnippetConfig.useToolTips() ) @@ -597,7 +597,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del) if ( strName != del+del ) { //if not doubel-delimiter if (iInMeth == 0) { //if input-method "single" is selected if ( mapVar[strName].length() <= 0 ) { // and not already in map - strMsg=i18n("Please enter the value for <b>%1</b>:").tqarg(strName); + strMsg=i18n("Please enter the value for <b>%1</b>:").arg(strName); strNew = showSingleVarDialog( strName, &_mapSaved, rSingle ); if (strNew=="") return ""; //user clicked Cancle @@ -671,7 +671,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ TQDialog dlg(this); dlg.setCaption(i18n("Enter Values for Variables")); - TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout"); + TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout"); TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop"); TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar"); TQGridLayout * layoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "layoutBtn"); @@ -681,15 +681,15 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ TQCheckBox * cb = NULL; labTop = new TQLabel( &dlg, "label" ); - labTop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, + labTop->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, labTop->sizePolicy().hasHeightForWidth() ) ); labTop->setText(i18n("Enter the replacement values for these variables:")); layoutTop->addWidget(labTop, 0, 0); - tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); + layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); int i = 0; //walk through the variable map and add - for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main tqlayout + for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main layout if (it.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter()) continue; @@ -716,22 +716,22 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ i++; } - tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); + layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" ); btn1->setText(i18n("&Cancel")); - btn1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, + btn1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btn1->sizePolicy().hasHeightForWidth() ) ); layoutBtn->addWidget( btn1, 0, 0 ); KPushButton * btn2 = new KPushButton( &dlg, "pushButton2" ); btn2->setText(i18n("&Apply")); btn2->setDefault( TRUE ); - btn2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, + btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btn2->sizePolicy().hasHeightForWidth() ) ); layoutBtn->addWidget( btn2, 0, 1 ); - tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); + layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots @@ -742,7 +742,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ bool bReturn = false; //resize the textedits if (iWidth > 1) { - TQRect r = dlg.tqgeometry(); + TQRect r = dlg.geometry(); r.setHeight(iBasicHeight + iOneHeight*mapVar2Te.count()); r.setWidth(iWidth); dlg.setGeometry(r); @@ -763,9 +763,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ } bReturn = true; - iBasicHeight = dlg.tqgeometry().height() - layoutVar->tqgeometry().height(); - iOneHeight = layoutVar->tqgeometry().height() / mapVar2Te.count(); - iWidth = dlg.tqgeometry().width(); + iBasicHeight = dlg.geometry().height() - layoutVar->geometry().height(); + iOneHeight = layoutVar->geometry().height() / mapVar2Te.count(); + iWidth = dlg.geometry().width(); } //do some cleanup @@ -780,7 +780,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ delete layoutTop; delete layoutVar; delete layoutBtn; - delete tqlayout; + delete layout; if (i==0) //if nothing happened this means, that there are no variables to translate return true; //.. so just return OK @@ -800,7 +800,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri TQDialog dlg(this); dlg.setCaption(i18n("Enter Values for Variables")); - TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout"); + TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout"); TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop"); TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar"); TQGridLayout * layoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "layoutBtn"); @@ -811,8 +811,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri labTop = new TQLabel( &dlg, "label" ); layoutTop->addWidget(labTop, 0, 0); - labTop->setText(i18n("Enter the replacement values for %1:").tqarg( var )); - tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); + labTop->setText(i18n("Enter the replacement values for %1:").arg( var )); + layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); cb = new TQCheckBox( &dlg, "cbVar" ); @@ -832,7 +832,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri "If you use the same variable later, even in another snippet, the value entered to the right " "will be the default value for that variable.") ); - tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); + layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" ); btn1->setText(i18n("&Cancel")); @@ -843,7 +843,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri btn2->setDefault( TRUE ); layoutBtn->addWidget( btn2, 0, 1 ); - tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); + layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); te->setFocus(); // --END-- building a dynamic dialog @@ -863,7 +863,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri strReturn = te->text(); //copy the entered values back the the given map - dlgSize = dlg.tqgeometry(); + dlgSize = dlg.geometry(); } //do some cleanup @@ -875,7 +875,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri delete layoutTop; delete layoutVar; delete layoutBtn; - delete tqlayout; + delete layout; return strReturn; } @@ -920,7 +920,7 @@ void SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *) group = dynamic_cast<SnippetGroup *>(item2->parent()); TQCString dropped; - TQByteArray data = e->tqencodedData("text/plain"); + TQByteArray data = e->encodedData("text/plain"); if ( e->provides("text/plain") && data.size()>0 ) { //get the data from the event... TQString encData(data.data()); diff --git a/parts/snippet/snippetdlg.ui b/parts/snippet/snippetdlg.ui index 55bd67ad..3606549b 100644 --- a/parts/snippet/snippetdlg.ui +++ b/parts/snippet/snippetdlg.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -64,7 +64,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -91,7 +91,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> @@ -116,7 +116,7 @@ <property name="text"> <string>&Snippet:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> diff --git a/parts/snippet/snippetsettingsbase.ui b/parts/snippet/snippetsettingsbase.ui index f5c56b99..7ae3bfc8 100644 --- a/parts/snippet/snippetsettingsbase.ui +++ b/parts/snippet/snippetsettingsbase.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>70</height> @@ -123,7 +123,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -144,7 +144,7 @@ <property name="name"> <cstring>leDelimiter</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> @@ -164,7 +164,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp index 1133621d..a358fb07 100644 --- a/parts/texttools/texttoolswidget.cpp +++ b/parts/texttools/texttoolswidget.cpp @@ -45,7 +45,7 @@ public: TQString text(int) const { - return extra.isNull()? tag : TQString("%1: %2").tqarg(tag).tqarg(extra); + return extra.isNull()? tag : TQString("%1: %2").arg(tag).arg(extra); } TextStructItem *parentStructItem() { return static_cast<TextStructItem*>(parent()); } diff --git a/parts/tools/addtooldlg.ui b/parts/tools/addtooldlg.ui index 78363581..a1a6157e 100644 --- a/parts/tools/addtooldlg.ui +++ b/parts/tools/addtooldlg.ui @@ -123,7 +123,7 @@ executed.</p></string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp index 7db56d91..e5360ba3 100644 --- a/parts/tools/kapplicationtree.cpp +++ b/parts/tools/kapplicationtree.cpp @@ -26,7 +26,7 @@ #include <tqdialog.h> #include <tqpixmap.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqtoolbutton.h> #include <tqcheckbox.h> @@ -104,7 +104,7 @@ void KDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, con TQString KDevAppTreeListItem::key(int column, bool /*ascending*/) const { if (directory) - return TQString::tqfromLatin1(" ") + text(column).upper(); + return TQString::fromLatin1(" ") + text(column).upper(); else return text(column).upper(); } @@ -117,7 +117,7 @@ void KDevAppTreeListItem::activate() void KDevAppTreeListItem::setOpen( bool o ) { - if( o && !parsed ) { // fill the tqchildren before opening + if( o && !parsed ) { // fill the children before opening ((KDevApplicationTree *) parent())->addDesktopGroup( path, this ); parsed = true; } @@ -248,7 +248,7 @@ void KDevApplicationTree::slotSelectionChanged(TQListViewItem* i) void KDevApplicationTree::resizeEvent( TQResizeEvent * e) { - setColumnWidth(0, width()-TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent)); + setColumnWidth(0, width()-TQApplication::tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent)); KListView::resizeEvent(e); } diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp index 1b4c90f3..5ace3932 100644 --- a/parts/tools/toolsconfig.cpp +++ b/parts/tools/toolsconfig.cpp @@ -2,7 +2,7 @@ #include <tqapplication.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqpushbutton.h> #include <tqheader.h> @@ -162,7 +162,7 @@ void ToolsConfig::updateList() _list->insertItem(it.current()->icon, it.current()->name); _list->setUpdatesEnabled(true); - _list->tqrepaint(); + _list->repaint(); } diff --git a/parts/tools/toolsconfigwidgetbase.ui b/parts/tools/toolsconfigwidgetbase.ui index cd4a7e6f..67f9b7b5 100644 --- a/parts/tools/toolsconfigwidgetbase.ui +++ b/parts/tools/toolsconfigwidgetbase.ui @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -124,7 +124,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -170,7 +170,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -209,7 +209,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -228,7 +228,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -274,7 +274,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -313,7 +313,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -332,7 +332,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/parts/uimode/uichooser.ui b/parts/uimode/uichooser.ui index 864e015b..e66cc1a2 100644 --- a/parts/uimode/uichooser.ui +++ b/parts/uimode/uichooser.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -107,7 +107,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -213,7 +213,7 @@ <property name="text"> <string>Note: Changes will take effect after KDevelop is restarted</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> diff --git a/parts/valgrind/dialog_widget.ui b/parts/valgrind/dialog_widget.ui index 727215ba..5da3365d 100644 --- a/parts/valgrind/dialog_widget.ui +++ b/parts/valgrind/dialog_widget.ui @@ -103,7 +103,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -122,7 +122,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -141,15 +141,15 @@ </widget> <widget class="TQCheckBox"> <property name="name"> - <cstring>tqchildrenBox</cstring> + <cstring>childrenBox</cstring> </property> <property name="text"> - <string>&Trace tqchildren</string> + <string>&Trace children</string> </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -223,7 +223,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout3_2</cstring> + <cstring>layout3_2</cstring> </property> <grid> <property name="name"> @@ -271,7 +271,7 @@ <cstring>ctChildrenBox</cstring> </property> <property name="text"> - <string>&Trace tqchildren</string> + <string>&Trace children</string> </property> </widget> </grid> @@ -323,7 +323,7 @@ <tabstop>paramEdit</tabstop> <tabstop>memleakBox</tabstop> <tabstop>reachableBox</tabstop> - <tabstop>tqchildrenBox</tabstop> + <tabstop>childrenBox</tabstop> <tabstop>valExecutableEdit</tabstop> <tabstop>valParamEdit</tabstop> <tabstop>ctChildrenBox</tabstop> diff --git a/parts/valgrind/valgrind_dialog.cpp b/parts/valgrind/valgrind_dialog.cpp index cfca7074..fe440449 100644 --- a/parts/valgrind/valgrind_dialog.cpp +++ b/parts/valgrind/valgrind_dialog.cpp @@ -1,4 +1,4 @@ -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqregexp.h> #include <tqwidgetstack.h> @@ -89,7 +89,7 @@ void ValgrindDialog::setValExecutable( const TQString& ve ) static const TQString memCheckParam( "--tool=memcheck" ); static const TQString leakCheckParam( "--leak-check=yes" ); static const TQString reachableParam( "--show-reachable=yes" ); -static const TQString tqchildrenParam( "--trace-tqchildren=yes" ); +static const TQString childrenParam( "--trace-children=yes" ); TQString ValgrindDialog::valParams() const { @@ -100,8 +100,8 @@ TQString ValgrindDialog::valParams() const params += " " + leakCheckParam; if ( w->reachableBox->isChecked() ) params += " " + reachableParam; - if ( w->tqchildrenBox->isChecked() ) - params += " " + tqchildrenParam; + if ( w->childrenBox->isChecked() ) + params += " " + childrenParam; return params; } @@ -113,14 +113,14 @@ void ValgrindDialog::setValParams( const TQString& params ) w->memleakBox->setChecked( true ); if ( myParams.contains( reachableParam ) ) w->reachableBox->setChecked( true ); - if ( myParams.contains( tqchildrenParam ) ) - w->tqchildrenBox->setChecked( true ); + if ( myParams.contains( childrenParam ) ) + w->childrenBox->setChecked( true ); w->init(); myParams = myParams.replace( TQRegExp( memCheckParam ), "" ); myParams = myParams.replace( TQRegExp( leakCheckParam ), "" ); myParams = myParams.replace( TQRegExp( reachableParam ), "" ); - myParams = myParams.replace( TQRegExp( tqchildrenParam ), "" ); + myParams = myParams.replace( TQRegExp( childrenParam ), "" ); myParams = myParams.stripWhiteSpace(); w->valParamEdit->setText( myParams ); } @@ -150,7 +150,7 @@ TQString ValgrindDialog::ctParams() const { TQString params = w->ctParamEdit->text(); if ( w->ctChildrenBox->isChecked() ) - params += " " + tqchildrenParam; + params += " " + childrenParam; return params; } @@ -161,11 +161,11 @@ void ValgrindDialog::setCtParams( const TQString& params ) //force --tool=callgrind if no params are given if (myParams.isEmpty()) myParams = "--tool=callgrind"; - if ( myParams.contains( tqchildrenParam ) ) + if ( myParams.contains( childrenParam ) ) w->ctChildrenBox->setChecked( true ); w->init(); - myParams = myParams.replace( TQRegExp( tqchildrenParam ), "" ); + myParams = myParams.replace( TQRegExp( childrenParam ), "" ); myParams = myParams.stripWhiteSpace(); w->ctParamEdit->setText( myParams ); } diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp index abf10a6d..bd0df1ef 100644 --- a/parts/valgrind/valgrind_part.cpp +++ b/parts/valgrind/valgrind_part.cpp @@ -93,7 +93,7 @@ void ValgrindPart::loadOutput() TQFile f( fName ); if ( !f.open( IO_ReadOnly ) ) { - KMessageBox::sorry( 0, i18n("Could not open valgrind output: %1").tqarg(fName) ); + KMessageBox::sorry( 0, i18n("Could not open valgrind output: %1").arg(fName) ); return; } @@ -234,7 +234,7 @@ void ValgrindPart::runValgrind( const TQString& exec, const TQString& params, co DomUtil::PairList::ConstIterator it; for (it = run_envvars.begin(); it != run_envvars.end(); ++it) { - envVarList << TQString("%1=\"%2\" ").tqarg((*it).first).tqarg((*it).second); + envVarList << TQString("%1=\"%2\" ").arg((*it).first).arg((*it).second); } *proc << envVarList.join("") << valExec << valParams << exec << params; @@ -312,7 +312,7 @@ void ValgrindPart::processExited( KProcess* p ) KProcess *kcProc = new KProcess; // kcProc->setWorkingDirectory(kcInfo.kcWorkDir); *kcProc << kcInfo.kcPath; - *kcProc << TQString("callgrind.out.%1").tqarg(p->pid()); + *kcProc << TQString("callgrind.out.%1").arg(p->pid()); kcProc->start(KProcess::DontCare); } } diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp index 074a2c38..d9980d7c 100644 --- a/parts/valgrind/valgrind_widget.cpp +++ b/parts/valgrind/valgrind_widget.cpp @@ -1,4 +1,4 @@ -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqpopupmenu.h> diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp index 43e8bdb7..58ef9444 100644 --- a/parts/vcsmanager/vcsmanagerpart.cpp +++ b/parts/vcsmanager/vcsmanagerpart.cpp @@ -95,7 +95,7 @@ void VCSManagerPart::loadVCSPlugin() m_vcsPluginName = DomUtil::readEntry( dom, "/general/versioncontrol" ).stripWhiteSpace(); if ( m_vcsPluginName.isEmpty() ) return; - TQString constraint = TQString( "DesktopEntryName=='%1'" ).tqarg( m_vcsPluginName ); + TQString constraint = TQString( "DesktopEntryName=='%1'" ).arg( m_vcsPluginName ); pluginController()->loadPlugin( "KDevelop/VersionControl", constraint ); } diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.cpp b/parts/vcsmanager/vcsmanagerprojectconfig.cpp index ef2f9568..9a081f3a 100644 --- a/parts/vcsmanager/vcsmanagerprojectconfig.cpp +++ b/parts/vcsmanager/vcsmanagerprojectconfig.cpp @@ -51,7 +51,7 @@ void VCSManagerProjectConfig::setup( ) int current = 0; - TQString constraint = TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); + TQString constraint = TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION); KTrader::OfferList offers = KTrader::self()->query("KDevelop/VersionControl", constraint ); KTrader::OfferList::const_iterator it = offers.begin(); for ( int i = 1; it != offers.end(); ++it, ++i ) diff --git a/parts/vcsmanager/vcsmanagerprojectconfigbase.ui b/parts/vcsmanager/vcsmanagerprojectconfigbase.ui index ae87176c..9649ec6e 100644 --- a/parts/vcsmanager/vcsmanagerprojectconfigbase.ui +++ b/parts/vcsmanager/vcsmanagerprojectconfigbase.ui @@ -26,7 +26,7 @@ <property name="text"> <string>Version control system to use for this project:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>131</height> diff --git a/src/generalinfowidget.cpp b/src/generalinfowidget.cpp index d60619f0..e30734e8 100644 --- a/src/generalinfowidget.cpp +++ b/src/generalinfowidget.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include <klineedit.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqcombobox.h> #include <tqlabel.h> #include <tqfileinfo.h> @@ -92,7 +92,7 @@ void GeneralInfoWidget::configureinUpdateVersion( TQString configureinpath, TQSt TQFile configurein(configureinpath); if ( !configurein.open( IO_ReadOnly ) ){ - KMessageBox::error(this, i18n("Could not open %1 for reading.").tqarg(configureinpath)); + KMessageBox::error(this, i18n("Could not open %1 for reading.").arg(configureinpath)); return; } @@ -152,7 +152,7 @@ void GeneralInfoWidget::configureinUpdateVersion( TQString configureinpath, TQSt // write our changes.. TQFile configureout(configureinpath); if ( !configureout.open( IO_WriteOnly ) ){ - KMessageBox::error(this, i18n("Could not open %1 for writing.").tqarg(configureinpath)); + KMessageBox::error(this, i18n("Could not open %1 for writing.").arg(configureinpath)); return ; } TQTextStream output( &configureout); @@ -217,13 +217,13 @@ void GeneralInfoWidget::slotProjectDirectoryChanged( const TQString& text ) { else if(isProjectDirectoryAbsolute() && text[0] != '/') { setProjectDirectoryError( - i18n("'%1' is not an absolute path.").tqarg( + i18n("'%1' is not an absolute path.").arg( project_directory_edit->text())); } else if(!isProjectDirectoryAbsolute() && text[0] == '/') { setProjectDirectoryError( - i18n("'%1' is not a relative path.").tqarg( + i18n("'%1' is not a relative path.").arg( project_directory_edit->text())); } else @@ -231,11 +231,11 @@ void GeneralInfoWidget::slotProjectDirectoryChanged( const TQString& text ) { TQFileInfo info(projectDirectory()); if(!info.exists()) setProjectDirectoryError( - i18n("'%1' does not exist.").tqarg( + i18n("'%1' does not exist.").arg( project_directory_edit->text())); else if(!info.isDir()) setProjectDirectoryError( - i18n("'%1' is not a directory.").tqarg( + i18n("'%1' is not a directory.").arg( project_directory_edit->text())); else setProjectDirectorySuccess(); @@ -261,10 +261,10 @@ void GeneralInfoWidget::setProjectDirectorySuccess() { project_directory_diagnostic_icon->setPixmap(SmallIcon("ok")); if(isProjectDirectoryAbsolute()) project_directory_diagnostic_label->setText( - i18n("'%1' is a valid project directory.").tqarg(projectDirectory())); + i18n("'%1' is a valid project directory.").arg(projectDirectory())); else project_directory_diagnostic_label->setText( - i18n("'%1' is a valid project directory.").tqarg(projectDirectory())); + i18n("'%1' is a valid project directory.").arg(projectDirectory())); } TQString makeRelativePath(const TQString& fromPath, const TQString& toPath) diff --git a/src/generalinfowidgetbase.ui b/src/generalinfowidgetbase.ui index f253e41a..42502e58 100644 --- a/src/generalinfowidgetbase.ui +++ b/src/generalinfowidgetbase.ui @@ -44,7 +44,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>408</width> <height>20</height> @@ -103,7 +103,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>100</width> <height>32767</height> @@ -145,13 +145,13 @@ Placed in the AUTHORS file</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>16</height> diff --git a/src/kconf_update/kdev-gen-settings-kconf_update.cpp b/src/kconf_update/kdev-gen-settings-kconf_update.cpp index 64c0b791..a2703163 100644 --- a/src/kconf_update/kdev-gen-settings-kconf_update.cpp +++ b/src/kconf_update/kdev-gen-settings-kconf_update.cpp @@ -16,7 +16,7 @@ */ #include <tqmap.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqregexp.h> static TQTextStream qcin ( stdin, IO_ReadOnly ); diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp index fcf3414c..0f31d40e 100644 --- a/src/kdevideextension.cpp +++ b/src/kdevideextension.cpp @@ -79,7 +79,7 @@ void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg) gsw->embeddedDesignerRadioButton->setChecked( DesignerSetting == "EmbeddedKDevDesigner" ); config->setGroup("TerminalEmulator"); - gsw->terminalEdit->setText( config->readEntry( "TerminalApplication", TQString::tqfromLatin1("konsole") ) ); + gsw->terminalEdit->setText( config->readEntry( "TerminalApplication", TQString::fromLatin1("konsole") ) ); bool useKDESetting = config->readBoolEntry( "UseKDESetting", true ); gsw->useKDETerminal->setChecked( useKDESetting ); gsw->useOtherTerminal->setChecked( !useKDESetting ); diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp index eb77fc44..4300fcfd 100644 --- a/src/languageselectwidget.cpp +++ b/src/languageselectwidget.cpp @@ -13,7 +13,7 @@ #include <tqvariant.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqgroupbox.h> #include <tqhbox.h> @@ -60,14 +60,14 @@ LanguageSelectWidget::LanguageSelectWidget(TQDomDocument &projectDom, void LanguageSelectWidget::init() { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); TQGroupBox * groupBox1 = new TQGroupBox( i18n("Additional Language Support"), this ); groupBox1->setColumnLayout(0, Qt::Vertical ); - groupBox1->tqlayout()->setSpacing( 6 ); - groupBox1->tqlayout()->setMargin( 11 ); - TQVBoxLayout * groupBox1Layout = new TQVBoxLayout( groupBox1->tqlayout() ); - groupBox1Layout->tqsetAlignment( TQt::AlignTop ); + groupBox1->layout()->setSpacing( 6 ); + groupBox1->layout()->setMargin( 11 ); + TQVBoxLayout * groupBox1Layout = new TQVBoxLayout( groupBox1->layout() ); + groupBox1Layout->setAlignment( TQt::AlignTop ); _currentLanguage = new TQLabel( "", groupBox1 ); @@ -78,21 +78,21 @@ void LanguageSelectWidget::init() groupBox1Layout->addWidget(_currentLanguage); groupBox1Layout->addWidget( _pluginList ); - tqlayout->addWidget( groupBox1 ); + layout->addWidget( groupBox1 ); TQGroupBox * groupBox2 = new TQGroupBox( i18n("Description"), this ); groupBox2->setColumnLayout(0, Qt::Vertical ); - groupBox2->tqlayout()->setSpacing( 6 ); - groupBox2->tqlayout()->setMargin( 11 ); - TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() ); - groupBox2Layout->tqsetAlignment( TQt::AlignTop ); + groupBox2->layout()->setSpacing( 6 ); + groupBox2->layout()->setMargin( 11 ); + TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() ); + groupBox2Layout->setAlignment( TQt::AlignTop ); _pluginDescription = new TQLabel( groupBox2 ); - _pluginDescription->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + _pluginDescription->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); groupBox2Layout->addWidget( _pluginDescription ); - tqlayout->addWidget( groupBox2 ); + layout->addWidget( groupBox2 ); connect( _pluginList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( itemSelected( TQListViewItem * ) ) ); @@ -106,13 +106,13 @@ LanguageSelectWidget::~LanguageSelectWidget() void LanguageSelectWidget::readProjectConfig() { KTrader::OfferList languageSupportOffers = - KTrader::self()->query(TQString::tqfromLatin1("KDevelop/LanguageSupport"), - TQString::tqfromLatin1("[X-KDevelop-Version] == %1" - ).tqarg( KDEVELOP_PLUGIN_VERSION )); + KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"), + TQString::fromLatin1("[X-KDevelop-Version] == %1" + ).arg( KDEVELOP_PLUGIN_VERSION )); TQStringList languages = DomUtil::readListEntry(m_projectDom, "/general/secondaryLanguages", "language"); TQString language = DomUtil::readEntry(m_projectDom, "/general/primarylanguage"); - _currentLanguage->setText(i18n("Primary language is '%1'. Please select additional languages the project might contain.").tqarg(language)); + _currentLanguage->setText(i18n("Primary language is '%1'. Please select additional languages the project might contain.").arg(language)); for (KTrader::OfferList::ConstIterator it = languageSupportOffers.begin(); it != languageSupportOffers.end(); ++it) { diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index 6eda3c46..922ccd26 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -127,30 +127,30 @@ void MainWindowShare::createActions() this, TQT_SLOT(slotShowMenuBar()), m_pMainWnd->actionCollection(), "settings_show_menubar" ); action->setToolTip(beautifyToolTip(action->text())); - action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you switch the menubar on/off."))); + action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you switch the menubar on/off."))); action = KStdAction::keyBindings( this, TQT_SLOT(slotKeyBindings()), m_pMainWnd->actionCollection(), "settings_configure_shortcuts" ); action->setToolTip(beautifyToolTip(action->text())); - action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you configure shortcut keys."))); + action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure shortcut keys."))); action = KStdAction::configureToolbars( this, TQT_SLOT(slotConfigureToolbars()), m_pMainWnd->actionCollection(), "settings_configure_toolbars" ); action->setToolTip(beautifyToolTip(action->text())); - action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you configure toolbars."))); + action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure toolbars."))); action = KStdAction::configureNotifications( this, TQT_SLOT(slotConfigureNotifications()), m_pMainWnd->actionCollection(), "settings_configure_notifications" ); action->setToolTip(beautifyToolTip(action->text())); - action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you configure system notifications."))); + action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure system notifications."))); action = KStdAction::preferences(this, TQT_SLOT(slotSettings()), m_pMainWnd->actionCollection(), "settings_configure" ); action->setToolTip( i18n( "Configure KDevelop" ) ); - action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(i18n( "Configure KDevelop" )).tqarg(i18n("Lets you customize KDevelop."))); + action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(i18n( "Configure KDevelop" )).arg(i18n("Lets you customize KDevelop."))); m_toggleStatusbar = KStdAction::showToolbar(this, TQT_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar"); m_toggleStatusbar->setText(i18n("Show &Statusbar")); diff --git a/src/mimewarningdialog.ui b/src/mimewarningdialog.ui index 87b92349..3891110a 100644 --- a/src/mimewarningdialog.ui +++ b/src/mimewarningdialog.ui @@ -124,7 +124,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>24</width> <height>20</height> @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -181,7 +181,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -197,7 +197,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>20</height> diff --git a/src/newui/button.cpp b/src/newui/button.cpp index 3b483cd4..0d7cf9aa 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -49,8 +49,8 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, setToggleButton(true); setFocusPolicy(TQ_NoFocus); setDescription(m_description); - tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); - resize(tqsizeHint()); + setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + resize(sizeHint()); fixDimensions(Ideal::Bottom); TQToolTip::add(this, m_realText); @@ -62,9 +62,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, KConfig *config = kapp->config(); config->setGroup("UI"); - TQString accel = config->readEntry(TQString("button_%1").tqarg(text), ""); + TQString accel = config->readEntry(TQString("button_%1").arg(text), ""); if (!accel.isEmpty()) - setRealText(TQString("&%1 %2").tqarg(accel).tqarg(m_realText)); + setRealText(TQString("&%1 %2").arg(accel).arg(m_realText)); } Button::~Button() @@ -80,11 +80,11 @@ Button::~Button() TQString text = m_realText; if (text.contains(r2)) text.remove(r2); - config->writeEntry(TQString("button_%1").tqarg(text), r.cap(1)); + config->writeEntry(TQString("button_%1").arg(text), r.cap(1)); } else { - config->writeEntry(TQString("button_%1").tqarg(m_realText), ""); + config->writeEntry(TQString("button_%1").arg(m_realText), ""); } } @@ -131,11 +131,11 @@ void Button::drawButton(TQPainter *p) pm.fill(eraseColor()); TQPainter p2(&pm); - tqstyle().tqdrawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), tqcolorGroup(),flags); + tqstyle().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags); - tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel, &p2, this, + tqstyle().drawControl(TQStyle::CE_PushButtonLabel, &p2, this, TQRect(0,0,pm.width(),pm.height()), - tqcolorGroup(), flags, TQStyleOption()); + colorGroup(), flags, TQStyleOption()); switch (m_place) { @@ -178,7 +178,7 @@ void Button::fixDimensions(Place oldPlace) if ((oldPlace == Ideal::Bottom) || (oldPlace == Ideal::Top)) { setFixedWidth(height()); - setMinimumHeight(tqsizeHint().width()); + setMinimumHeight(sizeHint().width()); setMaximumHeight(32767); } break; @@ -187,19 +187,19 @@ void Button::fixDimensions(Place oldPlace) if ((oldPlace == Ideal::Left) || (oldPlace == Ideal::Right)) { setFixedHeight(width()); - setMinimumWidth(tqsizeHint().height()); + setMinimumWidth(sizeHint().height()); setMaximumWidth(32767); } break; } } -TQSize Button::tqsizeHint() const +TQSize Button::sizeHint() const { - return tqsizeHint(text()); + return sizeHint(text()); } -TQSize Button::tqsizeHint(const TQString &text) const +TQSize Button::sizeHint(const TQString &text) const { constPolish(); int w = 0, h = 0; @@ -211,7 +211,7 @@ TQSize Button::tqsizeHint(const TQString &text) const h = TQMAX( h, ih ); } if ( isMenuButton() ) - w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this); + w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); if ( pixmap() ) { TQPixmap *pm = (TQPixmap *)pixmap(); w += pm->width(); @@ -220,7 +220,7 @@ TQSize Button::tqsizeHint(const TQString &text) const TQString s( text ); bool empty = s.isEmpty(); if ( empty ) - s = TQString::tqfromLatin1("XXXX"); + s = TQString::fromLatin1("XXXX"); TQFontMetrics fm = fontMetrics(); TQSize sz = fm.size( ShowPrefix, s ); if(!empty || !w) @@ -239,12 +239,12 @@ void Button::updateSize() { case Ideal::Left: case Ideal::Right: - setMinimumHeight(tqsizeHint().width()); - resize(tqsizeHint().height(), tqsizeHint().width()); + setMinimumHeight(sizeHint().width()); + resize(sizeHint().height(), sizeHint().width()); break; case Ideal::Top: case Ideal::Bottom: - resize(tqsizeHint().width(), tqsizeHint().height()); + resize(sizeHint().width(), sizeHint().height()); break; } } @@ -319,7 +319,7 @@ void Button::assignAccel() if (ok) { TQString text = realTextWithoutAccel(); - text = TQString("&%1 %2").tqarg(num).tqarg(text); + text = TQString("&%1 %2").arg(num).arg(text); setRealText(text); } } diff --git a/src/newui/button.h b/src/newui/button.h index 34ce4e3a..96948267 100644 --- a/src/newui/button.h +++ b/src/newui/button.h @@ -54,8 +54,8 @@ public: /**Sets the mode of a button.*/ void setMode(Ideal::ButtonMode mode); - TQSize tqsizeHint() const; - TQSize tqsizeHint(const TQString &text) const; + TQSize sizeHint() const; + TQSize sizeHint(const TQString &text) const; /**Updates size of a widget. Used after squeezing button's text.*/ void updateSize(); diff --git a/src/newui/buttonbar.cpp b/src/newui/buttonbar.cpp index ddd4249b..2f193ad8 100644 --- a/src/newui/buttonbar.cpp +++ b/src/newui/buttonbar.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "buttonbar.h" -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> #include <kconfig.h> @@ -37,9 +37,9 @@ ButtonLayout::ButtonLayout(ButtonBar *parent, Direction d, int margin, int spaci { } -TQSize ButtonLayout::tqminimumSize() const +TQSize ButtonLayout::minimumSize() const { - TQSize size = TQBoxLayout::tqminimumSize(); + TQSize size = TQBoxLayout::minimumSize(); if (!m_buttonBar->autoResize()) return size; @@ -54,7 +54,7 @@ TQSize ButtonLayout::tqminimumSize() const case Ideal::Bottom: return TQSize(0,size.height()); } - return TQBoxLayout::tqminimumSize(); + return TQBoxLayout::minimumSize(); } @@ -128,14 +128,14 @@ void ButtonBar::fixDimensions() { case Ideal::Left: case Ideal::Right: - setFixedWidth(tqsizeHint().width()); - setMinimumHeight(tqsizeHint().height()); + setFixedWidth(sizeHint().width()); + setMinimumHeight(sizeHint().height()); setMaximumHeight(32767); break; case Ideal::Top: case Ideal::Bottom: - setFixedHeight(tqsizeHint().height()); - setMinimumWidth(tqsizeHint().width()); + setFixedHeight(sizeHint().height()); + setMinimumWidth(sizeHint().width()); setMaximumWidth(32767); break; } @@ -156,13 +156,13 @@ void ButtonBar::resizeEvent(TQResizeEvent *ev) { case Ideal::Left: case Ideal::Right: - preferredDimension = l->TQBoxLayout::tqminimumSize().height(); + preferredDimension = l->TQBoxLayout::minimumSize().height(); actualDimension = size().height(); oldDimension = ev->oldSize().height(); break; case Ideal::Top: case Ideal::Bottom: - preferredDimension = l->TQBoxLayout::tqminimumSize().width(); + preferredDimension = l->TQBoxLayout::minimumSize().width(); actualDimension = size().width(); oldDimension = ev->oldSize().width(); break; @@ -285,7 +285,7 @@ int ButtonBar::originalDimension() int size = 0; for (ButtonList::const_iterator it = m_buttons.constBegin(); it != m_buttons.constEnd(); ++it) { - size += (*it)->tqsizeHint((*it)->realText()).width(); + size += (*it)->sizeHint((*it)->realText()).width(); } return size; } diff --git a/src/newui/buttonbar.h b/src/newui/buttonbar.h index ce4ad23b..9eb18e30 100644 --- a/src/newui/buttonbar.h +++ b/src/newui/buttonbar.h @@ -25,21 +25,21 @@ #include "comdefs.h" -#include <tqlayout.h> +#include <layout.h> namespace Ideal { class Button; class ButtonBar; -/**@short A tqlayout for a ButtonBar class. +/**@short A layout for a ButtonBar class. -Overrides tqminimumSize method to allow shrinking button bar buttons.*/ +Overrides minimumSize method to allow shrinking button bar buttons.*/ class ButtonLayout: public TQBoxLayout{ public: ButtonLayout(ButtonBar *parent, Direction d, int margin = 0, int spacing = -1, const char * name = 0); - virtual TQSize tqminimumSize() const; + virtual TQSize minimumSize() const; private: ButtonBar *m_buttonBar; diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp index 9ce444eb..07d3da2a 100644 --- a/src/newui/ddockwindow.cpp +++ b/src/newui/ddockwindow.cpp @@ -20,7 +20,7 @@ #include "ddockwindow.h" #include <tqtoolbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstyle.h> #include <tqwidgetstack.h> #include <tqimage.h> @@ -104,7 +104,7 @@ void DDockWindow::setVisible(bool v) { //write dock width to the config file KConfig *config = kapp->config(); - TQString group = TQString("%1").tqarg(m_name); + TQString group = TQString("%1").arg(m_name); config->setGroup(group); if (m_visible) @@ -115,13 +115,13 @@ void DDockWindow::setVisible(bool v) v ? m_widgetStack->show() : m_widgetStack->hide(); m_visible = v; - m_internalLayout->tqinvalidate(); + m_internalLayout->invalidate(); if (!m_visible) { if (m_position == DDockWindow::Bottom) - setFixedExtentHeight(m_internalLayout->tqsizeHint().height()); + setFixedExtentHeight(m_internalLayout->sizeHint().height()); else - setFixedExtentWidth(m_internalLayout->tqsizeHint().width()); + setFixedExtentWidth(m_internalLayout->sizeHint().width()); emit hidden(); } else @@ -130,12 +130,12 @@ void DDockWindow::setVisible(bool v) int size = 0; if (m_position == DDockWindow::Bottom) { - size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().height()); + size = config->readNumEntry("ViewWidth", m_internalLayout->sizeHint().height()); setFixedExtentHeight(size); } else { - size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().width()); + size = config->readNumEntry("ViewWidth", m_internalLayout->sizeHint().width()); setFixedExtentWidth(size); } } @@ -148,7 +148,7 @@ void DDockWindow::loadSettings() void DDockWindow::saveSettings() { KConfig *config = kapp->config(); - TQString group = TQString("%1").tqarg(m_name); + TQString group = TQString("%1").arg(m_name); int invisibleWidth = 0; config->setGroup(group); if (config->hasKey("ViewWidth")) @@ -200,7 +200,7 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc //if the widget was selected last time the dock is deleted //we need to show it KConfig *config = kapp->config(); - TQString group = TQString("%1").tqarg(m_name); + TQString group = TQString("%1").arg(m_name); config->setGroup(group); if (config->readEntry("ViewLastWidget") == title) { @@ -338,7 +338,7 @@ bool DDockWindow::isActive() { if (m_toggledButton) { - TQWidget *w = tqApp->tqfocusWidget(); + TQWidget *w = tqApp->focusWidget(); if (!w) return false; TQWidget *toolWidget = m_widgets[m_toggledButton]; diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index 4c787886..45894178 100644 --- a/src/newui/dmainwindow.cpp +++ b/src/newui/dmainwindow.cpp @@ -184,8 +184,8 @@ DTabWidget *DMainWindow::splitVertical() void DMainWindow::invalidateActiveTabWidget() { -/* TQWidget *focused = m_central->tqfocusWidget(); - kdDebug(9000) << "tqinvalidate: " << focused << endl; +/* TQWidget *focused = m_central->focusWidget(); + kdDebug(9000) << "invalidate: " << focused << endl; if (focused == 0) return; if (!m_widgets.contains(focused)) diff --git a/src/newui/docksplitter.cpp b/src/newui/docksplitter.cpp index 8b382fb7..26fd4a71 100644 --- a/src/newui/docksplitter.cpp +++ b/src/newui/docksplitter.cpp @@ -113,7 +113,7 @@ void DockSplitter::removeDock(uint row, uint col, bool alsoDelete) w->hide(); } - m_splitters[row]->setMinimumSize(m_splitters[row]->tqminimumSizeHint()); + m_splitters[row]->setMinimumSize(m_splitters[row]->minimumSizeHint()); if (isRowEmpty(row)) { diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp index 64b60ee7..c3a0c7d1 100644 --- a/src/newui/dtabwidget.cpp +++ b/src/newui/dtabwidget.cpp @@ -85,7 +85,7 @@ void DTabWidget::insertTab(TQWidget *child, const TQString &label, int index) if (m_closeButton && m_closeButtonShown) m_closeButton->show(); KTabWidget::insertTab(child, label, index); - if (index != -1) tabBar()->tqrepaint(); + if (index != -1) tabBar()->repaint(); } void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset, @@ -94,7 +94,7 @@ void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset, if (m_closeButton && m_closeButtonShown) m_closeButton->show(); KTabWidget::insertTab(child, iconset, label, index); - if (index != -1) tabBar()->tqrepaint(); + if (index != -1) tabBar()->repaint(); } /*void DTabWidget::updateHistory(TQWidget *w) diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index 65257b1f..50659803 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -4,7 +4,7 @@ #include <tqpopupmenu.h> #include <tqfile.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmap.h> #include <tqlabel.h> #include <tqradiobutton.h> @@ -131,7 +131,7 @@ void PartController::setupActions() newAction->setWhatsThis( i18n("<b>Open file</b><p>Opens an existing file without adding it to the project.</p>") ); m_openRecentAction = KStdAction::openRecent( this, TQT_SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" ); - m_openRecentAction->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(m_openRecentAction->text())).tqarg(i18n("Opens recently opened file."))); + m_openRecentAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_openRecentAction->text())).arg(i18n("Opens recently opened file."))); m_openRecentAction->loadEntries( kapp->config(), "RecentFiles" ); m_saveAllFilesAction = new KAction(i18n("Save Al&l"), 0, this, TQT_SLOT(slotSaveAllFiles()), ac, "file_save_all"); @@ -146,7 +146,7 @@ void PartController::setupActions() m_closeWindowAction = KStdAction::close(this, TQT_SLOT(slotCloseWindow()), ac, "file_close"); m_closeWindowAction->setToolTip( i18n("Close current file") ); - m_closeWindowAction->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(m_closeWindowAction->text())).tqarg(i18n("Closes current file."))); + m_closeWindowAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_closeWindowAction->text())).arg(i18n("Closes current file."))); m_closeWindowAction->setEnabled(false); m_closeAllWindowsAction = new KAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all"); @@ -534,8 +534,8 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, else { MimeWarningDialog dlg; - dlg.text2->setText( TQString( "<qt><b>%1</b></qt>" ).tqarg(url.path())); - dlg.text3->setText( dlg.text3->text().tqarg(MimeType->name()) ); + dlg.text2->setText( TQString( "<qt><b>%1</b></qt>" ).arg(url.path())); + dlg.text3->setText( dlg.text3->text().arg(MimeType->name()) ); if ( dlg.exec() == TQDialog::Accepted ) { @@ -593,7 +593,7 @@ void PartController::showDocument(const KURL &url, bool newWin) KParts::Factory *PartController::findPartFactory(const TQString &mimeType, const TQString &partType, const TQString &preferredName) { - KTrader::OfferList offers = KTrader::self()->query(mimeType, TQString("'%1' in ServiceTypes").tqarg(partType)); + KTrader::OfferList offers = KTrader::self()->query(mimeType, TQString("'%1' in ServiceTypes").arg(partType)); if (offers.count() > 0) { @@ -694,7 +694,7 @@ void PartController::integratePart(KParts::Part *part, const KURL &url, // Document object and our HTMLDocumentationPart // connect(part, TQT_SIGNAL(fileNameChanged()), this, TQT_SLOT(slotFileNameChanged())); - // Connect to the document's views newtqStatus() signal in order to keep track of the + // Connect to the document's views newStatus() signal in order to keep track of the // modified-status of the document. if (isTextEditor) @@ -718,8 +718,8 @@ void PartController::integratePart(KParts::Part *part, const KURL &url, connect(designerPart, TQT_SIGNAL(editSource(DesignerType, const TQString& )), API::getInstance()->languageSupport(), TQT_SLOT(openSource(DesignerType, const TQString& ))); - connect(designerPart, TQT_SIGNAL(newtqStatus(const TQString &, int)), - this, TQT_SLOT(slotNewDesignertqStatus(const TQString &, int))); + connect(designerPart, TQT_SIGNAL(newStatus(const TQString &, int)), + this, TQT_SLOT(slotNewDesignerStatus(const TQString &, int))); } } @@ -787,7 +787,7 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc) TQPtrListIterator<KTextEditor::View> it( list ); while ( it.current() ) { - connect( it, TQT_SIGNAL( newtqStatus() ), this, TQT_SLOT( slotNewtqStatus() ) ); + connect( it, TQT_SIGNAL( newStatus() ), this, TQT_SLOT( slotNewStatus() ) ); ++it; } } @@ -1005,7 +1005,7 @@ void PartController::reloadFile( const KURL & url ) if ( part->isModified() ) { if ( KMessageBox::warningYesNo( TopLevel::getInstance()->main(), - i18n( "The file \"%1\" is modified in memory. Are you sure you want to reload it? (Local changes will be lost.)" ).tqarg( url.path() ), + i18n( "The file \"%1\" is modified in memory. Are you sure you want to reload it? (Local changes will be lost.)" ).arg( url.path() ), i18n( "File is Modified" ), i18n("Reload"), i18n("Do Not Reload") ) == KMessageBox::Yes ) { part->setModified( false ); @@ -1120,7 +1120,7 @@ bool PartController::saveFile( const KURL & url, bool force ) case DirtyAndModified: { int code = KMessageBox::warningYesNoCancel( TopLevel::getInstance()->main(), - i18n("The file \"%1\" is modified on disk.\n\nAre you sure you want to overwrite it? (External changes will be lost.)").tqarg( url.path() ), + i18n("The file \"%1\" is modified on disk.\n\nAre you sure you want to overwrite it? (External changes will be lost.)").arg( url.path() ), i18n("File Externally Modified"), i18n("Overwrite"), i18n("Do Not Overwrite") ); if ( code == KMessageBox::Yes ) { @@ -1481,7 +1481,7 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason ) { KMessageBox::sorry( TopLevel::getInstance()->main(), i18n("Conflict: The file \"%1\" has changed on disk while being modified in memory.\n\n" - "You should investigate before saving to make sure you are not losing data.").tqarg( url.path() ), + "You should investigate before saving to make sure you are not losing data.").arg( url.path() ), i18n("Conflict") ); return false; } @@ -1490,7 +1490,7 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason ) { KMessageBox::sorry( TopLevel::getInstance()->main(), i18n("Warning: The file \"%1\" has been deleted on disk.\n\n" - "If this was not your intention, make sure to save this file now.").tqarg( url.path() ), + "If this was not your intention, make sure to save this file now.").arg( url.path() ), i18n("File Deleted") ); return false; } @@ -1498,7 +1498,7 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason ) if ( dirtyAction == "alert" ) { if ( KMessageBox::warningYesNo( TopLevel::getInstance()->main(), - i18n("The file \"%1\" has changed on disk.\n\nDo you want to reload it?").tqarg( url.path() ), + i18n("The file \"%1\" has changed on disk.\n\nDo you want to reload it?").arg( url.path() ), i18n("File Changed"), i18n("Reload"), i18n("Do Not Reload") ) == KMessageBox::No ) { return false; @@ -1511,14 +1511,14 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason ) return true; } -void PartController::slotNewDesignertqStatus(const TQString &formName, int status) +void PartController::slotNewDesignerStatus(const TQString &formName, int status) { kdDebug(9000) << k_funcinfo << endl; kdDebug(9000) << " formName: " << formName << ", status: " << status << endl; emit documentChangedState( KURL::fromPathOrURL(formName), DocumentState(status) ); } -void PartController::slotNewtqStatus( ) +void PartController::slotNewStatus( ) { kdDebug(9000) << k_funcinfo << endl; @@ -1628,7 +1628,7 @@ void PartController::slotBackAboutToShow() TQValueList<HistoryEntry>::ConstIterator it = m_backHistory.begin(); while( i < 10 && it != m_backHistory.end() ) { - popup->insertItem( (*it).url.fileName() + TQString(" (%1)").tqarg( (*it).line +1), (*it).id ); + popup->insertItem( (*it).url.fileName() + TQString(" (%1)").arg( (*it).line +1), (*it).id ); ++i; ++it; } @@ -1645,7 +1645,7 @@ void PartController::slotForwardAboutToShow( ) TQValueList<HistoryEntry>::ConstIterator it = m_forwardHistory.begin(); while( i < 10 && it != m_forwardHistory.end() ) { - popup->insertItem( (*it).url.fileName() + TQString(" (%1)").tqarg( (*it).line +1), (*it).id ); + popup->insertItem( (*it).url.fileName() + TQString(" (%1)").arg( (*it).line +1), (*it).id ); ++i; ++it; } diff --git a/src/partcontroller.h b/src/partcontroller.h index 9e563914..c811df7a 100644 --- a/src/partcontroller.h +++ b/src/partcontroller.h @@ -141,8 +141,8 @@ private slots: void slotDocumentDirty( Kate::Document * doc, bool isModified, unsigned char reason ); void slotDocumentDirtyStepTwo( void * ); - void slotNewtqStatus(); - void slotNewDesignertqStatus(const TQString &formName, int status); + void slotNewStatus(); + void slotNewDesignerStatus(const TQString &formName, int status); void textChanged(); void gotoLastEditPos(); diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index 5ec5a72c..6639375b 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -49,7 +49,7 @@ namespace template <class ComponentType> ComponentType *loadDefaultPart( const TQString &serviceType ) { - KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION)); + KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION)); KTrader::OfferList::ConstIterator serviceIt = offers.begin(); for ( ; serviceIt != offers.end(); ++serviceIt ) { KService::Ptr service = *serviceIt; @@ -79,10 +79,10 @@ PluginController *PluginController::getInstance() PluginController::PluginController() : KDevPluginController() { -/* m_defaultProfile = TQString::tqfromLatin1( "FullIDE" ); +/* m_defaultProfile = TQString::fromLatin1( "FullIDE" ); m_defaultProfilePath = kapp->dirs()->localtdedir() + "/" + KStandardDirs::kde_default( "data" ) + - TQString::tqfromLatin1("/tdevelop/profiles/FullIDE");*/ + TQString::fromLatin1("/tdevelop/profiles/FullIDE");*/ KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); if( args->isSet("profile") ){ @@ -147,7 +147,7 @@ void PluginController::loadPlugins( KTrader::OfferList offers, const TQStringLis if( m_parts[ name ] != 0 || ignorePlugins.contains( name ) ) continue; - emit loadingPlugin(i18n("Loading: %1").tqarg((*it)->genericName())); + emit loadingPlugin(i18n("Loading: %1").arg((*it)->genericName())); KDevPlugin *plugin = loadPlugin( *it ); if ( plugin ) @@ -218,7 +218,7 @@ KDevPlugin *PluginController::loadPlugin( const KService::Ptr &service ) 0, i18n("<b>Could not load plugin</b><br>" "Plugin %1 could not be loaded<br>" - "Library loader error: %2").tqarg(service->name()). + "Library loader error: %2").arg(service->name()). arg(KLibLoader::self()->lastErrorMessage()), i18n("Could not load plugin")); } diff --git a/src/pluginselectdialogbase.ui b/src/pluginselectdialogbase.ui index 1f69a9ca..a773a155 100644 --- a/src/pluginselectdialogbase.ui +++ b/src/pluginselectdialogbase.ui @@ -37,7 +37,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -81,7 +81,7 @@ <property name="name"> <cstring>plugin_description_label</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>40</height> @@ -90,7 +90,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -106,7 +106,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -122,7 +122,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>191</width> <height>21</height> diff --git a/src/profileengine/editor/addprofilewidget.ui b/src/profileengine/editor/addprofilewidget.ui index a44765ab..78d20d17 100644 --- a/src/profileengine/editor/addprofilewidget.ui +++ b/src/profileengine/editor/addprofilewidget.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -53,7 +53,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -85,7 +85,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp index 99921768..93fe2850 100644 --- a/src/profileengine/editor/profileeditor.cpp +++ b/src/profileengine/editor/profileeditor.cpp @@ -18,10 +18,10 @@ ***************************************************************************/ #include "profileeditor.h" -#include <tqlayout.h> +#include <layout.h> #include <klineedit.h> -#include <tqtextedit.h> -#include <tqpalette.h> +#include <textedit.h> +#include <palette.h> #include <kdebug.h> #include <kpushbutton.h> @@ -69,12 +69,12 @@ public: bool isDerived() const { return m_derived; } - virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { TQColorGroup cgNew = cg; if (m_derived) cgNew.setColor(TQColorGroup::Text, KGlobalSettings::inactiveTextColor()); - KListViewItem::paintCell(p, cgNew, column, width, tqalignment); + KListViewItem::paintCell(p, cgNew, column, width, alignment); } private: @@ -115,7 +115,7 @@ void ProfileEditor::refresh() void ProfileEditor::refreshPropertyCombo() { - KTrader::OfferList list = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin")); + KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin")); TQStringList props; for (KTrader::OfferList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it) { diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui index d66c4e31..4c6af611 100644 --- a/src/profileengine/editor/profileeditorbase.ui +++ b/src/profileengine/editor/profileeditorbase.ui @@ -49,7 +49,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <grid> <property name="name"> @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>142</height> @@ -192,7 +192,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -221,7 +221,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -263,7 +263,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="2" rowspan="4" colspan="1"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -303,7 +303,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="2" rowspan="4" colspan="1"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -376,7 +376,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -401,7 +401,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -410,7 +410,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="0" rowspan="8" colspan="1"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -474,7 +474,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp index ac30ff87..68666f3a 100644 --- a/src/profileengine/lib/profile.cpp +++ b/src/profileengine/lib/profile.cpp @@ -59,18 +59,18 @@ Profile::Profile(Profile *parent, const TQString &name, const TQString &genericN Profile::~Profile() { - for (TQValueList<Profile*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) + for (TQValueList<Profile*>::iterator it = m_children.begin(); it != m_children.end(); ++it) delete *it; } void Profile::addChildProfile(Profile *profile) { - m_tqchildren.append(profile); + m_children.append(profile); } void Profile::removeChildProfile(Profile *profile) { - m_tqchildren.remove(profile); + m_children.remove(profile); } TQString Profile::dirName() const diff --git a/src/profileengine/lib/profile.h b/src/profileengine/lib/profile.h index 3cbfd6f5..857ddf39 100644 --- a/src/profileengine/lib/profile.h +++ b/src/profileengine/lib/profile.h @@ -49,7 +49,7 @@ public: Profile(Profile *parent, const TQString &name, const TQString &genericName, const TQString &description); ~Profile(); - TQValueList<Profile*> tqchildren() const { return m_tqchildren; } + TQValueList<Profile*> children() const { return m_children; } Profile *parent() const { return m_parent; } void save(); @@ -81,7 +81,7 @@ protected: private: Profile *m_parent; - TQValueList<Profile*> m_tqchildren; + TQValueList<Profile*> m_children; TQString m_name; diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp index d21a6b58..48a4e4e2 100644 --- a/src/profileengine/lib/profileengine.cpp +++ b/src/profileengine/lib/profileengine.cpp @@ -78,24 +78,24 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType if (!profile) return KTrader::OfferList(); - TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); + TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION); switch (offerType) { case Global: - constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Global'"); + constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'"); break; case Project: - constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Project'"); + constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'"); break; case Core: - constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Core'"); + constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'"); break; } TQString constraint_add = ""; Profile::EntryList properties = profile->list(Profile::Properties); int i = 0; for (Profile::EntryList::const_iterator it = properties.begin(); it != properties.end(); ++it) - constraint_add += TQString::tqfromLatin1(" %1 '%2' in [X-KDevelop-Properties]"). - tqarg((i++)==0?"":"or").tqarg((*it).name); + constraint_add += TQString::fromLatin1(" %1 '%2' in [X-KDevelop-Properties]"). + arg((i++)==0?"":"or").arg((*it).name); if (!constraint_add.isEmpty()) constraint += " and ( " + constraint_add + " ) "; @@ -106,7 +106,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType << " " << constraint << endl << endl << endl;*/ //END debug - KTrader::OfferList list = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint); + KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint); TQStringList names; /* Wrong, this is not what we want to do. @@ -129,9 +129,9 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType { if (names.contains((*it).name)) continue; - TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); - constraint += TQString::tqfromLatin1("and [Name] == '%1'").tqarg((*it).name); - KTrader::OfferList enable = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint); + TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION); + constraint += TQString::fromLatin1("and [Name] == '%1'").arg((*it).name); + KTrader::OfferList enable = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint); list += enable; } @@ -149,19 +149,19 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType KTrader::OfferList ProfileEngine::allOffers(OfferType offerType) { - TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); + TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION); switch (offerType) { case Global: - constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Global'"); + constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'"); break; case Project: - constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Project'"); + constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'"); break; case Core: - constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Core'"); + constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'"); break; } - return KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint); + return KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint); } void ProfileEngine::getProfileWithListing(ProfileListing &listing, Profile **profile, diff --git a/src/profileengine/lib/profileengine.h b/src/profileengine/lib/profileengine.h index d34f9e02..6404e48f 100644 --- a/src/profileengine/lib/profileengine.h +++ b/src/profileengine/lib/profileengine.h @@ -177,8 +177,8 @@ public: template<class Operation> void walkProfiles(Operation &op, Profile *root) { - TQValueList<Profile*> tqchildren = root->tqchildren(); - for (TQValueList<Profile*>::iterator it = tqchildren.begin(); it != tqchildren.end(); ++it) + TQValueList<Profile*> children = root->children(); + for (TQValueList<Profile*>::iterator it = children.begin(); it != children.end(); ++it) { op(*it); walkProfiles<Operation>(op, *it); @@ -244,8 +244,8 @@ public: template<class Operation, class Result> void walkProfiles(Operation &op, Result *result, Profile *root) { - TQValueList<Profile*> tqchildren = root->tqchildren(); - for (TQValueList<Profile*>::iterator it = tqchildren.begin(); it != tqchildren.end(); ++it) + TQValueList<Profile*> children = root->children(); + for (TQValueList<Profile*>::iterator it = children.begin(); it != children.end(); ++it) { Result *newResult = op(result, *it); walkProfiles<Operation>(op, newResult, *it); diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index f7478e75..b0f44d90 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -355,7 +355,7 @@ bool ProjectManager::loadProjectFile() TQString path; if (!KIO::NetAccess::download(m_info->m_projectURL, path, 0)) { KMessageBox::sorry(TopLevel::getInstance()->main(), - i18n("Could not read project file: %1").tqarg(m_info->m_projectURL.prettyURL())); + i18n("Could not read project file: %1").arg(m_info->m_projectURL.prettyURL())); return false; } @@ -363,7 +363,7 @@ bool ProjectManager::loadProjectFile() if (!fin.open(IO_ReadOnly)) { KMessageBox::sorry(TopLevel::getInstance()->main(), - i18n("Could not read project file: %1").tqarg(m_info->m_projectURL.prettyURL())); + i18n("Could not read project file: %1").arg(m_info->m_projectURL.prettyURL())); return false; } @@ -374,7 +374,7 @@ bool ProjectManager::loadProjectFile() KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("This is not a valid project file.\n" "XML error in line %1, column %2:\n%3") - .tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg)); + .arg(errorLine).arg(errorCol).arg(errorMsg)); fin.close(); KIO::NetAccess::removeTempFile(path); return false; @@ -411,7 +411,7 @@ bool ProjectManager::saveProjectFile() API::getInstance()->projectDom()->save(stream, 2); fout.close(); } else { - KTempFile fout(TQString::tqfromLatin1("tdevelop3")); + KTempFile fout(TQString::fromLatin1("tdevelop3")); fout.setAutoDelete(true); if (fout.status() != 0) { KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("Could not write the project file.")); @@ -486,7 +486,7 @@ bool ProjectManager::loadProjectPart() if (!projectService) { KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("No project management plugin %1 found.") - .tqarg(m_info->m_projectPlugin)); + .arg(m_info->m_projectPlugin)); return false; } @@ -496,7 +496,7 @@ bool ProjectManager::loadProjectPart() if ( !projectPart ) { KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("Could not create project management plugin %1.") - .tqarg(m_info->m_projectPlugin)); + .arg(m_info->m_projectPlugin)); return false; } @@ -536,13 +536,13 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang) } KTrader::OfferList languageSupportOffers = - KTrader::self()->query(TQString::tqfromLatin1("KDevelop/LanguageSupport"), - TQString::tqfromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").tqarg(lang).tqarg(KDEVELOP_PLUGIN_VERSION)); + KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"), + TQString::fromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").arg(lang).arg(KDEVELOP_PLUGIN_VERSION)); if (languageSupportOffers.isEmpty()) { KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("No language plugin for %1 found.") - .tqarg(lang)); + .arg(lang)); return false; } @@ -556,7 +556,7 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang) if ( !langSupport ) { KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("Could not create language plugin for %1.") - .tqarg(lang)); + .arg(lang)); return false; } diff --git a/src/projectsession.cpp b/src/projectsession.cpp index f09967ef..ae7377e1 100644 --- a/src/projectsession.cpp +++ b/src/projectsession.cpp @@ -79,7 +79,7 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ if (!ok) { KMessageBox::sorry(0L, i18n("The file %1 does not contain valid XML.\n" - "The loading of the session failed.").tqarg(sessionFileName)); + "The loading of the session failed.").arg(sessionFileName)); initXMLTree(); // because it was now broken after failed setContent() return false; } @@ -91,8 +91,8 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ // Check for proper document type. if (domdoc.doctype().name() != "KDevPrjSession") { KMessageBox::sorry(0L, - i18n("The file %1 does not contain a valid KDevelop project session ('KDevPrjSession').\n").tqarg(sessionFileName) - + i18n("The document type seems to be: '%1'.").tqarg(domdoc.doctype().name())); + i18n("The file %1 does not contain a valid KDevelop project session ('KDevPrjSession').\n").arg(sessionFileName) + + i18n("The document type seems to be: '%1'.").arg(domdoc.doctype().name())); return false; } diff --git a/src/settingswidget.ui b/src/settingswidget.ui index 92d4554e..e5d1ac1f 100644 --- a/src/settingswidget.ui +++ b/src/settingswidget.ui @@ -43,7 +43,7 @@ <property name="text"> <string><qt><h3>Project Settings</h3></qt></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -63,7 +63,7 @@ </widget> <widget class="TQLayoutWidget" row="5" column="2" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -129,13 +129,13 @@ <property name="textFormat"> <enum>AutoText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignBottom|AlignLeft</set> </property> </widget> <widget class="TQLayoutWidget" row="2" column="2" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -187,7 +187,7 @@ </spacer> <widget class="TQLayoutWidget" row="4" column="2" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -232,7 +232,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>60</height> @@ -272,7 +272,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -319,7 +319,7 @@ <property name="text"> <string><qt><h3>Terminal Emulation</h3></qt></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -350,7 +350,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -364,7 +364,7 @@ <property name="text"> <string><qt><h3>UI Designer Integration</h3>This will only be used when no project is opened. For the project specific setting see Project Options/C++ Specific and open the Qt tab.</qt></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -459,7 +459,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>150</height> @@ -479,7 +479,7 @@ <property name="title"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignAuto</set> </property> <vbox> diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index e71e6b1d..5afa22df 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "simplemainwindow.h" -#include <tqtextedit.h> +#include <textedit.h> #include <kaction.h> #include <kstdaction.h> @@ -765,7 +765,7 @@ void SimpleMainWindow::fillWindowMenu() while (itt != list.end()) { - temp = m_windowMenu->insertItem( i < 10 ? TQString("&%1 %2").tqarg(i).tqarg((*itt).fileName()) : (*itt).fileName() ); + temp = m_windowMenu->insertItem( i < 10 ? TQString("&%1 %2").arg(i).arg((*itt).fileName()) : (*itt).fileName() ); m_windowList << tqMakePair(temp, *itt); ++i; ++itt; diff --git a/src/splashscreen.cpp b/src/splashscreen.cpp index ddfb8e62..22ffcf9d 100644 --- a/src/splashscreen.cpp +++ b/src/splashscreen.cpp @@ -29,7 +29,7 @@ KDevSplashScreen::~KDevSplashScreen() void KDevSplashScreen::animate() { state = ((state + 1) % (2*progress_bar_size-1)); - tqrepaint(); + repaint(); } @@ -74,7 +74,7 @@ void KDevSplashScreen::drawContents (TQPainter* painter) // Draw version number TQRect r = rect(); r.setRect(r.x() + 5, r.y() + 5, r.width() - 10, r.height() - 10); - painter->drawText(r, TQt::AlignRight, i18n("Version %1").tqarg( VERSION )); + painter->drawText(r, TQt::AlignRight, i18n("Version %1").arg( VERSION )); // Draw message at given position, limited to 43 chars // If message is too long, string is truncated diff --git a/src/statusbar.cpp b/src/statusbar.cpp index b730d55a..be2f810d 100644 --- a/src/statusbar.cpp +++ b/src/statusbar.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpainter.h> #include <tqtimer.h> @@ -36,7 +36,7 @@ KDevStatusBar::KDevStatusBar(TQWidget *parent, const char *name) _status = new TQLabel( this ); _status->setMinimumWidth(_status->fontMetrics().width("Line: XXXXX Col: XXX OVR NORM * ")); - _status->tqsetAlignment(TQWidget::AlignCenter); + _status->setAlignment(TQWidget::AlignCenter); addWidget(_status, 0, true); connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), @@ -61,7 +61,7 @@ void KDevStatusBar::activePartChanged(KParts::Part *part) if ((_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) { connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ), - this, TQT_SLOT( settqStatus( const TQString & ) ) ); + this, TQT_SLOT( setStatus( const TQString & ) ) ); _status->show(); } @@ -90,7 +90,7 @@ void KDevStatusBar::cursorPositionChanged() } } -void KDevStatusBar::settqStatus(const TQString &str) +void KDevStatusBar::setStatus(const TQString &str) { _status->setText(str); } @@ -98,15 +98,15 @@ void KDevStatusBar::settqStatus(const TQString &str) void KDevStatusBar::setCursorPosition(int line, int col) { - _status->setText(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col)); + _status->setText(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col)); } void KDevStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent) { KStatusBar::addWidget(widget,stretch,permanent); - if(widget->tqsizeHint().height() + 4 > height()) - setFixedHeight(widget->tqsizeHint().height() + 4); + if(widget->sizeHint().height() + 4 > height()) + setFixedHeight(widget->sizeHint().height() + 4); } #include "statusbar.moc" diff --git a/src/statusbar.h b/src/statusbar.h index c17392e8..a17ef3a9 100644 --- a/src/statusbar.h +++ b/src/statusbar.h @@ -22,7 +22,7 @@ namespace KTextEditor { class ViewCursorInterface; } namespace KParts { class Part; } /** -tqStatus bar. +Status bar. */ class KDevStatusBar : public KStatusBar { @@ -37,7 +37,7 @@ public: private slots: void cursorPositionChanged(); void activePartChanged(KParts::Part *part); - void settqStatus(const TQString &str); + void setStatus(const TQString &str); void setCursorPosition(int line, int col); private: diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp index 33fb5302..5fe6dbf3 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.cpp +++ b/vcs/clearcase/clearcasefileinfoprovider.cpp @@ -45,7 +45,7 @@ const VCSFileInfoMap* ClearcaseFileinfoProvider::status( const TQString &dirPath return vcsInfo_; } -bool ClearcaseFileinfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) { +bool ClearcaseFileinfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) { VCSFileInfoMap* vcsDirInfos = ccManipulator_.retreiveFilesInfos(dirPath); diff --git a/vcs/clearcase/clearcasefileinfoprovider.h b/vcs/clearcase/clearcasefileinfoprovider.h index 292ada0f..85f60cc8 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.h +++ b/vcs/clearcase/clearcasefileinfoprovider.h @@ -32,7 +32,7 @@ public: const VCSFileInfoMap *status( const TQString &dirPath ) ; // -- Async interface for requesting data - bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ); + bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ); private: diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp index 9b1cd67b..198cc1db 100644 --- a/vcs/clearcase/clearcasepart.cpp +++ b/vcs/clearcase/clearcasepart.cpp @@ -86,7 +86,7 @@ void ClearcasePart::contextMenu(TQPopupMenu *popup, const Context *context) KPopupMenu *sub = new KPopupMenu(popup); TQString name = fi.fileName(); - sub->insertTitle( i18n("Actions for %1").tqarg(name) ); + sub->insertTitle( i18n("Actions for %1").arg(name) ); sub->insertItem( i18n("Checkin"), this, TQT_SLOT(slotCheckin()) ); sub->insertItem( i18n("Checkout"), diff --git a/vcs/clearcase/commentdlg.cpp b/vcs/clearcase/commentdlg.cpp index 5355b3f0..dcfe5eea 100644 --- a/vcs/clearcase/commentdlg.cpp +++ b/vcs/clearcase/commentdlg.cpp @@ -11,7 +11,7 @@ #include "commentdlg.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpushbutton.h> #include <kapplication.h> @@ -25,21 +25,21 @@ CcaseCommentDlg::CcaseCommentDlg(bool bCheckin) { setCaption( i18n("Clearcase Comment") ); - TQBoxLayout *tqlayout = new TQVBoxLayout(this, 10); + TQBoxLayout *layout = new TQVBoxLayout(this, 10); TQLabel *messagelabel = new TQLabel(i18n("Enter log message:"), this); - messagelabel->setMinimumSize(messagelabel->tqsizeHint()); - tqlayout->addWidget(messagelabel, 0); + messagelabel->setMinimumSize(messagelabel->sizeHint()); + layout->addWidget(messagelabel, 0); _edit = new TQMultiLineEdit(this); TQFontMetrics fm(_edit->fontMetrics()); _edit->setMinimumSize(fm.width("0")*40, fm.lineSpacing()*3); - tqlayout->addWidget(_edit, 10); + layout->addWidget(_edit, 10); - TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout); + TQBoxLayout *layout2 = new TQHBoxLayout(layout); if(bCheckin) { _check = new TQCheckBox(i18n("Reserve"), this); - tqlayout2->addWidget(_check); + layout2->addWidget(_check); } KButtonBox *buttonbox = new KButtonBox(this); @@ -49,10 +49,10 @@ CcaseCommentDlg::CcaseCommentDlg(bool bCheckin) connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); ok->setDefault(true); - buttonbox->tqlayout(); - tqlayout2->addWidget(buttonbox, 0); + buttonbox->layout(); + layout2->addWidget(buttonbox, 0); - tqlayout->activate(); + layout->activate(); adjustSize(); } diff --git a/vcs/clearcase/integrator/ccintegratordlgbase.ui b/vcs/clearcase/integrator/ccintegratordlgbase.ui index c8b7100c..35182376 100644 --- a/vcs/clearcase/integrator/ccintegratordlgbase.ui +++ b/vcs/clearcase/integrator/ccintegratordlgbase.ui @@ -34,7 +34,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>437</height> diff --git a/vcs/cvsservice/annotatepage.cpp b/vcs/cvsservice/annotatepage.cpp index 4c838cf9..cdcd0fdc 100644 --- a/vcs/cvsservice/annotatepage.cpp +++ b/vcs/cvsservice/annotatepage.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <tqregexp.h> #include <tqstringlist.h> #include <tqdatetime.h> @@ -106,7 +106,7 @@ void AnnotatePage::slotJobExited( bool normalExit, int exitStatus ) if (!normalExit) { - KMessageBox::sorry( this, i18n("Annotate failed with exitStatus == %1").tqarg( exitStatus), i18n("Annotate Failed") ); + KMessageBox::sorry( this, i18n("Annotate failed with exitStatus == %1").arg( exitStatus), i18n("Annotate Failed") ); return; } diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp index 597415f1..bd8014d8 100644 --- a/vcs/cvsservice/annotateview.cpp +++ b/vcs/cvsservice/annotateview.cpp @@ -170,7 +170,7 @@ void AnnotateView::addLine(TQString rev, TQString author, TQDateTime date, } -TQSize AnnotateView::tqsizeHint() const +TQSize AnnotateView::sizeHint() const { TQFontMetrics fm(fontMetrics()); return TQSize(100 * fm.width("0"), 20 * fm.lineSpacing()); @@ -189,7 +189,7 @@ void AnnotateView::maybeTip( const TQPoint & p ) return; } - TQRect r = tqitemRect( item ); + TQRect r = itemRect( item ); //get the dimension of the author + the date column TQRect headerRect = header()->sectionRect(AnnotateViewItem::AuthorColumn); headerRect = headerRect.unite(header()->sectionRect(AnnotateViewItem::DateColumn)); diff --git a/vcs/cvsservice/annotateview.h b/vcs/cvsservice/annotateview.h index 956c0251..7586616e 100644 --- a/vcs/cvsservice/annotateview.h +++ b/vcs/cvsservice/annotateview.h @@ -42,7 +42,7 @@ public: void addLine(TQString rev, TQString author, TQDateTime date, TQString content, TQString comment, bool odd); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; void maybeTip( const TQPoint & p ); private: diff --git a/vcs/cvsservice/changelog.cpp b/vcs/cvsservice/changelog.cpp index 18deee0f..93aec07d 100644 --- a/vcs/cvsservice/changelog.cpp +++ b/vcs/cvsservice/changelog.cpp @@ -11,7 +11,7 @@ #include <tqdatetime.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kemailsettings.h> @@ -24,7 +24,7 @@ ChangeLogEntry::ChangeLogEntry() authorEmail = emailConfig.getSetting( KEMailSettings::EmailAddress ); authorName = emailConfig.getSetting( KEMailSettings::RealName ); - TQDate currDate = TQDate::tqcurrentDate(); + TQDate currDate = TQDate::currentDate(); date = currDate.toString( "yyyy-MM-dd" ); } diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp index be20d977..87c9cd15 100644 --- a/vcs/cvsservice/checkoutdialog.cpp +++ b/vcs/cvsservice/checkoutdialog.cpp @@ -13,7 +13,7 @@ #include <tqpushbutton.h> #include <tqcombobox.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <klistview.h> #include <kurlrequester.h> diff --git a/vcs/cvsservice/checkoutdialogbase.ui b/vcs/cvsservice/checkoutdialogbase.ui index 0639364d..38f1e7f0 100644 --- a/vcs/cvsservice/checkoutdialogbase.ui +++ b/vcs/cvsservice/checkoutdialogbase.ui @@ -56,7 +56,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -106,7 +106,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -122,7 +122,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>156</width> <height>20</height> @@ -238,7 +238,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -254,7 +254,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>421</width> <height>20</height> diff --git a/vcs/cvsservice/commitdialogbase.ui b/vcs/cvsservice/commitdialogbase.ui index eabd9c57..61805f99 100644 --- a/vcs/cvsservice/commitdialogbase.ui +++ b/vcs/cvsservice/commitdialogbase.ui @@ -42,7 +42,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -88,7 +88,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>350</width> <height>20</height> diff --git a/vcs/cvsservice/commitdlg.cpp b/vcs/cvsservice/commitdlg.cpp index 18850643..35dbb391 100644 --- a/vcs/cvsservice/commitdlg.cpp +++ b/vcs/cvsservice/commitdlg.cpp @@ -11,10 +11,10 @@ * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqpushbutton.h> #include <kapplication.h> diff --git a/vcs/cvsservice/cvsdiffpage.cpp b/vcs/cvsservice/cvsdiffpage.cpp index 04a37607..fcdb8b27 100644 --- a/vcs/cvsservice/cvsdiffpage.cpp +++ b/vcs/cvsservice/cvsdiffpage.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include <tqtextedit.h> -#include <tqlayout.h> +#include <textedit.h> +#include <layout.h> #include <tqregexp.h> #include <tqdir.h> #include <tqstringlist.h> diff --git a/vcs/cvsservice/cvsdir.cpp b/vcs/cvsservice/cvsdir.cpp index c9e9ab51..c1d90973 100644 --- a/vcs/cvsservice/cvsdir.cpp +++ b/vcs/cvsservice/cvsdir.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include "cvsdir.h" @@ -173,7 +173,7 @@ TQStringList CVSDir::registeredEntryList() const bool CVSDir::isRegistered( const TQString fileName ) const { - CVSEntry entry = filetqStatus( fileName ); + CVSEntry entry = fileStatus( fileName ); return entry.isValid() && entry.fileName() == fileName; } @@ -197,7 +197,7 @@ void CVSDir::refreshEntriesCache() const /////////////////////////////////////////////////////////////////////////////// -CVSEntry CVSDir::filetqStatus( const TQString &fileName, bool refreshCache ) const +CVSEntry CVSDir::fileStatus( const TQString &fileName, bool refreshCache ) const { if (refreshCache) refreshEntriesCache(); @@ -284,7 +284,7 @@ void CVSDir::doNotIgnoreFile( const TQString &fileName ) /////////////////////////////////////////////////////////////////////////////// -VCSFileInfoMap CVSDir::dirtqStatus() const +VCSFileInfoMap CVSDir::dirStatus() const { VCSFileInfoMap vcsInfo; /// Convert to VCSFileInfoMap: \FIXME : any speed improvement here? @@ -293,7 +293,7 @@ VCSFileInfoMap CVSDir::dirtqStatus() const for ( ; it != end; ++it) { const TQString &fileName = (*it); - const CVSEntry entry = filetqStatus( fileName ); + const CVSEntry entry = fileStatus( fileName ); vcsInfo.insert( fileName, entry.toVCSFileInfo() ); } @@ -303,7 +303,7 @@ VCSFileInfoMap CVSDir::dirtqStatus() const /////////////////////////////////////////////////////////////////////////////// -VCSFileInfoMap *CVSDir::cacheableDirtqStatus() const +VCSFileInfoMap *CVSDir::cacheableDirStatus() const { VCSFileInfoMap *vcsInfo = new VCSFileInfoMap; /// Convert to VCSFileInfoMap: \FIXME : any speed improvement here? @@ -312,7 +312,7 @@ VCSFileInfoMap *CVSDir::cacheableDirtqStatus() const for ( ; it != end; ++it) { const TQString &fileName = (*it); - const CVSEntry entry = filetqStatus( fileName ); + const CVSEntry entry = fileStatus( fileName ); vcsInfo->insert( fileName, entry.toVCSFileInfo() ); } diff --git a/vcs/cvsservice/cvsdir.h b/vcs/cvsservice/cvsdir.h index dc7cb53a..1d3f7d85 100644 --- a/vcs/cvsservice/cvsdir.h +++ b/vcs/cvsservice/cvsdir.h @@ -46,11 +46,11 @@ public: * @param refreshCache update internal cache re-parsing "<dirPath>/CVS/Entries" * @return an empty CVSEntry if the file is not present */ - CVSEntry filetqStatus( const TQString &fileName, bool refreshCache = false ) const; + CVSEntry fileStatus( const TQString &fileName, bool refreshCache = false ) const; /** */ - VCSFileInfoMap dirtqStatus() const; - VCSFileInfoMap *cacheableDirtqStatus() const; + VCSFileInfoMap dirStatus() const; + VCSFileInfoMap *cacheableDirStatus() const; /** * @return true if the file is registered into repository, false otherwise */ diff --git a/vcs/cvsservice/cvsentry.cpp b/vcs/cvsservice/cvsentry.cpp index bf478f7c..e9d7b676 100644 --- a/vcs/cvsservice/cvsentry.cpp +++ b/vcs/cvsservice/cvsentry.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include "cvsentry.h" #include "cvsdir.h" diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp index 2ed764f4..cbfc726f 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.cpp +++ b/vcs/cvsservice/cvsfileinfoprovider.cpp @@ -59,14 +59,14 @@ const VCSFileInfoMap *CVSFileInfoProvider::status( const TQString &dirPath ) delete m_cachedDirEntries; CVSDir cvsdir( projectDirectory() + TQDir::separator() + dirPath ); m_previousDirPath = dirPath; - m_cachedDirEntries = cvsdir.cacheableDirtqStatus(); + m_cachedDirEntries = cvsdir.cacheableDirStatus(); } return m_cachedDirEntries; } /////////////////////////////////////////////////////////////////////////////// -bool CVSFileInfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) +bool CVSFileInfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) { m_savedCallerData = callerData; if (m_requestStatusJob) @@ -131,11 +131,11 @@ void CVSFileInfoProvider::propagateUpdate() void CVSFileInfoProvider::updateStatusFor(const CVSDir& dir) { - m_cachedDirEntries = dir.cacheableDirtqStatus(); + m_cachedDirEntries = dir.cacheableDirStatus(); printOutFileInfoMap( *m_cachedDirEntries ); - /* FileTree will call requesttqStatus() everytime the user expands a directory - * Unfortunatly requesttqStatus() will be called before the + /* FileTree will call requestStatus() everytime the user expands a directory + * Unfortunatly requestStatus() will be called before the * VCSFileTreeViewItem of the directory will be filled with the files * it contains. Meaning, m_savedCallerData contains no childs at that * time. When a dcop call is made to run "cvs status" this is no problem. @@ -196,7 +196,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream ) { TQRegExp rx_recordStart( "^=+$" ); TQRegExp rx_fileName( "^File: (\\.|\\-|\\w)+" ); - TQRegExp rx_filetqStatus( "Status: (\\.|-|\\s|\\w)+" ); + TQRegExp rx_fileStatus( "Status: (\\.|-|\\s|\\w)+" ); TQRegExp rx_fileWorkRev( "\\bWorking revision:" ); TQRegExp rx_fileRepoRev( "\\bRepository revision:" ); //TQRegExp rx_stickyTag( "\\s+(Sticky Tag:\\W+(w+|\\(none\\)))" ); @@ -204,7 +204,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream ) //TQRegExp rx_stickyOptions( "" ); //@todo TQString fileName, - filetqStatus, + fileStatus, workingRevision, repositoryRevision, stickyTag, @@ -224,12 +224,12 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream ) if (rx_recordStart.exactMatch( s )) state = 1; - else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_filetqStatus.search( s ) >= 0) // FileName + else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_fileStatus.search( s ) >= 0) // FileName { fileName = rx_fileName.cap().replace( "File:", "" ).stripWhiteSpace(); - filetqStatus = rx_filetqStatus.cap().replace( "Status:", "" ).stripWhiteSpace(); + fileStatus = rx_fileStatus.cap().replace( "Status:", "" ).stripWhiteSpace(); ++state; // Next state - kdDebug(9006) << ">> " << fileName << ", " << filetqStatus << endl; + kdDebug(9006) << ">> " << fileName << ", " << fileStatus << endl; } else if (state == 2 && rx_fileWorkRev.search( s ) >= 0) { @@ -266,7 +266,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream ) { // Package stuff, put into map and get ready for a new record VCSFileInfo vcsInfo( fileName, workingRevision, repositoryRevision, - String2EnumState( filetqStatus ) ); + String2EnumState( fileStatus ) ); kdDebug(9006) << "== Inserting: " << vcsInfo.toString() << endl; vcsStates->insert( fileName, vcsInfo ); } diff --git a/vcs/cvsservice/cvsfileinfoprovider.h b/vcs/cvsservice/cvsfileinfoprovider.h index ead2d113..0a3d8887 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.h +++ b/vcs/cvsservice/cvsfileinfoprovider.h @@ -40,7 +40,7 @@ public: virtual const VCSFileInfoMap *status( const TQString &dirPath ) ; // -- Async interface for requesting data - virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ); + virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ); public slots: void updateStatusFor( const CVSDir& ); diff --git a/vcs/cvsservice/cvsformbase.ui b/vcs/cvsservice/cvsformbase.ui index 62abbfd5..875bac49 100644 --- a/vcs/cvsservice/cvsformbase.ui +++ b/vcs/cvsservice/cvsformbase.ui @@ -197,7 +197,7 @@ Most of the thime you'll just reuse the project name</string> <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> diff --git a/vcs/cvsservice/cvslogdialog.cpp b/vcs/cvsservice/cvslogdialog.cpp index df00d8a5..6d192f38 100644 --- a/vcs/cvsservice/cvslogdialog.cpp +++ b/vcs/cvsservice/cvslogdialog.cpp @@ -79,7 +79,7 @@ void CVSLogDialog::slotDiffRequested( const TQString &pathName, const TQString & kdDebug(9006) << "CVSLogDialog::slotDiffRequested()" << endl; // Create a new CVSDiffPage and start diffing process - TQString diffTitle = i18n("Diff between %1 and %2").tqarg( revA ).tqarg( revB ); + TQString diffTitle = i18n("Diff between %1 and %2").arg( revA ).arg( revB ); TQVBox *vbox = addVBoxPage( diffTitle ); CVSDiffPage *diffPage = new CVSDiffPage( m_cvsService, vbox ); diffPage->startDiff( pathName, revA, revB ); diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp index c9659e0c..226b9689 100644 --- a/vcs/cvsservice/cvslogpage.cpp +++ b/vcs/cvsservice/cvslogpage.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include <tqtextbrowser.h> -#include <tqlayout.h> +#include <textbrowser.h> +#include <layout.h> #include <tqregexp.h> #include <tqdir.h> #include <tqstringlist.h> @@ -113,7 +113,7 @@ void CVSLogPage::slotJobExited( bool normalExit, int exitStatus ) // m_part->core()->running( m_part, false ); if (!normalExit) { - KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").tqarg( exitStatus), i18n("Log Failed") ); + KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").arg( exitStatus), i18n("Log Failed") ); return; } diff --git a/vcs/cvsservice/cvsoptions.cpp b/vcs/cvsservice/cvsoptions.cpp index 6f2894e6..20cc198e 100644 --- a/vcs/cvsservice/cvsoptions.cpp +++ b/vcs/cvsservice/cvsoptions.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <kconfig.h> @@ -24,9 +24,9 @@ // Macros /////////////////////////////////////////////////////////////////////////////// -#define default_revert TQString::tqfromLatin1("-C") -#define default_diff TQString::tqfromLatin1("-p") -#define default_rsh TQString::tqfromLatin1("") +#define default_revert TQString::fromLatin1("-C") +#define default_diff TQString::fromLatin1("-p") +#define default_rsh TQString::fromLatin1("") #define default_contextLines 3 #define default_compression 0 diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp index bca0d2f2..9df91a9b 100644 --- a/vcs/cvsservice/cvspart.cpp +++ b/vcs/cvsservice/cvspart.cpp @@ -321,45 +321,45 @@ void CvsServicePart::contextMenu( TQPopupMenu *popup, const Context *context ) popup->insertSeparator(); int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.")); + subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.")); // CvsService let to do log and diff operations only on one file (or directory) at time if (m_urls.count() == 1) { id = subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Build difference</b><p>Builds difference between releases.")); + subMenu->setWhatsThis(id, i18n("<b>Build difference</b><p>Builds difference between releases.")); id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Generate log</b><p>Produces log for this file.")); + subMenu->setWhatsThis(id, i18n("<b>Generate log</b><p>Produces log for this file.")); id = subMenu->insertItem( actionAnnotate->text(), this, TQT_SLOT(slotAnnotate()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Generate Annotate</b><p>Produces annotation output for this file.")); + subMenu->setWhatsThis(id, i18n("<b>Generate Annotate</b><p>Produces annotation output for this file.")); } id = subMenu->insertItem( actionEditors->text(), this, TQT_SLOT(slotEditors()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Show editors</b><p>Shows the list of users who are editing files.")); + subMenu->setWhatsThis(id, i18n("<b>Show editors</b><p>Shows the list of users who are editing files.")); id = subMenu->insertItem( actionEdit->text(), this, TQT_SLOT(slotEdit()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Mark as beeing edited</b><p>Mark the files as beeing edited.")); + subMenu->setWhatsThis(id, i18n("<b>Mark as beeing edited</b><p>Mark the files as beeing edited.")); id = subMenu->insertItem( actionUnEdit->text(), this, TQT_SLOT(slotUnEdit()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files.")); + subMenu->setWhatsThis(id, i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files.")); id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Add to repository</b><p>Adds file to repository.")); + subMenu->setWhatsThis(id, i18n("<b>Add to repository</b><p>Adds file to repository.")); id = subMenu->insertItem( actionAddBinary->text(), this, TQT_SLOT(slotAddBinary()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option).")); + subMenu->setWhatsThis(id, i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option).")); id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotRemove()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository.")); + subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository.")); subMenu->insertSeparator(); id = subMenu->insertItem( actionTag->text(), this, TQT_SLOT(slotTag()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s).")); + subMenu->setWhatsThis(id, i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s).")); id = subMenu->insertItem( actionUnTag->text(), this, TQT_SLOT(slotUnTag()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Delete tag</b><p>Delete tag from selected file(s).")); + subMenu->setWhatsThis(id, i18n("<b>Delete tag</b><p>Delete tag from selected file(s).")); id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release.")); + subMenu->setWhatsThis(id, i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release.")); id = subMenu->insertItem( actionRemoveSticky->text(), this, TQT_SLOT(slotRemoveSticky()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s).")); + subMenu->setWhatsThis(id, i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s).")); subMenu->insertSeparator(); id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file.")); + subMenu->setWhatsThis(id, i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file.")); id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file.")); + subMenu->setWhatsThis(id, i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file.")); // Now insert in parent menu popup->insertItem( i18n("CvsService"), subMenu ); diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp index b8b1685d..7556f7bc 100644 --- a/vcs/cvsservice/cvspartimpl.cpp +++ b/vcs/cvsservice/cvspartimpl.cpp @@ -211,7 +211,7 @@ bool CvsServicePartImpl::isRegisteredInRepository( const TQString &projectDirect kdDebug(9006) << k_funcinfo << " Error: " << cvsdir.path() << " is not a valid CVS directory " << endl; return false; } - CVSEntry entry = cvsdir.filetqStatus( url.fileName() ); + CVSEntry entry = cvsdir.fileStatus( url.fileName() ); return entry.isValid(); } } @@ -639,7 +639,7 @@ void CvsServicePartImpl::diff( const KURL::List& urlList ) return; CVSDir cvsdir = CVSDir( urlList[0].directory() ); - CVSEntry entry = cvsdir.filetqStatus( urlList[0].fileName() ); + CVSEntry entry = cvsdir.fileStatus( urlList[0].fileName() ); DiffDialog dlg(entry); if (dlg.exec() != TQDialog::Accepted) diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp index ed7f3da2..b1e888ff 100644 --- a/vcs/cvsservice/cvsprocesswidget.cpp +++ b/vcs/cvsservice/cvsprocesswidget.cpp @@ -142,7 +142,7 @@ bool CvsProcessWidget::startJob( const DCOPRef &aJob ) // disconnect 3rd party slots from our signals disconnect( TQT_SIGNAL(jobFinished(bool, int)) ); - showInfo( i18n("Started job: %1").tqarg( cmdLine ) ); + showInfo( i18n("Started job: %1").arg( cmdLine ) ); #ifdef MYDCOPDEBUG g_dcopExitCounter = 0; @@ -187,7 +187,7 @@ void CvsProcessWidget::slotJobExited( bool normalExit, int exitStatus ) m_job = 0; } TQString exitMsg = i18n("Job finished with exitCode == %1"); - showInfo( exitMsg.tqarg( exitStatus) ); + showInfo( exitMsg.arg( exitStatus) ); m_part->core()->running( m_part, false ); m_part->mainWindow()->statusBar()->message( i18n("Done CVS command ..."), 2000 ); diff --git a/vcs/cvsservice/cvsprocesswidget.h b/vcs/cvsservice/cvsprocesswidget.h index ad2ec45a..fa302a4b 100644 --- a/vcs/cvsservice/cvsprocesswidget.h +++ b/vcs/cvsservice/cvsprocesswidget.h @@ -12,7 +12,7 @@ #ifndef _CVSPROCESSWIDGET_H_ #define _CVSPROCESSWIDGET_H_ -#include <tqtextedit.h> +#include <textedit.h> #include <tqstringlist.h> #include "cvsservicedcopIface.h" diff --git a/vcs/cvsservice/diffdialog.cpp b/vcs/cvsservice/diffdialog.cpp index a141d2a8..c86ae0ce 100644 --- a/vcs/cvsservice/diffdialog.cpp +++ b/vcs/cvsservice/diffdialog.cpp @@ -83,7 +83,7 @@ void DiffDialog::languageChange() { //FIXME: We need a function in CVSEntry to return the latest revision there is in cvs // if(!m_entry.revision().isNull()) -// diffLocalHeadRadio->setText( tr2i18n( "Local copy and &HEAD (%1)" ).tqarg( m_entry.revision()) ); +// diffLocalHeadRadio->setText( tr2i18n( "Local copy and &HEAD (%1)" ).arg( m_entry.revision()) ); } #include "diffdialog.moc" diff --git a/vcs/cvsservice/diffdialogbase.ui b/vcs/cvsservice/diffdialogbase.ui index b4995cb4..a5e07812 100644 --- a/vcs/cvsservice/diffdialogbase.ui +++ b/vcs/cvsservice/diffdialogbase.ui @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -69,7 +69,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -171,7 +171,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>130</width> <height>20</height> diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index b0f60a20..b1891a20 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/diffwidget.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include <tqlayout.h> -#include <tqtextedit.h> +#include <layout.h> +#include <textedit.h> #include <tqpopupmenu.h> #include <tqcursor.h> #include <tqfile.h> @@ -70,7 +70,7 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) int i = 0; for ( TQStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) { - popup->insertItem( i18n( "Show in %1" ).tqarg( *it ), i + POPUP_BASE, i ); + popup->insertItem( i18n( "Show in %1" ).arg( *it ), i + POPUP_BASE, i ); i++; } if ( !extPartsTranslated.isEmpty() ) @@ -186,8 +186,8 @@ DiffWidget::DiffWidget( TQWidget *parent, const char *name, WFlags f ): // te->setMinimumSize( 300, 200 ); connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( te ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->addWidget( te ); } DiffWidget::~DiffWidget() @@ -226,7 +226,7 @@ void DiffWidget::loadExtPart( const TQString& partName ) if ( !extPart || !extPart->widget() ) return; - tqlayout()->add( extPart->widget() ); + layout()->add( extPart->widget() ); setExtPartVisible( true ); diff --git a/vcs/cvsservice/diffwidget.h b/vcs/cvsservice/diffwidget.h index c220e4f0..c4828096 100644 --- a/vcs/cvsservice/diffwidget.h +++ b/vcs/cvsservice/diffwidget.h @@ -13,7 +13,7 @@ #define _DIFFWIDGET_H_ #include <tqwidget.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqstringlist.h> #include <kurl.h> diff --git a/vcs/cvsservice/editorsdialog.cpp b/vcs/cvsservice/editorsdialog.cpp index 79695840..bbd8443f 100644 --- a/vcs/cvsservice/editorsdialog.cpp +++ b/vcs/cvsservice/editorsdialog.cpp @@ -15,7 +15,7 @@ #include <kdebug.h> #include <dcopref.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <tqregexp.h> #include "editorsdialog.h" @@ -61,7 +61,7 @@ void EditorsDialog::slotJobExited( bool normalExit, int exitStatus ) { if (!normalExit) { - KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").tqarg( exitStatus), i18n("Log Failed") ); + KMessageBox::sorry( this, i18n("Log failed with exitStatus == %1").arg( exitStatus), i18n("Log Failed") ); return; } diff --git a/vcs/cvsservice/editorsdialogbase.ui b/vcs/cvsservice/editorsdialogbase.ui index 933d477f..37af7c1b 100644 --- a/vcs/cvsservice/editorsdialogbase.ui +++ b/vcs/cvsservice/editorsdialogbase.ui @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/vcs/cvsservice/integrator/fetcherdlgbase.ui b/vcs/cvsservice/integrator/fetcherdlgbase.ui index 398af4cf..9028b325 100644 --- a/vcs/cvsservice/integrator/fetcherdlgbase.ui +++ b/vcs/cvsservice/integrator/fetcherdlgbase.ui @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/vcs/cvsservice/integrator/initdlg.ui b/vcs/cvsservice/integrator/initdlg.ui index 6e5b76f1..82e26c55 100644 --- a/vcs/cvsservice/integrator/initdlg.ui +++ b/vcs/cvsservice/integrator/initdlg.ui @@ -53,7 +53,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp index 961094fc..5ae31ed1 100644 --- a/vcs/cvsservice/integrator/integratordlg.cpp +++ b/vcs/cvsservice/integrator/integratordlg.cpp @@ -21,10 +21,10 @@ #include <tqfile.h> #include <tqdir.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <tqregexp.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqcheckbox.h> #include <kapplication.h> @@ -81,11 +81,11 @@ void IntegratorDlg::init_clicked() if (!proc->normalExit()) KMessageBox::error(this, i18n("cvs init did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository")); else if (proc->exitStatus() != 0) - KMessageBox::error(this, i18n("cvs init exited with status %1. Please check if the cvs location is correct.").tqarg(proc->exitStatus()), i18n("Init CVS Repository")); + KMessageBox::error(this, i18n("cvs init exited with status %1. Please check if the cvs location is correct.").arg(proc->exitStatus()), i18n("Init CVS Repository")); else { - repository->insertItem(TQString(":local:%1").tqarg(url)); - repository->setCurrentText(TQString(":local:%1").tqarg(url)); + repository->insertItem(TQString(":local:%1").arg(url)); + repository->setCurrentText(TQString(":local:%1").arg(url)); } } } @@ -122,13 +122,13 @@ void IntegratorDlg::accept() proc->setWorkingDirectory(m_projectLocation); *proc << "cvs"; *proc << "-d" << repository->currentText() << "import" - << "-m" << TQString("\"%1\"").tqarg(comment->text()) << module->text() + << "-m" << TQString("\"%1\"").arg(comment->text()) << module->text() << vendorTag->text() << releaseTag->text(); proc->start(KProcess::Block); if (!proc->normalExit()) KMessageBox::error(this, i18n("cvs import did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository")); else if (proc->exitStatus() != 0) - KMessageBox::error(this, i18n("cvs import exited with status %1. Please check if the cvs location is correct.").tqarg(proc->exitStatus()), i18n("Init CVS Repository")); + KMessageBox::error(this, i18n("cvs import exited with status %1. Please check if the cvs location is correct.").arg(proc->exitStatus()), i18n("Init CVS Repository")); else { kdDebug() << "Project is in: " << m_projectLocation << endl; diff --git a/vcs/cvsservice/integrator/integratordlgbase.ui b/vcs/cvsservice/integrator/integratordlgbase.ui index 8e7cc979..6b53c738 100644 --- a/vcs/cvsservice/integrator/integratordlgbase.ui +++ b/vcs/cvsservice/integrator/integratordlgbase.ui @@ -29,7 +29,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <grid> <property name="name"> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -279,7 +279,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> diff --git a/vcs/cvsservice/releaseinputdialogbase.ui b/vcs/cvsservice/releaseinputdialogbase.ui index dbc59f7e..e6e65b15 100644 --- a/vcs/cvsservice/releaseinputdialogbase.ui +++ b/vcs/cvsservice/releaseinputdialogbase.ui @@ -37,7 +37,7 @@ <property name="title"> <string>Revision</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> <vbox> @@ -57,7 +57,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -92,7 +92,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -158,7 +158,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -174,7 +174,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> diff --git a/vcs/cvsservice/tagdialogbase.ui b/vcs/cvsservice/tagdialogbase.ui index 2ac067b3..86390490 100644 --- a/vcs/cvsservice/tagdialogbase.ui +++ b/vcs/cvsservice/tagdialogbase.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -83,7 +83,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>20</height> diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp index 1f1f8290..8625ecd0 100644 --- a/vcs/perforce/commitdlg.cpp +++ b/vcs/perforce/commitdlg.cpp @@ -12,9 +12,9 @@ #include "commitdlg.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqpushbutton.h> #include <tqregexp.h> #include <kprocess.h> @@ -38,11 +38,11 @@ CommitDialog::CommitDialog( TQWidget *parent, const char *name ) TQFontMetrics fm(edit->fontMetrics()); edit->setMinimumSize(fm.width("0")*40, fm.lineSpacing()*3); - TQVBoxLayout *tqlayout = new TQVBoxLayout( w, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( w, 0, spacingHint() ); TQLabel *editLabel = new TQLabel(i18n("&Enter description:"), w); editLabel->setBuddy(edit); - tqlayout->addWidget(editLabel); - tqlayout->addWidget(edit); + layout->addWidget(editLabel); + layout->addWidget(edit); w = new TQWidget( this, "details widget" ); @@ -50,19 +50,19 @@ CommitDialog::CommitDialog( TQWidget *parent, const char *name ) userEdit = new KLineEdit( w ); filesBox = new KListBox( w ); - tqlayout = new TQVBoxLayout( w, 0, spacingHint() ); + layout = new TQVBoxLayout( w, 0, spacingHint() ); TQLabel *clientLabel = new TQLabel(i18n("C&lient:"), w); clientLabel->setBuddy(clientEdit); - tqlayout->addWidget(clientLabel); - tqlayout->addWidget( clientEdit ); + layout->addWidget(clientLabel); + layout->addWidget( clientEdit ); TQLabel *userLabel = new TQLabel(i18n("&User:"), w); userLabel->setBuddy(userEdit); - tqlayout->addWidget( userLabel ); - tqlayout->addWidget( userEdit ); + layout->addWidget( userLabel ); + layout->addWidget( userEdit ); TQLabel *filesLabel = new TQLabel(i18n("&File(s):"), w); filesLabel->setBuddy(filesBox); - tqlayout->addWidget( filesLabel ); - tqlayout->addWidget( filesBox ); + layout->addWidget( filesLabel ); + layout->addWidget( filesBox ); setDetailsWidget( w ); autoGuess(); diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h index 83766914..56fd680e 100644 --- a/vcs/perforce/commitdlg.h +++ b/vcs/perforce/commitdlg.h @@ -14,7 +14,7 @@ #define _COMMITDIALOG_H_ #include <tqstringlist.h> -#include <tqtextedit.h> +#include <textedit.h> #include <klineedit.h> #include <klistbox.h> #include <kdialogbase.h> diff --git a/vcs/perforce/integrator/pfintegratordlgbase.ui b/vcs/perforce/integrator/pfintegratordlgbase.ui index 8d1c3530..f798e42a 100644 --- a/vcs/perforce/integrator/pfintegratordlgbase.ui +++ b/vcs/perforce/integrator/pfintegratordlgbase.ui @@ -34,7 +34,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>435</height> diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp index ca81a8d4..dd501e37 100644 --- a/vcs/perforce/perforcepart.cpp +++ b/vcs/perforce/perforcepart.cpp @@ -94,30 +94,30 @@ void PerforcePart::contextMenu(TQPopupMenu *popup, const Context *context) KPopupMenu *sub = new KPopupMenu(popup); TQString name = fi.fileName(); - sub->insertTitle( i18n("Actions for %1").tqarg(name) ); + sub->insertTitle( i18n("Actions for %1").arg(name) ); int id = sub->insertItem( i18n("Edit"), this, TQT_SLOT(slotEdit()) ); - sub->tqsetWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit.")); + sub->setWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit.")); id = sub->insertItem( i18n("Revert"), this, TQT_SLOT(slotRevert()) ); - sub->tqsetWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files.")); + sub->setWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files.")); id = sub->insertItem( i18n("Submit"), this, TQT_SLOT(slotCommit()) ); - sub->tqsetWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot.")); + sub->setWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot.")); id = sub->insertItem( i18n("Sync"), this, TQT_SLOT(slotUpdate()) ); - sub->tqsetWhatsThis(id, i18n("<b>Sync</b><p>Copies files from the depot into the workspace.")); + sub->setWhatsThis(id, i18n("<b>Sync</b><p>Copies files from the depot into the workspace.")); sub->insertSeparator(); id = sub->insertItem( i18n("Diff Against Repository"), this, TQT_SLOT(slotDiff()) ); - sub->tqsetWhatsThis(id, i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot.")); + sub->setWhatsThis(id, i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot.")); id = sub->insertItem( i18n("Add to Repository"), this, TQT_SLOT(slotAdd()) ); - sub->tqsetWhatsThis(id, i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot.")); + sub->setWhatsThis(id, i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot.")); id = sub->insertItem( i18n("Remove From Repository"), this, TQT_SLOT(slotRemove()) ); - sub->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot.")); + sub->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot.")); id = popup->insertItem(i18n("Perforce"), sub); } } @@ -153,7 +153,7 @@ void PerforcePart::revert( const TQString& filename ) { if ( KMessageBox::questionYesNo( 0, i18n("Do you really want to revert " - "the file %1 and lose all your changes?").tqarg( filename ), TQString(), i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) { + "the file %1 and lose all your changes?").arg( filename ), TQString(), i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) { execCommand( "revert", filename ); } } diff --git a/vcs/subversion/commitdlgbase.ui b/vcs/subversion/commitdlgbase.ui index d557aa91..d58bd745 100644 --- a/vcs/subversion/commitdlgbase.ui +++ b/vcs/subversion/commitdlgbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -42,7 +42,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>220</width> <height>20</height> diff --git a/vcs/subversion/integrator/svnintegratordlgbase.ui b/vcs/subversion/integrator/svnintegratordlgbase.ui index 52ce91a5..76b68321 100644 --- a/vcs/subversion/integrator/svnintegratordlgbase.ui +++ b/vcs/subversion/integrator/svnintegratordlgbase.ui @@ -105,7 +105,7 @@ file:///home/user/subversion/mynewproject</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -156,7 +156,7 @@ http://localhost/svn/projectname/trunk</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>131</height> diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp index c5c341a5..5e2ec8d9 100644 --- a/vcs/subversion/kdevsvnd.cpp +++ b/vcs/subversion/kdevsvnd.cpp @@ -239,7 +239,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) // return false; // } // -// int KSvnd::gettqStatus( const KURL::List& list ) { +// int KSvnd::getStatus( const KURL::List& list ) { // int result = 0; // uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0; // for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { @@ -299,18 +299,18 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) // // TQStringList KSvnd::getActionMenu ( const KURL::List &list ) { // TQStringList result; -// int listtqStatus = gettqStatus( list ); +// int listStatus = getStatus( list ); // -// if ( !(listtqStatus & SomeAreInParentsEntries) && -// !(listtqStatus & SomeAreExternalToParent) && -// !(listtqStatus & SomeHaveSvn)) { -// if( list.size() == 1 && listtqStatus & SomeAreFolders) { +// if ( !(listStatus & SomeAreInParentsEntries) && +// !(listStatus & SomeAreExternalToParent) && +// !(listStatus & SomeHaveSvn)) { +// if( list.size() == 1 && listStatus & SomeAreFolders) { // result << "Checkout"; // result << "Export"; // // result << "CreateRepository"; // result << "Import"; // } -// } else if ( (listtqStatus & AllAreInParentsEntries) ) { +// } else if ( (listStatus & AllAreInParentsEntries) ) { // result << "Diff"; // //In SVN // // result << "ShowLog"; @@ -320,7 +320,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) // // result << "Update to revision..." // result << "Rename"; // result << "Delete"; -// if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) { +// if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) { // result << "Revert"; // // result << "Cleanup"; // } @@ -328,19 +328,19 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) // // result << "BranchTag"; // result << "Switch"; // result << "Merge"; -// if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) { +// if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) { // // result << "Export"; // // result << "Relocate"; // result << "_SEPARATOR_"; // result << "Add"; // } // result << "_SEPARATOR_"; -// if( listtqStatus & SomeAreFiles && !(listtqStatus & SomeAreFolders)) { +// if( listStatus & SomeAreFiles && !(listStatus & SomeAreFolders)) { // result << "Blame"; // } // result << "CreatePatch"; // -// if( list.size() == 1 && listtqStatus & SomeAreFolders) { +// if( list.size() == 1 && listStatus & SomeAreFolders) { // // result << "ApplyPatchToFolder"; // } // } @@ -349,12 +349,12 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) // // TQStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) { // TQStringList result; -// int listtqStatus = gettqStatus( list ); +// int listStatus = getStatus( list ); // // -// if ( ( listtqStatus & AllParentsHaveSvn && -// ( ( listtqStatus & SomeAreExternalToParent ) || ( listtqStatus & SomeAreInParentsEntries ) ) -// || ( listtqStatus & SomeHaveSvn ) ) +// if ( ( listStatus & AllParentsHaveSvn && +// ( ( listStatus & SomeAreExternalToParent ) || ( listStatus & SomeAreInParentsEntries ) ) +// || ( listStatus & SomeHaveSvn ) ) // ) { // result << "Update"; // result << "Commit"; diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index f49ac302..75546d11 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -40,9 +40,9 @@ #include <ktempfile.h> #include <kprocess.h> #include <kstandarddirs.h> -#include <tqtextcodec.h> -#include <tqtextstream.h> -#include <tqtextbrowser.h> +#include <textcodec.h> +#include <textstream.h> +#include <textbrowser.h> #include <kmessagebox.h> #include <klocale.h> #include <tqregexp.h> @@ -223,7 +223,7 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){ if ( where=="HEAD"){ diffTo=i18n("the current svn HEAD version."); } - KMessageBox::information( 0, i18n("No differences between the file and %1").tqarg(diffTo), i18n("No difference") ); + KMessageBox::information( 0, i18n("No differences between the file and %1").arg(diffTo), i18n("No difference") ); } diffresult.clear(); } diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp index 8ea4e4d5..be0a4411 100644 --- a/vcs/subversion/subversion_fileinfo.cpp +++ b/vcs/subversion/subversion_fileinfo.cpp @@ -123,14 +123,14 @@ const VCSFileInfoMap *SVNFileInfoProvider::status( const TQString &dirPath ) { if ( rx.search( *it ) == -1 ) break; // something is wrong ! :) curIdx = rx.cap( 1 ).toInt(); } - slottqStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev); + slotStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev); } } kdDebug(9036) << " Returning VcsFileInfoMap. provider::status() finished " << endl; return m_cachedDirEntries; } -bool SVNFileInfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) { +bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) { kdDebug(9036) << "##################################################################################### svn provider : request status" << endl; m_savedCallerData = callerData; // Flush old cache @@ -210,14 +210,14 @@ void SVNFileInfoProvider::slotResult( KIO::Job *j ) { if ( rx.search( *it ) == -1 ) break; // something is wrong ! :) curIdx = rx.cap( 1 ).toInt(); } - slottqStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev); + slotStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev); } if ( m_cachedDirEntries ) emit statusReady(*m_cachedDirEntries, m_savedCallerData); } -void SVNFileInfoProvider::slottqStatus( const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) { +void SVNFileInfoProvider::slotStatus( const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) { // kdDebug(9036) << "##################################################################################### svn provider : slotstatus" // << " path " << path << " text_status " << text_status << " prop_status " << prop_status << " repos_text_status " << repos_text_status // << " repos_prop_status " << repos_prop_status << " rev " << rev diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h index dc1bfe1e..4729c35b 100644 --- a/vcs/subversion/subversion_fileinfo.h +++ b/vcs/subversion/subversion_fileinfo.h @@ -51,12 +51,12 @@ public: void slotStatusExt( const TQString&, const TQString& , int, int, int, int, long int ) ; // -- Async interface for requesting data - virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ); + virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ); TQString projectDirectory() const; k_dcop: - void slottqStatus( const TQString& , int, int, int, int, long int ) ; + void slotStatus( const TQString& , int, int, int, int, long int ) ; public slots: void slotResult( KIO::Job * ); diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp index a98f2298..af58f7c8 100644 --- a/vcs/subversion/subversion_part.cpp +++ b/vcs/subversion/subversion_part.cpp @@ -220,42 +220,42 @@ if(!project()) subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) ); subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); }*/ - subMenu->tqsetWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.")); + subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.")); id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository.")); + subMenu->setWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository.")); id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotDel()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository.")); + subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository.")); id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs")); + subMenu->setWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs")); id = subMenu->insertItem( actionBlame->text(), this, TQT_SLOT(slotBlame()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate")); + subMenu->setWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate")); subMenu->insertSeparator(); id = subMenu->insertItem( actionDiffLocal->text(), this, TQT_SLOT(slotDiffLocal()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk.")); + subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk.")); id = subMenu->insertItem( actionDiffHead->text(), this, TQT_SLOT(slotDiffHead()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository.")); + subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository.")); id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository.")); + subMenu->setWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository.")); id = subMenu->insertItem( actionRevert->text(), this, TQT_SLOT(slotRevert()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") ); + subMenu->setWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") ); id = subMenu->insertItem( actionResolve->text(), this, TQT_SLOT(slotResolve()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") ); + subMenu->setWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") ); id = subMenu->insertItem( actionSwitch->text(), this, TQT_SLOT(slotSwitch()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") ); + subMenu->setWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") ); id = subMenu->insertItem( actionCopy->text(), this, TQT_SLOT(slotCopy()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") ); + subMenu->setWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") ); id = subMenu->insertItem( actionMerge->text(), this, TQT_SLOT(slotMerge()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") ); + subMenu->setWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") ); /* subMenu->insertSeparator(); id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s).")); + subMenu->setWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s).")); id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) ); - subMenu->tqsetWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s).")); + subMenu->setWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s).")); */ // Now insert in parent menu popup->insertItem( i18n("Subversion"), subMenu ); diff --git a/vcs/subversion/subversiondiff.ui b/vcs/subversion/subversiondiff.ui index e647f6b6..a624e6bb 100644 --- a/vcs/subversion/subversiondiff.ui +++ b/vcs/subversion/subversiondiff.ui @@ -60,7 +60,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/vcs/subversion/subversionprojectwidget.ui b/vcs/subversion/subversionprojectwidget.ui index 19529991..22f43ba9 100644 --- a/vcs/subversion/subversionprojectwidget.ui +++ b/vcs/subversion/subversionprojectwidget.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp index b4095389..49afb744 100644 --- a/vcs/subversion/svn_blamewidget.cpp +++ b/vcs/subversion/svn_blamewidget.cpp @@ -16,7 +16,7 @@ #include "subversion_widget.h" #include <tqmap.h> #include <tqlistview.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqstringlist.h> #include <tqfont.h> diff --git a/vcs/subversion/svn_co.ui b/vcs/subversion/svn_co.ui index 73bc66b5..db9d8f31 100644 --- a/vcs/subversion/svn_co.ui +++ b/vcs/subversion/svn_co.ui @@ -48,7 +48,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -82,7 +82,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -139,7 +139,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <vbox> <property name="name"> @@ -191,7 +191,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -225,7 +225,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -253,7 +253,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -269,7 +269,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>191</width> <height>20</height> @@ -278,7 +278,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> diff --git a/vcs/subversion/svn_commitdlgbase.ui b/vcs/subversion/svn_commitdlgbase.ui index d6ebee02..75937324 100644 --- a/vcs/subversion/svn_commitdlgbase.ui +++ b/vcs/subversion/svn_commitdlgbase.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>335</width> <height>30</height> @@ -76,7 +76,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="2"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> diff --git a/vcs/subversion/svn_copydlgwidget.ui b/vcs/subversion/svn_copydlgwidget.ui index 4361afe2..e874206a 100644 --- a/vcs/subversion/svn_copydlgwidget.ui +++ b/vcs/subversion/svn_copydlgwidget.ui @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>31</height> diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp index 25149483..0c014a9d 100644 --- a/vcs/subversion/svn_fileselectdlg_commit.cpp +++ b/vcs/subversion/svn_fileselectdlg_commit.cpp @@ -86,17 +86,17 @@ SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart vcsInfo = it.data(); // TQString absPathStr( fileInfo.absFilePath() + "/" + it.key() ); TQString absPathStr( fileInfo.filePath() + "/" + it.key() ); - KURL urlFromtqStatus( absPathStr ); + KURL urlFromStatus( absPathStr ); if( vcsInfo.state == VCSFileInfo::Added || vcsInfo.state == VCSFileInfo::Modified || vcsInfo.state == VCSFileInfo::Deleted || vcsInfo.state == VCSFileInfo::Replaced){ - this->insertItem( VCSFileInfo::state2String( vcsInfo.state ), urlFromtqStatus ); + this->insertItem( VCSFileInfo::state2String( vcsInfo.state ), urlFromStatus ); -// tobeCommittedUrls.push_back( urlFromtqStatus ); -// kdDebug(9036) << "slotCommit() @ DirCase adding " << urlFromtqStatus.prettyURL() << endl; +// tobeCommittedUrls.push_back( urlFromStatus ); +// kdDebug(9036) << "slotCommit() @ DirCase adding " << urlFromStatus.prettyURL() << endl; } else{ - kdDebug(9036) << "slotCommit() @ DirCase ignoring " << urlFromtqStatus.prettyURL() << endl; + kdDebug(9036) << "slotCommit() @ DirCase ignoring " << urlFromStatus.prettyURL() << endl; } } diff --git a/vcs/subversion/svn_kio.cpp b/vcs/subversion/svn_kio.cpp index 8b97d3f2..7646e727 100644 --- a/vcs/subversion/svn_kio.cpp +++ b/vcs/subversion/svn_kio.cpp @@ -223,7 +223,7 @@ svn_error_t* kio_svnProtocol::checkAuth(svn_auth_cred_simple_t **cred, void *bat p->info.url = p->myURL; p->info.username = username; //( const char* )svn_auth_get_parameter( p->ctx->auth_baton, SVN_AUTH_PARAM_DEFAULT_USERNAME ); if (realm) { - p->info.prompt = i18n("Username and Password for %1.").tqarg(realm); + p->info.prompt = i18n("Username and Password for %1.").arg(realm); } // if ( !p->checkCachedAuthentication( p->info ) ){ @@ -246,7 +246,7 @@ void kio_svnProtocol::get(const KURL& url ){ kdDebug(9036) << "kio_svn::get(const KURL& url)" << endl ; TQString remoteServer = url.host(); - infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) ); + infoMessage(i18n("Looking for %1...").arg( remoteServer ) ); apr_pool_t *subpool = svn_pool_create (pool); kbaton *bt = (kbaton*)apr_pcalloc(subpool, sizeof(*bt)); @@ -1261,7 +1261,7 @@ void kio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl, } m_counter = 0L; setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string", - TQString("switched to %1").tqarg( toUrl ) ); + TQString("switched to %1").arg( toUrl ) ); finished(); svn_pool_destroy( subpool ); } @@ -1384,7 +1384,7 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc TQString userstring = i18n ( "Nothing to commit." ); if ( SVN_IS_VALID_REVNUM( commit_info->revision ) ) - userstring = i18n( "Committed revision %1." ).tqarg(commit_info->revision); + userstring = i18n( "Committed revision %1." ).arg(commit_info->revision); setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() ); setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" ); setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" ); @@ -1584,7 +1584,7 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString & if( commit_info ){ setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string", - i18n("Copied Revision %1").tqarg( commit_info->revision) ); + i18n("Copied Revision %1").arg( commit_info->revision) ); } else { setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string", i18n("Copied") ); @@ -1900,42 +1900,42 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action switch ( action ) { case svn_wc_notify_add : //add if (mime_type && (svn_mime_type_is_binary (mime_type))) - userstring = i18n( "A (bin) %1" ).tqarg( path ); + userstring = i18n( "A (bin) %1" ).arg( path ); else - userstring = i18n( "A %1" ).tqarg( path ); + userstring = i18n( "A %1" ).arg( path ); break; case svn_wc_notify_copy: //copy - userstring = i18n( "Copied %1 " ).tqarg( path ); + userstring = i18n( "Copied %1 " ).arg( path ); break; case svn_wc_notify_delete: //delete nb->received_some_change = TRUE; - userstring = i18n( "D %1" ).tqarg( path ); + userstring = i18n( "D %1" ).arg( path ); break; case svn_wc_notify_restore : //restore - userstring=i18n( "Restored %1." ).tqarg( path ); + userstring=i18n( "Restored %1." ).arg( path ); break; case svn_wc_notify_revert : //revert - userstring=i18n( "Reverted %1." ).tqarg( path ); + userstring=i18n( "Reverted %1." ).arg( path ); break; case svn_wc_notify_failed_revert: //failed revert - userstring=i18n( "Failed to revert %1.\nTry updating instead." ).tqarg( path ); + userstring=i18n( "Failed to revert %1.\nTry updating instead." ).arg( path ); break; case svn_wc_notify_resolved: //resolved - userstring=i18n( "Resolved conflicted state of %1." ).tqarg( path ); + userstring=i18n( "Resolved conflicted state of %1." ).arg( path ); break; case svn_wc_notify_skip: //skip if ( content_state == svn_wc_notify_state_missing ) - userstring=i18n("Skipped missing target %1.").tqarg( path ); + userstring=i18n("Skipped missing target %1.").arg( path ); else - userstring=i18n("Skipped %1.").tqarg( path ); + userstring=i18n("Skipped %1.").arg( path ); break; case svn_wc_notify_update_delete: //update_delete nb->received_some_change = TRUE; - userstring=i18n( "D %1" ).tqarg( path ); + userstring=i18n( "D %1" ).arg( path ); break; case svn_wc_notify_update_add: //update_add nb->received_some_change = TRUE; - userstring=i18n( "A %1" ).tqarg( path ); + userstring=i18n( "A %1" ).arg( path ); break; case svn_wc_notify_update_update: //update_update { @@ -1980,25 +1980,25 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action if (SVN_IS_VALID_REVNUM (revision)) { if (nb->is_export) { if ( nb->in_external ) - userstring = i18n("Exported external at revision %1.").tqarg( revision ); + userstring = i18n("Exported external at revision %1.").arg( revision ); else - userstring = i18n("Exported revision %1.").tqarg( revision ); + userstring = i18n("Exported revision %1.").arg( revision ); } else if (nb->is_checkout) { if ( nb->in_external ) - userstring = i18n("Checked out external at revision %1.").tqarg( revision ); + userstring = i18n("Checked out external at revision %1.").arg( revision ); else - userstring = i18n("Checked out revision %1.").tqarg( revision); + userstring = i18n("Checked out revision %1.").arg( revision); } else { if (nb->received_some_change) { if ( nb->in_external ) - userstring=i18n("Updated external to revision %1.").tqarg( revision ); + userstring=i18n("Updated external to revision %1.").arg( revision ); else - userstring = i18n("Updated to revision %1.").tqarg( revision); + userstring = i18n("Updated to revision %1.").arg( revision); } else { if ( nb->in_external ) - userstring = i18n("External at revision %1.").tqarg( revision ); + userstring = i18n("External at revision %1.").arg( revision ); else - userstring = i18n("At revision %1.").tqarg( revision); + userstring = i18n("At revision %1.").arg( revision); } } } else /* no revision */ { @@ -2026,30 +2026,30 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action break; case svn_wc_notify_update_external: //update_external nb->in_external = TRUE; - userstring = i18n("Fetching external item into %1." ).tqarg( path ); + userstring = i18n("Fetching external item into %1." ).arg( path ); break; case svn_wc_notify_status_completed: //status_completed if (SVN_IS_VALID_REVNUM (revision)) - userstring = i18n( "Status against revision: %1.").tqarg( revision ); + userstring = i18n( "Status against revision: %1.").arg( revision ); break; case svn_wc_notify_status_external: //status_external - userstring = i18n("Performing status on external item at %1.").tqarg( path ); + userstring = i18n("Performing status on external item at %1.").arg( path ); break; case svn_wc_notify_commit_modified: //commit_modified - userstring = i18n( "Sending %1").tqarg( path ); + userstring = i18n( "Sending %1").arg( path ); break; case svn_wc_notify_commit_added: //commit_added if (mime_type && svn_mime_type_is_binary (mime_type)) { - userstring = i18n( "Adding (bin) %1.").tqarg( path ); + userstring = i18n( "Adding (bin) %1.").arg( path ); } else { - userstring = i18n( "Adding %1.").tqarg( path ); + userstring = i18n( "Adding %1.").arg( path ); } break; case svn_wc_notify_commit_deleted: //commit_deleted - userstring = i18n( "Deleting %1.").tqarg( path ); + userstring = i18n( "Deleting %1.").arg( path ); break; case svn_wc_notify_commit_replaced: //commit_replaced - userstring = i18n( "Replacing %1.").tqarg( path ); + userstring = i18n( "Replacing %1.").arg( path ); break; case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta if (! nb->sent_first_txdelta) { @@ -2062,7 +2062,7 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action break; case svn_wc_notify_blame_revision: //blame_revision - userstring = i18n("Blame %1.").tqarg(path); + userstring = i18n("Blame %1.").arg(path); break; default: break; diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp index 541d1674..7a1346d1 100644 --- a/vcs/subversion/svn_logviewwidget.cpp +++ b/vcs/subversion/svn_logviewwidget.cpp @@ -35,7 +35,7 @@ #include <tqsplitter.h> #include <tqheader.h> #include <tqlistview.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstringlist.h> SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) @@ -52,7 +52,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) listView1->addColumn( i18n( "Date" ) ); listView1->addColumn( i18n( "Author" ) ); listView1->addColumn( i18n( "Comment" ) ); - listView1->resize( TQSize(1, 1).expandedTo(tqminimumSizeHint()) ); + listView1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) ); TQFont listView1_font( listView1->font() ); listView1_font.setPointSize( 9 ); listView1->setFont( listView1_font ); @@ -60,7 +60,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) listView1->setShowSortIndicator( TRUE ); textEdit1 = new KTextEdit( splitter1, "textEdit1" ); - textEdit1->resize( TQSize(1, 1).expandedTo(tqminimumSizeHint()) ); + textEdit1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) ); TQFont textEdit1_font( textEdit1->font() ); textEdit1_font.setPointSize( 9 ); textEdit1->setFont( textEdit1_font ); @@ -70,7 +70,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) m_layout->addWidget( splitter1, 0, 0 ); m_layout->setMargin(1); - resize( TQSize(692, 343).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(692, 343).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); connect( listView1, TQT_SIGNAL(clicked( TQListViewItem *)), this, TQT_SLOT(slotClicked(TQListViewItem*)) ); diff --git a/vcs/subversion/svn_mergeoptiondlgbase.ui b/vcs/subversion/svn_mergeoptiondlgbase.ui index d42a2707..b54ead45 100644 --- a/vcs/subversion/svn_mergeoptiondlgbase.ui +++ b/vcs/subversion/svn_mergeoptiondlgbase.ui @@ -279,7 +279,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>171</width> <height>31</height> diff --git a/vcs/subversion/svn_switchdlgbase.ui b/vcs/subversion/svn_switchdlgbase.ui index 3c640661..87533197 100644 --- a/vcs/subversion/svn_switchdlgbase.ui +++ b/vcs/subversion/svn_switchdlgbase.ui @@ -24,7 +24,7 @@ <cstring>nonRecurseCheck</cstring> </property> <property name="text"> - <string>Non-recursive. (Switch its immediate tqchildren only)</string> + <string>Non-recursive. (Switch its immediate children only)</string> </property> </widget> <widget class="Line" row="5" column="0" rowspan="1" colspan="2"> @@ -43,7 +43,7 @@ </widget> <widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>150</width> <height>30</height> diff --git a/vcs/subversion/svnssltrustpromptbase.ui b/vcs/subversion/svnssltrustpromptbase.ui index a4c5d0c9..fc72c0d5 100644 --- a/vcs/subversion/svnssltrustpromptbase.ui +++ b/vcs/subversion/svnssltrustpromptbase.ui @@ -86,7 +86,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> |